msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-15 11:57+0800\n"
+"POT-Creation-Date: 2018-12-02 10:55+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: advice.c:58
+#: advice.c:99
#, c-format
-msgid "hint: %.*s\n"
+msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:86
+#: advice.c:152
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:88
+#: advice.c:154
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:90
+#: advice.c:156
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:92
+#: advice.c:158
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:94
+#: advice.c:160
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:96
+#: advice.c:162
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:104
+#: advice.c:170
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: advice.c:112
+#: advice.c:178
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:183 builtin/merge.c:1289
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:119
+#: advice.c:185
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:120
+#: advice.c:186
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:126
+#: advice.c:192
#, c-format
msgid ""
"Note: checking out '%s'.\n"
"\n"
msgstr ""
-#: apply.c:58
+#: apply.c:59
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: apply.c:74
+#: apply.c:75
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:126
+#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:128
+#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr ""
-#: apply.c:131
+#: apply.c:130
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:142
+#: apply.c:141
msgid "--index outside a repository"
msgstr ""
-#: apply.c:145
+#: apply.c:144
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:836
+#: apply.c:826
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:845
+#: apply.c:835
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:929
+#: apply.c:909
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:967
+#: apply.c:947
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:973
+#: apply.c:953
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:974
+#: apply.c:954
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:979
+#: apply.c:959
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:1008
+#: apply.c:988
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1326
+#: apply.c:1307
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1498
+#: apply.c:1479
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1567
+#: apply.c:1548
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1587
+#: apply.c:1568
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1600
+#: apply.c:1581
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1770
+#: apply.c:1769
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1772
+#: apply.c:1771
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1806
+#: apply.c:1805
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1843
+#: apply.c:1842
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1845
+#: apply.c:1844
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1848
+#: apply.c:1847
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1995
+#: apply.c:1994
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2032
+#: apply.c:2031
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2276
+#: apply.c:2279
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2280
+#: apply.c:2283
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2933
+#: apply.c:2942
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3052
+#: apply.c:3063
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:3064
+#: apply.c:3075
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3070
+#: apply.c:3081
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3092
+#: apply.c:3103
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3100
+#: apply.c:3111
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3146
+#: apply.c:3158
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3156
+#: apply.c:3168
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3164
+#: apply.c:3176
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3182
+#: apply.c:3194
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3195
+#: apply.c:3207
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3201
+#: apply.c:3213
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3222
+#: apply.c:3234
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3344
+#: apply.c:3356
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3400
+#: apply.c:3416
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3429 apply.c:3669
+#: apply.c:3445 apply.c:3688
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3512 apply.c:3683
+#: apply.c:3531 apply.c:3703
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3521 apply.c:3691
+#: apply.c:3540 apply.c:3711
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3556
+#: apply.c:3575
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3559
+#: apply.c:3578
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3575 apply.c:3579
+#: apply.c:3594 apply.c:3598
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3591
+#: apply.c:3610
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3605
+#: apply.c:3624
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3610
+#: apply.c:3629
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3636
+#: apply.c:3655
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3708
+#: apply.c:3728
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3710
+#: apply.c:3730
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3860 apply.c:3862
+#: apply.c:3881 apply.c:3883
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3918
+#: apply.c:3939
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3921
+#: apply.c:3942
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3941
+#: apply.c:3962
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3946
+#: apply.c:3967
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3966
+#: apply.c:3987
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3970
+#: apply.c:3991
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3985
+#: apply.c:4006
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4076
+#: apply.c:4098
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4083
+#: apply.c:4105
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4086
+#: apply.c:4108
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4095
+#: apply.c:4117
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4105
+#: apply.c:4127
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4243
+#: apply.c:4265
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4278
+#: apply.c:4299
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4284
+#: apply.c:4305
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4292
+#: apply.c:4313
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4298 apply.c:4442
+#: apply.c:4319 apply.c:4464
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4339
+#: apply.c:4362
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4343
+#: apply.c:4366
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4413
+#: apply.c:4436
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4511
+#: apply.c:4534
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4519
+#: apply.c:4542
msgid "internal error"
msgstr ""
-#: apply.c:4522
+#: 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:4533
+#: apply.c:4556
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4555
+#: apply.c:4578
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4559
+#: apply.c:4582
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4669
+#: apply.c:4692
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4677
+#: apply.c:4700
msgid "unrecognized input"
msgstr ""
-#: apply.c:4696
+#: apply.c:4719
msgid "unable to read index file"
msgstr ""
-#: apply.c:4833
+#: apply.c:4874
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4860
+#: apply.c:4901
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4866 apply.c:4881
+#: apply.c:4907 apply.c:4922
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4874
+#: apply.c:4915
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
-#: git-add--interactive.perl:197
+#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
+#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
+#: builtin/pull.c:199 builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
+#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
+#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
msgid "path"
msgstr ""
-#: apply.c:4922
+#: apply.c:4959
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4925
+#: apply.c:4962
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4964 builtin/am.c:2218
msgid "num"
msgstr ""
-#: apply.c:4928
+#: apply.c:4965
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4931
+#: apply.c:4968
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4933
+#: apply.c:4970
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4937
+#: apply.c:4974
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4939
+#: apply.c:4976
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4941
+#: apply.c:4978
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4943
+#: apply.c:4980
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4945
+#: apply.c:4982
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:4984
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4947
+#: apply.c:4986
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4949
+#: apply.c:4989
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4951
+#: apply.c:4991
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4953
+#: apply.c:4993
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4958
+#: apply.c:4998
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3312 builtin/rebase.c:857
msgid "action"
msgstr ""
-#: apply.c:4960
+#: apply.c:5000
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4963 apply.c:4966
+#: apply.c:5003 apply.c:5006
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4969
+#: apply.c:5009
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4971
+#: apply.c:5011
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4973
+#: apply.c:5013
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4975
+#: apply.c:5015
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
+#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
+#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
+#: builtin/rebase--interactive.c:157
msgid "be verbose"
msgstr ""
-#: apply.c:4978
+#: apply.c:5018
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4981
+#: apply.c:5021
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5023 builtin/am.c:2206
msgid "root"
msgstr ""
-#: apply.c:4984
+#: apply.c:5024
msgid "prepend <root> to all filenames"
msgstr ""
-#: archive.c:13
+#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: archive.c:14
+#: archive.c:15
msgid "git archive --list"
msgstr ""
-#: archive.c:15
+#: archive.c:16
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: archive.c:16
+#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:418
+#: archive.c:453
msgid "fmt"
msgstr ""
-#: archive.c:418
+#: archive.c:453
msgid "archive format"
msgstr ""
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:454 builtin/log.c:1536
msgid "prefix"
msgstr ""
-#: archive.c:420
+#: archive.c:455
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
-#: parse-options.h:153
+#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
+#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
+#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
+#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
+#: parse-options.h:162
msgid "file"
msgstr ""
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:457 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:424
+#: archive.c:459
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:425
+#: archive.c:460
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:426
+#: archive.c:461
msgid "store only"
msgstr ""
-#: archive.c:427
+#: archive.c:462
msgid "compress faster"
msgstr ""
-#: archive.c:435
+#: archive.c:470
msgid "compress better"
msgstr ""
-#: archive.c:438
+#: archive.c:473
msgid "list supported archive formats"
msgstr ""
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
+#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
msgid "repo"
msgstr ""
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:476 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr ""
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:478 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:450
+#: archive.c:485
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:452
+#: archive.c:487
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:454
+#: archive.c:489
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:476
+#: archive.c:511
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:483
+#: archive.c:518
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
-#: attr.c:214
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr ""
+
+#: archive-tar.c:260 archive-zip.c:363
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr ""
+
+#: archive-tar.c:287 archive-zip.c:353
+#, c-format
+msgid "cannot read %s"
+msgstr ""
+
+#: archive-tar.c:458
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr ""
+
+#: archive-tar.c:461
+msgid "unable to redirect descriptor"
+msgstr ""
+
+#: archive-tar.c:468
+#, c-format
+msgid "'%s' filter reported error"
+msgstr ""
+
+#: archive-zip.c:314
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr ""
+
+#: archive-zip.c:318
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr ""
+
+#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: archive-zip.c:609
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr ""
+
+#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:410
+#: attr.c:409
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:447
+#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:655
+#: bisect.c:676
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:708
+#: bisect.c:730
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:732
+#: bisect.c:754
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-#: bisect.c:737
+#: bisect.c:759
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:742
+#: bisect.c:764
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-#: bisect.c:750
+#: bisect.c:772
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: bisect.c:763
+#: bisect.c:785
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr ""
-#: bisect.c:798
+#: bisect.c:818
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:849
+#: bisect.c:858
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:917
+#: bisect.c:928 builtin/merge.c:138
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:947
+#: bisect.c:958
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:967
+#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:975
+#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:994
+#: bisect.c:1004
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1010
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] ""
msgstr[1] ""
-#: blame.c:1757
+#: blame.c:1787
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1768
+#: blame.c:1801
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1788
+#: blame.c:1822
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
+#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
+#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
+#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:1815
+#: blame.c:1849
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1826
+#: blame.c:1860
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1837
+#: blame.c:1871
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
-#: branch.c:53
+#: branch.c:52
#, c-format
msgid ""
"\n"
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
-#: branch.c:67
+#: branch.c:66
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr ""
+#: branch.c:92
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
-#: branch.c:94
+#: branch.c:97
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "Branch '%s' set up to track local branch '%s'."
msgstr ""
-#: branch.c:99
+#: branch.c:103
#, c-format
-msgid "Branch %s set up to track local branch %s."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
-#: branch.c:105
+#: branch.c:108
#, c-format
-msgid "Branch %s set up to track remote ref %s."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
-#: branch.c:110
-#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr ""
-
-#: branch.c:119
+#: branch.c:118
msgid "Unable to write upstream branch configuration"
msgstr ""
-#: branch.c:156
+#: branch.c:155
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:185
+#: branch.c:188
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
-#: branch.c:190
+#: branch.c:207
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:198
+#: branch.c:212
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:218
+#: branch.c:232
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:220
+#: branch.c:234
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:222
+#: branch.c:236
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:265
+#: branch.c:279
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:285
+#: branch.c:299
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:290
+#: branch.c:304
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:344
+#: branch.c:358
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:366
+#: branch.c:381
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
-#: bundle.c:34
+#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr ""
-#: bundle.c:62
+#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
+#: builtin/commit.c:774
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:140
+#: bundle.c:141
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:186
+#: bundle.c:192
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:193
+#: bundle.c:199
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:195
+#: bundle.c:201
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:254
+#: bundle.c:267
+msgid "unable to dup bundle descriptor"
+msgstr ""
+
+#: bundle.c:274
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:265
+#: bundle.c:285
msgid "pack-objects died"
msgstr ""
-#: bundle.c:307
+#: bundle.c:327
msgid "rev-list died"
msgstr ""
-#: bundle.c:356
+#: bundle.c:376
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:454
+#: bundle.c:464
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:466
+#: bundle.c:474
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:494
+#: bundle.c:498
msgid "index-pack died"
msgstr ""
-#: color.c:301
+#: color.c:296
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
+#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
+#: builtin/replace.c:448
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:43
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:1511
+#: commit.c:193
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+
+#: commit.c:1115
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: commit.c:1118
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: commit.c:1121
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: commit.c:1124
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: commit.c:1378
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
+#: commit-graph.c:108
+#, c-format
+msgid "graph file %s is too small"
msgstr ""
-#: config.c:186
-msgid "relative config include conditionals must come from files"
+#: commit-graph.c:115
+#, c-format
+msgid "graph signature %X does not match signature %X"
msgstr ""
-#: config.c:720
+#: commit-graph.c:122
#, c-format
-msgid "bad config line %d in blob %s"
+msgid "graph version %X does not match version %X"
msgstr ""
-#: config.c:724
+#: commit-graph.c:129
#, c-format
-msgid "bad config line %d in file %s"
+msgid "hash version %X does not match version %X"
msgstr ""
-#: config.c:728
+#: commit-graph.c:153
#, c-format
-msgid "bad config line %d in standard input"
+msgid "improper chunk offset %08x%08x"
msgstr ""
-#: config.c:732
+#: commit-graph.c:189
#, c-format
-msgid "bad config line %d in submodule-blob %s"
+msgid "chunk id %08x appears multiple times"
msgstr ""
-#: config.c:736
+#: commit-graph.c:308
#, c-format
-msgid "bad config line %d in command line %s"
+msgid "could not find commit %s"
msgstr ""
-#: config.c:740
+#: commit-graph.c:617 builtin/pack-objects.c:2652
#, c-format
-msgid "bad config line %d in %s"
+msgid "unable to get type of object %s"
msgstr ""
-#: config.c:868
-msgid "out of range"
+#: commit-graph.c:651
+msgid "Annotating commits in commit graph"
msgstr ""
-#: config.c:868
-msgid "invalid unit"
+#: commit-graph.c:691
+msgid "Computing commit graph generation numbers"
msgstr ""
-#: config.c:874
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
+#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
+msgid "Finding commits for commit graph"
msgstr ""
-#: config.c:879
+#: commit-graph.c:812
#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgid "error adding pack %s"
msgstr ""
-#: config.c:882
+#: commit-graph.c:814
#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgid "error opening index for %s"
msgstr ""
-#: config.c:885
+#: commit-graph.c:868
#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgid "the commit graph format cannot write %d commits"
msgstr ""
-#: config.c:888
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+#: commit-graph.c:895
+msgid "too many commits to write graph"
msgstr ""
-#: config.c:891
+#: commit-graph.c:902 midx.c:769
#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgid "unable to create leading directories of %s"
msgstr ""
-#: config.c:894
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
+#: commit-graph.c:1002
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: config.c:989
-#, c-format
-msgid "failed to expand user dir in: '%s'"
+#: commit-graph.c:1046
+msgid "Verifying commits in commit graph"
msgstr ""
-#: config.c:1084 config.c:1095
-#, c-format
-msgid "bad zlib compression level %d"
+#: compat/obstack.c:405 compat/obstack.c:407
+msgid "memory exhausted"
msgstr ""
-#: config.c:1212
+#: config.c:123
#, c-format
-msgid "invalid mode for object creation: %s"
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
msgstr ""
-#: config.c:1368
+#: config.c:139
#, c-format
-msgid "bad pack compression level %d"
+msgid "could not expand include path '%s'"
msgstr ""
-#: config.c:1564
-msgid "unable to parse command-line config"
+#: config.c:150
+msgid "relative config includes must come from files"
msgstr ""
-#: config.c:1894
-msgid "unknown error occurred while reading the configuration files"
+#: config.c:190
+msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:2064
+#: config.c:348
#, c-format
-msgid "Invalid %s: '%s'"
+msgid "key does not contain a section: %s"
msgstr ""
-#: config.c:2085
+#: config.c:354
#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:2111
+#: config.c:378 sequencer.c:2296
#, c-format
-msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgid "invalid key: %s"
msgstr ""
-#: config.c:2122
+#: config.c:384
#, c-format
-msgid "unable to parse '%s' from command-line config"
+msgid "invalid key (newline): %s"
msgstr ""
-#: config.c:2124
+#: config.c:420 config.c:432
#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
+msgid "bogus config parameter: %s"
msgstr ""
-#: config.c:2183
+#: config.c:467
#, c-format
-msgid "%s has multiple values"
+msgid "bogus format in %s"
msgstr ""
-#: config.c:2517 config.c:2745
+#: config.c:793
#, c-format
-msgid "fstat on %s failed"
+msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:2635
+#: config.c:797
#, c-format
-msgid "could not set '%s' to '%s'"
+msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:2637 builtin/remote.c:775
+#: config.c:801
#, c-format
-msgid "could not unset '%s'"
+msgid "bad config line %d in standard input"
msgstr ""
-#: connect.c:50
-msgid "The remote end hung up upon initial contact"
+#: config.c:805
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: connect.c:52
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
+#: config.c:809
+#, c-format
+msgid "bad config line %d in command line %s"
msgstr ""
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
-msgid "Checking connectivity"
+#: config.c:813
+#, c-format
+msgid "bad config line %d in %s"
msgstr ""
-#: connected.c:75
-msgid "Could not run 'git rev-list'"
+#: config.c:952
+msgid "out of range"
msgstr ""
-#: connected.c:95
-msgid "failed write to rev-list"
+#: config.c:952
+msgid "invalid unit"
msgstr ""
-#: connected.c:102
-msgid "failed to close rev-list's stdin"
+#: config.c:958
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: convert.c:205
+#: config.c:963
#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory."
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: convert.c:209
+#: config.c:966
#, c-format
-msgid "CRLF would be replaced by LF in %s."
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: convert.c:215
+#: config.c:969
#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory."
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: convert.c:219
+#: config.c:972
#, c-format
-msgid "LF would be replaced by CRLF in %s"
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: date.c:116
-msgid "in the future"
+#: config.c:975
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
-#: date.c:175 date.c:180
-msgid "%"
-msgid_plural "%"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
-msgid "%s, %"
-msgid_plural "%s, %"
-msgstr[0] ""
-msgstr[1] ""
-
-#: diffcore-order.c:24
+#: config.c:978
#, c-format
-msgid "failed to read orderfile '%s'"
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: diffcore-rename.c:536
-msgid "Performing inexact rename detection"
+#: config.c:1073
+#, c-format
+msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: diff.c:63
+#: config.c:1082
#, c-format
-msgid "option '%s' requires a value"
+msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: diff.c:125
+#: config.c:1173
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgid "abbrev length out of range: %d"
msgstr ""
-#: diff.c:130
+#: config.c:1187 config.c:1198
#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
+msgid "bad zlib compression level %d"
msgstr ""
-#: diff.c:282
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+#: config.c:1290
+msgid "core.commentChar should only be one character"
msgstr ""
-#: diff.c:342
+#: config.c:1323
#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
+msgid "invalid mode for object creation: %s"
msgstr ""
-#: diff.c:3101
+#: config.c:1395
#, c-format
-msgid "external diff died, stopping at %s"
+msgid "malformed value for %s"
msgstr ""
-#: diff.c:3427
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#: config.c:1421
+#, c-format
+msgid "malformed value for %s: %s"
msgstr ""
-#: diff.c:3517
-msgid "--follow requires exactly one pathspec"
+#: config.c:1422
+msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: diff.c:3680
+#: config.c:1481 builtin/pack-objects.c:3391
#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
+msgid "bad pack compression level %d"
msgstr ""
-#: diff.c:3694
+#: config.c:1602
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "unable to load config blob object '%s'"
msgstr ""
-#: diff.c:4716
-msgid "inexact rename detection was skipped due to too many files."
+#: config.c:1605
+#, c-format
+msgid "reference '%s' does not point to a blob"
msgstr ""
-#: diff.c:4719
-msgid "only found copies from modified paths due to too many files."
+#: config.c:1622
+#, c-format
+msgid "unable to resolve config blob '%s'"
msgstr ""
-#: diff.c:4722
+#: config.c:1652
#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
+msgid "failed to parse %s"
msgstr ""
-#: dir.c:1948
-msgid "failed to get kernel name and information"
+#: config.c:1705
+msgid "unable to parse command-line config"
msgstr ""
-#: dir.c:2067
-msgid "Untracked cache is disabled on this system or location."
+#: config.c:2037
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: dir.c:2846 dir.c:2851
+#: config.c:2207
#, c-format
-msgid "could not create directories for %s"
+msgid "Invalid %s: '%s'"
msgstr ""
-#: dir.c:2876
+#: config.c:2250
#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: entry.c:281
+#: config.c:2276
#, c-format
-msgid "could not stat file '%s'"
-msgstr ""
-
-#: fetch-pack.c:251
-msgid "git fetch-pack: expected shallow list"
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: fetch-pack.c:263
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#: config.c:2322
+#, c-format
+msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: fetch-pack.c:282 builtin/archive.c:63
+#: config.c:2324
#, c-format
-msgid "remote error: %s"
+msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: fetch-pack.c:283
+#: config.c:2405
#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgid "invalid section name '%s'"
msgstr ""
-#: fetch-pack.c:335
-msgid "--stateless-rpc requires multi_ack_detailed"
+#: config.c:2437
+#, c-format
+msgid "%s has multiple values"
msgstr ""
-#: fetch-pack.c:421
+#: config.c:2466
#, c-format
-msgid "invalid shallow line: %s"
+msgid "failed to write new configuration file %s"
msgstr ""
-#: fetch-pack.c:427
+#: config.c:2717 config.c:3041
#, c-format
-msgid "invalid unshallow line: %s"
+msgid "could not lock config file %s"
msgstr ""
-#: fetch-pack.c:429
+#: config.c:2728
#, c-format
-msgid "object not found: %s"
+msgid "opening %s"
msgstr ""
-#: fetch-pack.c:432
+#: config.c:2763 builtin/config.c:327
#, c-format
-msgid "error in object: %s"
+msgid "invalid pattern: %s"
msgstr ""
-#: fetch-pack.c:434
+#: config.c:2788
#, c-format
-msgid "no shallow found: %s"
+msgid "invalid config file %s"
msgstr ""
-#: fetch-pack.c:437
+#: config.c:2801 config.c:3054
#, c-format
-msgid "expected shallow/unshallow, got %s"
+msgid "fstat on %s failed"
msgstr ""
-#: fetch-pack.c:476
+#: config.c:2812
#, c-format
-msgid "got %s %d %s"
+msgid "unable to mmap '%s'"
msgstr ""
-#: fetch-pack.c:490
+#: config.c:2821 config.c:3059
#, c-format
-msgid "invalid commit %s"
+msgid "chmod on %s failed"
msgstr ""
-#: fetch-pack.c:523
-msgid "giving up"
+#: config.c:2906 config.c:3156
+#, c-format
+msgid "could not write config file %s"
msgstr ""
-#: fetch-pack.c:533 progress.c:235
-msgid "done"
+#: config.c:2940
+#, c-format
+msgid "could not set '%s' to '%s'"
msgstr ""
-#: fetch-pack.c:545
+#: config.c:2942 builtin/remote.c:782
#, c-format
-msgid "got %s (%d) %s"
+msgid "could not unset '%s'"
msgstr ""
-#: fetch-pack.c:591
+#: config.c:3032
#, c-format
-msgid "Marking %s as complete"
+msgid "invalid section name: %s"
msgstr ""
-#: fetch-pack.c:775
+#: config.c:3199
#, c-format
-msgid "already have %s (%s)"
+msgid "missing value for '%s'"
msgstr ""
-#: fetch-pack.c:813
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
msgstr ""
-#: fetch-pack.c:821
-msgid "protocol error: bad pack header"
+#: connect.c:63
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
msgstr ""
-#: fetch-pack.c:877
+#: connect.c:81
#, c-format
-msgid "fetch-pack: unable to fork off %s"
+msgid "server doesn't support '%s'"
msgstr ""
-#: fetch-pack.c:893
+#: connect.c:103
#, c-format
-msgid "%s failed"
+msgid "server doesn't support feature '%s'"
msgstr ""
-#: fetch-pack.c:895
-msgid "error in sideband demultiplexer"
+#: connect.c:114
+msgid "expected flush after capabilities"
msgstr ""
-#: fetch-pack.c:922
-msgid "Server does not support shallow clients"
+#: connect.c:233
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
msgstr ""
-#: fetch-pack.c:926
-msgid "Server supports multi_ack_detailed"
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: fetch-pack.c:929
-msgid "Server supports no-done"
+#: connect.c:273
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: fetch-pack.c:935
-msgid "Server supports multi_ack"
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
msgstr ""
-#: fetch-pack.c:939
-msgid "Server supports side-band-64k"
+#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
msgstr ""
-#: fetch-pack.c:943
-msgid "Server supports side-band"
+#: connect.c:316
+msgid "invalid packet"
msgstr ""
-#: fetch-pack.c:947
-msgid "Server supports allow-tip-sha1-in-want"
+#: connect.c:336
+#, c-format
+msgid "protocol error: unexpected '%s'"
msgstr ""
-#: fetch-pack.c:951
-msgid "Server supports allow-reachable-sha1-in-want"
+#: connect.c:444
+#, c-format
+msgid "invalid ls-refs response: %s"
msgstr ""
-#: fetch-pack.c:961
-msgid "Server supports ofs-delta"
+#: connect.c:448
+msgid "expected flush after ref listing"
msgstr ""
-#: fetch-pack.c:968
+#: connect.c:547
#, c-format
-msgid "Server version is %.*s"
+msgid "protocol '%s' is not supported"
msgstr ""
-#: fetch-pack.c:974
-msgid "Server does not support --shallow-since"
+#: connect.c:598
+msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: fetch-pack.c:978
-msgid "Server does not support --shallow-exclude"
+#: connect.c:638 connect.c:701
+#, c-format
+msgid "Looking up %s ... "
msgstr ""
-#: fetch-pack.c:980
-msgid "Server does not support --deepen"
+#: connect.c:642
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
msgstr ""
-#: fetch-pack.c:991
-msgid "no common commits"
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:646 connect.c:717
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
msgstr ""
-#: fetch-pack.c:1003
-msgid "git fetch-pack: fetch failed."
+#: connect.c:668 connect.c:745
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
msgstr ""
-#: fetch-pack.c:1165
-msgid "no matching remote head"
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:674 connect.c:751
+msgid "done."
msgstr ""
-#: fetch-pack.c:1187
+#: connect.c:705
#, c-format
-msgid "no such remote ref %s"
+msgid "unable to look up %s (%s)"
msgstr ""
-#: fetch-pack.c:1190
+#: connect.c:711
#, c-format
-msgid "Server does not allow request for unadvertised object %s"
+msgid "unknown port %s"
msgstr ""
-#: gpg-interface.c:181
-msgid "gpg failed to sign the data"
+#: connect.c:848 connect.c:1174
+#, c-format
+msgid "strange hostname '%s' blocked"
msgstr ""
-#: gpg-interface.c:211
-msgid "could not create temporary file"
+#: connect.c:850
+#, c-format
+msgid "strange port '%s' blocked"
msgstr ""
-#: gpg-interface.c:213
+#: connect.c:860
#, c-format
-msgid "failed writing detached signature to '%s'"
+msgid "cannot start proxy %s"
msgstr ""
-#: graph.c:97
-#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+#: connect.c:927
+msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: grep.c:1981
-#, c-format
-msgid "'%s': unable to read %s"
+#: connect.c:1122
+msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
-#, c-format
-msgid "failed to stat '%s'"
+#: connect.c:1134
+msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: grep.c:2009
-#, c-format
-msgid "'%s': short read"
+#: connect.c:1151
+msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: help.c:179
+#: connect.c:1262
#, c-format
-msgid "available git commands in '%s'"
+msgid "strange pathname '%s' blocked"
msgstr ""
-#: help.c:186
-msgid "git commands available from elsewhere on your $PATH"
+#: connect.c:1307
+msgid "unable to fork"
msgstr ""
-#: help.c:217
-msgid "These are common Git commands used in various situations:"
+#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+msgid "Checking connectivity"
msgstr ""
-#: help.c:281
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+#: connected.c:80
+msgid "Could not run 'git rev-list'"
msgstr ""
-#: help.c:336
-msgid "Uh oh. Your system reports no Git commands at all."
+#: connected.c:100
+msgid "failed write to rev-list"
msgstr ""
-#: help.c:358
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
+#: connected.c:107
+msgid "failed to close rev-list's stdin"
msgstr ""
-#: help.c:363
+#: convert.c:194
#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
+msgid "illegal crlf_action %d"
msgstr ""
-#: help.c:368
+#: convert.c:207
#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: help.c:376
+#: convert.c:209
#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr ""
-
-#: help.c:380
msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-msgstr[1] ""
-
-#: help.c:395
-msgid "git version [<options>]"
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
msgstr ""
-#: help.c:456
+#: convert.c:217
#, c-format
-msgid "%s: %s - %s"
+msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: help.c:460
+#: convert.c:219
+#, c-format
msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-msgstr[1] ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
-#: ident.c:342
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-" git config --global user.email \"you@example.com\"\n"
-" git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
+#: convert.c:280
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
-#: ident.c:366
-msgid "no email was given and auto-detection is disabled"
+#: convert.c:287
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
msgstr ""
-#: ident.c:371
+#: convert.c:305
#, c-format
-msgid "unable to auto-detect email address (got '%s')"
+msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
-#: ident.c:381
-msgid "no name was given and auto-detection is disabled"
+#: convert.c:307
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
-#: ident.c:387
+#: convert.c:425 convert.c:496
#, c-format
-msgid "unable to auto-detect name (got '%s')"
+msgid "failed to encode '%s' from %s to %s"
msgstr ""
-#: ident.c:395
+#: convert.c:468
#, c-format
-msgid "empty ident name (for <%s>) not allowed"
+msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
-#: ident.c:401
+#: convert.c:674
#, c-format
-msgid "name consists only of disallowed characters: %s"
+msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: ident.c:416 builtin/commit.c:612
+#: convert.c:694
#, c-format
-msgid "invalid date format: %s"
+msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: lockfile.c:152
+#: convert.c:701
#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
+msgid "external filter '%s' failed %d"
msgstr ""
-#: lockfile.c:160
+#: convert.c:736 convert.c:739
#, c-format
-msgid "Unable to create '%s.lock': %s"
+msgid "read from external filter '%s' failed"
msgstr ""
-#: merge.c:41
-msgid "failed to read the cache"
+#: convert.c:742 convert.c:796
+#, c-format
+msgid "external filter '%s' failed"
msgstr ""
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
-msgid "unable to write new index file"
+#: convert.c:844
+msgid "unexpected filter type"
msgstr ""
-#: merge-recursive.c:210
-msgid "(bad commit)\n"
+#: convert.c:855
+msgid "path name too long for external filter"
msgstr ""
-#: merge-recursive.c:232 merge-recursive.c:240
+#: convert.c:929
#, c-format
-msgid "addinfo_cache failed for path '%s'"
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
msgstr ""
-#: merge-recursive.c:304
-msgid "error building trees"
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: merge-recursive.c:728
+#: convert.c:1398 convert.c:1432
#, c-format
-msgid "failed to create path '%s'%s"
+msgid "%s: clean filter '%s' failed"
msgstr ""
-#: merge-recursive.c:739
+#: convert.c:1476
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
+msgid "%s: smudge filter %s failed"
msgstr ""
-#: merge-recursive.c:753 merge-recursive.c:772
-msgid ": perhaps a D/F conflict?"
+#: date.c:116
+msgid "in the future"
msgstr ""
-#: merge-recursive.c:762
+#: date.c:122
#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr ""
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: date.c:129
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr ""
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:806
+#: date.c:136
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr ""
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:830
+#: date.c:143
#, c-format
-msgid "failed to open '%s': %s"
-msgstr ""
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:841
+#: date.c:149
#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr ""
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:846
+#: date.c:156
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr ""
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:986
-msgid "Failed to execute internal merge"
+#: date.c:167
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:170
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:175 date.c:180
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: delta-islands.c:268
+msgid "Propagating island marks"
msgstr ""
-#: merge-recursive.c:990
+#: delta-islands.c:286
#, c-format
-msgid "Unable to add %s to database"
+msgid "bad tree object %s"
msgstr ""
-#: merge-recursive.c:1093
+#: delta-islands.c:330
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+msgid "failed to load island regex for '%s': %s"
msgstr ""
-#: merge-recursive.c:1098
+#: delta-islands.c:386
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
+msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
-#: merge-recursive.c:1105
+#: delta-islands.c:462
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+msgid "Marked %d islands, done.\n"
msgstr ""
-#: merge-recursive.c:1110
+#: diffcore-order.c:24
#, 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."
+msgid "failed to read orderfile '%s'"
msgstr ""
-#: merge-recursive.c:1144
-msgid "rename"
+#: diffcore-rename.c:544
+msgid "Performing inexact rename detection"
msgstr ""
-#: merge-recursive.c:1144
-msgid "renamed"
+#: diff.c:108
+#, c-format
+msgid "option '%s' requires a value"
msgstr ""
-#: merge-recursive.c:1201
+#: diff.c:158
#, c-format
-msgid "%s is a directory in %s adding as %s instead"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: merge-recursive.c:1226
+#: diff.c:163
#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: merge-recursive.c:1231
-msgid " (left unresolved)"
+#: diff.c:291
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
msgstr ""
-#: merge-recursive.c:1293
+#: diff.c:316
#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgid "ignoring unknown color-moved-ws mode '%s'"
msgstr ""
-#: merge-recursive.c:1326
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
+#: diff.c:323
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other white "
+"space modes"
msgstr ""
-#: merge-recursive.c:1529
+#: diff.c:394
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: merge-recursive.c:1544
+#: diff.c:454
#, c-format
-msgid "Adding merged %s"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
msgstr ""
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: diff.c:4140
#, c-format
-msgid "Adding as %s instead"
+msgid "external diff died, stopping at %s"
msgstr ""
-#: merge-recursive.c:1608
-#, c-format
-msgid "cannot read object %s"
+#: diff.c:4482
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: merge-recursive.c:1611
-#, c-format
-msgid "object %s is not a blob"
+#: diff.c:4485
+msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: merge-recursive.c:1680
-msgid "modify"
+#: diff.c:4563
+msgid "--follow requires exactly one pathspec"
msgstr ""
-#: merge-recursive.c:1680
-msgid "modified"
+#: diff.c:4729
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
msgstr ""
-#: merge-recursive.c:1690
-msgid "content"
+#: diff.c:4743
+#, c-format
+msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: merge-recursive.c:1697
-msgid "add/add"
+#: diff.c:5823
+msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: merge-recursive.c:1733
-#, c-format
-msgid "Skipped %s (merged same as existing)"
+#: diff.c:5826
+msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: merge-recursive.c:1747
+#: diff.c:5829
#, c-format
-msgid "Auto-merging %s"
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: merge-recursive.c:1751 git-submodule.sh:945
-msgid "submodule"
+#: dir.c:576
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: merge-recursive.c:1752
+#: dir.c:965
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
+msgid "cannot use %s as an exclude file"
msgstr ""
-#: merge-recursive.c:1846
+#: dir.c:1880
#, c-format
-msgid "Removing %s"
+msgid "could not open directory '%s'"
msgstr ""
-#: merge-recursive.c:1872
-msgid "file/directory"
+#: dir.c:2122
+msgid "failed to get kernel name and information"
msgstr ""
-#: merge-recursive.c:1878
-msgid "directory/file"
+#: dir.c:2246
+msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: merge-recursive.c:1884
+#: dir.c:3047
#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgid "index file corrupt in repo %s"
msgstr ""
-#: merge-recursive.c:1893
+#: dir.c:3092 dir.c:3097
#, c-format
-msgid "Adding %s"
+msgid "could not create directories for %s"
msgstr ""
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: dir.c:3126
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: merge-recursive.c:1939
+#: editor.c:73
#, c-format
-msgid "merging of trees %s and %s failed"
+msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: merge-recursive.c:2022
-msgid "Merging:"
+#: entry.c:178
+msgid "Filtering content"
msgstr ""
-#: merge-recursive.c:2035
+#: entry.c:465
#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: merge-recursive.c:2074
-msgid "merge returned no commit"
+msgid "could not stat file '%s'"
msgstr ""
-#: merge-recursive.c:2137
+#: environment.c:150
#, c-format
-msgid "Could not parse object '%s'"
+msgid "bad git namespace path \"%s\""
msgstr ""
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
-msgid "Unable to write index."
+#: environment.c:332
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
msgstr ""
-#: notes-merge.c:273
+#: exec-cmd.c:361
#, 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 "too many args to run %s"
msgstr ""
-#: notes-merge.c:280
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
+#: fetch-object.c:17
+msgid "Remote with no URL"
msgstr ""
-#: notes-utils.c:42
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: notes-utils.c:101
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+#: fetch-pack.c:163
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: notes-utils.c:111
+#: fetch-pack.c:183
#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:141
-#, c-format
-msgid "Bad %s value: '%s'"
+#: fetch-pack.c:253
+msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: object.c:240
+#: fetch-pack.c:347 fetch-pack.c:1277
#, c-format
-msgid "unable to parse object: %s"
+msgid "invalid shallow line: %s"
msgstr ""
-#: parse-options.c:573
-msgid "..."
+#: fetch-pack.c:353 fetch-pack.c:1283
+#, c-format
+msgid "invalid unshallow line: %s"
msgstr ""
-#: parse-options.c:591
+#: fetch-pack.c:355 fetch-pack.c:1285
#, c-format
-msgid "usage: %s"
+msgid "object not found: %s"
msgstr ""
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:597
+#: fetch-pack.c:358 fetch-pack.c:1288
#, c-format
-msgid " or: %s"
+msgid "error in object: %s"
msgstr ""
-#: parse-options.c:600
+#: fetch-pack.c:360 fetch-pack.c:1290
#, c-format
-msgid " %s"
+msgid "no shallow found: %s"
msgstr ""
-#: parse-options.c:634
-msgid "-NUM"
+#: fetch-pack.c:363 fetch-pack.c:1293
+#, c-format
+msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: parse-options-cb.c:108
+#: fetch-pack.c:404
#, c-format
-msgid "malformed object name '%s'"
+msgid "got %s %d %s"
msgstr ""
-#: path.c:890
+#: fetch-pack.c:421
#, c-format
-msgid "Could not make %s writable by group"
+msgid "invalid commit %s"
msgstr ""
-#: pathspec.c:129
-msgid "Escape character '\\' not allowed as last character in attr value"
+#: fetch-pack.c:452
+msgid "giving up"
msgstr ""
-#: pathspec.c:147
-msgid "Only one 'attr:' specification is allowed."
+#: fetch-pack.c:464 progress.c:229
+msgid "done"
msgstr ""
-#: pathspec.c:150
-msgid "attr spec must not be empty"
+#: fetch-pack.c:476
+#, c-format
+msgid "got %s (%d) %s"
msgstr ""
-#: pathspec.c:193
+#: fetch-pack.c:522
#, c-format
-msgid "invalid attribute name %s"
+msgid "Marking %s as complete"
msgstr ""
-#: pathspec.c:258
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+#: fetch-pack.c:764
+#, c-format
+msgid "already have %s (%s)"
msgstr ""
-#: pathspec.c:265
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
+#: fetch-pack.c:803
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: pathspec.c:305
-msgid "invalid parameter for pathspec magic 'prefix'"
+#: fetch-pack.c:811
+msgid "protocol error: bad pack header"
msgstr ""
-#: pathspec.c:326
+#: fetch-pack.c:879
#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: pathspec.c:331
+#: fetch-pack.c:895
#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgid "%s failed"
msgstr ""
-#: pathspec.c:369
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
+#: fetch-pack.c:897
+msgid "error in sideband demultiplexer"
msgstr ""
-#: pathspec.c:428
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
+#: fetch-pack.c:926
+msgid "Server does not support shallow clients"
msgstr ""
-#: pathspec.c:441
-#, c-format
-msgid "%s: '%s' is outside repository"
+#: fetch-pack.c:930
+msgid "Server supports multi_ack_detailed"
msgstr ""
-#: pathspec.c:515
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
+#: fetch-pack.c:933
+msgid "Server supports no-done"
msgstr ""
-#: pathspec.c:525
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
+#: fetch-pack.c:939
+msgid "Server supports multi_ack"
msgstr ""
-#: pathspec.c:575
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
+#: fetch-pack.c:943
+msgid "Server supports side-band-64k"
msgstr ""
-#: pathspec.c:599
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
+#: fetch-pack.c:947
+msgid "Server supports side-band"
msgstr ""
-#: pretty.c:963
-msgid "unable to parse --pretty format"
+#: fetch-pack.c:951
+msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: read-cache.c:1443
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+#: fetch-pack.c:955
+msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: read-cache.c:1453
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+#: fetch-pack.c:965
+msgid "Server supports ofs-delta"
msgstr ""
-#: read-cache.c:2308 builtin/merge.c:1019
-#, c-format
-msgid "could not close '%s'"
+#: fetch-pack.c:971 fetch-pack.c:1158
+msgid "Server supports filter"
msgstr ""
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: fetch-pack.c:979
#, c-format
-msgid "could not stat '%s'"
+msgid "Server version is %.*s"
msgstr ""
-#: read-cache.c:2396
-#, c-format
-msgid "unable to open git dir: %s"
+#: fetch-pack.c:985
+msgid "Server does not support --shallow-since"
msgstr ""
-#: read-cache.c:2408
-#, c-format
-msgid "unable to unlink: %s"
+#: fetch-pack.c:989
+msgid "Server does not support --shallow-exclude"
msgstr ""
-#: refs.c:622
-#, c-format
-msgid "Could not open '%s' for writing"
+#: fetch-pack.c:991
+msgid "Server does not support --deepen"
msgstr ""
-#: refs.c:1769
-msgid "ref updates forbidden inside quarantine environment"
+#: fetch-pack.c:1008
+msgid "no common commits"
msgstr ""
-#: refs/files-backend.c:1664
-#, c-format
-msgid "could not delete reference %s: %s"
+#: fetch-pack.c:1020 fetch-pack.c:1418
+msgid "git fetch-pack: fetch failed."
msgstr ""
-#: refs/files-backend.c:1667
-#, c-format
-msgid "could not delete references: %s"
+#: fetch-pack.c:1153
+msgid "Server does not support shallow requests"
msgstr ""
-#: refs/files-backend.c:1676
+#: fetch-pack.c:1199
#, c-format
-msgid "could not remove reference %s"
+msgid "error reading section header '%s'"
msgstr ""
-#: ref-filter.c:35 wt-status.c:1811
-msgid "gone"
-msgstr ""
-
-#: ref-filter.c:36
+#: fetch-pack.c:1205
#, c-format
-msgid "ahead %d"
+msgid "expected '%s', received '%s'"
msgstr ""
-#: ref-filter.c:37
+#: fetch-pack.c:1244
#, c-format
-msgid "behind %d"
+msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: ref-filter.c:38
+#: fetch-pack.c:1249
#, c-format
-msgid "ahead %d, behind %d"
+msgid "error processing acks: %d"
msgstr ""
-#: ref-filter.c:105
-#, c-format
-msgid "expected format: %%(color:<color>)"
+#: fetch-pack.c:1259
+msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: ref-filter.c:107
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
+#: fetch-pack.c:1261
+msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: ref-filter.c:121
+#: fetch-pack.c:1298
#, c-format
-msgid "Integer value expected refname:lstrip=%s"
+msgid "error processing shallow info: %d"
msgstr ""
-#: ref-filter.c:125
+#: fetch-pack.c:1314
#, c-format
-msgid "Integer value expected refname:rstrip=%s"
+msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: ref-filter.c:127
+#: fetch-pack.c:1324
#, c-format
-msgid "unrecognized %%(%s) argument: %s"
+msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: ref-filter.c:167
+#: fetch-pack.c:1328
#, c-format
-msgid "%%(body) does not take arguments"
+msgid "error processing wanted refs: %d"
msgstr ""
-#: ref-filter.c:174
-#, c-format
-msgid "%%(subject) does not take arguments"
+#: fetch-pack.c:1642
+msgid "no matching remote head"
msgstr ""
-#: ref-filter.c:181
-#, c-format
-msgid "%%(trailers) does not take arguments"
+#: fetch-pack.c:1660 builtin/clone.c:664
+msgid "remote did not send all necessary objects"
msgstr ""
-#: ref-filter.c:200
+#: fetch-pack.c:1686
#, c-format
-msgid "positive value expected contents:lines=%s"
+msgid "no such remote ref %s"
msgstr ""
-#: ref-filter.c:202
+#: fetch-pack.c:1689
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
+msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: ref-filter.c:215
-#, c-format
-msgid "positive value expected objectname:short=%s"
+#: gpg-interface.c:318
+msgid "gpg failed to sign the data"
msgstr ""
-#: ref-filter.c:219
-#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+#: gpg-interface.c:344
+msgid "could not create temporary file"
msgstr ""
-#: ref-filter.c:246
+#: gpg-interface.c:347
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+msgid "failed writing detached signature to '%s'"
msgstr ""
-#: ref-filter.c:258
+#: graph.c:97
#, c-format
-msgid "unrecognized position:%s"
+msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: ref-filter.c:262
+#: grep.c:2113
#, c-format
-msgid "unrecognized width:%s"
+msgid "'%s': unable to read %s"
msgstr ""
-#: ref-filter.c:268
+#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
+#: builtin/rm.c:134
#, c-format
-msgid "unrecognized %%(align) argument: %s"
+msgid "failed to stat '%s'"
msgstr ""
-#: ref-filter.c:272
+#: grep.c:2141
#, c-format
-msgid "positive width expected with the %%(align) atom"
+msgid "'%s': short read"
msgstr ""
-#: ref-filter.c:287
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
msgstr ""
-#: ref-filter.c:378
-#, c-format
-msgid "malformed field name: %.*s"
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
msgstr ""
-#: ref-filter.c:404
-#, c-format
-msgid "unknown field name: %.*s"
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
msgstr ""
-#: ref-filter.c:508
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
+#: help.c:26
+msgid "grow, mark and tweak your common history"
msgstr ""
-#: ref-filter.c:568
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
msgstr ""
-#: ref-filter.c:570
-#, c-format
-msgid "format: %%(then) atom used more than once"
+#: help.c:31
+msgid "Main Porcelain Commands"
msgstr ""
-#: ref-filter.c:572
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
msgstr ""
-#: ref-filter.c:598
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
msgstr ""
-#: ref-filter.c:600
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
+#: help.c:34
+msgid "Interacting with Others"
msgstr ""
-#: ref-filter.c:602
-#, c-format
-msgid "format: %%(else) atom used more than once"
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
msgstr ""
-#: ref-filter.c:615
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
msgstr ""
-#: ref-filter.c:670
-#, c-format
-msgid "malformed format string %s"
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
msgstr ""
-#: ref-filter.c:1254
-#, c-format
-msgid "(no branch, rebasing %s)"
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
msgstr ""
-#: ref-filter.c:1257
+#: help.c:296
#, c-format
-msgid "(no branch, bisect started on %s)"
+msgid "available git commands in '%s'"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1265
-#, c-format
-msgid "(HEAD detached at %s)"
+#: help.c:303
+msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1272
-#, c-format
-msgid "(HEAD detached from %s)"
+#: help.c:312
+msgid "These are common Git commands used in various situations:"
msgstr ""
-#: ref-filter.c:1276
-msgid "(no branch)"
+#: help.c:361 git.c:90
+#, c-format
+msgid "unsupported command listing type '%s'"
msgstr ""
-#: ref-filter.c:1426 ref-filter.c:1457
-#, c-format
-msgid "missing object %s for %s"
+#: help.c:408
+msgid "The common Git guides are:"
msgstr ""
-#: ref-filter.c:1429 ref-filter.c:1460
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
+#: help.c:517
+msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
-#: ref-filter.c:1760
-#, c-format
-msgid "malformed object at '%s'"
+#: help.c:522
+msgid "External commands"
msgstr ""
-#: ref-filter.c:1827
-#, c-format
-msgid "ignoring ref with broken name %s"
+#: help.c:530
+msgid "Command aliases"
msgstr ""
-#: ref-filter.c:1832
+#: help.c:594
#, c-format
-msgid "ignoring broken ref %s"
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: ref-filter.c:2095
-#, c-format
-msgid "format: %%(end) atom missing"
+#: help.c:653
+msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: ref-filter.c:2176
+#: help.c:675
#, c-format
-msgid "malformed object name %s"
+msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-#: remote.c:747
+#: help.c:680
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
+msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
-#: remote.c:751
+#: help.c:685
#, c-format
-msgid "%s usually tracks %s, not %s"
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#: remote.c:755
+#: help.c:693
#, c-format
-msgid "%s tracks both %s and %s"
+msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: remote.c:763
-msgid "Internal error"
-msgstr ""
-
-#: remote.c:1680 remote.c:1782
-msgid "HEAD does not point to a branch"
-msgstr ""
+#: help.c:697
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+msgstr[1] ""
-#: remote.c:1689
-#, c-format
-msgid "no such branch: '%s'"
+#: help.c:712
+msgid "git version [<options>]"
msgstr ""
-#: remote.c:1692
+#: help.c:780
#, c-format
-msgid "no upstream configured for branch '%s'"
+msgid "%s: %s - %s"
msgstr ""
-#: remote.c:1698
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr ""
+#: help.c:784
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+msgstr[1] ""
-#: remote.c:1713
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
+#: ident.c:345
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
msgstr ""
-#: remote.c:1725
-#, c-format
-msgid "branch '%s' has no remote for pushing"
+#: ident.c:369
+msgid "no email was given and auto-detection is disabled"
msgstr ""
-#: remote.c:1736
+#: ident.c:374
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr ""
-
-#: remote.c:1749
-msgid "push has no destination (push.default is 'nothing')"
+msgid "unable to auto-detect email address (got '%s')"
msgstr ""
-#: remote.c:1771
-msgid "cannot resolve 'simple' push to a single destination"
+#: ident.c:384
+msgid "no name was given and auto-detection is disabled"
msgstr ""
-#: remote.c:2076
+#: ident.c:390
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgid "unable to auto-detect name (got '%s')"
msgstr ""
-#: remote.c:2080
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+#: ident.c:398
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
msgstr ""
-#: remote.c:2083
+#: ident.c:404
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: remote.c:2087
+#: ident.c:419 builtin/commit.c:606
#, 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] ""
+msgid "invalid date format: %s"
+msgstr ""
-#: remote.c:2093
-msgid " (use \"git push\" to publish your local commits)\n"
+#: list-objects-filter-options.c:35
+msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: remote.c:2096
-#, 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] ""
+#: list-objects-filter-options.c:58
+msgid "only 'tree:0' is supported"
+msgstr ""
-#: remote.c:2104
-msgid " (use \"git pull\" to update your local branch)\n"
+#: list-objects-filter-options.c:137
+msgid "cannot change partial clone promisor remote"
msgstr ""
-#: remote.c:2107
+#: lockfile.c:151
#, 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:2117
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
msgstr ""
-#: revision.c:2187
-msgid "your current branch appears to be broken"
+#: lockfile.c:159
+#, c-format
+msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: revision.c:2190
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
+#: merge.c:41
+msgid "failed to read the cache"
msgstr ""
-#: revision.c:2384
-msgid "--first-parent is incompatible with --bisect"
+#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
+#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+msgid "unable to write new index file"
msgstr ""
-#: run-command.c:644
-msgid "open /dev/null failed"
+#: merge-recursive.c:323
+msgid "(bad commit)\n"
msgstr ""
-#: send-pack.c:151
+#: merge-recursive.c:345
#, c-format
-msgid "unable to parse remote unpack status: %s"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: send-pack.c:153
+#: merge-recursive.c:353
#, c-format
-msgid "remote unpack failed: %s"
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: send-pack.c:316
-msgid "failed to sign the push certificate"
+#: merge-recursive.c:435
+msgid "error building trees"
msgstr ""
-#: send-pack.c:429
-msgid "the receiving end does not support --signed push"
+#: merge-recursive.c:906
+#, c-format
+msgid "failed to create path '%s'%s"
msgstr ""
-#: send-pack.c:431
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+#: merge-recursive.c:917
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: send-pack.c:443
-msgid "the receiving end does not support --atomic push"
+#: merge-recursive.c:931 merge-recursive.c:950
+msgid ": perhaps a D/F conflict?"
msgstr ""
-#: send-pack.c:448
-msgid "the receiving end does not support push options"
+#: merge-recursive.c:940
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: sequencer.c:216
-msgid "revert"
+#: merge-recursive.c:982 builtin/cat-file.c:39
+#, c-format
+msgid "cannot read object %s '%s'"
msgstr ""
-#: sequencer.c:218
-msgid "cherry-pick"
+#: merge-recursive.c:984
+#, c-format
+msgid "blob expected for %s '%s'"
msgstr ""
-#: sequencer.c:220
-msgid "rebase -i"
+#: merge-recursive.c:1008
+#, c-format
+msgid "failed to open '%s': %s"
msgstr ""
-#: sequencer.c:222
+#: merge-recursive.c:1019
#, c-format
-msgid "Unknown action: %d"
+msgid "failed to symlink '%s': %s"
msgstr ""
-#: sequencer.c:279
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+#: merge-recursive.c:1024
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: sequencer.c:282
-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'"
+#: merge-recursive.c:1212
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: sequencer.c:295 sequencer.c:1685
+#: merge-recursive.c:1219
#, c-format
-msgid "could not lock '%s'"
+msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: merge-recursive.c:1226
#, c-format
-msgid "could not write to '%s'"
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: sequencer.c:302
+#: merge-recursive.c:1234 merge-recursive.c:1246
#, c-format
-msgid "could not write eol to '%s'"
+msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: merge-recursive.c:1237 merge-recursive.c:1249
#, c-format
-msgid "failed to finalize '%s'."
+msgid "Fast-forwarding submodule %s"
msgstr ""
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: merge-recursive.c:1271
#, c-format
-msgid "could not read '%s'"
+msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: sequencer.c:356
+#: merge-recursive.c:1275
#, c-format
-msgid "your local changes would be overwritten by %s."
+msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: sequencer.c:360
-msgid "commit your changes or stash them to proceed."
+#: merge-recursive.c:1276
+msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: sequencer.c:389
+#: merge-recursive.c:1279
#, c-format
-msgid "%s: fast-forward"
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
msgstr ""
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
-#.
-#: sequencer.c:472
+#: merge-recursive.c:1288
#, c-format
-msgid "%s: Unable to write new index file"
+msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: sequencer.c:491
-msgid "could not resolve HEAD commit\n"
+#: merge-recursive.c:1358
+msgid "Failed to execute internal merge"
msgstr ""
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
+#: merge-recursive.c:1363
+#, c-format
+msgid "Unable to add %s to database"
msgstr ""
-#: sequencer.c:595
+#: merge-recursive.c:1395
#, 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 "Auto-merging %s"
msgstr ""
-#: sequencer.c:697
+#: merge-recursive.c:1416
#, c-format
-msgid "could not parse commit %s\n"
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: sequencer.c:702
+#: merge-recursive.c:1483
#, c-format
-msgid "could not parse parent commit %s\n"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-#: sequencer.c:824
+#: merge-recursive.c:1488
#, c-format
msgid ""
-"unexpected 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
msgstr ""
-#: sequencer.c:830
+#: merge-recursive.c:1495
#, c-format
msgid ""
-"invalid 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-#: sequencer.c:836 sequencer.c:861
+#: merge-recursive.c:1500
#, c-format
-msgid "This is a combination of %d commits."
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
msgstr ""
-#: sequencer.c:845
-msgid "need a HEAD to fixup"
+#: merge-recursive.c:1534
+msgid "rename"
msgstr ""
-#: sequencer.c:847
-msgid "could not read HEAD"
+#: merge-recursive.c:1534
+msgid "renamed"
msgstr ""
-#: sequencer.c:849
-msgid "could not read HEAD's commit message"
+#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
+#: merge-recursive.c:3124
+#, c-format
+msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: sequencer.c:855
+#: merge-recursive.c:1602
#, c-format
-msgid "cannot write '%s'"
+msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: sequencer.c:864 git-rebase--interactive.sh:445
-msgid "This is the 1st commit message:"
+#: merge-recursive.c:1607
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: sequencer.c:872
+#: merge-recursive.c:1633
#, c-format
-msgid "could not read commit message of %s"
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: sequencer.c:879
-#, c-format
-msgid "This is the commit message #%d:"
+#: merge-recursive.c:1638
+msgid " (left unresolved)"
msgstr ""
-#: sequencer.c:884
+#: merge-recursive.c:1699
#, c-format
-msgid "The commit message #%d will be skipped:"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: sequencer.c:889
+#: merge-recursive.c:1734
#, c-format
-msgid "unknown command: %d"
+msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: sequencer.c:955
-msgid "your index file is unmerged."
+#: merge-recursive.c:1746
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: sequencer.c:973
+#: merge-recursive.c:1952
#, c-format
-msgid "commit %s is a merge but no -m option was given."
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
msgstr ""
-#: sequencer.c:981
+#: merge-recursive.c:1984
#, c-format
-msgid "commit %s does not have parent %d"
+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 ""
-#: sequencer.c:985
+#: merge-recursive.c:1994
#, c-format
-msgid "mainline was specified but commit %s is not a merge."
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: sequencer.c:991
+#: merge-recursive.c:2086
#, c-format
-msgid "cannot get commit message for %s"
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
msgstr ""
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1012
+#: merge-recursive.c:2331
#, c-format
-msgid "%s: cannot parse parent commit %s"
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
msgstr ""
-#: sequencer.c:1075 sequencer.c:1830
+#: merge-recursive.c:2737
#, c-format
-msgid "could not rename '%s' to '%s'"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: sequencer.c:1126
+#: merge-recursive.c:2763
#, c-format
-msgid "could not revert %s... %s"
+msgid "Adding merged %s"
msgstr ""
-#: sequencer.c:1127
+#: merge-recursive.c:2770 merge-recursive.c:3127
#, c-format
-msgid "could not apply %s... %s"
+msgid "Adding as %s instead"
msgstr ""
-#: sequencer.c:1169
-msgid "empty commit set passed"
+#: merge-recursive.c:2934
+#, c-format
+msgid "cannot read object %s"
msgstr ""
-#: sequencer.c:1179
+#: merge-recursive.c:2937
#, c-format
-msgid "git %s: failed to read the index"
+msgid "object %s is not a blob"
msgstr ""
-#: sequencer.c:1186
-#, c-format
-msgid "git %s: failed to refresh the index"
+#: merge-recursive.c:3006
+msgid "modify"
msgstr ""
-#: sequencer.c:1306
-#, c-format
-msgid "invalid line %d: %.*s"
+#: merge-recursive.c:3006
+msgid "modified"
msgstr ""
-#: sequencer.c:1314
-#, c-format
-msgid "cannot '%s' without a previous commit"
+#: merge-recursive.c:3017
+msgid "content"
+msgstr ""
+
+#: merge-recursive.c:3024
+msgid "add/add"
msgstr ""
-#: sequencer.c:1347
+#: merge-recursive.c:3071
#, c-format
-msgid "could not read '%s'."
+msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: sequencer.c:1359
-msgid "please fix this using 'git rebase --edit-todo'."
+#: merge-recursive.c:3093 git-submodule.sh:858
+msgid "submodule"
msgstr ""
-#: sequencer.c:1361
+#: merge-recursive.c:3094
#, c-format
-msgid "unusable instruction sheet: '%s'"
+msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: sequencer.c:1366
-msgid "no commits parsed."
+#: merge-recursive.c:3216
+#, c-format
+msgid "Removing %s"
msgstr ""
-#: sequencer.c:1377
-msgid "cannot cherry-pick during a revert."
+#: merge-recursive.c:3242
+msgid "file/directory"
msgstr ""
-#: sequencer.c:1379
-msgid "cannot revert during a cherry-pick."
+#: merge-recursive.c:3248
+msgid "directory/file"
msgstr ""
-#: sequencer.c:1442
+#: merge-recursive.c:3255
#, c-format
-msgid "invalid key: %s"
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: sequencer.c:1445
+#: merge-recursive.c:3264
#, c-format
-msgid "invalid value for %s: %s"
+msgid "Adding %s"
msgstr ""
-#: sequencer.c:1502
+#: merge-recursive.c:3300
#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr ""
-
-#: sequencer.c:1540
-msgid "a cherry-pick or revert is already in progress"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
msgstr ""
-#: sequencer.c:1541
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: merge-recursive.c:3311
+msgid "Already up to date!"
msgstr ""
-#: sequencer.c:1544
+#: merge-recursive.c:3320
#, c-format
-msgid "could not create sequencer directory '%s'"
+msgid "merging of trees %s and %s failed"
msgstr ""
-#: sequencer.c:1558
-msgid "could not lock HEAD"
+#: merge-recursive.c:3419
+msgid "Merging:"
msgstr ""
-#: sequencer.c:1614 sequencer.c:2188
-msgid "no cherry-pick or revert in progress"
+#: merge-recursive.c:3432
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: merge-recursive.c:3471
+msgid "merge returned no commit"
msgstr ""
-#: sequencer.c:1616
-msgid "cannot resolve HEAD"
+#: merge-recursive.c:3537
+#, c-format
+msgid "Could not parse object '%s'"
msgstr ""
-#: sequencer.c:1618 sequencer.c:1652
-msgid "cannot abort from a branch yet to be born"
+#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+msgid "Unable to write index."
msgstr ""
-#: sequencer.c:1638 builtin/grep.c:929
+#: midx.c:65
#, c-format
-msgid "cannot open '%s'"
+msgid "multi-pack-index file %s is too small"
msgstr ""
-#: sequencer.c:1640
+#: midx.c:81
#, c-format
-msgid "cannot read '%s': %s"
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: sequencer.c:1641
-msgid "unexpected end of file"
+#: midx.c:86
+#, c-format
+msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: sequencer.c:1647
+#: midx.c:91
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgid "hash version %u does not match"
msgstr ""
-#: sequencer.c:1658
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+#: midx.c:105
+msgid "invalid chunk offset (too large)"
msgstr ""
-#: sequencer.c:1795 sequencer.c:2086
-msgid "cannot read HEAD"
+#: midx.c:129
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: sequencer.c:1835 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
+#: midx.c:142
+msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: sequencer.c:1851
-msgid "could not read index"
+#: midx.c:144
+msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: sequencer.c:1856
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+#: midx.c:146
+msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: sequencer.c:1862
-msgid "and made changes to the index and/or the working tree\n"
+#: midx.c:148
+msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: sequencer.c:1868
+#: midx.c:162
#, 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"
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: sequencer.c:1925
+#: midx.c:205
#, c-format
-msgid "Applied autostash.\n"
+msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: sequencer.c:1937
-#, c-format
-msgid "cannot store %s"
+#: midx.c:246
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: sequencer.c:1940 git-rebase.sh:173
-#, 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"
+#: midx.c:271
+msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: sequencer.c:2022
+#: midx.c:407
#, c-format
-msgid "Stopped at %s... %.*s\n"
+msgid "failed to add packfile '%s'"
msgstr ""
-#: sequencer.c:2064
+#: midx.c:413
#, c-format
-msgid "unknown command %d"
+msgid "failed to open pack-index '%s'"
msgstr ""
-#: sequencer.c:2094
-msgid "could not read orig-head"
+#: midx.c:507
+#, c-format
+msgid "failed to locate object %d in packfile"
msgstr ""
-#: sequencer.c:2099
-msgid "could not read 'onto'"
+#: midx.c:943
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: sequencer.c:2106
+#: midx.c:981
#, c-format
-msgid "could not update %s"
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: sequencer.c:2113
+#: midx.c:992
#, c-format
-msgid "could not update HEAD to %s"
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: sequencer.c:2197
-msgid "cannot rebase: You have unstaged changes."
+#: midx.c:996
+msgid "Verifying object offsets"
msgstr ""
-#: sequencer.c:2202
-msgid "could not remove CHERRY_PICK_HEAD"
+#: midx.c:1004
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: sequencer.c:2211
-msgid "cannot amend non-existing commit"
+#: midx.c:1010
+#, c-format
+msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: sequencer.c:2213
+#: midx.c:1019
#, c-format
-msgid "invalid file: '%s'"
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: sequencer.c:2215
+#: name-hash.c:532
#, c-format
-msgid "invalid contents: '%s'"
+msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: sequencer.c:2218
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
+#: name-hash.c:554
+#, c-format
+msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: sequencer.c:2228
-msgid "could not commit staged changes."
+#: name-hash.c:560
+#, c-format
+msgid "unable to join lazy_name thread: %s"
msgstr ""
-#: sequencer.c:2308
+#: notes-merge.c:275
#, c-format
-msgid "%s: can't cherry-pick a %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 ""
-#: sequencer.c:2312
+#: notes-merge.c:282
#, c-format
-msgid "%s: bad revision"
+msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: sequencer.c:2345
-msgid "can't revert as initial commit"
+#: notes-utils.c:45
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: setup.c:171
+#: notes-utils.c:104
#, 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 "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: setup.c:184
+#: notes-utils.c:114
#, 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 "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-#: setup.c:252
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:144
#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+msgid "Bad %s value: '%s'"
msgstr ""
-#: setup.c:504
+#: object.c:54
#, c-format
-msgid "Expected git repo version <= %d, found %d"
+msgid "invalid object type \"%s\""
msgstr ""
-#: setup.c:512
-msgid "unknown repository extensions found:"
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
msgstr ""
-#: setup.c:810
+#: object.c:233
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
+msgid "object %s has unknown type id %d"
msgstr ""
-#: setup.c:812 builtin/index-pack.c:1652
-msgid "Cannot come back to cwd"
+#: object.c:246
+#, c-format
+msgid "unable to parse object: %s"
msgstr ""
-#: setup.c:1050
-msgid "Unable to read current working directory"
+#: object.c:266 object.c:277
+#, c-format
+msgid "sha1 mismatch %s"
+msgstr ""
+
+#: packfile.c:607
+msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: setup.c:1062 setup.c:1068
+#: packfile.c:1864
#, c-format
-msgid "Cannot change to '%s'"
+msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: setup.c:1081
+#: packfile.c:1868
#, c-format
-msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
-"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: setup.c:1173
+#: parse-options.c:672
+msgid "..."
+msgstr ""
+
+#: parse-options.c:691
#, c-format
-msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+msgid "usage: %s"
msgstr ""
-#: sha1_file.c:560
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:697
#, c-format
-msgid "path '%s' does not exist"
+msgid " or: %s"
msgstr ""
-#: sha1_file.c:586
+#: parse-options.c:700
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgid " %s"
+msgstr ""
+
+#: parse-options.c:739
+msgid "-NUM"
msgstr ""
-#: sha1_file.c:592
+#: parse-options-cb.c:37
#, c-format
-msgid "reference repository '%s' is not a local repository."
+msgid "malformed expiration date '%s'"
msgstr ""
-#: sha1_file.c:598
+#: parse-options-cb.c:109
#, c-format
-msgid "reference repository '%s' is shallow"
+msgid "malformed object name '%s'"
msgstr ""
-#: sha1_file.c:606
+#: path.c:894
#, c-format
-msgid "reference repository '%s' is grafted"
+msgid "Could not make %s writable by group"
msgstr ""
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
+#: pathspec.c:129
+msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
+#: pathspec.c:147
+msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
+#: pathspec.c:150
+msgid "attr spec must not be empty"
msgstr ""
-#: sha1_name.c:419
+#: pathspec.c:193
#, c-format
-msgid "short SHA1 %s is ambiguous"
+msgid "invalid attribute name %s"
msgstr ""
-#: sha1_name.c:430
-msgid "The candidates are:"
+#: pathspec.c:258
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: sha1_name.c:589
+#: pathspec.c:265
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\""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-#: submodule.c:70 submodule.c:104
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: pathspec.c:305
+msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: submodule.c:74 submodule.c:108
+#: pathspec.c:326
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: submodule.c:82
+#: pathspec.c:331
#, c-format
-msgid "Could not update .gitmodules entry %s"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: submodule.c:115
+#: pathspec.c:369
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: submodule.c:126
-msgid "staging updated .gitmodules failed"
+#: pathspec.c:428
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
+#: pathspec.c:441
+#, c-format
+msgid "%s: '%s' is outside repository"
msgstr ""
-#: submodule.c:376
+#: pathspec.c:515
#, c-format
-msgid "in unpopulated submodule '%s'"
+msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: submodule.c:407
+#: pathspec.c:525
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: submodule.c:1337
+#: pathspec.c:592
#, c-format
-msgid "'%s' not recognized as a git repository"
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: submodule.c:1475
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
+#: pkt-line.c:104
+msgid "flush packet write failed"
msgstr ""
-#: submodule.c:1488
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
+#: pkt-line.c:142 pkt-line.c:228
+msgid "protocol error: impossibly long line"
msgstr ""
-#: submodule.c:1581
-#, c-format
-msgid "submodule '%s' has dirty index"
+#: pkt-line.c:158 pkt-line.c:160
+msgid "packet write with format failed"
msgstr ""
-#: submodule.c:1845
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+#: pkt-line.c:192
+msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: submodule.c:1857 submodule.c:1913
-#, c-format
-msgid "could not lookup name for submodule '%s'"
+#: pkt-line.c:199 pkt-line.c:206
+msgid "packet write failed"
+msgstr ""
+
+#: pkt-line.c:291
+msgid "read error"
+msgstr ""
+
+#: pkt-line.c:299
+msgid "the remote end hung up unexpectedly"
msgstr ""
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: pkt-line.c:327
#, c-format
-msgid "could not create directory '%s'"
+msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: submodule.c:1864
+#: pkt-line.c:337 pkt-line.c:342
#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
+msgid "protocol error: bad line length %d"
+msgstr ""
+
+#: preload-index.c:118
+msgid "Refreshing index"
msgstr ""
-#: submodule.c:1948
+#: preload-index.c:137
#, c-format
-msgid "could not recurse into submodule '%s'"
+msgid "unable to create threaded lstat: %s"
msgstr ""
-#: submodule.c:1992
-msgid "could not start ls-files in .."
+#: pretty.c:962
+msgid "unable to parse --pretty format"
msgstr ""
-#: submodule.c:2012
-msgid "BUG: returned path string doesn't match cwd?"
+#: range-diff.c:56
+msgid "could not start `log`"
msgstr ""
-#: submodule.c:2031
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
+#: range-diff.c:59
+msgid "could not read `log` output"
msgstr ""
-#: submodule-config.c:420
+#: range-diff.c:74 sequencer.c:4764
#, c-format
-msgid "invalid value for %s"
+msgid "could not parse commit '%s'"
msgstr ""
-#: trailer.c:241
-#, c-format
-msgid "running trailer command '%s' failed"
+#: range-diff.c:224
+msgid "failed to generate diff"
msgstr ""
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: range-diff.c:455 range-diff.c:457
#, c-format
-msgid "unknown value '%s' for key '%s'"
+msgid "could not parse log for '%s'"
msgstr ""
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: read-cache.c:1490
+msgid "Refresh index"
+msgstr ""
+
+#: read-cache.c:1604
#, c-format
-msgid "more than one %s"
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: trailer.c:703
+#: read-cache.c:1614
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: trailer.c:723
+#: read-cache.c:1792
#, c-format
-msgid "could not read input file '%s'"
+msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: trailer.c:726
-msgid "could not read from stdin"
+#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
+#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
+#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
+#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
+#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+msgid "index file corrupt"
msgstr ""
-#: trailer.c:950 builtin/am.c:45
+#: read-cache.c:2101
#, c-format
-msgid "could not stat %s"
+msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: trailer.c:952
+#: read-cache.c:2114
#, c-format
-msgid "file %s is not a regular file"
+msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: trailer.c:954
+#: read-cache.c:2201
#, c-format
-msgid "file %s is not writable by user"
+msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: trailer.c:966
-msgid "could not open temporary file"
+#: read-cache.c:2228
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: trailer.c:1002
+#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
#, c-format
-msgid "could not rename temporary file to %s"
+msgid "could not close '%s'"
msgstr ""
-#: transport.c:63
+#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgid "could not stat '%s'"
msgstr ""
-#: transport.c:152
+#: read-cache.c:3068
#, c-format
-msgid "transport: invalid depth option '%s'"
+msgid "unable to open git dir: %s"
msgstr ""
-#: transport.c:890
+#: read-cache.c:3080
#, c-format
+msgid "unable to unlink: %s"
+msgstr ""
+
+#: rebase-interactive.c:10
msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+"\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 ""
-#: transport.c:894
-#, c-format
+#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
msgid ""
"\n"
-"Please try\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+
+#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+msgid ""
"\n"
-"\tgit push --recurse-submodules=on-demand\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+
+#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+msgid ""
"\n"
-"or cd to the path and use\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"
-"\tgit push\n"
+msgstr ""
+
+#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+msgid ""
"\n"
-"to push them to a remote.\n"
+"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: transport.c:902
-msgid "Aborting."
+#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
msgstr ""
-#: transport-helper.c:1071
+#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
+#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
#, c-format
-msgid "Could not read ref %s"
+msgid "could not read '%s'."
msgstr ""
-#: tree-walk.c:31
-msgid "too-short tree object"
+#: refs.c:192
+#, c-format
+msgid "%s does not point to a valid object!"
msgstr ""
-#: tree-walk.c:37
-msgid "malformed mode in tree entry"
+#: refs.c:583
+#, c-format
+msgid "ignoring dangling symref %s"
msgstr ""
-#: tree-walk.c:41
-msgid "empty filename in tree entry"
+#: refs.c:585 ref-filter.c:1951
+#, c-format
+msgid "ignoring broken ref %s"
msgstr ""
-#: tree-walk.c:113
-msgid "too-short tree file"
+#: refs.c:711
+#, c-format
+msgid "could not open '%s' for writing: %s"
msgstr ""
-#: unpack-trees.c:105
+#: refs.c:721 refs.c:772
#, 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."
+msgid "could not read ref '%s'"
msgstr ""
-#: unpack-trees.c:107
+#: refs.c:727
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+msgid "ref '%s' already exists"
msgstr ""
-#: unpack-trees.c:110
+#: refs.c:732
#, 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."
+msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: unpack-trees.c:112
+#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
+#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
+#: wrapper.c:656
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+msgid "could not write to '%s'"
msgstr ""
-#: unpack-trees.c:115
+#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:728
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
+msgid "could not open '%s' for writing"
msgstr ""
-#: unpack-trees.c:117
+#: refs.c:774
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: unpack-trees.c:122
+#: refs.c:905
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
+msgid "log for ref %s has gap after %s"
msgstr ""
-#: unpack-trees.c:126
+#: refs.c:911
#, 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 "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: unpack-trees.c:128
+#: refs.c:969
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+msgid "log for %s is empty"
msgstr ""
-#: unpack-trees.c:131
+#: refs.c:1061
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: unpack-trees.c:133
+#: refs.c:1137
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: unpack-trees.c:136
+#: refs.c:1911
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+#: refs.c:1943
+msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: unpack-trees.c:143
+#: refs.c:2039 refs.c:2069
#, 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 "'%s' exists; cannot create '%s'"
msgstr ""
-#: unpack-trees.c:145
+#: refs.c:2045 refs.c:2080
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: unpack-trees.c:148
+#: refs/files-backend.c:1228
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "could not remove reference %s"
msgstr ""
-#: unpack-trees.c:150
+#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+msgid "could not delete reference %s: %s"
msgstr ""
-#: unpack-trees.c:153
+#: refs/files-backend.c:1245 refs/packed-backend.c:1545
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "could not delete references: %s"
msgstr ""
-#: unpack-trees.c:155
+#: refspec.c:137
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+msgid "invalid refspec '%s'"
msgstr ""
-#: unpack-trees.c:162
-#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+#: ref-filter.c:39 wt-status.c:1855
+msgid "gone"
msgstr ""
-#: unpack-trees.c:165
+#: ref-filter.c:40
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
+msgid "ahead %d"
msgstr ""
-#: unpack-trees.c:167
+#: ref-filter.c:41
#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+msgid "behind %d"
msgstr ""
-#: unpack-trees.c:169
+#: ref-filter.c:42
#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+msgid "ahead %d, behind %d"
msgstr ""
-#: unpack-trees.c:171
+#: ref-filter.c:138
#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
+msgid "expected format: %%(color:<color>)"
msgstr ""
-#: unpack-trees.c:248
+#: ref-filter.c:140
#, c-format
-msgid "Aborting\n"
+msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: unpack-trees.c:277
+#: ref-filter.c:162
#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
+msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: unpack-trees.c:346
-msgid "Checking out files"
+#: ref-filter.c:166
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
+#: ref-filter.c:168
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#: ref-filter.c:223
#, c-format
-msgid "invalid %XX escape sequence"
+msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
+#: ref-filter.c:235
+#, c-format
+msgid "%%(objectsize) does not take arguments"
msgstr ""
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
+#: ref-filter.c:247
+#, c-format
+msgid "%%(body) does not take arguments"
msgstr ""
-#: urlmatch.c:247
-msgid "invalid characters in host name"
+#: ref-filter.c:256
+#, c-format
+msgid "%%(subject) does not take arguments"
msgstr ""
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
+#: ref-filter.c:278
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
+#: ref-filter.c:307
+#, c-format
+msgid "positive value expected contents:lines=%s"
msgstr ""
-#: worktree.c:245
+#: ref-filter.c:309
#, c-format
-msgid "failed to read '%s'"
+msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: wrapper.c:223 wrapper.c:393
+#: ref-filter.c:324
#, c-format
-msgid "could not open '%s' for reading and writing"
+msgid "positive value expected objectname:short=%s"
msgstr ""
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
+#: ref-filter.c:328
#, c-format
-msgid "could not open '%s' for writing"
+msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: ref-filter.c:358
#, c-format
-msgid "could not open '%s' for reading"
+msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: wrapper.c:424 wrapper.c:624
+#: ref-filter.c:370
#, c-format
-msgid "unable to access '%s'"
+msgid "unrecognized position:%s"
msgstr ""
-#: wrapper.c:632
-msgid "unable to get current working directory"
+#: ref-filter.c:377
+#, c-format
+msgid "unrecognized width:%s"
msgstr ""
-#: wrapper.c:656
+#: ref-filter.c:386
#, c-format
-msgid "could not write to %s"
+msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: wrapper.c:658
+#: ref-filter.c:394
#, c-format
-msgid "could not close %s"
+msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: wt-status.c:152
-msgid "Unmerged paths:"
+#: ref-filter.c:412
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: wt-status.c:179 wt-status.c:206
+#: ref-filter.c:508
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid "malformed field name: %.*s"
msgstr ""
-#: wt-status.c:181 wt-status.c:208
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: ref-filter.c:535
+#, c-format
+msgid "unknown field name: %.*s"
msgstr ""
-#: wt-status.c:185
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: ref-filter.c:539
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: wt-status.c:187 wt-status.c:191
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: ref-filter.c:663
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: wt-status.c:189
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: ref-filter.c:726
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: wt-status.c:200 wt-status.c:981
-msgid "Changes to be committed:"
+#: ref-filter.c:728
+#, c-format
+msgid "format: %%(then) atom used more than once"
msgstr ""
-#: wt-status.c:218 wt-status.c:990
-msgid "Changes not staged for commit:"
+#: ref-filter.c:730
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: wt-status.c:222
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: ref-filter.c:758
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: wt-status.c:224
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: ref-filter.c:760
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: wt-status.c:225
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: ref-filter.c:762
+#, c-format
+msgid "format: %%(else) atom used more than once"
msgstr ""
-#: wt-status.c:227
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: ref-filter.c:777
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: wt-status.c:239
+#: ref-filter.c:834
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid "malformed format string %s"
msgstr ""
-#: wt-status.c:254
-msgid "both deleted:"
+#: ref-filter.c:1424
+#, c-format
+msgid "(no branch, rebasing %s)"
msgstr ""
-#: wt-status.c:256
-msgid "added by us:"
+#: ref-filter.c:1427
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: wt-status.c:258
-msgid "deleted by them:"
+#: ref-filter.c:1430
+#, c-format
+msgid "(no branch, bisect started on %s)"
msgstr ""
-#: wt-status.c:260
-msgid "added by them:"
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1438
+#, c-format
+msgid "(HEAD detached at %s)"
msgstr ""
-#: wt-status.c:262
-msgid "deleted by us:"
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1445
+#, c-format
+msgid "(HEAD detached from %s)"
msgstr ""
-#: wt-status.c:264
-msgid "both added:"
+#: ref-filter.c:1449
+msgid "(no branch)"
msgstr ""
-#: wt-status.c:266
-msgid "both modified:"
+#: ref-filter.c:1483 ref-filter.c:1638
+#, c-format
+msgid "missing object %s for %s"
msgstr ""
-#: wt-status.c:276
-msgid "new file:"
+#: ref-filter.c:1491
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: wt-status.c:278
-msgid "copied:"
+#: ref-filter.c:1857
+#, c-format
+msgid "malformed object at '%s'"
msgstr ""
-#: wt-status.c:280
-msgid "deleted:"
+#: ref-filter.c:1946
+#, c-format
+msgid "ignoring ref with broken name %s"
msgstr ""
-#: wt-status.c:282
-msgid "modified:"
+#: ref-filter.c:2232
+#, c-format
+msgid "format: %%(end) atom missing"
msgstr ""
-#: wt-status.c:284
-msgid "renamed:"
+#: ref-filter.c:2338
+#, c-format
+msgid "malformed object name %s"
msgstr ""
-#: wt-status.c:286
-msgid "typechange:"
+#: remote.c:607
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: wt-status.c:288
-msgid "unknown:"
+#: remote.c:611
+#, c-format
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: wt-status.c:290
-msgid "unmerged:"
+#: remote.c:615
+#, c-format
+msgid "%s tracks both %s and %s"
msgstr ""
-#: wt-status.c:372
-msgid "new commits, "
+#: remote.c:623
+msgid "Internal error"
msgstr ""
-#: wt-status.c:374
-msgid "modified content, "
+#: remote.c:1569 remote.c:1670
+msgid "HEAD does not point to a branch"
msgstr ""
-#: wt-status.c:376
-msgid "untracked content, "
+#: remote.c:1578
+#, c-format
+msgid "no such branch: '%s'"
msgstr ""
-#: wt-status.c:821
+#: remote.c:1581
#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:853
-msgid "Submodules changed but not updated:"
+msgid "no upstream configured for branch '%s'"
msgstr ""
-#: wt-status.c:855
-msgid "Submodule changes to be committed:"
+#: remote.c:1587
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: wt-status.c:937
-msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+#: remote.c:1602
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: wt-status.c:1049
-msgid "You have unmerged paths."
+#: remote.c:1614
+#, c-format
+msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: wt-status.c:1052
-msgid " (fix conflicts and run \"git commit\")"
+#: remote.c:1624
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: wt-status.c:1054
-msgid " (use \"git merge --abort\" to abort the merge)"
+#: remote.c:1637
+msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: wt-status.c:1059
-msgid "All conflicts fixed but you are still merging."
+#: remote.c:1659
+msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: wt-status.c:1062
-msgid " (use \"git commit\" to conclude merge)"
+#: remote.c:1935
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: wt-status.c:1072
-msgid "You are in the middle of an am session."
+#: remote.c:1939
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: wt-status.c:1075
-msgid "The current patch is empty."
+#: remote.c:1942
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: wt-status.c:1079
-msgid " (fix conflicts and then run \"git am --continue\")"
+#: remote.c:1946
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: wt-status.c:1081
-msgid " (use \"git am --skip\" to skip this patch)"
+#: remote.c:1949
+#, c-format
+msgid " (use \"%s\" for details)\n"
msgstr ""
-#: wt-status.c:1083
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr ""
+#: remote.c:1953
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] ""
+msgstr[1] ""
-#: wt-status.c:1214
-msgid "git-rebase-todo is missing."
+#: remote.c:1959
+msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: wt-status.c:1216
-msgid "No commands done."
+#: remote.c:1962
+#, 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:1970
+msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: wt-status.c:1219
+#: remote.c:1973
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
+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] ""
-#: wt-status.c:1230
-#, c-format
-msgid " (see more in file %s)"
+#: remote.c:1983
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: wt-status.c:1235
-msgid "No commands remaining."
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
msgstr ""
-#: wt-status.c:1238
+#: replace-object.c:30
#, 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:1246
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgid "duplicate replace ref: %s"
msgstr ""
-#: wt-status.c:1259
+#: replace-object.c:73
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+msgid "replace depth too high for object %s"
msgstr ""
-#: wt-status.c:1264
-msgid "You are currently rebasing."
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
msgstr ""
-#: wt-status.c:1278
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
msgstr ""
-#: wt-status.c:1280
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
+#, c-format
+msgid "could not write '%s'"
msgstr ""
-#: wt-status.c:1282
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: rerere.c:495
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: wt-status.c:1288
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
msgstr ""
-#: wt-status.c:1292
+#: rerere.c:503 rerere.c:1039
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgid "could not parse conflict hunks in '%s'"
msgstr ""
-#: wt-status.c:1297
-msgid "You are currently splitting a commit during a rebase."
+#: rerere.c:684
+#, c-format
+msgid "failed utime() on '%s'"
msgstr ""
-#: wt-status.c:1300
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: rerere.c:694
+#, c-format
+msgid "writing '%s' failed"
msgstr ""
-#: wt-status.c:1304
+#: rerere.c:714
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgid "Staged '%s' using previous resolution."
msgstr ""
-#: wt-status.c:1309
-msgid "You are currently editing a commit during a rebase."
+#: rerere.c:753
+#, c-format
+msgid "Recorded resolution for '%s'."
msgstr ""
-#: wt-status.c:1312
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: rerere.c:788
+#, c-format
+msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: wt-status.c:1314
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: rerere.c:803
+#, c-format
+msgid "cannot unlink stray '%s'"
msgstr ""
-#: wt-status.c:1324
+#: rerere.c:807
#, c-format
-msgid "You are currently cherry-picking commit %s."
+msgid "Recorded preimage for '%s'"
msgstr ""
-#: wt-status.c:1329
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1423
+#, c-format
+msgid "could not create directory '%s'"
msgstr ""
-#: wt-status.c:1332
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: rerere.c:1057
+#, c-format
+msgid "failed to update conflicted state in '%s'"
msgstr ""
-#: wt-status.c:1334
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: rerere.c:1068 rerere.c:1075
+#, c-format
+msgid "no remembered resolution for '%s'"
msgstr ""
-#: wt-status.c:1343
+#: rerere.c:1077
#, c-format
-msgid "You are currently reverting commit %s."
+msgid "cannot unlink '%s'"
msgstr ""
-#: wt-status.c:1348
-msgid " (fix conflicts and run \"git revert --continue\")"
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
msgstr ""
-#: wt-status.c:1351
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+#: rerere.c:1096
+#, c-format
+msgid "Forgot resolution for '%s'\n"
msgstr ""
-#: wt-status.c:1353
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
+msgstr ""
+
+#: revision.c:2324
+msgid "your current branch appears to be broken"
msgstr ""
-#: wt-status.c:1364
+#: revision.c:2327
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: wt-status.c:1368
-msgid "You are currently bisecting."
+#: revision.c:2523
+msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: wt-status.c:1371
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: run-command.c:740
+msgid "open /dev/null failed"
msgstr ""
-#: wt-status.c:1568
-msgid "On branch "
+#: run-command.c:1229
+#, c-format
+msgid "cannot create async thread: %s"
msgstr ""
-#: wt-status.c:1574
-msgid "interactive rebase in progress; onto "
+#: run-command.c:1293
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: wt-status.c:1576
-msgid "rebase in progress; onto "
+#: send-pack.c:142
+msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: wt-status.c:1581
-msgid "HEAD detached at "
+#: send-pack.c:144
+#, c-format
+msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: wt-status.c:1583
-msgid "HEAD detached from "
+#: send-pack.c:146
+#, c-format
+msgid "remote unpack failed: %s"
msgstr ""
-#: wt-status.c:1586
-msgid "Not currently on any branch."
+#: send-pack.c:308
+msgid "failed to sign the push certificate"
msgstr ""
-#: wt-status.c:1606
-msgid "Initial commit"
+#: send-pack.c:421
+msgid "the receiving end does not support --signed push"
msgstr ""
-#: wt-status.c:1607
-msgid "No commits yet"
+#: send-pack.c:423
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-#: wt-status.c:1621
-msgid "Untracked files"
+#: send-pack.c:435
+msgid "the receiving end does not support --atomic push"
msgstr ""
-#: wt-status.c:1623
-msgid "Ignored files"
+#: send-pack.c:440
+msgid "the receiving end does not support push options"
msgstr ""
-#: wt-status.c:1627
+#: sequencer.c:183
#, 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 "invalid commit message cleanup mode '%s'"
msgstr ""
-#: wt-status.c:1633
+#: sequencer.c:287
#, c-format
-msgid "Untracked files not listed%s"
+msgid "could not delete '%s'"
msgstr ""
-#: wt-status.c:1635
-msgid " (use -u option to show untracked files)"
+#: sequencer.c:313
+msgid "revert"
msgstr ""
-#: wt-status.c:1641
-msgid "No changes"
+#: sequencer.c:315
+msgid "cherry-pick"
msgstr ""
-#: wt-status.c:1646
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+#: sequencer.c:317
+msgid "rebase -i"
msgstr ""
-#: wt-status.c:1649
+#: sequencer.c:319
#, c-format
-msgid "no changes added to commit\n"
+msgid "unknown action: %d"
msgstr ""
-#: wt-status.c:1652
-#, c-format
+#: sequencer.c:376
msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+
+#: sequencer.c:379
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'\n"
+"and commit the result with 'git commit'"
msgstr ""
-#: wt-status.c:1655
+#: sequencer.c:392 sequencer.c:2632
#, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid "could not lock '%s'"
msgstr ""
-#: wt-status.c:1658
+#: sequencer.c:399
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "could not write eol to '%s'"
msgstr ""
-#: wt-status.c:1661 wt-status.c:1666
+#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
+#: sequencer.c:2885
#, c-format
-msgid "nothing to commit\n"
+msgid "failed to finalize '%s'"
msgstr ""
-#: wt-status.c:1664
+#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
+#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
+#: builtin/merge.c:1084 builtin/rebase.c:152
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid "could not read '%s'"
msgstr ""
-#: wt-status.c:1668
+#: sequencer.c:453
#, c-format
-msgid "nothing to commit, working tree clean\n"
+msgid "your local changes would be overwritten by %s."
msgstr ""
-#: wt-status.c:1780
-msgid "No commits yet on "
+#: sequencer.c:457
+msgid "commit your changes or stash them to proceed."
msgstr ""
-#: wt-status.c:1784
-msgid "HEAD (no branch)"
+#: sequencer.c:486
+#, c-format
+msgid "%s: fast-forward"
msgstr ""
-#: wt-status.c:1813 wt-status.c:1821
-msgid "behind "
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:575
+#, c-format
+msgid "%s: Unable to write new index file"
msgstr ""
-#: wt-status.c:1816 wt-status.c:1819
-msgid "ahead "
+#: sequencer.c:591
+msgid "unable to update cache tree"
msgstr ""
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
-#, c-format
-msgid "cannot %s: You have unstaged changes."
+#: sequencer.c:604
+msgid "could not resolve HEAD commit"
msgstr ""
-#: wt-status.c:2317
-msgid "additionally, your index contains uncommitted changes."
+#: sequencer.c:684
+#, c-format
+msgid "no key present in '%.*s'"
msgstr ""
-#: wt-status.c:2319
+#: sequencer.c:695
#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
+msgid "unable to dequote value of '%s'"
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
+#: builtin/am.c:811 builtin/merge.c:1081
#, c-format
-msgid "failed to unlink '%s'"
+msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/add.c:24
-msgid "git add [<options>] [--] <pathspec>..."
+#: sequencer.c:742
+msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: builtin/add.c:82
-#, c-format
-msgid "unexpected diff status %c"
+#: sequencer.c:747
+msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: builtin/add.c:87 builtin/commit.c:292
-msgid "updating files failed"
+#: sequencer.c:752
+msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: builtin/add.c:97
+#: sequencer.c:756
#, c-format
-msgid "remove '%s'\n"
+msgid "unknown variable '%s'"
msgstr ""
-#: builtin/add.c:151
-msgid "Unstaged changes after refreshing the index:"
+#: sequencer.c:761
+msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: builtin/add.c:211 builtin/rev-parse.c:873
-msgid "Could not read the index"
+#: sequencer.c:763
+msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: builtin/add.c:222
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr ""
-
-#: builtin/add.c:226
-msgid "Could not write patch"
+#: sequencer.c:765
+msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: builtin/add.c:229
-msgid "editing patch failed"
+#: sequencer.c:825
+#, c-format
+msgid "invalid date format '%s' in '%s'"
msgstr ""
-#: builtin/add.c:232
+#: sequencer.c:842
#, c-format
-msgid "Could not stat '%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 ""
-#: builtin/add.c:234
-msgid "Empty patch. Aborted."
+#: sequencer.c:935
+msgid "writing root commit"
msgstr ""
-#: builtin/add.c:239
-#, c-format
-msgid "Could not apply '%s'"
+#: sequencer.c:1142
+msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: builtin/add.c:249
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: sequencer.c:1149
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"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 ""
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
-msgid "dry run"
+#: sequencer.c:1162
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"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 ""
-#: builtin/add.c:272
-msgid "interactive picking"
+#: sequencer.c:1202
+msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
-msgid "select hunks interactively"
+#: sequencer.c:1204
+msgid "could not parse newly created commit"
msgstr ""
-#: builtin/add.c:274
-msgid "edit current diff and apply"
+#: sequencer.c:1250
+msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: builtin/add.c:275
-msgid "allow adding otherwise ignored files"
+#: sequencer.c:1252
+msgid "detached HEAD"
msgstr ""
-#: builtin/add.c:276
-msgid "update tracked files"
+#: sequencer.c:1256
+msgid " (root-commit)"
msgstr ""
-#: builtin/add.c:277
-msgid "record only the fact that the path will be added later"
+#: sequencer.c:1277
+msgid "could not parse HEAD"
msgstr ""
-#: builtin/add.c:278
-msgid "add changes from all tracked and untracked files"
+#: sequencer.c:1279
+#, c-format
+msgid "HEAD %s is not a commit!"
msgstr ""
-#: builtin/add.c:281
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: sequencer.c:1283 builtin/commit.c:1543
+msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/add.c:283
-msgid "don't add, only refresh the index"
+#: sequencer.c:1334 sequencer.c:1934
+msgid "unable to parse commit author"
msgstr ""
-#: builtin/add.c:284
-msgid "just skip files which cannot be added because of errors"
+#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/add.c:285
-msgid "check if - even missing - files are ignored in dry run"
+#: sequencer.c:1361 sequencer.c:1416
+#, c-format
+msgid "unable to read commit message from '%s'"
msgstr ""
-#: builtin/add.c:286 builtin/update-index.c:952
-msgid "(+/-)x"
+#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
+#: builtin/merge.c:883
+msgid "failed to write commit object"
msgstr ""
-#: builtin/add.c:286 builtin/update-index.c:953
-msgid "override the executable bit of the listed files"
+#: sequencer.c:1443
+#, c-format
+msgid "could not parse commit %s"
msgstr ""
-#: builtin/add.c:288
-msgid "warn when adding an embedded repository"
+#: sequencer.c:1448
+#, c-format
+msgid "could not parse parent commit %s"
msgstr ""
-#: builtin/add.c:303
+#: sequencer.c:1546 sequencer.c:1654
#, 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 "unknown command: %d"
msgstr ""
-#: builtin/add.c:331
+#: sequencer.c:1601 sequencer.c:1626
#, c-format
-msgid "adding embedded git repository: %s"
+msgid "This is a combination of %d commits."
msgstr ""
-#: builtin/add.c:349
-#, c-format
-msgid "Use -f if you really want to add them.\n"
+#: sequencer.c:1611 sequencer.c:4744
+msgid "need a HEAD to fixup"
msgstr ""
-#: builtin/add.c:357
-msgid "adding files failed"
+#: sequencer.c:1613 sequencer.c:2912
+msgid "could not read HEAD"
msgstr ""
-#: builtin/add.c:394
-msgid "-A and -u are mutually incompatible"
+#: sequencer.c:1615
+msgid "could not read HEAD's commit message"
msgstr ""
-#: builtin/add.c:401
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: sequencer.c:1621
+#, c-format
+msgid "cannot write '%s'"
+msgstr ""
+
+#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+msgid "This is the 1st commit message:"
msgstr ""
-#: builtin/add.c:405
+#: sequencer.c:1636
#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
+msgid "could not read commit message of %s"
msgstr ""
-#: builtin/add.c:420
+#: sequencer.c:1643
#, c-format
-msgid "Nothing specified, nothing added.\n"
+msgid "This is the commit message #%d:"
msgstr ""
-#: builtin/add.c:421
+#: sequencer.c:1649
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+msgid "The commit message #%d will be skipped:"
msgstr ""
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
-msgid "index file corrupt"
+#: sequencer.c:1732
+msgid "your index file is unmerged."
msgstr ""
-#: builtin/am.c:413
-msgid "could not parse author script"
+#: sequencer.c:1739
+msgid "cannot fixup root commit"
msgstr ""
-#: builtin/am.c:489
+#: sequencer.c:1758
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
+msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: builtin/am.c:530
+#: sequencer.c:1766
#, c-format
-msgid "Malformed input line: '%s'."
+msgid "commit %s does not have parent %d"
msgstr ""
-#: builtin/am.c:567
+#: sequencer.c:1770
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "mainline was specified but commit %s is not a merge."
msgstr ""
-#: builtin/am.c:593
-msgid "fseek failed"
+#: sequencer.c:1776
+#, c-format
+msgid "cannot get commit message for %s"
msgstr ""
-#: builtin/am.c:777
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1795
#, c-format
-msgid "could not parse patch '%s'"
+msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: builtin/am.c:842
-msgid "Only one StGIT patch series can be applied at once"
+#: sequencer.c:1860
+#, c-format
+msgid "could not rename '%s' to '%s'"
msgstr ""
-#: builtin/am.c:889
-msgid "invalid timestamp"
+#: sequencer.c:1915
+#, c-format
+msgid "could not revert %s... %s"
msgstr ""
-#: builtin/am.c:892 builtin/am.c:900
-msgid "invalid Date line"
+#: sequencer.c:1916
+#, c-format
+msgid "could not apply %s... %s"
msgstr ""
-#: builtin/am.c:897
-msgid "invalid timezone offset"
+#: sequencer.c:1974
+#, c-format
+msgid "git %s: failed to read the index"
msgstr ""
-#: builtin/am.c:986
-msgid "Patch format detection failed."
+#: sequencer.c:1981
+#, c-format
+msgid "git %s: failed to refresh the index"
msgstr ""
-#: builtin/am.c:991 builtin/clone.c:401
+#: sequencer.c:2062
#, c-format
-msgid "failed to create directory '%s'"
+msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: builtin/am.c:995
-msgid "Failed to split patches."
+#: sequencer.c:2071
+#, c-format
+msgid "missing arguments for %s"
msgstr ""
-#: builtin/am.c:1120 builtin/commit.c:377
-msgid "unable to write index file"
+#: sequencer.c:2130
+#, c-format
+msgid "invalid line %d: %.*s"
msgstr ""
-#: builtin/am.c:1171
+#: sequencer.c:2138
#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+msgid "cannot '%s' without a previous commit"
msgstr ""
-#: builtin/am.c:1172
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+#: sequencer.c:2209
+msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: builtin/am.c:1173
+#: sequencer.c:2211
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: builtin/am.c:1304
-msgid "Patch is empty."
+#: sequencer.c:2216
+msgid "no commits parsed."
+msgstr ""
+
+#: sequencer.c:2227
+msgid "cannot cherry-pick during a revert."
+msgstr ""
+
+#: sequencer.c:2229
+msgid "cannot revert during a cherry-pick."
msgstr ""
-#: builtin/am.c:1370
+#: sequencer.c:2299
#, c-format
-msgid "invalid ident line: %.*s"
+msgid "invalid value for %s: %s"
+msgstr ""
+
+#: sequencer.c:2380
+msgid "unusable squash-onto"
msgstr ""
-#: builtin/am.c:1392
+#: sequencer.c:2396
#, c-format
-msgid "unable to parse commit %s"
+msgid "malformed options sheet: '%s'"
msgstr ""
-#: builtin/am.c:1586
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: sequencer.c:2479 sequencer.c:4005
+msgid "empty commit set passed"
msgstr ""
-#: builtin/am.c:1588
-msgid "Using index info to reconstruct a base tree..."
+#: sequencer.c:2487
+msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: builtin/am.c:1607
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+#: sequencer.c:2488
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: builtin/am.c:1613
-msgid "Falling back to patching base and 3-way merge..."
+#: sequencer.c:2491
+#, c-format
+msgid "could not create sequencer directory '%s'"
msgstr ""
-#: builtin/am.c:1638
-msgid "Failed to merge in the changes."
+#: sequencer.c:2505
+msgid "could not lock HEAD"
msgstr ""
-#: builtin/am.c:1662 builtin/merge.c:632
-msgid "git write-tree failed to write a tree"
+#: sequencer.c:2560 sequencer.c:3761
+msgid "no cherry-pick or revert in progress"
msgstr ""
-#: builtin/am.c:1669
-msgid "applying to an empty history"
+#: sequencer.c:2562
+msgid "cannot resolve HEAD"
msgstr ""
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
-msgid "failed to write commit object"
+#: sequencer.c:2564 sequencer.c:2599
+msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: builtin/am.c:1715 builtin/am.c:1719
+#: sequencer.c:2585 builtin/grep.c:721
#, c-format
-msgid "cannot resume: %s does not exist."
+msgid "cannot open '%s'"
msgstr ""
-#: builtin/am.c:1735
-msgid "cannot be interactive without stdin connected to a terminal."
+#: sequencer.c:2587
+#, c-format
+msgid "cannot read '%s': %s"
msgstr ""
-#: builtin/am.c:1740
-msgid "Commit Body is:"
+#: sequencer.c:2588
+msgid "unexpected end of file"
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:1750
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: sequencer.c:2594
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: builtin/am.c:1800
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
+#: sequencer.c:2605
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: builtin/am.c:1840 builtin/am.c:1912
+#: sequencer.c:2709 sequencer.c:3679
#, c-format
-msgid "Applying: %.*s"
+msgid "could not update %s"
msgstr ""
-#: builtin/am.c:1856
-msgid "No changes -- Patch already applied."
+#: sequencer.c:2747 sequencer.c:3659
+msgid "cannot read HEAD"
msgstr ""
-#: builtin/am.c:1864
+#: sequencer.c:2762
#, c-format
-msgid "Patch failed at %s %.*s"
+msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: builtin/am.c:1870
+#: sequencer.c:2770
#, c-format
-msgid "The copy of the patch that failed is found in: %s"
+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 ""
-#: builtin/am.c:1915
-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."
+#: sequencer.c:2780
+#, c-format
+msgid "Could not apply %s... %.*s"
msgstr ""
-#: builtin/am.c:1922
-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."
+#: sequencer.c:2787
+#, c-format
+msgid "Could not merge %.*s"
msgstr ""
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
#, c-format
-msgid "Could not parse object '%s'."
+msgid "could not copy '%s' to '%s'"
msgstr ""
-#: builtin/am.c:2083
-msgid "failed to clean index"
+#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
+#: builtin/rebase.c:1372 builtin/rebase.c:1426
+msgid "could not read index"
msgstr ""
-#: builtin/am.c:2117
+#: sequencer.c:2829
+#, c-format
msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: builtin/am.c:2180
-#, c-format
-msgid "Invalid value for --patch-format: %s"
+#: sequencer.c:2835
+msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: builtin/am.c:2213
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+#: sequencer.c:2841
+#, 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"
msgstr ""
-#: builtin/am.c:2214
-msgid "git am [<options>] (--continue | --skip | --abort)"
+#: sequencer.c:2902
+#, c-format
+msgid "illegal label name: '%.*s'"
msgstr ""
-#: builtin/am.c:2220
-msgid "run interactively"
+#: sequencer.c:2954
+msgid "writing fake root commit"
msgstr ""
-#: builtin/am.c:2222
-msgid "historical option -- no-op"
+#: sequencer.c:2959
+msgid "writing squash-onto"
msgstr ""
-#: builtin/am.c:2224
-msgid "allow fall back on 3way merging if needed"
+#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#, c-format
+msgid "failed to find tree of %s"
msgstr ""
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
-msgid "be quiet"
+#: sequencer.c:3015 builtin/rebase.c:604
+msgid "could not write index"
msgstr ""
-#: builtin/am.c:2227
-msgid "add a Signed-off-by line to the commit message"
+#: sequencer.c:3042
+#, c-format
+msgid "could not resolve '%s'"
msgstr ""
-#: builtin/am.c:2230
-msgid "recode into utf8 (default)"
+#: sequencer.c:3068
+msgid "cannot merge without a current revision"
msgstr ""
-#: builtin/am.c:2232
-msgid "pass -k flag to git-mailinfo"
+#: sequencer.c:3090
+#, c-format
+msgid "unable to parse '%.*s'"
msgstr ""
-#: builtin/am.c:2234
-msgid "pass -b flag to git-mailinfo"
+#: sequencer.c:3099
+#, c-format
+msgid "nothing to merge: '%.*s'"
msgstr ""
-#: builtin/am.c:2236
-msgid "pass -m flag to git-mailinfo"
+#: sequencer.c:3111
+msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: builtin/am.c:2238
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+#: sequencer.c:3126
+#, c-format
+msgid "could not get commit message of '%s'"
msgstr ""
-#: builtin/am.c:2241
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: sequencer.c:3274
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: builtin/am.c:2244
-msgid "strip everything before a scissors line"
+#: sequencer.c:3290
+msgid "merge: Unable to write new index file"
msgstr ""
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
-msgid "pass it through git-apply"
+#: sequencer.c:3358 builtin/rebase.c:268
+#, c-format
+msgid "Applied autostash.\n"
msgstr ""
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
-msgid "n"
+#: sequencer.c:3370
+#, c-format
+msgid "cannot store %s"
msgstr ""
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
-msgid "format"
+#: sequencer.c:3373 builtin/rebase.c:284
+#, 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"
msgstr ""
-#: builtin/am.c:2270
-msgid "format the patch(es) are in"
+#: sequencer.c:3427
+#, c-format
+msgid "could not checkout %s"
msgstr ""
-#: builtin/am.c:2276
-msgid "override error message when patch failure occurs"
+#: sequencer.c:3441
+#, c-format
+msgid "%s: not a valid OID"
msgstr ""
-#: builtin/am.c:2278
-msgid "continue applying patches after resolving a conflict"
+#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
msgstr ""
-#: builtin/am.c:2281
-msgid "synonyms for --continue"
+#: sequencer.c:3461
+#, c-format
+msgid "Stopped at HEAD\n"
msgstr ""
-#: builtin/am.c:2284
-msgid "skip the current patch"
+#: sequencer.c:3463
+#, c-format
+msgid "Stopped at %s\n"
msgstr ""
-#: builtin/am.c:2287
-msgid "restore the original branch and abort the patching operation."
+#: sequencer.c:3471
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+" %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
msgstr ""
-#: builtin/am.c:2291
-msgid "lie about committer date"
+#: sequencer.c:3543
+#, c-format
+msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: builtin/am.c:2293
-msgid "use current timestamp for author date"
+#: sequencer.c:3622
+#, c-format
+msgid "unknown command %d"
msgstr ""
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
-msgid "key-id"
+#: sequencer.c:3667
+msgid "could not read orig-head"
msgstr ""
-#: builtin/am.c:2296
-msgid "GPG-sign commits"
+#: sequencer.c:3672 sequencer.c:4741
+msgid "could not read 'onto'"
msgstr ""
-#: builtin/am.c:2299
-msgid "(internal use for git-rebase)"
+#: sequencer.c:3686
+#, c-format
+msgid "could not update HEAD to %s"
msgstr ""
-#: builtin/am.c:2317
-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."
+#: sequencer.c:3772
+msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: builtin/am.c:2324
-msgid "failed to read the index"
+#: sequencer.c:3781
+msgid "cannot amend non-existing commit"
msgstr ""
-#: builtin/am.c:2339
+#: sequencer.c:3783
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
+msgid "invalid file: '%s'"
msgstr ""
-#: builtin/am.c:2363
+#: sequencer.c:3785
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
-msgstr ""
-
-#: builtin/am.c:2369
-msgid "Resolve operation not in progress, we are not resuming."
+msgid "invalid contents: '%s'"
msgstr ""
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
+#: sequencer.c:3788
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
msgstr ""
-#: builtin/archive.c:17
+#: sequencer.c:3824 sequencer.c:3862
#, c-format
-msgid "could not create archive file '%s'"
+msgid "could not write file: '%s'"
msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: sequencer.c:3877
+msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: sequencer.c:3884
+msgid "could not commit staged changes."
msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
+#: sequencer.c:3982
+#, c-format
+msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: builtin/archive.c:61
+#: sequencer.c:3986
#, c-format
-msgid "git archive: NACK %s"
+msgid "%s: bad revision"
msgstr ""
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
+#: sequencer.c:4021
+msgid "can't revert as initial commit"
msgstr ""
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
+#: sequencer.c:4466
+msgid "make_script: unhandled options"
msgstr ""
-#: builtin/bisect--helper.c:7
-msgid "git bisect--helper --next-all [--no-checkout]"
+#: sequencer.c:4469
+msgid "make_script: error preparing revisions"
msgstr ""
-#: builtin/bisect--helper.c:17
-msgid "perform 'git bisect next'"
+#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
+#, c-format
+msgid "unusable todo list: '%s'"
msgstr ""
-#: builtin/bisect--helper.c:19
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: sequencer.c:4620
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-#: builtin/blame.c:27
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+#: sequencer.c:4690
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
msgstr ""
-#: builtin/blame.c:32
-msgid "<rev-opts> are documented in git-rev-list(1)"
+#: sequencer.c:4697
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
msgstr ""
-#: builtin/blame.c:668
-msgid "Show blame entries as we find them, incrementally"
+#: sequencer.c:4710
+#, 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 ""
-#: builtin/blame.c:669
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: sequencer.c:4848 sequencer.c:4886
+msgid "nothing to do"
msgstr ""
-#: builtin/blame.c:670
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr ""
+#: sequencer.c:4852
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/blame.c:671
-msgid "Show work cost statistics"
+#: sequencer.c:4864
+#, c-format
+msgid "could not copy '%s' to '%s'."
msgstr ""
-#: builtin/blame.c:672
-msgid "Force progress reporting"
+#: sequencer.c:4868 sequencer.c:4897
+msgid "could not transform the todo list"
msgstr ""
-#: builtin/blame.c:673
-msgid "Show output score for blame entries"
+#: sequencer.c:4900
+msgid "could not skip unnecessary pick commands"
msgstr ""
-#: builtin/blame.c:674
-msgid "Show original filename (Default: auto)"
+#: sequencer.c:4983
+msgid "the script was already rearranged."
msgstr ""
-#: builtin/blame.c:675
-msgid "Show original linenumber (Default: off)"
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
msgstr ""
-#: builtin/blame.c:676
-msgid "Show in a format designed for machine consumption"
+#: setup.c:172
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-#: builtin/blame.c:677
-msgid "Show porcelain format with per-line commit information"
+#: setup.c:185
+#, 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>...]'"
msgstr ""
-#: builtin/blame.c:678
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: setup.c:234
+#, c-format
+msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: builtin/blame.c:679
-msgid "Show raw timestamp (Default: off)"
+#: setup.c:253
+#, 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 ""
-#: builtin/blame.c:680
-msgid "Show long commit SHA1 (Default: off)"
+#: setup.c:389
+msgid "unable to set up work tree using invalid config"
msgstr ""
-#: builtin/blame.c:681
-msgid "Suppress author name and timestamp (Default: off)"
+#: setup.c:393
+msgid "this operation must be run in a work tree"
msgstr ""
-#: builtin/blame.c:682
-msgid "Show author email instead of name (Default: off)"
+#: setup.c:527
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: builtin/blame.c:683
-msgid "Ignore whitespace differences"
+#: setup.c:535
+msgid "unknown repository extensions found:"
msgstr ""
-#: builtin/blame.c:690
-msgid "Use an experimental heuristic to improve diffs"
+#: setup.c:554
+#, c-format
+msgid "error opening '%s'"
msgstr ""
-#: builtin/blame.c:692
-msgid "Spend extra cycles to find better match"
+#: setup.c:556
+#, c-format
+msgid "too large to be a .git file: '%s'"
msgstr ""
-#: builtin/blame.c:693
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: setup.c:558
+#, c-format
+msgid "error reading %s"
msgstr ""
-#: builtin/blame.c:694
-msgid "Use <file>'s contents as the final image"
+#: setup.c:560
+#, c-format
+msgid "invalid gitfile format: %s"
msgstr ""
-#: builtin/blame.c:695 builtin/blame.c:696
-msgid "score"
+#: setup.c:562
+#, c-format
+msgid "no path in gitfile: %s"
msgstr ""
-#: builtin/blame.c:695
-msgid "Find line copies within and across files"
+#: setup.c:564
+#, c-format
+msgid "not a git repository: %s"
msgstr ""
-#: builtin/blame.c:696
-msgid "Find line movements within and across files"
+#: setup.c:663
+#, c-format
+msgid "'$%s' too big"
msgstr ""
-#: builtin/blame.c:697
-msgid "n,m"
+#: setup.c:677
+#, c-format
+msgid "not a git repository: '%s'"
msgstr ""
-#: builtin/blame.c:697
-msgid "Process only line range n,m, counting from 1"
+#: setup.c:706 setup.c:708 setup.c:739
+#, c-format
+msgid "cannot chdir to '%s'"
msgstr ""
-#: builtin/blame.c:744
-msgid "--progress can't be used with --incremental or porcelain formats"
+#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+msgid "cannot come back to cwd"
msgstr ""
-#. 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:795
-msgid "4 years, 11 months ago"
+#: setup.c:837
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: builtin/blame.c:882
+#: setup.c:848
#, c-format
-msgid "file %s has only %lu line"
-msgid_plural "file %s has only %lu lines"
-msgstr[0] ""
-msgstr[1] ""
+msgid "failed to stat '%*s%s%s'"
+msgstr ""
-#: builtin/blame.c:928
-msgid "Blaming lines"
+#: setup.c:1078
+msgid "Unable to read current working directory"
msgstr ""
-#: builtin/branch.c:27
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+#: setup.c:1090 setup.c:1096
+#, c-format
+msgid "cannot change to '%s'"
msgstr ""
-#: builtin/branch.c:28
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+#: setup.c:1109
+#, c-format
+msgid ""
+"not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+#: setup.c:1192
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
msgstr ""
-#: builtin/branch.c:30
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+#: setup.c:1235
+msgid "open /dev/null or dup failed"
msgstr ""
-#: builtin/branch.c:31
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+#: setup.c:1250
+msgid "fork failed"
msgstr ""
-#: builtin/branch.c:32
-msgid "git branch [<options>] [-r | -a] [--format]"
+#: setup.c:1255
+msgid "setsid failed"
msgstr ""
-#: builtin/branch.c:145
+#: sha1-file.c:381
#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: builtin/branch.c:149
+#: sha1-file.c:432
#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
+msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: builtin/branch.c:163
+#: sha1-file.c:503
#, c-format
-msgid "Couldn't look up commit object for '%s'"
+msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: builtin/branch.c:167
+#: sha1-file.c:510
#, 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 "unable to normalize object directory: %s"
msgstr ""
-#: builtin/branch.c:180
-msgid "Update of config-file failed"
+#: sha1-file.c:565
+msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: builtin/branch.c:211
-msgid "cannot use -a with -d"
+#: sha1-file.c:583
+msgid "unable to read alternates file"
msgstr ""
-#: builtin/branch.c:217
-msgid "Couldn't look up commit object for HEAD"
+#: sha1-file.c:590
+msgid "unable to move new alternates file into place"
msgstr ""
-#: builtin/branch.c:231
+#: sha1-file.c:625
#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
+msgid "path '%s' does not exist"
msgstr ""
-#: builtin/branch.c:246
+#: sha1-file.c:651
#, c-format
-msgid "remote-tracking branch '%s' not found."
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: builtin/branch.c:247
+#: sha1-file.c:657
#, c-format
-msgid "branch '%s' not found."
+msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/branch.c:262
+#: sha1-file.c:663
#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
+msgid "reference repository '%s' is shallow"
msgstr ""
-#: builtin/branch.c:263
+#: sha1-file.c:671
#, c-format
-msgid "Error deleting branch '%s'"
+msgid "reference repository '%s' is grafted"
msgstr ""
-#: builtin/branch.c:270
+#: sha1-file.c:781
#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+
+#: sha1-file.c:806
+msgid "mmap failed"
msgstr ""
-#: builtin/branch.c:271
+#: sha1-file.c:973
#, c-format
-msgid "Deleted branch %s (was %s).\n"
+msgid "object file %s is empty"
msgstr ""
-#: builtin/branch.c:445
+#: sha1-file.c:1093 sha1-file.c:2215
#, c-format
-msgid "Branch %s is being rebased at %s"
+msgid "corrupt loose object '%s'"
msgstr ""
-#: builtin/branch.c:449
+#: sha1-file.c:1095 sha1-file.c:2219
#, c-format
-msgid "Branch %s is being bisected at %s"
+msgid "garbage at end of loose object '%s'"
msgstr ""
-#: builtin/branch.c:464
-msgid "cannot rename the current branch while not on any."
+#: sha1-file.c:1137
+msgid "invalid object type"
msgstr ""
-#: builtin/branch.c:474
+#: sha1-file.c:1219
#, c-format
-msgid "Invalid branch name: '%s'"
+msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: builtin/branch.c:491
-msgid "Branch rename failed"
+#: sha1-file.c:1222
+#, c-format
+msgid "unable to unpack %s header"
msgstr ""
-#: builtin/branch.c:494
+#: sha1-file.c:1228
#, c-format
-msgid "Renamed a misnamed branch '%s' away"
+msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: builtin/branch.c:497
+#: sha1-file.c:1231
#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+msgid "unable to parse %s header"
msgstr ""
-#: builtin/branch.c:506
-msgid "Branch is renamed, but update of config-file failed"
+#: sha1-file.c:1422
+#, c-format
+msgid "failed to read object %s"
msgstr ""
-#: builtin/branch.c:522
+#: sha1-file.c:1426
#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
+msgid "replacement %s not found for %s"
msgstr ""
-#: builtin/branch.c:555
-msgid "Generic options"
+#: sha1-file.c:1430
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/branch.c:557
-msgid "show hash and subject, give twice for upstream branch"
+#: sha1-file.c:1434
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/branch.c:558
-msgid "suppress informational messages"
+#: sha1-file.c:1536
+#, c-format
+msgid "unable to write sha1 filename %s"
msgstr ""
-#: builtin/branch.c:559
-msgid "set up tracking mode (see git-pull(1))"
+#: sha1-file.c:1543
+#, c-format
+msgid "unable to set permission to '%s'"
msgstr ""
-#: builtin/branch.c:561
-msgid "change upstream info"
+#: sha1-file.c:1550
+msgid "file write error"
msgstr ""
-#: builtin/branch.c:563
-msgid "upstream"
+#: sha1-file.c:1569
+msgid "error when closing sha1 file"
msgstr ""
-#: builtin/branch.c:563
-msgid "change the upstream info"
+#: sha1-file.c:1635
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: builtin/branch.c:564
-msgid "Unset the upstream info"
+#: sha1-file.c:1637
+msgid "unable to create temporary file"
msgstr ""
-#: builtin/branch.c:565
-msgid "use colored output"
+#: sha1-file.c:1661
+msgid "unable to write sha1 file"
msgstr ""
-#: builtin/branch.c:566
-msgid "act on remote-tracking branches"
+#: sha1-file.c:1667
+#, c-format
+msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: builtin/branch.c:568 builtin/branch.c:570
-msgid "print only branches that contain the commit"
+#: sha1-file.c:1671
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: builtin/branch.c:569 builtin/branch.c:571
-msgid "print only branches that don't contain the commit"
+#: sha1-file.c:1675
+#, c-format
+msgid "confused by unstable object source data for %s"
msgstr ""
-#: builtin/branch.c:574
-msgid "Specific git-branch actions:"
+#: sha1-file.c:1685 builtin/pack-objects.c:918
+#, c-format
+msgid "failed utime() on %s"
msgstr ""
-#: builtin/branch.c:575
-msgid "list both remote-tracking and local branches"
+#: sha1-file.c:1760
+#, c-format
+msgid "cannot read sha1_file for %s"
msgstr ""
-#: builtin/branch.c:577
-msgid "delete fully merged branch"
+#: sha1-file.c:1805
+msgid "corrupt commit"
msgstr ""
-#: builtin/branch.c:578
-msgid "delete branch (even if not merged)"
+#: sha1-file.c:1813
+msgid "corrupt tag"
msgstr ""
-#: builtin/branch.c:579
-msgid "move/rename a branch and its reflog"
+#: sha1-file.c:1912
+#, c-format
+msgid "read error while indexing %s"
msgstr ""
-#: builtin/branch.c:580
-msgid "move/rename a branch, even if target exists"
+#: sha1-file.c:1915
+#, c-format
+msgid "short read while indexing %s"
msgstr ""
-#: builtin/branch.c:581
-msgid "list branch names"
+#: sha1-file.c:1988 sha1-file.c:1997
+#, c-format
+msgid "%s: failed to insert into database"
msgstr ""
-#: builtin/branch.c:582
-msgid "create the branch's reflog"
+#: sha1-file.c:2003
+#, c-format
+msgid "%s: unsupported file type"
msgstr ""
-#: builtin/branch.c:584
-msgid "edit the description for the branch"
+#: sha1-file.c:2027
+#, c-format
+msgid "%s is not a valid object"
msgstr ""
-#: builtin/branch.c:585
-msgid "force creation, move/rename, deletion"
+#: sha1-file.c:2029
+#, c-format
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/branch.c:586
-msgid "print only branches that are merged"
+#: sha1-file.c:2056 builtin/index-pack.c:154
+#, c-format
+msgid "unable to open %s"
msgstr ""
-#: builtin/branch.c:587
-msgid "print only branches that are not merged"
+#: sha1-file.c:2226 sha1-file.c:2278
+#, c-format
+msgid "sha1 mismatch for %s (expected %s)"
msgstr ""
-#: builtin/branch.c:588
-msgid "list branches in columns"
+#: sha1-file.c:2250
+#, c-format
+msgid "unable to mmap %s"
msgstr ""
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
-msgid "key"
+#: sha1-file.c:2255
+#, c-format
+msgid "unable to unpack header of %s"
msgstr ""
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
-msgid "field name to sort on"
+#: sha1-file.c:2261
+#, c-format
+msgid "unable to parse header of %s"
msgstr ""
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
-msgid "object"
+#: sha1-file.c:2272
+#, c-format
+msgid "unable to unpack contents of %s"
msgstr ""
-#: builtin/branch.c:593
-msgid "print only branches of the object"
+#: sha1-name.c:476
+#, c-format
+msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
-msgid "sorting and filtering are case insensitive"
+#: sha1-name.c:487
+msgid "The candidates are:"
msgstr ""
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
-#: builtin/verify-tag.c:39
-msgid "format to use for the output"
+#: sha1-name.c:770
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"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 ""
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
+#: submodule.c:116 submodule.c:145
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: builtin/branch.c:619 builtin/clone.c:728
-msgid "HEAD not found below refs/heads!"
+#: submodule.c:120 submodule.c:149
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: builtin/branch.c:642
-msgid "--column and --verbose are incompatible"
+#: submodule.c:156
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: builtin/branch.c:653 builtin/branch.c:705
-msgid "branch name required"
+#: submodule.c:167
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: builtin/branch.c:681
-msgid "Cannot give description to detached HEAD"
+#: submodule.c:329
+#, c-format
+msgid "in unpopulated submodule '%s'"
msgstr ""
-#: builtin/branch.c:686
-msgid "cannot edit description of more than one branch"
+#: submodule.c:360
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: builtin/branch.c:693
+#: submodule.c:857
#, c-format
-msgid "No commit on branch '%s' yet."
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr ""
+
+#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:696
+#: submodule.c:1404
#, c-format
-msgid "No branch named '%s'."
+msgid "'%s' not recognized as a git repository"
msgstr ""
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
+#: submodule.c:1542
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
+#: submodule.c:1555
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: builtin/branch.c:720
+#: submodule.c:1648
#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
+msgid "submodule '%s' has dirty index"
msgstr ""
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: submodule.c:1700
#, c-format
-msgid "no such branch '%s'"
+msgid "Submodule '%s' could not be updated."
msgstr ""
-#: builtin/branch.c:727
+#: submodule.c:1747
#, c-format
-msgid "branch '%s' does not exist"
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
+#: submodule.c:1759 submodule.c:1815
+#, c-format
+msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: builtin/branch.c:743
-msgid "could not unset upstream of HEAD when it does not point to any branch."
+#: submodule.c:1766
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
msgstr ""
-#: builtin/branch.c:749
+#: submodule.c:1850
#, c-format
-msgid "Branch '%s' has no upstream information"
+msgid "could not recurse into submodule '%s'"
msgstr ""
-#: builtin/branch.c:763
-msgid "it does not make sense to create 'HEAD' manually"
+#: submodule.c:1894
+msgid "could not start ls-files in .."
msgstr ""
-#: builtin/branch.c:769
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: submodule.c:1933
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: builtin/branch.c:772
+#: submodule-config.c:232
#, c-format
-msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+msgid "ignoring suspicious submodule name: %s"
+msgstr ""
+
+#: submodule-config.c:296
+msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: builtin/branch.c:789
+#: submodule-config.c:390
#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: builtin/bundle.c:45
+#: submodule-config.c:479
#, c-format
-msgid "%s is okay\n"
+msgid "invalid value for %s"
msgstr ""
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
+#: submodule-config.c:754
+#, c-format
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: builtin/bundle.c:62
-msgid "Need a repository to unbundle."
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
msgstr ""
-#: builtin/cat-file.c:519
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#: 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 ""
-#: builtin/cat-file.c:520
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#, c-format
+msgid "more than one %s"
msgstr ""
-#: builtin/cat-file.c:557
-msgid "<type> can be one of: blob, tree, commit, tag"
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: builtin/cat-file.c:558
-msgid "show object type"
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
msgstr ""
-#: builtin/cat-file.c:559
-msgid "show object size"
+#: trailer.c:753
+msgid "could not read from stdin"
msgstr ""
-#: builtin/cat-file.c:561
-msgid "exit with zero when there's no error"
+#: trailer.c:1011 builtin/am.c:47
+#, c-format
+msgid "could not stat %s"
msgstr ""
-#: builtin/cat-file.c:562
-msgid "pretty-print object's content"
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not a regular file"
msgstr ""
-#: builtin/cat-file.c:564
-msgid "for blob objects, run textconv on object's content"
+#: trailer.c:1015
+#, c-format
+msgid "file %s is not writable by user"
msgstr ""
-#: builtin/cat-file.c:566
-msgid "for blob objects, run filters on object's content"
+#: trailer.c:1027
+msgid "could not open temporary file"
msgstr ""
-#: builtin/cat-file.c:567 git-submodule.sh:944
-msgid "blob"
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
msgstr ""
-#: builtin/cat-file.c:568
-msgid "use a specific path for --textconv/--filters"
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: builtin/cat-file.c:570
-msgid "allow -s and -t to work with broken/corrupt objects"
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
msgstr ""
-#: builtin/cat-file.c:571
-msgid "buffer --batch output"
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
msgstr ""
-#: builtin/cat-file.c:573
-msgid "show info and content of objects fed from the standard input"
+#: transport.c:616
+msgid "could not parse transport.color.* config"
msgstr ""
-#: builtin/cat-file.c:576
-msgid "show info about objects fed from the standard input"
+#: transport.c:689
+msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: builtin/cat-file.c:579
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: transport.c:816
+#, c-format
+msgid "unknown value for config '%s': %s"
msgstr ""
-#: builtin/cat-file.c:581
-msgid "show all objects with --batch or --batch-check"
+#: transport.c:882
+#, c-format
+msgid "transport '%s' not allowed"
msgstr ""
-#: builtin/check-attr.c:12
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+#: transport.c:936
+msgid "git-over-rsync is no longer supported"
msgstr ""
-#: builtin/check-attr.c:13
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+#: transport.c:1031
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
msgstr ""
-#: builtin/check-attr.c:20
-msgid "report all attributes set on file"
+#: transport.c:1035
+#, 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"
msgstr ""
-#: builtin/check-attr.c:21
-msgid "use .gitattributes only from the index"
+#: transport.c:1043
+msgid "Aborting."
msgstr ""
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
-msgid "read file names from stdin"
+#: transport.c:1182
+msgid "failed to push all needed submodules"
msgstr ""
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
-msgid "terminate input and output records by a NUL character"
+#: transport.c:1315 transport-helper.c:643
+msgid "operation not supported by protocol"
msgstr ""
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
-msgid "suppress progress reporting"
+#: transport.c:1419
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: builtin/check-ignore.c:28
-msgid "show non-matching input paths"
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
msgstr ""
-#: builtin/check-ignore.c:30
-msgid "ignore index when checking"
+#: transport-helper.c:132
+#, c-format
+msgid "unable to find remote helper for '%s'"
msgstr ""
-#: builtin/check-ignore.c:158
-msgid "cannot specify pathnames with --stdin"
+#: transport-helper.c:148 transport-helper.c:557
+msgid "can't dup helper output fd"
msgstr ""
-#: builtin/check-ignore.c:161
-msgid "-z only makes sense with --stdin"
+#: transport-helper.c:199
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
msgstr ""
-#: builtin/check-ignore.c:163
-msgid "no path specified"
+#: transport-helper.c:205
+msgid "this remote helper should implement refspec capability"
msgstr ""
-#: builtin/check-ignore.c:167
-msgid "--quiet is only valid with a single pathname"
+#: transport-helper.c:272 transport-helper.c:412
+#, c-format
+msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: builtin/check-ignore.c:169
-msgid "cannot have both --quiet and --verbose"
+#: transport-helper.c:401
+#, c-format
+msgid "%s also locked %s"
msgstr ""
-#: builtin/check-ignore.c:172
-msgid "--non-matching is only valid with --verbose"
+#: transport-helper.c:479
+msgid "couldn't run fast-import"
msgstr ""
-#: builtin/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
+#: transport-helper.c:502
+msgid "error while running fast-import"
msgstr ""
-#: builtin/check-mailmap.c:14
-msgid "also read contacts from stdin"
+#: transport-helper.c:531 transport-helper.c:1091
+#, c-format
+msgid "could not read ref %s"
msgstr ""
-#: builtin/check-mailmap.c:25
+#: transport-helper.c:576
#, c-format
-msgid "unable to parse contact: %s"
+msgid "unknown response to connect: %s"
msgstr ""
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
+#: transport-helper.c:598
+msgid "setting remote service path not supported by protocol"
msgstr ""
-#: builtin/checkout-index.c:128
-msgid "git checkout-index [<options>] [--] [<file>...]"
+#: transport-helper.c:600
+msgid "invalid remote service path"
msgstr ""
-#: builtin/checkout-index.c:145
-msgid "stage should be between 1 and 3 or all"
+#: transport-helper.c:646
+#, c-format
+msgid "can't connect to subservice %s"
msgstr ""
-#: builtin/checkout-index.c:161
-msgid "check out all files in the index"
+#: transport-helper.c:713
+#, c-format
+msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: builtin/checkout-index.c:162
-msgid "force overwrite of existing files"
+#: transport-helper.c:766
+#, c-format
+msgid "helper reported unexpected status of %s"
msgstr ""
-#: builtin/checkout-index.c:164
-msgid "no warning for existing files and files not in index"
+#: transport-helper.c:827
+#, c-format
+msgid "helper %s does not support dry-run"
msgstr ""
-#: builtin/checkout-index.c:166
-msgid "don't checkout new files"
+#: transport-helper.c:830
+#, c-format
+msgid "helper %s does not support --signed"
msgstr ""
-#: builtin/checkout-index.c:168
-msgid "update stat information in the index file"
+#: transport-helper.c:833
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: builtin/checkout-index.c:172
-msgid "read list of paths from the standard input"
-msgstr ""
-
-#: builtin/checkout-index.c:174
-msgid "write the content to temporary files"
-msgstr ""
-
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
-msgid "string"
+#: transport-helper.c:840
+#, c-format
+msgid "helper %s does not support 'push-option'"
msgstr ""
-#: builtin/checkout-index.c:176
-msgid "when creating files, prepend <string>"
+#: transport-helper.c:932
+msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: builtin/checkout-index.c:178
-msgid "copy out the files from named stage"
+#: transport-helper.c:937
+#, c-format
+msgid "helper %s does not support 'force'"
msgstr ""
-#: builtin/checkout.c:26
-msgid "git checkout [<options>] <branch>"
+#: transport-helper.c:984
+msgid "couldn't run fast-export"
msgstr ""
-#: builtin/checkout.c:27
-msgid "git checkout [<options>] [<branch>] -- <file>..."
+#: transport-helper.c:989
+msgid "error while running fast-export"
msgstr ""
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: transport-helper.c:1014
#, c-format
-msgid "path '%s' does not have our version"
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: transport-helper.c:1077
#, c-format
-msgid "path '%s' does not have their version"
+msgid "malformed response in ref list: %s"
msgstr ""
-#: builtin/checkout.c:153
+#: transport-helper.c:1231
#, c-format
-msgid "path '%s' does not have all necessary versions"
+msgid "read(%s) failed"
msgstr ""
-#: builtin/checkout.c:197
+#: transport-helper.c:1258
#, c-format
-msgid "path '%s' does not have necessary versions"
+msgid "write(%s) failed"
msgstr ""
-#: builtin/checkout.c:214
+#: transport-helper.c:1307
#, c-format
-msgid "path '%s': cannot merge"
+msgid "%s thread failed"
msgstr ""
-#: builtin/checkout.c:231
+#: transport-helper.c:1311
#, c-format
-msgid "Unable to add merge result for '%s'"
+msgid "%s thread failed to join: %s"
msgstr ""
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: transport-helper.c:1330 transport-helper.c:1334
#, c-format
-msgid "'%s' cannot be used with updating paths"
+msgid "can't start thread for copying data: %s"
msgstr ""
-#: builtin/checkout.c:265 builtin/checkout.c:268
+#: transport-helper.c:1371
#, c-format
-msgid "'%s' cannot be used with %s"
+msgid "%s process failed to wait"
msgstr ""
-#: builtin/checkout.c:271
+#: transport-helper.c:1375
#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgid "%s process failed"
msgstr ""
-#: builtin/checkout.c:342 builtin/checkout.c:349
-#, c-format
-msgid "path '%s' is unmerged"
+#: transport-helper.c:1393 transport-helper.c:1402
+msgid "can't start thread for copying data"
msgstr ""
-#: builtin/checkout.c:497
-msgid "you need to resolve your current index first"
+#: tree-walk.c:33
+msgid "too-short tree object"
msgstr ""
-#: builtin/checkout.c:628
-#, c-format
-msgid "Can not do reflog for '%s': %s\n"
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
msgstr ""
-#: builtin/checkout.c:669
-msgid "HEAD is now at"
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
msgstr ""
-#: builtin/checkout.c:673 builtin/clone.c:682
-msgid "unable to update HEAD"
+#: tree-walk.c:115
+msgid "too-short tree file"
msgstr ""
-#: builtin/checkout.c:677
+#: unpack-trees.c:112
#, c-format
-msgid "Reset branch '%s'\n"
+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/checkout.c:680
+#: unpack-trees.c:114
#, c-format
-msgid "Already on '%s'\n"
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/checkout.c:684
+#: unpack-trees.c:117
#, c-format
-msgid "Switched to and reset branch '%s'\n"
+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/checkout.c:686 builtin/checkout.c:1075
+#: unpack-trees.c:119
#, c-format
-msgid "Switched to a new branch '%s'\n"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/checkout.c:688
+#: unpack-trees.c:122
#, c-format
-msgid "Switched to branch '%s'\n"
+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/checkout.c:739
+#: unpack-trees.c:124
#, c-format
-msgid " ... and %d more.\n"
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/checkout.c:745
+#: unpack-trees.c:129
#, 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] ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
-#: builtin/checkout.c:764
+#: unpack-trees.c:133
#, 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:800
-msgid "internal error in revision walk"
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/checkout.c:804
-msgid "Previous HEAD position was"
+#: unpack-trees.c:135
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/checkout.c:832 builtin/checkout.c:1070
-msgid "You are on a branch yet to be born"
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/checkout.c:976
+#: unpack-trees.c:140
#, c-format
-msgid "only one reference expected, %d given."
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: unpack-trees.c:143
#, c-format
-msgid "invalid reference: %s"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/checkout.c:1045
+#: unpack-trees.c:145
#, c-format
-msgid "reference is not a tree: %s"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-#: builtin/checkout.c:1084
-msgid "paths cannot be used with switching branches"
+#: unpack-trees.c:151
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: unpack-trees.c:153
#, c-format
-msgid "'%s' cannot be used with switching branches"
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: unpack-trees.c:156
#, c-format
-msgid "'%s' cannot be used with '%s'"
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/checkout.c:1111
+#: unpack-trees.c:158
#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
-msgid "branch"
+#: unpack-trees.c:161
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/checkout.c:1145
-msgid "create and checkout a new branch"
+#: unpack-trees.c:163
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/checkout.c:1147
-msgid "create/reset and checkout a branch"
+#: unpack-trees.c:171
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: builtin/checkout.c:1148
-msgid "create reflog for new branch"
+#: unpack-trees.c:174
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
msgstr ""
-#: builtin/checkout.c:1149 builtin/worktree.c:332
-msgid "detach HEAD at named commit"
+#: unpack-trees.c:176
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/checkout.c:1150
-msgid "set upstream info for new branch"
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/checkout.c:1152
-msgid "new-branch"
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
msgstr ""
-#: builtin/checkout.c:1152
-msgid "new unparented branch"
+#: unpack-trees.c:254
+#, c-format
+msgid "Aborting\n"
msgstr ""
-#: builtin/checkout.c:1153
-msgid "checkout our version for unmerged files"
+#: unpack-trees.c:336
+msgid "Checking out files"
msgstr ""
-#: builtin/checkout.c:1155
-msgid "checkout their version for unmerged files"
+#: unpack-trees.c:368
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
msgstr ""
-#: builtin/checkout.c:1157
-msgid "force checkout (throw away local modifications)"
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: builtin/checkout.c:1158
-msgid "perform a 3-way merge with the new branch"
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
msgstr ""
-#: builtin/checkout.c:1159 builtin/merge.c:235
-msgid "update ignored files (default)"
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
msgstr ""
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
-msgid "style"
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: builtin/checkout.c:1161
-msgid "conflict style (merge or diff3)"
+#: urlmatch.c:247
+msgid "invalid characters in host name"
msgstr ""
-#: builtin/checkout.c:1164
-msgid "do not limit pathspecs to sparse entries only"
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
msgstr ""
-#: builtin/checkout.c:1166
-msgid "second guess 'git checkout <no-such-branch>'"
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
msgstr ""
-#: builtin/checkout.c:1168
-msgid "do not check if another worktree is holding the given ref"
+#: worktree.c:249 builtin/am.c:2100
+#, c-format
+msgid "failed to read '%s'"
msgstr ""
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
-#: builtin/send-pack.c:173
-msgid "force progress reporting"
+#: worktree.c:295
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: builtin/checkout.c:1203
-msgid "-b, -B and --orphan are mutually exclusive"
+#: worktree.c:306
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: builtin/checkout.c:1220
-msgid "--track needs a branch name"
+#: worktree.c:318
+#, c-format
+msgid "'%s' does not exist"
msgstr ""
-#: builtin/checkout.c:1225
-msgid "Missing branch name; try -b"
+#: worktree.c:324
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: builtin/checkout.c:1261
-msgid "invalid path specification"
+#: worktree.c:332
+#, c-format
+msgid "'%s' does not point back to '%s'"
msgstr ""
-#: builtin/checkout.c:1268
+#: wrapper.c:223 wrapper.c:393
#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgid "could not open '%s' for reading and writing"
msgstr ""
-#: builtin/checkout.c:1272
+#: wrapper.c:424 wrapper.c:624
#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
+msgid "unable to access '%s'"
msgstr ""
-#: builtin/checkout.c:1276
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: wrapper.c:632
+msgid "unable to get current working directory"
msgstr ""
-#: builtin/clean.c:26
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+#: wt-status.c:154
+msgid "Unmerged paths:"
msgstr ""
-#: builtin/clean.c:30
+#: wt-status.c:181 wt-status.c:208
#, c-format
-msgid "Removing %s\n"
+msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: builtin/clean.c:31
-#, c-format
-msgid "Would remove %s\n"
+#: wt-status.c:183 wt-status.c:210
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: builtin/clean.c:32
-#, c-format
-msgid "Skipping repository %s\n"
+#: wt-status.c:187
+msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: builtin/clean.c:33
-#, c-format
-msgid "Would skip repository %s\n"
+#: wt-status.c:189 wt-status.c:193
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: builtin/clean.c:34
-#, c-format
-msgid "failed to remove %s"
+#: wt-status.c:191
+msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: builtin/clean.c:298 git-add--interactive.perl:572
-#, c-format
-msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing\n"
+#: wt-status.c:202 wt-status.c:1042
+msgid "Changes to be committed:"
msgstr ""
-#: builtin/clean.c:302 git-add--interactive.perl:581
-#, 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"
+#: wt-status.c:220 wt-status.c:1051
+msgid "Changes not staged for commit:"
msgstr ""
-#: builtin/clean.c:518 git-add--interactive.perl:547
-#: git-add--interactive.perl:552
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
+#: wt-status.c:224
+msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/clean.c:660
-#, c-format
-msgid "Input ignore patterns>> "
+#: wt-status.c:226
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/clean.c:697
-#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
+#: wt-status.c:227
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: builtin/clean.c:718
-msgid "Select items to delete"
+#: wt-status.c:229
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: wt-status.c:241
#, c-format
-msgid "Remove %s [y/N]? "
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: builtin/clean.c:784 git-add--interactive.perl:1616
-#, c-format
-msgid "Bye.\n"
+#: wt-status.c:256
+msgid "both deleted:"
msgstr ""
-#: builtin/clean.c:792
-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"
+#: wt-status.c:258
+msgid "added by us:"
msgstr ""
-#: builtin/clean.c:819 git-add--interactive.perl:1692
-msgid "*** Commands ***"
+#: wt-status.c:260
+msgid "deleted by them:"
msgstr ""
-#: builtin/clean.c:820 git-add--interactive.perl:1689
-msgid "What now"
+#: wt-status.c:262
+msgid "added by them:"
msgstr ""
-#: builtin/clean.c:828
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/clean.c:844
-msgid "No more files to clean, exiting."
+#: wt-status.c:264
+msgid "deleted by us:"
msgstr ""
-#: builtin/clean.c:906
-msgid "do not print names of files removed"
+#: wt-status.c:266
+msgid "both added:"
msgstr ""
-#: builtin/clean.c:908
-msgid "force"
+#: wt-status.c:268
+msgid "both modified:"
msgstr ""
-#: builtin/clean.c:909
-msgid "interactive cleaning"
+#: wt-status.c:278
+msgid "new file:"
msgstr ""
-#: builtin/clean.c:911
-msgid "remove whole directories"
+#: wt-status.c:280
+msgid "copied:"
msgstr ""
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
-msgid "pattern"
+#: wt-status.c:282
+msgid "deleted:"
msgstr ""
-#: builtin/clean.c:913
-msgid "add <pattern> to ignore rules"
+#: wt-status.c:284
+msgid "modified:"
msgstr ""
-#: builtin/clean.c:914
-msgid "remove ignored files, too"
+#: wt-status.c:286
+msgid "renamed:"
msgstr ""
-#: builtin/clean.c:916
-msgid "remove only ignored files"
+#: wt-status.c:288
+msgid "typechange:"
msgstr ""
-#: builtin/clean.c:934
-msgid "-x and -X cannot be used together"
+#: wt-status.c:290
+msgid "unknown:"
msgstr ""
-#: builtin/clean.c:938
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+#: wt-status.c:292
+msgid "unmerged:"
msgstr ""
-#: builtin/clean.c:941
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+#: wt-status.c:372
+msgid "new commits, "
msgstr ""
-#: builtin/clone.c:38
-msgid "git clone [<options>] [--] <repo> [<dir>]"
+#: wt-status.c:374
+msgid "modified content, "
msgstr ""
-#: builtin/clone.c:82
-msgid "don't create a checkout"
+#: wt-status.c:376
+msgid "untracked content, "
msgstr ""
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
-msgid "create a bare repository"
-msgstr ""
+#: wt-status.c:880
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/clone.c:87
-msgid "create a mirror repository (implies bare)"
+#: wt-status.c:912
+msgid "Submodules changed but not updated:"
msgstr ""
-#: builtin/clone.c:89
-msgid "to clone from a local repository"
+#: wt-status.c:914
+msgid "Submodule changes to be committed:"
msgstr ""
-#: builtin/clone.c:91
-msgid "don't use local hardlinks, always copy"
+#: wt-status.c:996
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-#: builtin/clone.c:93
-msgid "setup as shared repository"
+#: wt-status.c:1097
+msgid "You have unmerged paths."
msgstr ""
-#: builtin/clone.c:95 builtin/clone.c:99
-msgid "pathspec"
+#: wt-status.c:1100
+msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: builtin/clone.c:95 builtin/clone.c:99
-msgid "initialize submodules in the clone"
+#: wt-status.c:1102
+msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: builtin/clone.c:102
-msgid "number of submodules cloned in parallel"
+#: wt-status.c:1106
+msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: builtin/clone.c:103 builtin/init-db.c:476
-msgid "template-directory"
+#: wt-status.c:1109
+msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: builtin/clone.c:104 builtin/init-db.c:477
-msgid "directory from which templates will be used"
+#: wt-status.c:1118
+msgid "You are in the middle of an am session."
msgstr ""
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
-msgid "reference repository"
+#: wt-status.c:1121
+msgid "The current patch is empty."
msgstr ""
-#: builtin/clone.c:110
-msgid "use --reference only while cloning"
+#: wt-status.c:1125
+msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
-msgid "name"
+#: wt-status.c:1127
+msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: builtin/clone.c:112
-msgid "use <name> instead of 'origin' to track upstream"
+#: wt-status.c:1129
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: builtin/clone.c:114
-msgid "checkout <branch> instead of the remote's HEAD"
+#: wt-status.c:1260
+msgid "git-rebase-todo is missing."
msgstr ""
-#: builtin/clone.c:116
-msgid "path to git-upload-pack on the remote"
+#: wt-status.c:1262
+msgid "No commands done."
msgstr ""
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
-msgid "depth"
+#: wt-status.c:1265
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:1276
+#, c-format
+msgid " (see more in file %s)"
msgstr ""
-#: builtin/clone.c:118
-msgid "create a shallow clone of that depth"
+#: wt-status.c:1281
+msgid "No commands remaining."
msgstr ""
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
-#: parse-options.h:142
-msgid "time"
+#: wt-status.c:1284
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:1292
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: builtin/clone.c:120
-msgid "create a shallow clone since a specific time"
+#: wt-status.c:1304
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/clone.c:121 builtin/fetch.c:119
-msgid "revision"
+#: wt-status.c:1309
+msgid "You are currently rebasing."
msgstr ""
-#: builtin/clone.c:122 builtin/fetch.c:120
-msgid "deepen history of shallow clone, excluding rev"
+#: wt-status.c:1322
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: builtin/clone.c:124
-msgid "clone only one branch, HEAD or --branch"
+#: wt-status.c:1324
+msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: builtin/clone.c:126
-msgid "don't clone any tags, and make later fetches not to follow them"
+#: wt-status.c:1326
+msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: builtin/clone.c:128
-msgid "any cloned submodules will be shallow"
+#: wt-status.c:1333
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: builtin/clone.c:129 builtin/init-db.c:485
-msgid "gitdir"
+#: wt-status.c:1337
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/clone.c:130 builtin/init-db.c:486
-msgid "separate git dir from working tree"
+#: wt-status.c:1342
+msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: builtin/clone.c:131
-msgid "key=value"
+#: wt-status.c:1345
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: builtin/clone.c:132
-msgid "set config inside the new repository"
+#: wt-status.c:1349
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
-msgid "use IPv4 addresses only"
+#: wt-status.c:1354
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
-msgid "use IPv6 addresses only"
+#: wt-status.c:1357
+msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: builtin/clone.c:272
+#: wt-status.c:1359
msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: builtin/clone.c:325
+#: wt-status.c:1368
#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: builtin/clone.c:397
-#, c-format
-msgid "failed to open '%s'"
+#: wt-status.c:1373
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/clone.c:405
-#, c-format
-msgid "%s exists and is not a directory"
+#: wt-status.c:1376
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/clone.c:419
-#, c-format
-msgid "failed to stat %s\n"
+#: wt-status.c:1378
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: builtin/clone.c:441
+#: wt-status.c:1386
#, c-format
-msgid "failed to create link '%s'"
+msgid "You are currently reverting commit %s."
msgstr ""
-#: builtin/clone.c:445
-#, c-format
-msgid "failed to copy file to '%s'"
+#: wt-status.c:1391
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: builtin/clone.c:470
-#, c-format
-msgid "done.\n"
+#: wt-status.c:1394
+msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: builtin/clone.c:482
-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"
+#: wt-status.c:1396
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: builtin/clone.c:559
+#: wt-status.c:1406
#, c-format
-msgid "Could not find remote branch %s to clone."
+msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: builtin/clone.c:654
-msgid "remote did not send all necessary objects"
+#: wt-status.c:1410
+msgid "You are currently bisecting."
msgstr ""
-#: builtin/clone.c:670
-#, c-format
-msgid "unable to update %s"
+#: wt-status.c:1413
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: builtin/clone.c:719
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: wt-status.c:1611
+msgid "On branch "
msgstr ""
-#: builtin/clone.c:750
-msgid "unable to checkout working tree"
+#: wt-status.c:1618
+msgid "interactive rebase in progress; onto "
msgstr ""
-#: builtin/clone.c:792
-msgid "unable to write parameters to config file"
+#: wt-status.c:1620
+msgid "rebase in progress; onto "
msgstr ""
-#: builtin/clone.c:855
-msgid "cannot repack to clean up"
+#: wt-status.c:1625
+msgid "HEAD detached at "
msgstr ""
-#: builtin/clone.c:857
-msgid "cannot unlink temporary alternates file"
+#: wt-status.c:1627
+msgid "HEAD detached from "
msgstr ""
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
-msgid "Too many arguments."
+#: wt-status.c:1630
+msgid "Not currently on any branch."
msgstr ""
-#: builtin/clone.c:894
-msgid "You must specify a repository to clone."
+#: wt-status.c:1647
+msgid "Initial commit"
msgstr ""
-#: builtin/clone.c:907
-#, c-format
-msgid "--bare and --origin %s options are incompatible."
+#: wt-status.c:1648
+msgid "No commits yet"
msgstr ""
-#: builtin/clone.c:910
-msgid "--bare and --separate-git-dir are incompatible."
+#: wt-status.c:1662
+msgid "Untracked files"
+msgstr ""
+
+#: wt-status.c:1664
+msgid "Ignored files"
msgstr ""
-#: builtin/clone.c:923
+#: wt-status.c:1668
#, c-format
-msgid "repository '%s' does not exist"
+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/clone.c:929 builtin/fetch.c:1337
+#: wt-status.c:1674
#, c-format
-msgid "depth %s is not a positive number"
+msgid "Untracked files not listed%s"
msgstr ""
-#: builtin/clone.c:939
+#: wt-status.c:1676
+msgid " (use -u option to show untracked files)"
+msgstr ""
+
+#: wt-status.c:1682
+msgid "No changes"
+msgstr ""
+
+#: wt-status.c:1687
#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: builtin/clone.c:949
+#: wt-status.c:1690
#, c-format
-msgid "working tree '%s' already exists."
+msgid "no changes added to commit\n"
msgstr ""
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: wt-status.c:1693
#, c-format
-msgid "could not create leading directories of '%s'"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: builtin/clone.c:967
+#: wt-status.c:1696
#, c-format
-msgid "could not create work tree dir '%s'"
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: builtin/clone.c:979
+#: wt-status.c:1699
#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: builtin/clone.c:981
+#: wt-status.c:1702 wt-status.c:1707
#, c-format
-msgid "Cloning into '%s'...\n"
+msgid "nothing to commit\n"
msgstr ""
-#: builtin/clone.c:1005
-msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+#: wt-status.c:1705
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: builtin/clone.c:1067
-msgid "--depth is ignored in local clones; use file:// instead."
+#: wt-status.c:1709
+#, c-format
+msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: builtin/clone.c:1069
-msgid "--shallow-since is ignored in local clones; use file:// instead."
+#: wt-status.c:1822
+msgid "No commits yet on "
msgstr ""
-#: builtin/clone.c:1071
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+#: wt-status.c:1826
+msgid "HEAD (no branch)"
msgstr ""
-#: builtin/clone.c:1074
-msgid "source repository is shallow, ignoring --local"
+#: wt-status.c:1857
+msgid "different"
msgstr ""
-#: builtin/clone.c:1079
-msgid "--local is ignored"
+#: wt-status.c:1859 wt-status.c:1867
+msgid "behind "
msgstr ""
-#: builtin/clone.c:1083
-#, c-format
-msgid "Don't know how to clone %s"
+#: wt-status.c:1862 wt-status.c:1865
+msgid "ahead "
msgstr ""
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2374
#, c-format
-msgid "Remote branch %s not found in upstream %s"
+msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: builtin/clone.c:1149
-msgid "You appear to have cloned an empty repository."
+#: wt-status.c:2380
+msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/column.c:10
-msgid "git column [<options>]"
+#: wt-status.c:2382
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: builtin/column.c:27
-msgid "lookup config vars"
+#: builtin/add.c:24
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
+#: builtin/add.c:83
+#, c-format
+msgid "unexpected diff status %c"
msgstr ""
-#: builtin/column.c:30
-msgid "Maximum width"
+#: builtin/add.c:88 builtin/commit.c:284
+msgid "updating files failed"
msgstr ""
-#: builtin/column.c:31
-msgid "Padding space on left border"
+#: builtin/add.c:98
+#, c-format
+msgid "remove '%s'\n"
msgstr ""
-#: builtin/column.c:32
-msgid "Padding space on right border"
+#: builtin/add.c:173
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/column.c:33
-msgid "Padding space between columns"
+#: builtin/add.c:233 builtin/rev-parse.c:895
+msgid "Could not read the index"
msgstr ""
-#: builtin/column.c:52
-msgid "--command must be the first argument"
+#: builtin/add.c:244
+#, c-format
+msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/commit.c:39
-msgid "git commit [<options>] [--] <pathspec>..."
+#: builtin/add.c:248
+msgid "Could not write patch"
msgstr ""
-#: builtin/commit.c:44
-msgid "git status [<options>] [--] <pathspec>..."
+#: builtin/add.c:251
+msgid "editing patch failed"
msgstr ""
-#: builtin/commit.c:49
-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"
+#: builtin/add.c:254
+#, c-format
+msgid "Could not stat '%s'"
msgstr ""
-#: builtin/commit.c:62
-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"
+#: builtin/add.c:256
+msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/commit.c:74
-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/add.c:261
+#, c-format
+msgid "Could not apply '%s'"
msgstr ""
-#: builtin/commit.c:79
-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/add.c:269
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/commit.c:86
-msgid "Otherwise, please use 'git reset'\n"
+#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
+#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
+#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+msgid "dry run"
msgstr ""
-#: builtin/commit.c:89
-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/add.c:292
+msgid "interactive picking"
msgstr ""
-#: builtin/commit.c:319
-msgid "failed to unpack HEAD tree object"
+#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+msgid "select hunks interactively"
msgstr ""
-#: builtin/commit.c:360
-msgid "unable to create temporary index"
+#: builtin/add.c:294
+msgid "edit current diff and apply"
msgstr ""
-#: builtin/commit.c:366
-msgid "interactive add failed"
+#: builtin/add.c:295
+msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/commit.c:379
-msgid "unable to update temporary index"
+#: builtin/add.c:296
+msgid "update tracked files"
msgstr ""
-#: builtin/commit.c:381
-msgid "Failed to update main cache tree"
+#: builtin/add.c:297
+msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
-msgid "unable to write new_index file"
+#: builtin/add.c:298
+msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/commit.c:459
-msgid "cannot do a partial commit during a merge."
+#: builtin/add.c:299
+msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/commit.c:461
-msgid "cannot do a partial commit during a cherry-pick."
+#: builtin/add.c:302
+msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/commit.c:470
-msgid "cannot read the index"
+#: builtin/add.c:304
+msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/commit.c:489
-msgid "unable to write temporary index file"
+#: builtin/add.c:305
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/commit.c:583
-#, c-format
-msgid "commit '%s' lacks author header"
+#: builtin/add.c:306
+msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/commit.c:585
-#, c-format
-msgid "commit '%s' has malformed author line"
+#: builtin/add.c:308 builtin/update-index.c:990
+msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/commit.c:604
-msgid "malformed --author parameter"
+#: builtin/add.c:310
+msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/commit.c:656
+#: builtin/add.c:325
+#, c-format
msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
+"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/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/add.c:353
#, c-format
-msgid "could not lookup commit %s"
+msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/add.c:371
#, c-format
-msgid "(reading log message from standard input)\n"
+msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/commit.c:707
-msgid "could not read log from standard input"
+#: builtin/add.c:379
+msgid "adding files failed"
msgstr ""
-#: builtin/commit.c:711
-#, c-format
-msgid "could not read log file '%s'"
+#: builtin/add.c:417
+msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/commit.c:738 builtin/commit.c:746
-msgid "could not read SQUASH_MSG"
+#: builtin/add.c:424
+msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/commit.c:743
-msgid "could not read MERGE_MSG"
+#: builtin/add.c:428
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/commit.c:797
-msgid "could not write commit template"
+#: builtin/add.c:443
+#, c-format
+msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/commit.c:815
+#: builtin/add.c:444
#, 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 "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/commit.c:820
-#, 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"
+#: builtin/am.c:363
+msgid "could not parse author script"
msgstr ""
-#: builtin/commit.c:833
+#: builtin/am.c:447
#, 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 "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/commit.c:840
+#: builtin/am.c:488
#, 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"
+msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/commit.c:857
+#: builtin/am.c:525
#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
+msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/commit.c:865
-#, c-format
-msgid "%sDate: %s"
+#: builtin/am.c:551
+msgid "fseek failed"
msgstr ""
-#: builtin/commit.c:872
+#: builtin/am.c:739
#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
+msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/commit.c:889
-msgid "Cannot read index"
+#: builtin/am.c:804
+msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/commit.c:951
-msgid "Error building trees"
+#: builtin/am.c:852
+msgid "invalid timestamp"
msgstr ""
-#: builtin/commit.c:965 builtin/tag.c:274
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+#: builtin/am.c:857 builtin/am.c:869
+msgid "invalid Date line"
msgstr ""
-#: builtin/commit.c:1068
-#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+#: builtin/am.c:864
+msgid "invalid timezone offset"
+msgstr ""
+
+#: builtin/am.c:957
+msgid "Patch format detection failed."
msgstr ""
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/am.c:962 builtin/clone.c:408
#, c-format
-msgid "Invalid untracked files mode '%s'"
+msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/commit.c:1121
-msgid "--long and -z are incompatible"
+#: builtin/am.c:967
+msgid "Failed to split patches."
msgstr ""
-#: builtin/commit.c:1151
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/am.c:1097 builtin/commit.c:369
+msgid "unable to write index file"
msgstr ""
-#: builtin/commit.c:1160
-msgid "You have nothing to amend."
+#: builtin/am.c:1111
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/commit.c:1163
-msgid "You are in the middle of a merge -- cannot amend."
+#: builtin/am.c:1112
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/commit.c:1165
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: builtin/am.c:1113
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/commit.c:1168
-msgid "Options --squash and --fixup cannot be used together"
+#: builtin/am.c:1196
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/commit.c:1178
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: builtin/am.c:1224
+msgid "Patch is empty."
msgstr ""
-#: builtin/commit.c:1180
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+#: builtin/am.c:1290
+#, c-format
+msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/commit.c:1188
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: builtin/am.c:1312
+#, c-format
+msgid "unable to parse commit %s"
msgstr ""
-#: builtin/commit.c:1205
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: builtin/am.c:1508
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/commit.c:1207
-msgid "No paths with --include/--only does not make sense."
+#: builtin/am.c:1510
+msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/commit.c:1219 builtin/tag.c:552
-#, c-format
-msgid "Invalid cleanup mode %s"
+#: builtin/am.c:1529
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/commit.c:1224
-msgid "Paths with -a does not make sense."
+#: builtin/am.c:1535
+msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/commit.c:1342 builtin/commit.c:1617
-msgid "show status concisely"
+#: builtin/am.c:1561
+msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/commit.c:1344 builtin/commit.c:1619
-msgid "show branch information"
+#: builtin/am.c:1593
+msgid "applying to an empty history"
msgstr ""
-#: builtin/commit.c:1346
-msgid "show stash information"
+#: builtin/am.c:1639 builtin/am.c:1643
+#, c-format
+msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/commit.c:1348
-msgid "version"
+#: builtin/am.c:1659
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
-msgid "machine-readable output"
+#: builtin/am.c:1664
+msgid "Commit Body is:"
msgstr ""
-#: builtin/commit.c:1351 builtin/commit.c:1623
-msgid "show status in long format (default)"
+#. 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:1674
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/commit.c:1354 builtin/commit.c:1626
-msgid "terminate entries with NUL"
+#: builtin/am.c:1724
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
-msgid "mode"
+#: builtin/am.c:1764 builtin/am.c:1832
+#, c-format
+msgid "Applying: %.*s"
msgstr ""
-#: builtin/commit.c:1357 builtin/commit.c:1629
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+#: builtin/am.c:1781
+msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/commit.c:1360
-msgid "show ignored files"
+#: builtin/am.c:1787
+#, c-format
+msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/commit.c:1361 parse-options.h:155
-msgid "when"
+#: builtin/am.c:1791
+msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/commit.c:1362
+#: builtin/am.c:1835
msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+"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/commit.c:1364
-msgid "list untracked files in columns"
+#: builtin/am.c:1842
+msgid ""
+"You still have unmerged paths in your index.\n"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/commit.c:1440
-msgid "couldn't look up newly created commit"
+#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
+#: builtin/reset.c:336
+#, c-format
+msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/commit.c:1442
-msgid "could not parse newly created commit"
+#: builtin/am.c:2001
+msgid "failed to clean index"
msgstr ""
-#: builtin/commit.c:1487
-msgid "detached HEAD"
+#: builtin/am.c:2036
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/commit.c:1490
-msgid " (root-commit)"
+#: builtin/am.c:2129
+#, c-format
+msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/commit.c:1587
-msgid "suppress summary after successful commit"
+#: builtin/am.c:2165
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/commit.c:1588
-msgid "show diff in commit message template"
+#: builtin/am.c:2166
+msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/commit.c:1590
-msgid "Commit message options"
+#: builtin/am.c:2172
+msgid "run interactively"
msgstr ""
-#: builtin/commit.c:1591 builtin/tag.c:410
-msgid "read message from file"
+#: builtin/am.c:2174
+msgid "historical option -- no-op"
msgstr ""
-#: builtin/commit.c:1592
-msgid "author"
+#: builtin/am.c:2176
+msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/commit.c:1592
-msgid "override author for commit"
+#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
+#: builtin/repack.c:306
+msgid "be quiet"
msgstr ""
-#: builtin/commit.c:1593 builtin/gc.c:358
-msgid "date"
+#: builtin/am.c:2179
+msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/commit.c:1593
-msgid "override date for commit"
+#: builtin/am.c:2182
+msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
-msgid "message"
+#: builtin/am.c:2184
+msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/commit.c:1594
-msgid "commit message"
+#: builtin/am.c:2186
+msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
-msgid "commit"
+#: builtin/am.c:2188
+msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/commit.c:1595
-msgid "reuse and edit message from specified commit"
+#: builtin/am.c:2190
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/commit.c:1596
-msgid "reuse message from specified commit"
+#: builtin/am.c:2193
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/commit.c:1597
-msgid "use autosquash formatted message to fixup specified commit"
+#: builtin/am.c:2196
+msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/commit.c:1598
-msgid "use autosquash formatted message to squash specified commit"
+#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
+#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
+#: builtin/am.c:2225
+msgid "pass it through git-apply"
msgstr ""
-#: builtin/commit.c:1599
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
+#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
+#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
+#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
+#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
+#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+msgid "n"
msgstr ""
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
-msgid "add Signed-off-by:"
+#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
+#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+msgid "format"
msgstr ""
-#: builtin/commit.c:1601
-msgid "use specified template file"
+#: builtin/am.c:2222
+msgid "format the patch(es) are in"
msgstr ""
-#: builtin/commit.c:1602
-msgid "force edit of commit"
+#: builtin/am.c:2228
+msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/commit.c:1603
-msgid "default"
+#: builtin/am.c:2230
+msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/commit.c:1603 builtin/tag.c:413
-msgid "how to strip spaces and #comments from message"
+#: builtin/am.c:2233
+msgid "synonyms for --continue"
msgstr ""
-#: builtin/commit.c:1604
-msgid "include status in commit message template"
+#: builtin/am.c:2236
+msgid "skip the current patch"
msgstr ""
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
-#: builtin/revert.c:113
-msgid "GPG sign commit"
+#: builtin/am.c:2239
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/commit.c:1609
-msgid "Commit contents options"
+#: builtin/am.c:2242
+msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/commit.c:1610
-msgid "commit all changed files"
+#: builtin/am.c:2245
+msgid "show the patch being applied."
msgstr ""
-#: builtin/commit.c:1611
-msgid "add specified files to index for commit"
+#: builtin/am.c:2249
+msgid "lie about committer date"
msgstr ""
-#: builtin/commit.c:1612
-msgid "interactively add files"
+#: builtin/am.c:2251
+msgid "use current timestamp for author date"
msgstr ""
-#: builtin/commit.c:1613
-msgid "interactively add changes"
+#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
+#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
+#: builtin/revert.c:113 builtin/tag.c:402
+msgid "key-id"
msgstr ""
-#: builtin/commit.c:1614
-msgid "commit only specified files"
+#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+msgid "GPG-sign commits"
msgstr ""
-#: builtin/commit.c:1615
-msgid "bypass pre-commit and commit-msg hooks"
+#: builtin/am.c:2257
+msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/commit.c:1616
-msgid "show what would be committed"
+#: builtin/am.c:2275
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/commit.c:1627
-msgid "amend previous commit"
+#: builtin/am.c:2282
+msgid "failed to read the index"
msgstr ""
-#: builtin/commit.c:1628
-msgid "bypass post-rewrite hook"
+#: builtin/am.c:2297
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/commit.c:1633
-msgid "ok to record an empty change"
+#: builtin/am.c:2321
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/commit.c:1635
-msgid "ok to record a change with an empty message"
+#: builtin/am.c:2327
+msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/commit.c:1665
-msgid "could not parse HEAD commit"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/commit.c:1710
+#: builtin/archive.c:17
#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+msgid "could not create archive file '%s'"
msgstr ""
-#: builtin/commit.c:1717
-msgid "could not read MERGE_MODE"
+#: builtin/archive.c:20
+msgid "could not redirect output"
msgstr ""
-#: builtin/commit.c:1736
-#, c-format
-msgid "could not read commit message: %s"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+#: builtin/archive.c:58
+msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
-#: builtin/commit.c:1752
+#: builtin/archive.c:61
#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+msgid "git archive: NACK %s"
msgstr ""
-#: builtin/commit.c:1800
-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/archive.c:64
+msgid "git archive: protocol error"
msgstr ""
-#: builtin/config.c:10
-msgid "git config [<options>]"
+#: builtin/archive.c:68
+msgid "git archive: expected a flush"
msgstr ""
-#: builtin/config.c:57
-msgid "Config file location"
+#: builtin/bisect--helper.c:12
+msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/config.c:58
-msgid "use global config file"
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr ""
-#: builtin/config.c:59
-msgid "use system config file"
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
msgstr ""
-#: builtin/config.c:60
-msgid "use repository config file"
+#: builtin/bisect--helper.c:46
+#, c-format
+msgid "'%s' is not a valid term"
msgstr ""
-#: builtin/config.c:61
-msgid "use given config file"
+#: builtin/bisect--helper.c:50
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
msgstr ""
-#: builtin/config.c:62
-msgid "blob-id"
+#: builtin/bisect--helper.c:60
+#, c-format
+msgid "can't change the meaning of the term '%s'"
msgstr ""
-#: builtin/config.c:62
-msgid "read config from given blob object"
+#: builtin/bisect--helper.c:71
+msgid "please use two different terms"
msgstr ""
-#: builtin/config.c:63
-msgid "Action"
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
msgstr ""
-#: builtin/config.c:64
-msgid "get value: name [value-regex]"
+#: builtin/bisect--helper.c:120
+msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/config.c:65
-msgid "get all values: key [value-regex]"
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
-#: builtin/config.c:66
-msgid "get values for regexp: name-regex [value-regex]"
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
msgstr ""
-#: builtin/config.c:67
-msgid "get value specific for the URL: section[.var] URL"
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
msgstr ""
-#: builtin/config.c:68
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/bisect--helper.c:128
+msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/config.c:69
-msgid "add a new variable: name value"
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
msgstr ""
-#: builtin/config.c:70
-msgid "remove a variable: name [value-regex]"
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/config.c:71
-msgid "remove all matches: name [value-regex]"
+#: builtin/blame.c:31
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/config.c:72
-msgid "rename section: old-name new-name"
+#: builtin/blame.c:36
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/config.c:73
-msgid "remove a section: name"
+#: builtin/blame.c:406
+#, c-format
+msgid "expecting a color: %s"
msgstr ""
-#: builtin/config.c:74
-msgid "list all"
+#: builtin/blame.c:413
+msgid "must end with a color"
msgstr ""
-#: builtin/config.c:75
-msgid "open an editor"
+#: builtin/blame.c:700
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/config.c:76
-msgid "find the color configured: slot [default]"
+#: builtin/blame.c:718
+msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/config.c:77
-msgid "find the color setting: slot [stdout-is-tty]"
+#: builtin/blame.c:793
+msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/config.c:78
-msgid "Type"
+#: builtin/blame.c:794
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/config.c:79
-msgid "value is \"true\" or \"false\""
+#: builtin/blame.c:795
+msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/config.c:80
-msgid "value is decimal number"
+#: builtin/blame.c:796
+msgid "Show work cost statistics"
msgstr ""
-#: builtin/config.c:81
-msgid "value is --bool or --int"
+#: builtin/blame.c:797
+msgid "Force progress reporting"
msgstr ""
-#: builtin/config.c:82
-msgid "value is a path (file or directory name)"
+#: builtin/blame.c:798
+msgid "Show output score for blame entries"
msgstr ""
-#: builtin/config.c:83
-msgid "Other"
+#: builtin/blame.c:799
+msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/config.c:84
-msgid "terminate values with NUL byte"
+#: builtin/blame.c:800
+msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/config.c:85
-msgid "show variable names only"
+#: builtin/blame.c:801
+msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/config.c:86
-msgid "respect include directives on lookup"
+#: builtin/blame.c:802
+msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/config.c:87
-msgid "show origin of config (file, standard input, blob, command line)"
+#: builtin/blame.c:803
+msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/config.c:327
-msgid "unable to parse default color value"
+#: builtin/blame.c:804
+msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/config.c:471
-#, 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/blame.c:805
+msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/config.c:499
-msgid "--local can only be used inside a git repository"
+#: builtin/blame.c:806
+msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/config.c:621
-#, c-format
-msgid "cannot create configuration file %s"
+#: builtin/blame.c:807
+msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/config.c:633
-#, c-format
-msgid ""
-"cannot overwrite multiple values with a single value\n"
-" Use a regexp, --add or --replace-all to change %s."
+#: builtin/blame.c:808
+msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/count-objects.c:87
-msgid "git count-objects [-v] [-H | --human-readable]"
+#: builtin/blame.c:809
+msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/count-objects.c:97
-msgid "print sizes in human readable format"
+#: builtin/blame.c:810
+msgid "color lines by age"
msgstr ""
-#: builtin/describe.c:19
-msgid "git describe [<options>] [<commit-ish>...]"
+#: builtin/blame.c:817
+msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/describe.c:20
-msgid "git describe [<options>] --dirty"
+#: builtin/blame.c:819
+msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/describe.c:54
-msgid "head"
+#: builtin/blame.c:820
+msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/describe.c:54
-msgid "lightweight"
+#: builtin/blame.c:821
+msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/describe.c:54
-msgid "annotated"
+#: builtin/blame.c:822 builtin/blame.c:823
+msgid "score"
msgstr ""
-#: builtin/describe.c:253
-#, c-format
-msgid "annotated tag %s not available"
+#: builtin/blame.c:822
+msgid "Find line copies within and across files"
msgstr ""
-#: builtin/describe.c:257
-#, c-format
-msgid "annotated tag %s has no embedded name"
+#: builtin/blame.c:823
+msgid "Find line movements within and across files"
msgstr ""
-#: builtin/describe.c:259
-#, c-format
-msgid "tag '%s' is really '%s' here"
+#: builtin/blame.c:824
+msgid "n,m"
msgstr ""
-#: builtin/describe.c:286 builtin/log.c:489
-#, c-format
-msgid "Not a valid object name %s"
+#: builtin/blame.c:824
+msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/describe.c:289
-#, c-format
-msgid "%s is not a valid '%s' object"
+#: builtin/blame.c:873
+msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
-#: builtin/describe.c:306
-#, c-format
-msgid "no tag exactly matches '%s'"
+#. 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:924
+msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/describe.c:308
+#: builtin/blame.c:1011
#, c-format
-msgid "searching to describe %s\n"
-msgstr ""
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/describe.c:355
-#, c-format
-msgid "finished search at %s\n"
+#: builtin/blame.c:1057
+msgid "Blaming lines"
msgstr ""
-#: builtin/describe.c:382
-#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/describe.c:386
-#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/describe.c:416
-#, c-format
-msgid "traversed %lu commits\n"
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/describe.c:419
-#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/describe.c:441
-msgid "find the tag that comes after the commit"
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/describe.c:442
-msgid "debug search strategy on stderr"
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/describe.c:443
-msgid "use any ref"
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/describe.c:444
-msgid "use any tag, even unannotated"
+#: 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/describe.c:445
-msgid "always use long format"
+#: 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/describe.c:446
-msgid "only follow first parent"
+#: builtin/branch.c:169
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/describe.c:449
-msgid "only output exact matches"
+#: 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/describe.c:451
-msgid "consider <n> most recent tags (default: 10)"
+#: builtin/branch.c:186
+msgid "Update of config-file failed"
msgstr ""
-#: builtin/describe.c:453
-msgid "only consider tags matching <pattern>"
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
msgstr ""
-#: builtin/describe.c:455
-msgid "do not consider tags matching <pattern>"
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/describe.c:457 builtin/name-rev.c:406
-msgid "show abbreviated commit object as fallback"
+#: builtin/branch.c:237
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/describe.c:458 builtin/describe.c:461
-msgid "mark"
+#: builtin/branch.c:252
+#, c-format
+msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/describe.c:459
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+#: builtin/branch.c:253
+#, c-format
+msgid "branch '%s' not found."
msgstr ""
-#: builtin/describe.c:462
-msgid "append <mark> on broken working tree (default: \"-broken\")"
+#: builtin/branch.c:268
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/describe.c:480
-msgid "--long is incompatible with --abbrev=0"
+#: builtin/branch.c:269
+#, c-format
+msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/describe.c:509
-msgid "No names found, cannot describe anything."
+#: builtin/branch.c:276
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/describe.c:552
-msgid "--dirty is incompatible with commit-ishes"
+#: builtin/branch.c:277
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/describe.c:554
-msgid "--broken is incompatible with commit-ishes"
+#: builtin/branch.c:421 builtin/tag.c:59
+msgid "unable to parse format string"
msgstr ""
-#: builtin/diff.c:83
+#: builtin/branch.c:458
#, c-format
-msgid "'%s': not a regular file or symlink"
+msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/diff.c:235
+#: builtin/branch.c:462
#, c-format
-msgid "invalid option: %s"
+msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/diff.c:359
-msgid "Not a git repository"
+#: builtin/branch.c:479
+msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/diff.c:402
-#, c-format
-msgid "invalid object '%s' given."
+#: builtin/branch.c:481
+msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/diff.c:411
+#: builtin/branch.c:492
#, c-format
-msgid "more than two blobs given: '%s'"
+msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/diff.c:416
-#, c-format
-msgid "unhandled object '%s' given."
+#: builtin/branch.c:519
+msgid "Branch rename failed"
msgstr ""
-#: builtin/difftool.c:29
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+#: builtin/branch.c:521
+msgid "Branch copy failed"
msgstr ""
-#: builtin/difftool.c:249
+#: builtin/branch.c:525
#, c-format
-msgid "failed: %d"
+msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/difftool.c:291
+#: builtin/branch.c:528
#, c-format
-msgid "could not read symlink %s"
+msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/difftool.c:293
+#: builtin/branch.c:534
#, c-format
-msgid "could not read symlink file %s"
+msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/difftool.c:301
-#, c-format
-msgid "could not read object %s for symlink %s"
+#: builtin/branch.c:543
+msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/difftool.c:403
-msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+#: builtin/branch.c:545
+msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/difftool.c:626
+#: builtin/branch.c:561
#, c-format
-msgid "both files modified: '%s' and '%s'."
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/difftool.c:628
-msgid "working tree file has been left."
+#: builtin/branch.c:594
+msgid "Generic options"
msgstr ""
-#: builtin/difftool.c:639
-#, c-format
-msgid "temporary files exist in '%s'."
+#: builtin/branch.c:596
+msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/difftool.c:640
-msgid "you may want to cleanup or recover these."
+#: builtin/branch.c:597
+msgid "suppress informational messages"
msgstr ""
-#: builtin/difftool.c:689
-msgid "use `diff.guitool` instead of `diff.tool`"
+#: builtin/branch.c:598
+msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/difftool.c:691
-msgid "perform a full-directory diff"
+#: builtin/branch.c:600
+msgid "do not use"
msgstr ""
-#: builtin/difftool.c:693
-msgid "do not prompt before launching a diff tool"
+#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+msgid "upstream"
msgstr ""
-#: builtin/difftool.c:699
-msgid "use symlinks in dir-diff mode"
+#: builtin/branch.c:602
+msgid "change the upstream info"
msgstr ""
-#: builtin/difftool.c:700
-msgid "<tool>"
+#: builtin/branch.c:603
+msgid "Unset the upstream info"
msgstr ""
-#: builtin/difftool.c:701
-msgid "use the specified diff tool"
+#: builtin/branch.c:604
+msgid "use colored output"
msgstr ""
-#: builtin/difftool.c:703
-msgid "print a list of diff tools that may be used with `--tool`"
+#: builtin/branch.c:605
+msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/difftool.c:706
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
+#: builtin/branch.c:607 builtin/branch.c:609
+msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/difftool.c:708
-msgid "<command>"
+#: builtin/branch.c:608 builtin/branch.c:610
+msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/difftool.c:709
-msgid "specify a custom command for viewing diffs"
+#: builtin/branch.c:613
+msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/difftool.c:733
-msgid "no <tool> given for --tool=<tool>"
+#: builtin/branch.c:614
+msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/difftool.c:740
-msgid "no <cmd> given for --extcmd=<cmd>"
+#: builtin/branch.c:616
+msgid "delete fully merged branch"
msgstr ""
-#: builtin/fast-export.c:26
-msgid "git fast-export [rev-list-opts]"
+#: builtin/branch.c:617
+msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/fast-export.c:982
-msgid "show progress after <n> objects"
+#: builtin/branch.c:618
+msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/fast-export.c:984
-msgid "select handling of signed tags"
+#: builtin/branch.c:619
+msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/fast-export.c:987
-msgid "select handling of tags that tag filtered objects"
+#: builtin/branch.c:620
+msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/fast-export.c:990
-msgid "Dump marks to this file"
+#: builtin/branch.c:621
+msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/fast-export.c:992
-msgid "Import marks from this file"
+#: builtin/branch.c:622
+msgid "list branch names"
msgstr ""
-#: builtin/fast-export.c:994
-msgid "Fake a tagger when tags lack one"
+#: builtin/branch.c:623
+msgid "create the branch's reflog"
msgstr ""
-#: builtin/fast-export.c:996
-msgid "Output full tree for each commit"
+#: builtin/branch.c:625
+msgid "edit the description for the branch"
msgstr ""
-#: builtin/fast-export.c:998
-msgid "Use the done feature to terminate the stream"
+#: builtin/branch.c:626
+msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/fast-export.c:999
-msgid "Skip output of blob data"
+#: builtin/branch.c:627
+msgid "print only branches that are merged"
msgstr ""
-#: builtin/fast-export.c:1000
-msgid "refspec"
+#: builtin/branch.c:628
+msgid "print only branches that are not merged"
msgstr ""
-#: builtin/fast-export.c:1001
-msgid "Apply refspec to exported refs"
+#: builtin/branch.c:629
+msgid "list branches in columns"
msgstr ""
-#: builtin/fast-export.c:1002
-msgid "anonymize output"
+#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:415
+msgid "key"
msgstr ""
-#: builtin/fetch.c:22
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: 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/fetch.c:23
-msgid "git fetch [<options>] <group>"
+#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
+#: builtin/tag.c:418
+msgid "object"
msgstr ""
-#: builtin/fetch.c:24
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+#: builtin/branch.c:634
+msgid "print only branches of the object"
msgstr ""
-#: builtin/fetch.c:25
-msgid "git fetch --all [<options>]"
+#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/fetch.c:90 builtin/pull.c:182
-msgid "fetch from all remotes"
+#: 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/fetch.c:92 builtin/pull.c:185
-msgid "append to .git/FETCH_HEAD instead of overwriting"
+#: builtin/branch.c:660 builtin/clone.c:739
+msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/fetch.c:94 builtin/pull.c:188
-msgid "path to upload pack on remote end"
+#: builtin/branch.c:683
+msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/fetch.c:95 builtin/pull.c:190
-msgid "force overwrite of local branch"
+#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+msgid "branch name required"
msgstr ""
-#: builtin/fetch.c:97
-msgid "fetch from multiple remotes"
+#: builtin/branch.c:725
+msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/fetch.c:99 builtin/pull.c:192
-msgid "fetch all tags and associated objects"
+#: builtin/branch.c:730
+msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/fetch.c:101
-msgid "do not fetch all tags (--no-tags)"
+#: builtin/branch.c:737
+#, c-format
+msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/fetch.c:103
-msgid "number of submodules fetched in parallel"
+#: builtin/branch.c:740
+#, c-format
+msgid "No branch named '%s'."
msgstr ""
-#: builtin/fetch.c:105 builtin/pull.c:195
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/branch.c:755
+msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
-msgid "on-demand"
+#: builtin/branch.c:764
+msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/fetch.c:107
-msgid "control recursive fetching of submodules"
+#: builtin/branch.c:769
+msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/fetch.c:111 builtin/pull.c:203
-msgid "keep downloaded pack"
+#: 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/fetch.c:113
-msgid "allow updating of HEAD ref"
+#: builtin/branch.c:776 builtin/branch.c:798
+#, c-format
+msgid "no such branch '%s'"
msgstr ""
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
-msgid "deepen history of shallow clone"
+#: builtin/branch.c:780
+#, c-format
+msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/fetch.c:118
-msgid "deepen history of shallow repository based on time"
+#: builtin/branch.c:792
+msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/fetch.c:124 builtin/pull.c:209
-msgid "convert to a complete repository"
+#: builtin/branch.c:796
+msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/fetch.c:126 builtin/log.c:1450
-msgid "dir"
+#: builtin/branch.c:802
+#, c-format
+msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/fetch.c:127
-msgid "prepend this to submodule path output"
+#: builtin/branch.c:812
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/fetch.c:130
+#: builtin/branch.c:815
msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-#: builtin/fetch.c:134 builtin/pull.c:212
-msgid "accept refs that update .git/shallow"
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
msgstr ""
-#: builtin/fetch.c:135 builtin/pull.c:214
-msgid "refmap"
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/fetch.c:136 builtin/pull.c:215
-msgid "specify fetch refmap"
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/fetch.c:394
-msgid "Couldn't find remote ref HEAD"
+#: builtin/cat-file.c:587
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-#: builtin/fetch.c:512
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
+#: builtin/cat-file.c:588
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
msgstr ""
-#: builtin/fetch.c:605
-#, c-format
-msgid "object %s not found"
+#: builtin/cat-file.c:609
+msgid "only one batch option may be specified"
msgstr ""
-#: builtin/fetch.c:609
-msgid "[up to date]"
+#: builtin/cat-file.c:627
+msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/fetch.c:622 builtin/fetch.c:702
-msgid "[rejected]"
+#: builtin/cat-file.c:628
+msgid "show object type"
msgstr ""
-#: builtin/fetch.c:623
-msgid "can't fetch in current branch"
+#: builtin/cat-file.c:629
+msgid "show object size"
msgstr ""
-#: builtin/fetch.c:632
-msgid "[tag update]"
+#: builtin/cat-file.c:631
+msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
-msgid "unable to update local ref"
+#: builtin/cat-file.c:632
+msgid "pretty-print object's content"
msgstr ""
-#: builtin/fetch.c:652
-msgid "[new tag]"
+#: builtin/cat-file.c:634
+msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/fetch.c:655
-msgid "[new branch]"
+#: builtin/cat-file.c:636
+msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/fetch.c:658
-msgid "[new ref]"
+#: builtin/cat-file.c:637 git-submodule.sh:857
+msgid "blob"
msgstr ""
-#: builtin/fetch.c:697
-msgid "forced update"
+#: builtin/cat-file.c:638
+msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/fetch.c:702
-msgid "non-fast-forward"
+#: builtin/cat-file.c:640
+msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/fetch.c:747
-#, c-format
-msgid "%s did not send all necessary objects\n"
+#: builtin/cat-file.c:641
+msgid "buffer --batch output"
msgstr ""
-#: builtin/fetch.c:767
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+#: builtin/cat-file.c:643
+msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/fetch.c:855 builtin/fetch.c:951
-#, c-format
-msgid "From %.*s\n"
+#: builtin/cat-file.c:647
+msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/fetch.c:866
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+#: builtin/cat-file.c:651
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/fetch.c:921
-#, c-format
-msgid " (%s will become dangling)"
+#: builtin/cat-file.c:653
+msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/fetch.c:922
-#, c-format
-msgid " (%s has become dangling)"
+#: builtin/cat-file.c:655
+msgid "do not order --batch-all-objects output"
msgstr ""
-#: builtin/fetch.c:954
-msgid "[deleted]"
+#: builtin/check-attr.c:12
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
-#: builtin/fetch.c:955 builtin/remote.c:1023
-msgid "(none)"
+#: builtin/check-attr.c:13
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
-#: builtin/fetch.c:978
-#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+#: builtin/check-attr.c:20
+msgid "report all attributes set on file"
msgstr ""
-#: builtin/fetch.c:997
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+#: builtin/check-attr.c:21
+msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/fetch.c:1000
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+msgid "read file names from stdin"
msgstr ""
-#: builtin/fetch.c:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/fetch.c:1236
-#, c-format
-msgid "Fetching %s\n"
+#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
+#: builtin/worktree.c:495
+msgid "suppress progress reporting"
msgstr ""
-#: builtin/fetch.c:1238 builtin/remote.c:97
-#, c-format
-msgid "Could not fetch %s"
+#: builtin/check-ignore.c:28
+msgid "show non-matching input paths"
msgstr ""
-#: builtin/fetch.c:1256
-msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+#: builtin/check-ignore.c:30
+msgid "ignore index when checking"
msgstr ""
-#: builtin/fetch.c:1279
-msgid "You need to specify a tag name."
+#: builtin/check-ignore.c:159
+msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/fetch.c:1321
-msgid "Negative depth in --deepen is not supported"
+#: builtin/check-ignore.c:162
+msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/fetch.c:1323
-msgid "--deepen and --depth are mutually exclusive"
+#: builtin/check-ignore.c:164
+msgid "no path specified"
msgstr ""
-#: builtin/fetch.c:1328
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/check-ignore.c:168
+msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/fetch.c:1330
-msgid "--unshallow on a complete repository does not make sense"
+#: builtin/check-ignore.c:170
+msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/fetch.c:1349
-msgid "fetch --all does not take a repository argument"
+#: builtin/check-ignore.c:173
+msgid "--non-matching is only valid with --verbose"
msgstr ""
-#: builtin/fetch.c:1351
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
msgstr ""
-#: builtin/fetch.c:1362
-#, c-format
-msgid "No such remote or remote group: %s"
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
msgstr ""
-#: builtin/fetch.c:1370
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
msgstr ""
-#: builtin/fmt-merge-msg.c:15
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
msgstr ""
-#: builtin/fmt-merge-msg.c:664
-msgid "populate log with at most <n> entries from shortlog"
+#: builtin/checkout-index.c:128
+msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/fmt-merge-msg.c:667
-msgid "alias for --log (deprecated)"
+#: builtin/checkout-index.c:145
+msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
-msgid "text"
+#: builtin/checkout-index.c:161
+msgid "check out all files in the index"
msgstr ""
-#: builtin/fmt-merge-msg.c:671
-msgid "use <text> as start of message"
+#: builtin/checkout-index.c:162
+msgid "force overwrite of existing files"
msgstr ""
-#: builtin/fmt-merge-msg.c:672
-msgid "file to read from"
+#: builtin/checkout-index.c:164
+msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
+#: builtin/checkout-index.c:166
+msgid "don't checkout new files"
msgstr ""
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
+#: builtin/checkout-index.c:168
+msgid "update stat information in the index file"
msgstr ""
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#: builtin/checkout-index.c:172
+msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+#: builtin/checkout-index.c:174
+msgid "write the content to temporary files"
msgstr ""
-#: builtin/for-each-ref.c:28
-msgid "quote placeholders suitably for shells"
+#: builtin/checkout-index.c:175 builtin/column.c:31
+#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
+#: builtin/worktree.c:668
+msgid "string"
msgstr ""
-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for perl"
+#: builtin/checkout-index.c:176
+msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/for-each-ref.c:32
-msgid "quote placeholders suitably for python"
+#: builtin/checkout-index.c:178
+msgid "copy out the files from named stage"
msgstr ""
-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for Tcl"
+#: builtin/checkout.c:31
+msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/for-each-ref.c:37
-msgid "show only <n> matched refs"
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/for-each-ref.c:42
-msgid "print only refs which points at the given object"
+#: builtin/checkout.c:144 builtin/checkout.c:177
+#, c-format
+msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/for-each-ref.c:44
-msgid "print only refs that are merged"
+#: builtin/checkout.c:146 builtin/checkout.c:179
+#, c-format
+msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/for-each-ref.c:45
-msgid "print only refs that are not merged"
+#: builtin/checkout.c:162
+#, c-format
+msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/for-each-ref.c:46
-msgid "print only refs which contain the commit"
+#: builtin/checkout.c:206
+#, c-format
+msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/for-each-ref.c:47
-msgid "print only refs which don't contain the commit"
+#: builtin/checkout.c:224
+#, c-format
+msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/fsck.c:554
-msgid "Checking object directories"
+#: builtin/checkout.c:240
+#, c-format
+msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/fsck.c:646
-msgid "git fsck [<options>] [<object>...]"
+#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:271
+#, c-format
+msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/fsck.c:652
-msgid "show unreachable objects"
+#: builtin/checkout.c:274 builtin/checkout.c:277
+#, c-format
+msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/fsck.c:653
-msgid "show dangling objects"
+#: builtin/checkout.c:280
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/fsck.c:654
-msgid "report tags"
+#: builtin/checkout.c:349 builtin/checkout.c:356
+#, c-format
+msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/fsck.c:655
-msgid "report root nodes"
+#: builtin/checkout.c:608
+msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/fsck.c:656
-msgid "make index objects head nodes"
+#: builtin/checkout.c:745
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/fsck.c:657
-msgid "make reflogs head nodes (default)"
+#: builtin/checkout.c:786
+msgid "HEAD is now at"
msgstr ""
-#: builtin/fsck.c:658
-msgid "also consider packs and alternate objects"
+#: builtin/checkout.c:790 builtin/clone.c:692
+msgid "unable to update HEAD"
msgstr ""
-#: builtin/fsck.c:659
-msgid "check only connectivity"
+#: builtin/checkout.c:794
+#, c-format
+msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/fsck.c:660
-msgid "enable more strict checking"
+#: builtin/checkout.c:797
+#, c-format
+msgid "Already on '%s'\n"
msgstr ""
-#: builtin/fsck.c:662
-msgid "write dangling objects in .git/lost-found"
+#: builtin/checkout.c:801
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/fsck.c:663 builtin/prune.c:107
-msgid "show progress"
+#: builtin/checkout.c:803 builtin/checkout.c:1166
+#, c-format
+msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/fsck.c:664
-msgid "show verbose names for reachable objects"
+#: builtin/checkout.c:805
+#, c-format
+msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/fsck.c:725
-msgid "Checking objects"
+#: builtin/checkout.c:856
+#, c-format
+msgid " ... and %d more.\n"
msgstr ""
-#: builtin/gc.c:26
-msgid "git gc [<options>]"
-msgstr ""
-
-#: builtin/gc.c:79
-#, c-format
-msgid "Failed to fstat %s: %s"
-msgstr ""
-
-#: builtin/gc.c:311
+#: builtin/checkout.c:862
#, c-format
-msgid "Can't stat %s"
-msgstr ""
+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/gc.c:320
+#: builtin/checkout.c:881
#, 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"
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
"\n"
-"%s"
-msgstr ""
+" 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/gc.c:359
-msgid "prune unreferenced objects"
+#: builtin/checkout.c:913
+msgid "internal error in revision walk"
msgstr ""
-#: builtin/gc.c:361
-msgid "be more thorough (increased runtime)"
+#: builtin/checkout.c:917
+msgid "Previous HEAD position was"
msgstr ""
-#: builtin/gc.c:362
-msgid "enable auto-gc mode"
+#: builtin/checkout.c:945 builtin/checkout.c:1161
+msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/gc.c:363
-msgid "force running gc even if there may be another gc running"
+#: builtin/checkout.c:1066
+#, c-format
+msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/gc.c:380
+#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
#, c-format
-msgid "Failed to parse gc.logexpiry value %s"
+msgid "invalid reference: %s"
msgstr ""
-#: builtin/gc.c:408
+#: builtin/checkout.c:1136
#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
+msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/gc.c:410
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+#: builtin/checkout.c:1175
+msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/gc.c:411
+#: builtin/checkout.c:1178 builtin/checkout.c:1182
#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
+msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/gc.c:432
+#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
+#: builtin/checkout.c:1197
#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/gc.c:476
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+#: builtin/checkout.c:1202
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/grep.c:27
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
+#: builtin/worktree.c:490
+msgid "branch"
msgstr ""
-#: builtin/grep.c:235
-#, c-format
-msgid "grep: failed to create thread: %s"
+#: builtin/checkout.c:1236
+msgid "create and checkout a new branch"
msgstr ""
-#: builtin/grep.c:293
-#, c-format
-msgid "invalid number of threads specified (%d) for %s"
+#: builtin/checkout.c:1238
+msgid "create/reset and checkout a branch"
msgstr ""
-#. TRANSLATORS: %s is the configuration
-#. variable for tweaking threads, currently
-#. grep.threads
-#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
-#, c-format
-msgid "no threads support, ignoring %s"
+#: builtin/checkout.c:1239
+msgid "create reflog for new branch"
msgstr ""
-#: builtin/grep.c:788 builtin/grep.c:829
-#, c-format
-msgid "unable to read tree (%s)"
+#: builtin/checkout.c:1240 builtin/worktree.c:492
+msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/grep.c:848
-#, c-format
-msgid "unable to grep from object of type %s"
+#: builtin/checkout.c:1241
+msgid "set upstream info for new branch"
msgstr ""
-#: builtin/grep.c:912
-#, c-format
-msgid "switch `%c' expects a numerical value"
+#: builtin/checkout.c:1243
+msgid "new-branch"
msgstr ""
-#: builtin/grep.c:999
-msgid "search in index instead of in the work tree"
+#: builtin/checkout.c:1243
+msgid "new unparented branch"
msgstr ""
-#: builtin/grep.c:1001
-msgid "find in contents not managed by git"
+#: builtin/checkout.c:1245
+msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/grep.c:1003
-msgid "search in both tracked and untracked files"
+#: builtin/checkout.c:1248
+msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/grep.c:1005
-msgid "ignore files specified via '.gitignore'"
+#: builtin/checkout.c:1250
+msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/grep.c:1007
-msgid "recursively search in each submodule"
+#: builtin/checkout.c:1252
+msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/grep.c:1009
-msgid "basename"
+#: builtin/checkout.c:1254 builtin/merge.c:275
+msgid "update ignored files (default)"
msgstr ""
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
+#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
+msgid "style"
msgstr ""
-#: builtin/grep.c:1013
-msgid "show non-matching lines"
+#: builtin/checkout.c:1257
+msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/grep.c:1015
-msgid "case insensitive matching"
+#: builtin/checkout.c:1260
+msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/grep.c:1017
-msgid "match patterns only at word boundaries"
+#: builtin/checkout.c:1262
+msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/grep.c:1019
-msgid "process binary files as text"
+#: builtin/checkout.c:1264
+msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/grep.c:1021
-msgid "don't match patterns in binary files"
+#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
+#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
msgstr ""
-#: builtin/grep.c:1024
-msgid "process binary files with textconv filters"
+#: builtin/checkout.c:1298
+msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/grep.c:1026
-msgid "descend at most <depth> levels"
+#: builtin/checkout.c:1315
+msgid "--track needs a branch name"
msgstr ""
-#: builtin/grep.c:1030
-msgid "use extended POSIX regular expressions"
+#: builtin/checkout.c:1320
+msgid "missing branch name; try -b"
msgstr ""
-#: builtin/grep.c:1033
-msgid "use basic POSIX regular expressions (default)"
+#: builtin/checkout.c:1357
+msgid "invalid path specification"
msgstr ""
-#: builtin/grep.c:1036
-msgid "interpret patterns as fixed strings"
+#: builtin/checkout.c:1364
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/grep.c:1039
-msgid "use Perl-compatible regular expressions"
+#: builtin/checkout.c:1368
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/grep.c:1042
-msgid "show line numbers"
+#: builtin/checkout.c:1372
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
msgstr ""
-#: builtin/grep.c:1043
-msgid "don't show filenames"
+#: builtin/checkout.c:1392
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/grep.c:1044
-msgid "show filenames"
+#: builtin/clean.c:27
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/grep.c:1046
-msgid "show filenames relative to top directory"
+#: builtin/clean.c:31
+#, c-format
+msgid "Removing %s\n"
msgstr ""
-#: builtin/grep.c:1048
-msgid "show only filenames instead of matching lines"
+#: builtin/clean.c:32
+#, c-format
+msgid "Would remove %s\n"
msgstr ""
-#: builtin/grep.c:1050
-msgid "synonym for --files-with-matches"
+#: builtin/clean.c:33
+#, c-format
+msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/grep.c:1053
-msgid "show only the names of files without match"
+#: builtin/clean.c:34
+#, c-format
+msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/grep.c:1055
-msgid "print NUL after filenames"
+#: builtin/clean.c:35
+#, c-format
+msgid "failed to remove %s"
msgstr ""
-#: builtin/grep.c:1057
-msgid "show the number of matches instead of matching lines"
+#: builtin/clean.c:298 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/grep.c:1058
-msgid "highlight matches"
+#: builtin/clean.c:302 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/grep.c:1060
-msgid "print empty line between matches from different files"
+#: builtin/clean.c:518 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/grep.c:1062
-msgid "show filename only once above matches from same file"
+#: builtin/clean.c:660
+#, c-format
+msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/grep.c:1065
-msgid "show <n> context lines before and after matches"
+#: builtin/clean.c:697
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/grep.c:1068
-msgid "show <n> context lines before matches"
+#: builtin/clean.c:718
+msgid "Select items to delete"
msgstr ""
-#: builtin/grep.c:1070
-msgid "show <n> context lines after matches"
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:759
+#, c-format
+msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/grep.c:1072
-msgid "use <n> worker threads"
+#: builtin/clean.c:784 git-add--interactive.perl:1717
+#, c-format
+msgid "Bye.\n"
msgstr ""
-#: builtin/grep.c:1073
-msgid "shortcut for -C NUM"
+#: builtin/clean.c:792
+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/grep.c:1076
-msgid "show a line with the function name before matches"
+#: builtin/clean.c:819 git-add--interactive.perl:1793
+msgid "*** Commands ***"
msgstr ""
-#: builtin/grep.c:1078
-msgid "show the surrounding function"
+#: builtin/clean.c:820 git-add--interactive.perl:1790
+msgid "What now"
msgstr ""
-#: builtin/grep.c:1081
-msgid "read patterns from file"
-msgstr ""
+#: builtin/clean.c:828
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/grep.c:1083
-msgid "match <pattern>"
+#: builtin/clean.c:844
+msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/grep.c:1085
-msgid "combine patterns specified with -e"
+#: builtin/clean.c:906
+msgid "do not print names of files removed"
msgstr ""
-#: builtin/grep.c:1097
-msgid "indicate hit with exit status without output"
+#: builtin/clean.c:908
+msgid "force"
msgstr ""
-#: builtin/grep.c:1099
-msgid "show only matches from files that match all patterns"
+#: builtin/clean.c:909
+msgid "interactive cleaning"
msgstr ""
-#: builtin/grep.c:1101
-msgid "show parse tree for grep expression"
+#: builtin/clean.c:911
+msgid "remove whole directories"
msgstr ""
-#: builtin/grep.c:1105
-msgid "pager"
+#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
+#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
+#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/show-ref.c:178
+msgid "pattern"
msgstr ""
-#: builtin/grep.c:1105
-msgid "show matching files in the pager"
+#: builtin/clean.c:913
+msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/grep.c:1108
-msgid "allow calling of grep(1) (ignored by this build)"
+#: builtin/clean.c:914
+msgid "remove ignored files, too"
msgstr ""
-#: builtin/grep.c:1172
-msgid "no pattern given."
+#: builtin/clean.c:916
+msgid "remove only ignored files"
msgstr ""
-#: builtin/grep.c:1204
-msgid "--no-index or --untracked cannot be used with revs"
+#: builtin/clean.c:934
+msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/grep.c:1211
-#, c-format
-msgid "unable to resolve revision: %s"
+#: builtin/clean.c:938
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
msgstr ""
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
-#, c-format
-msgid "invalid number of threads specified (%d)"
+#: builtin/clean.c:941
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
msgstr ""
-#: builtin/grep.c:1250
-msgid "no threads support, ignoring --threads"
+#: builtin/clone.c:43
+msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/grep.c:1281
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/clone.c:88
+msgid "don't create a checkout"
msgstr ""
-#: builtin/grep.c:1304
-msgid "option not supported with --recurse-submodules."
-msgstr ""
-
-#: builtin/grep.c:1310
-msgid "--cached or --untracked cannot be used with --no-index."
-msgstr ""
-
-#: builtin/grep.c:1316
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
-msgstr ""
-
-#: builtin/grep.c:1324
-msgid "both --cached and trees are given."
-msgstr ""
-
-#: builtin/hash-object.c:82
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
-msgstr ""
-
-#: builtin/hash-object.c:83
-msgid "git hash-object --stdin-paths"
-msgstr ""
-
-#: builtin/hash-object.c:95
-msgid "type"
-msgstr ""
-
-#: builtin/hash-object.c:95
-msgid "object type"
+#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+msgid "create a bare repository"
msgstr ""
-#: builtin/hash-object.c:96
-msgid "write the object into the object database"
+#: builtin/clone.c:93
+msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/hash-object.c:98
-msgid "read the object from stdin"
+#: builtin/clone.c:95
+msgid "to clone from a local repository"
msgstr ""
-#: builtin/hash-object.c:100
-msgid "store file as is without filters"
+#: builtin/clone.c:97
+msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/hash-object.c:101
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
+#: builtin/clone.c:99
+msgid "setup as shared repository"
msgstr ""
-#: builtin/hash-object.c:102
-msgid "process file as it were from this path"
+#: builtin/clone.c:101 builtin/clone.c:105
+msgid "pathspec"
msgstr ""
-#: builtin/help.c:43
-msgid "print all available commands"
+#: builtin/clone.c:101 builtin/clone.c:105
+msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/help.c:44
-msgid "exclude guides"
+#: builtin/clone.c:108
+msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/help.c:45
-msgid "print list of useful guides"
+#: builtin/clone.c:109 builtin/init-db.c:478
+msgid "template-directory"
msgstr ""
-#: builtin/help.c:46
-msgid "show man page"
+#: builtin/clone.c:110 builtin/init-db.c:479
+msgid "directory from which templates will be used"
msgstr ""
-#: builtin/help.c:47
-msgid "show manual in web browser"
+#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1856
+msgid "reference repository"
msgstr ""
-#: builtin/help.c:49
-msgid "show info page"
+#: builtin/clone.c:116 builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1858
+msgid "use --reference only while cloning"
msgstr ""
-#: builtin/help.c:55
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3301 builtin/repack.c:329
+msgid "name"
msgstr ""
-#: builtin/help.c:67
-#, c-format
-msgid "unrecognized help format '%s'"
+#: builtin/clone.c:118
+msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/help.c:94
-msgid "Failed to start emacsclient."
+#: builtin/clone.c:120
+msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/help.c:107
-msgid "Failed to parse emacsclient version."
+#: builtin/clone.c:122
+msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/help.c:115
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
+#: builtin/pull.c:217
+msgid "depth"
msgstr ""
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
-#, c-format
-msgid "failed to exec '%s'"
+#: builtin/clone.c:124
+msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/help.c:208
-#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
+msgid "time"
msgstr ""
-#: builtin/help.c:220
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+#: builtin/clone.c:126
+msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/help.c:337
-#, c-format
-msgid "'%s': unknown man viewer."
+#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:831
+msgid "revision"
msgstr ""
-#: builtin/help.c:354
-msgid "no man viewer handled the request"
+#: builtin/clone.c:128 builtin/fetch.c:147
+msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/help.c:362
-msgid "no info viewer handled the request"
+#: builtin/clone.c:130
+msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/help.c:404
-msgid "Defining attributes per path"
+#: builtin/clone.c:132
+msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/help.c:405
-msgid "Everyday Git With 20 Commands Or So"
+#: builtin/clone.c:134
+msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/help.c:406
-msgid "A Git glossary"
+#: builtin/clone.c:135 builtin/init-db.c:487
+msgid "gitdir"
msgstr ""
-#: builtin/help.c:407
-msgid "Specifies intentionally untracked files to ignore"
+#: builtin/clone.c:136 builtin/init-db.c:488
+msgid "separate git dir from working tree"
msgstr ""
-#: builtin/help.c:408
-msgid "Defining submodule properties"
+#: builtin/clone.c:137
+msgid "key=value"
msgstr ""
-#: builtin/help.c:409
-msgid "Specifying revisions and ranges for Git"
+#: builtin/clone.c:138
+msgid "set config inside the new repository"
msgstr ""
-#: builtin/help.c:410
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
+#: builtin/push.c:583
+msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/help.c:411
-msgid "An overview of recommended workflows with Git"
+#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
+#: builtin/push.c:585
+msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/help.c:423
-msgid "The common Git guides are:\n"
+#: builtin/clone.c:279
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
msgstr ""
-#: builtin/help.c:441
+#: builtin/clone.c:332
#, c-format
-msgid "`git %s' is aliased to `%s'"
+msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/clone.c:404
#, c-format
-msgid "usage: %s%s"
+msgid "failed to open '%s'"
msgstr ""
-#: builtin/index-pack.c:155
+#: builtin/clone.c:412
#, c-format
-msgid "unable to open %s"
+msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/index-pack.c:205
+#: builtin/clone.c:426
#, c-format
-msgid "object type mismatch at %s"
+msgid "failed to stat %s\n"
msgstr ""
-#: builtin/index-pack.c:225
+#: builtin/clone.c:443
#, c-format
-msgid "did not receive expected object %s"
+msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/index-pack.c:228
+#: builtin/clone.c:448
#, c-format
-msgid "object %s: expected type %s, found %s"
+msgid "failed to create link '%s'"
msgstr ""
-#: builtin/index-pack.c:270
+#: builtin/clone.c:452
#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:280
-msgid "early EOF"
-msgstr ""
-
-#: builtin/index-pack.c:281
-msgid "read error on input"
+msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/index-pack.c:293
-msgid "used more bytes than were available"
+#: builtin/clone.c:478
+#, c-format
+msgid "done.\n"
msgstr ""
-#: builtin/index-pack.c:300
-msgid "pack too large for current definition of off_t"
+#: builtin/clone.c:492
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
-msgid "pack exceeds maximum allowed size"
+#: builtin/clone.c:569
+#, c-format
+msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/index-pack.c:318
+#: builtin/clone.c:680
#, c-format
-msgid "unable to create '%s'"
+msgid "unable to update %s"
msgstr ""
-#: builtin/index-pack.c:324
-#, c-format
-msgid "cannot open packfile '%s'"
+#: builtin/clone.c:730
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/index-pack.c:338
-msgid "pack signature mismatch"
+#: builtin/clone.c:761
+msgid "unable to checkout working tree"
msgstr ""
-#: builtin/index-pack.c:340
-#, c-format
-msgid "pack version %<PRIu32> unsupported"
+#: builtin/clone.c:806
+msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/index-pack.c:358
-#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
+#: builtin/clone.c:869
+msgid "cannot repack to clean up"
msgstr ""
-#: builtin/index-pack.c:479
-#, c-format
-msgid "inflate returned %d"
+#: builtin/clone.c:871
+msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/index-pack.c:528
-msgid "offset value overflow for delta base object"
+#: builtin/clone.c:911 builtin/receive-pack.c:1941
+msgid "Too many arguments."
msgstr ""
-#: builtin/index-pack.c:536
-msgid "delta base offset is out of bound"
+#: builtin/clone.c:915
+msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/index-pack.c:544
+#: builtin/clone.c:928
#, c-format
-msgid "unknown object type %d"
+msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/index-pack.c:575
-msgid "cannot pread pack file"
+#: builtin/clone.c:931
+msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/index-pack.c:577
+#: builtin/clone.c:944
#, c-format
-msgid "premature end of pack file, %<PRIuMAX> byte missing"
-msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:603
-msgid "serious inflate inconsistency"
+msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/clone.c:950 builtin/fetch.c:1606
#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/clone.c:960
#, c-format
-msgid "unable to read %s"
+msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/index-pack.c:814
+#: builtin/clone.c:970
#, c-format
-msgid "cannot read existing object info %s"
+msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/index-pack.c:822
+#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
+#: builtin/worktree.c:295 builtin/worktree.c:325
#, c-format
-msgid "cannot read existing object %s"
+msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/index-pack.c:836
+#: builtin/clone.c:990
#, c-format
-msgid "invalid blob object %s"
+msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/index-pack.c:851
+#: builtin/clone.c:1010
#, c-format
-msgid "invalid %s"
-msgstr ""
-
-#: builtin/index-pack.c:854
-msgid "Error in object"
+msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/index-pack.c:856
+#: builtin/clone.c:1012
#, c-format
-msgid "Not all child objects of %s are reachable"
-msgstr ""
-
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
-msgid "failed to apply delta"
+msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/index-pack.c:1130
-msgid "Receiving objects"
+#: builtin/clone.c:1036
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
msgstr ""
-#: builtin/index-pack.c:1130
-msgid "Indexing objects"
+#: builtin/clone.c:1097
+msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/index-pack.c:1164
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/clone.c:1099
+msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/index-pack.c:1169
-msgid "cannot fstat packfile"
+#: builtin/clone.c:1101
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/index-pack.c:1172
-msgid "pack has junk at the end"
+#: builtin/clone.c:1103
+msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/index-pack.c:1184
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: builtin/clone.c:1106
+msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/index-pack.c:1207
-msgid "Resolving deltas"
+#: builtin/clone.c:1111
+msgid "--local is ignored"
msgstr ""
-#: builtin/index-pack.c:1218
+#: builtin/clone.c:1181 builtin/clone.c:1189
#, c-format
-msgid "unable to create thread: %s"
+msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/index-pack.c:1260
-msgid "confusion beyond insanity"
+#: builtin/clone.c:1192
+msgid "You appear to have cloned an empty repository."
msgstr ""
-#: builtin/index-pack.c:1266
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1278
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
+#: builtin/column.c:10
+msgid "git column [<options>]"
msgstr ""
-#: builtin/index-pack.c:1282
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1306
-#, c-format
-msgid "unable to deflate appended object (%d)"
+#: builtin/column.c:27
+msgid "lookup config vars"
msgstr ""
-#: builtin/index-pack.c:1382
-#, c-format
-msgid "local object %s is corrupt"
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
msgstr ""
-#: builtin/index-pack.c:1408
-msgid "error while closing pack file"
+#: builtin/column.c:30
+msgid "Maximum width"
msgstr ""
-#: builtin/index-pack.c:1420
-#, c-format
-msgid "cannot write keep file '%s'"
+#: builtin/column.c:31
+msgid "Padding space on left border"
msgstr ""
-#: builtin/index-pack.c:1428
-#, c-format
-msgid "cannot close written keep file '%s'"
+#: builtin/column.c:32
+msgid "Padding space on right border"
msgstr ""
-#: builtin/index-pack.c:1438
-msgid "cannot store pack file"
+#: builtin/column.c:33
+msgid "Padding space between columns"
msgstr ""
-#: builtin/index-pack.c:1446
-msgid "cannot store index file"
+#: builtin/column.c:51
+msgid "--command must be the first argument"
msgstr ""
-#: builtin/index-pack.c:1484
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+#: builtin/commit.c:40
+msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/index-pack.c:1552
-#, c-format
-msgid "Cannot open existing pack file '%s'"
+#: builtin/commit.c:45
+msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/index-pack.c:1554
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+#: builtin/commit.c:50
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-#: builtin/index-pack.c:1602
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1609
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1622
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/commit.c:55
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
msgstr ""
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
-#, c-format
-msgid "bad %s"
+#: builtin/commit.c:62
+msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/index-pack.c:1743
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/commit.c:65
+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/index-pack.c:1745
-msgid "--stdin requires a git repository"
+#: builtin/commit.c:311
+msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/index-pack.c:1753
-msgid "--verify with no packfile name given"
+#: builtin/commit.c:352
+msgid "unable to create temporary index"
msgstr ""
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
+#: builtin/commit.c:358
+msgid "interactive add failed"
msgstr ""
-#: builtin/init-db.c:61
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/commit.c:371
+msgid "unable to update temporary index"
msgstr ""
-#: builtin/init-db.c:66
-#, c-format
-msgid "cannot opendir '%s'"
+#: builtin/commit.c:373
+msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/init-db.c:77
-#, c-format
-msgid "cannot readlink '%s'"
+#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+msgid "unable to write new_index file"
msgstr ""
-#: builtin/init-db.c:79
-#, c-format
-msgid "cannot symlink '%s' '%s'"
+#: builtin/commit.c:450
+msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/init-db.c:85
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: builtin/commit.c:452
+msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/init-db.c:89
-#, c-format
-msgid "ignoring template %s"
+#: builtin/commit.c:460
+msgid "cannot read the index"
msgstr ""
-#: builtin/init-db.c:120
-#, c-format
-msgid "templates not found %s"
+#: builtin/commit.c:479
+msgid "unable to write temporary index file"
msgstr ""
-#: builtin/init-db.c:135
+#: builtin/commit.c:577
#, c-format
-msgid "not copying templates from '%s': %s"
+msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/init-db.c:328
+#: builtin/commit.c:579
#, c-format
-msgid "unable to handle file type %d"
+msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/init-db.c:331
-#, c-format
-msgid "unable to move %s to %s"
+#: builtin/commit.c:598
+msgid "malformed --author parameter"
msgstr ""
-#: builtin/init-db.c:348 builtin/init-db.c:351
-#, c-format
-msgid "%s already exists"
+#: builtin/commit.c:650
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
msgstr ""
-#: builtin/init-db.c:404
+#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgid "could not lookup commit %s"
msgstr ""
-#: builtin/init-db.c:405
+#: builtin/commit.c:699 builtin/shortlog.c:317
#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
+msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/init-db.c:409
-#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
+#: builtin/commit.c:701
+msgid "could not read log from standard input"
msgstr ""
-#: builtin/init-db.c:410
+#: builtin/commit.c:705
#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
+msgid "could not read log file '%s'"
msgstr ""
-#: builtin/init-db.c:458
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+#: builtin/commit.c:734 builtin/commit.c:742
+msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/init-db.c:481
-msgid "permissions"
+#: builtin/commit.c:739
+msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/init-db.c:482
-msgid "specify that the git repository is to be shared amongst several users"
+#: builtin/commit.c:793
+msgid "could not write commit template"
msgstr ""
-#: builtin/init-db.c:516 builtin/init-db.c:521
+#: builtin/commit.c:811
#, c-format
-msgid "cannot mkdir %s"
+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"
msgstr ""
-#: builtin/init-db.c:525
+#: builtin/commit.c:816
#, c-format
-msgid "cannot chdir to %s"
+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"
msgstr ""
-#: builtin/init-db.c:546
+#: builtin/commit.c:829
#, c-format
msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+"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/init-db.c:574
+#: builtin/commit.c:837
#, c-format
-msgid "Cannot access work tree '%s'"
+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/interpret-trailers.c:15
-msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
+#: builtin/commit.c:854
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/interpret-trailers.c:26
-msgid "edit files in place"
+#: builtin/commit.c:862
+#, c-format
+msgid "%sDate: %s"
msgstr ""
-#: builtin/interpret-trailers.c:27
-msgid "trim empty trailers"
+#: builtin/commit.c:869
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/interpret-trailers.c:28
-msgid "trailer"
+#: builtin/commit.c:887
+msgid "Cannot read index"
msgstr ""
-#: builtin/interpret-trailers.c:29
-msgid "trailer(s) to add"
+#: builtin/commit.c:953
+msgid "Error building trees"
msgstr ""
-#: builtin/interpret-trailers.c:42
-msgid "no input file given for in-place editing"
+#: builtin/commit.c:967 builtin/tag.c:258
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/log.c:45
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+#: builtin/commit.c:1011
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/log.c:46
-msgid "git show [<options>] <object>..."
+#: builtin/commit.c:1025
+#, c-format
+msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/log.c:90
+#: builtin/commit.c:1039 builtin/commit.c:1276
#, c-format
-msgid "invalid --decorate option: %s"
+msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/log.c:147
-msgid "suppress diff output"
+#: builtin/commit.c:1077
+msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/log.c:148
-msgid "show source"
+#: builtin/commit.c:1110
+msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/log.c:149
-msgid "Use mail map file"
+#: builtin/commit.c:1119
+msgid "You have nothing to amend."
msgstr ""
-#: builtin/log.c:150
-msgid "decorate options"
+#: builtin/commit.c:1122
+msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/log.c:153
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/commit.c:1124
+msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/log.c:249
-#, c-format
-msgid "Final output: %d %s\n"
+#: builtin/commit.c:1127
+msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/log.c:497
-#, c-format
-msgid "git show %s: bad file"
+#: builtin/commit.c:1137
+msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/log.c:512 builtin/log.c:606
-#, c-format
-msgid "Could not read object %s"
+#: builtin/commit.c:1139
+msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/log.c:630
-#, c-format
-msgid "Unknown type: %d"
+#: builtin/commit.c:1147
+msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/log.c:751
-msgid "format.headers without value"
+#: builtin/commit.c:1164
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/log.c:852
-msgid "name of output directory is too long"
+#: builtin/commit.c:1166
+msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/log.c:868
+#: builtin/commit.c:1180 builtin/tag.c:546
#, c-format
-msgid "Cannot open patch file %s"
+msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/log.c:885
-msgid "Need exactly one range."
+#: builtin/commit.c:1185
+msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/log.c:895
-msgid "Not a range."
+#: builtin/commit.c:1311 builtin/commit.c:1495
+msgid "show status concisely"
msgstr ""
-#: builtin/log.c:1001
-msgid "Cover letter needs email format"
+#: builtin/commit.c:1313 builtin/commit.c:1497
+msgid "show branch information"
msgstr ""
-#: builtin/log.c:1081
-#, c-format
-msgid "insane in-reply-to: %s"
+#: builtin/commit.c:1315
+msgid "show stash information"
msgstr ""
-#: builtin/log.c:1108
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
+#: builtin/commit.c:1317 builtin/commit.c:1499
+msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/log.c:1158
-msgid "Two output directories?"
+#: builtin/commit.c:1319
+msgid "version"
msgstr ""
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
+#: builtin/worktree.c:639
+msgid "machine-readable output"
msgstr ""
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+#: builtin/commit.c:1322 builtin/commit.c:1503
+msgid "show status in long format (default)"
msgstr ""
-#: builtin/log.c:1280
-msgid "Could not find exact merge base."
+#: builtin/commit.c:1325 builtin/commit.c:1506
+msgid "terminate entries with NUL"
msgstr ""
-#: builtin/log.c:1284
-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/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
+#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
+#: builtin/tag.c:400
+msgid "mode"
msgstr ""
-#: builtin/log.c:1304
-msgid "Failed to find exact merge base"
+#: builtin/commit.c:1328 builtin/commit.c:1509
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/log.c:1315
-msgid "base commit should be the ancestor of revision list"
+#: builtin/commit.c:1332
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
msgstr ""
-#: builtin/log.c:1319
-msgid "base commit shouldn't be in revision list"
+#: builtin/commit.c:1334 parse-options.h:164
+msgid "when"
msgstr ""
-#: builtin/log.c:1368
-msgid "cannot get patch id"
+#: builtin/commit.c:1335
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
msgstr ""
-#: builtin/log.c:1425
-msgid "use [PATCH n/m] even with a single patch"
+#: builtin/commit.c:1337
+msgid "list untracked files in columns"
msgstr ""
-#: builtin/log.c:1428
-msgid "use [PATCH] even with multiple patches"
+#: builtin/commit.c:1338
+msgid "do not detect renames"
msgstr ""
-#: builtin/log.c:1432
-msgid "print patches to standard out"
+#: builtin/commit.c:1340
+msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/log.c:1434
-msgid "generate a cover letter"
+#: builtin/commit.c:1360
+msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/log.c:1436
-msgid "use simple number sequence for output file names"
+#: builtin/commit.c:1465
+msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/log.c:1437
-msgid "sfx"
+#: builtin/commit.c:1466
+msgid "show diff in commit message template"
msgstr ""
-#: builtin/log.c:1438
-msgid "use <sfx> instead of '.patch'"
+#: builtin/commit.c:1468
+msgid "Commit message options"
msgstr ""
-#: builtin/log.c:1440
-msgid "start numbering patches at <n> instead of 1"
+#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+msgid "read message from file"
msgstr ""
-#: builtin/log.c:1442
-msgid "mark the series as Nth re-roll"
+#: builtin/commit.c:1470
+msgid "author"
msgstr ""
-#: builtin/log.c:1444
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/commit.c:1470
+msgid "override author for commit"
msgstr ""
-#: builtin/log.c:1447
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/commit.c:1471 builtin/gc.c:518
+msgid "date"
msgstr ""
-#: builtin/log.c:1450
-msgid "store resulting files in <dir>"
+#: builtin/commit.c:1471
+msgid "override date for commit"
msgstr ""
-#: builtin/log.c:1453
-msgid "don't strip/add [PATCH]"
+#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
+#: builtin/notes.c:572 builtin/tag.c:395
+msgid "message"
msgstr ""
-#: builtin/log.c:1456
-msgid "don't output binary diffs"
+#: builtin/commit.c:1472
+msgid "commit message"
msgstr ""
-#: builtin/log.c:1458
-msgid "output all-zero hash in From header"
+#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
+#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+msgid "commit"
msgstr ""
-#: builtin/log.c:1460
-msgid "don't include a patch matching a commit upstream"
+#: builtin/commit.c:1473
+msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/log.c:1462
-msgid "show patch format instead of default (patch + stat)"
+#: builtin/commit.c:1474
+msgid "reuse message from specified commit"
msgstr ""
-#: builtin/log.c:1464
-msgid "Messaging"
+#: builtin/commit.c:1475
+msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/log.c:1465
-msgid "header"
+#: builtin/commit.c:1476
+msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/log.c:1466
-msgid "add email header"
+#: builtin/commit.c:1477
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/log.c:1467 builtin/log.c:1469
-msgid "email"
+#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
+#: builtin/pull.c:155 builtin/revert.c:106
+msgid "add Signed-off-by:"
msgstr ""
-#: builtin/log.c:1467
-msgid "add To: header"
+#: builtin/commit.c:1479
+msgid "use specified template file"
msgstr ""
-#: builtin/log.c:1469
-msgid "add Cc: header"
+#: builtin/commit.c:1480
+msgid "force edit of commit"
msgstr ""
-#: builtin/log.c:1471
-msgid "ident"
+#: builtin/commit.c:1481
+msgid "default"
msgstr ""
-#: builtin/log.c:1472
-msgid "set From address to <ident> (or committer ident if absent)"
+#: builtin/commit.c:1481 builtin/tag.c:401
+msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/log.c:1474
-msgid "message-id"
+#: builtin/commit.c:1482
+msgid "include status in commit message template"
msgstr ""
-#: builtin/log.c:1475
-msgid "make first mail a reply to <message-id>"
+#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
+#: builtin/revert.c:114
+msgid "GPG sign commit"
msgstr ""
-#: builtin/log.c:1476 builtin/log.c:1479
-msgid "boundary"
+#: builtin/commit.c:1487
+msgid "Commit contents options"
msgstr ""
-#: builtin/log.c:1477
-msgid "attach the patch"
+#: builtin/commit.c:1488
+msgid "commit all changed files"
msgstr ""
-#: builtin/log.c:1480
-msgid "inline the patch"
+#: builtin/commit.c:1489
+msgid "add specified files to index for commit"
msgstr ""
-#: builtin/log.c:1484
-msgid "enable message threading, styles: shallow, deep"
+#: builtin/commit.c:1490
+msgid "interactively add files"
msgstr ""
-#: builtin/log.c:1486
-msgid "signature"
+#: builtin/commit.c:1491
+msgid "interactively add changes"
msgstr ""
-#: builtin/log.c:1487
-msgid "add a signature"
+#: builtin/commit.c:1492
+msgid "commit only specified files"
msgstr ""
-#: builtin/log.c:1488
-msgid "base-commit"
+#: builtin/commit.c:1493
+msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/log.c:1489
-msgid "add prerequisite tree info to the patch series"
+#: builtin/commit.c:1494
+msgid "show what would be committed"
msgstr ""
-#: builtin/log.c:1491
-msgid "add a signature from a file"
+#: builtin/commit.c:1507
+msgid "amend previous commit"
msgstr ""
-#: builtin/log.c:1492
-msgid "don't print the patch filenames"
+#: builtin/commit.c:1508
+msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/log.c:1567
-#, c-format
-msgid "invalid ident line: %s"
+#: builtin/commit.c:1513
+msgid "ok to record an empty change"
msgstr ""
-#: builtin/log.c:1582
-msgid "-n and -k are mutually exclusive."
+#: builtin/commit.c:1515
+msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/log.c:1584
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+#: builtin/commit.c:1588
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/log.c:1592
-msgid "--name-only does not make sense"
+#: builtin/commit.c:1595
+msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/log.c:1594
-msgid "--name-status does not make sense"
+#: builtin/commit.c:1614
+#, c-format
+msgid "could not read commit message: %s"
msgstr ""
-#: builtin/log.c:1596
-msgid "--check does not make sense"
+#: builtin/commit.c:1625
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/log.c:1626
-msgid "standard output, or directory, which one?"
+#: builtin/commit.c:1630
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/log.c:1628
-#, c-format
-msgid "Could not create directory '%s'"
+#: builtin/commit.c:1665
+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/log.c:1722
-#, c-format
-msgid "unable to read signature file '%s'"
+#: builtin/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/log.c:1794
-msgid "Failed to create output files"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/log.c:1843
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
msgstr ""
-#: builtin/log.c:1897
-#, c-format
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
msgstr ""
-#: builtin/ls-files.c:468
-msgid "git ls-files [<options>] [<file>...]"
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
+#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
+#: builtin/log.c:1540
+msgid "dir"
msgstr ""
-#: builtin/ls-files.c:517
-msgid "identify the file status with tags"
+#: 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/ls-files.c:519
-msgid "use lowercase letters for 'assume unchanged' files"
+#: builtin/commit-graph.c:135
+msgid "start walk at all refs"
msgstr ""
-#: builtin/ls-files.c:521
-msgid "show cached files in the output (default)"
+#: builtin/commit-graph.c:137
+msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/ls-files.c:523
-msgid "show deleted files in the output"
+#: builtin/commit-graph.c:139
+msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/ls-files.c:525
-msgid "show modified files in the output"
+#: builtin/commit-graph.c:141
+msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/ls-files.c:527
-msgid "show other files in the output"
+#: builtin/commit-graph.c:150
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
-#: builtin/ls-files.c:529
-msgid "show ignored files in the output"
+#: builtin/config.c:11
+msgid "git config [<options>]"
msgstr ""
-#: builtin/ls-files.c:532
-msgid "show staged contents' object name in the output"
+#: builtin/config.c:103
+#, c-format
+msgid "unrecognized --type argument, %s"
msgstr ""
-#: builtin/ls-files.c:534
-msgid "show files on the filesystem that need to be removed"
+#: builtin/config.c:115
+msgid "only one type at a time"
msgstr ""
-#: builtin/ls-files.c:536
-msgid "show 'other' directories' names only"
+#: builtin/config.c:124
+msgid "Config file location"
msgstr ""
-#: builtin/ls-files.c:538
-msgid "show line endings of files"
+#: builtin/config.c:125
+msgid "use global config file"
msgstr ""
-#: builtin/ls-files.c:540
-msgid "don't show empty directories"
+#: builtin/config.c:126
+msgid "use system config file"
msgstr ""
-#: builtin/ls-files.c:543
-msgid "show unmerged files in the output"
+#: builtin/config.c:127
+msgid "use repository config file"
msgstr ""
-#: builtin/ls-files.c:545
-msgid "show resolve-undo information"
+#: builtin/config.c:128
+msgid "use per-worktree config file"
msgstr ""
-#: builtin/ls-files.c:547
-msgid "skip files matching pattern"
+#: builtin/config.c:129
+msgid "use given config file"
msgstr ""
-#: builtin/ls-files.c:550
-msgid "exclude patterns are read from <file>"
+#: builtin/config.c:130
+msgid "blob-id"
msgstr ""
-#: builtin/ls-files.c:553
-msgid "read additional per-directory exclude patterns in <file>"
+#: builtin/config.c:130
+msgid "read config from given blob object"
msgstr ""
-#: builtin/ls-files.c:555
-msgid "add the standard git exclusions"
+#: builtin/config.c:131
+msgid "Action"
msgstr ""
-#: builtin/ls-files.c:558
-msgid "make the output relative to the project top directory"
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/ls-files.c:561
-msgid "recurse through submodules"
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/ls-files.c:563
-msgid "if any <file> is not in the index, treat this as an error"
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/ls-files.c:564
-msgid "tree-ish"
+#: builtin/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/ls-files.c:565
-msgid "pretend that paths removed since <tree-ish> are still present"
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/ls-files.c:567
-msgid "show debugging data"
+#: builtin/config.c:137
+msgid "add a new variable: name value"
msgstr ""
-#: builtin/ls-remote.c:7
-msgid ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/ls-remote.c:52
-msgid "do not print remote URL"
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
-msgid "exec"
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
-msgid "path of git-upload-pack on the remote host"
+#: builtin/config.c:141
+msgid "remove a section: name"
msgstr ""
-#: builtin/ls-remote.c:58
-msgid "limit to tags"
+#: builtin/config.c:142
+msgid "list all"
msgstr ""
-#: builtin/ls-remote.c:59
-msgid "limit to heads"
+#: builtin/config.c:143
+msgid "open an editor"
msgstr ""
-#: builtin/ls-remote.c:60
-msgid "do not show peeled tags"
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/ls-remote.c:62
-msgid "take url.<base>.insteadOf into account"
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/ls-remote.c:64
-msgid "exit with exit code 2 if no matching refs are found"
+#: builtin/config.c:146
+msgid "Type"
msgstr ""
-#: builtin/ls-remote.c:66
-msgid "show underlying ref in addition to the object pointed by it"
+#: builtin/config.c:147
+msgid "value is given this type"
msgstr ""
-#: builtin/ls-tree.c:29
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/ls-tree.c:127
-msgid "only show trees"
+#: builtin/config.c:149
+msgid "value is decimal number"
msgstr ""
-#: builtin/ls-tree.c:129
-msgid "recurse into subtrees"
+#: builtin/config.c:150
+msgid "value is --bool or --int"
msgstr ""
-#: builtin/ls-tree.c:131
-msgid "show trees when recursing"
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/ls-tree.c:134
-msgid "terminate entries with NUL byte"
+#: builtin/config.c:152
+msgid "value is an expiry date"
msgstr ""
-#: builtin/ls-tree.c:135
-msgid "include object size"
+#: builtin/config.c:153
+msgid "Other"
msgstr ""
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
-msgid "list only filenames"
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/ls-tree.c:142
-msgid "use full path names"
+#: builtin/config.c:155
+msgid "show variable names only"
msgstr ""
-#: builtin/ls-tree.c:144
-msgid "list entire tree; not just current directory (implies --full-name)"
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
msgstr ""
-#: builtin/mailsplit.c:241
-#, c-format
-msgid "empty mbox: '%s'"
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/merge.c:47
-msgid "git merge [<options>] [<commit>...]"
+#: builtin/config.c:158
+msgid "value"
msgstr ""
-#: builtin/merge.c:48
-msgid "git merge --abort"
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/merge.c:49
-msgid "git merge --continue"
+#: builtin/config.c:171
+#, c-format
+msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/merge.c:104
-msgid "switch `m' requires a value"
+#: builtin/config.c:173
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/merge.c:141
+#: builtin/config.c:307
#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+msgid "invalid key pattern: %s"
msgstr ""
-#: builtin/merge.c:142
+#: builtin/config.c:343
#, c-format
-msgid "Available strategies are:"
+msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/merge.c:147
+#: builtin/config.c:400
#, c-format
-msgid "Available custom strategies are:"
+msgid "cannot parse color '%s'"
msgstr ""
-#: builtin/merge.c:197 builtin/pull.c:134
-msgid "do not show a diffstat at the end of the merge"
+#: builtin/config.c:442
+msgid "unable to parse default color value"
msgstr ""
-#: builtin/merge.c:200 builtin/pull.c:137
-msgid "show a diffstat at the end of the merge"
+#: builtin/config.c:495 builtin/config.c:741
+msgid "not in a git directory"
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:140
-msgid "(synonym to --stat)"
+#: builtin/config.c:498
+msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/merge.c:203 builtin/pull.c:143
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+#: builtin/config.c:501
+msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/merge.c:206 builtin/pull.c:146
-msgid "create a single commit instead of doing a merge"
+#: builtin/config.c:586
+#, 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/merge.c:208 builtin/pull.c:149
-msgid "perform a commit if the merge succeeds (default)"
+#: builtin/config.c:610
+msgid "only one config file at a time"
msgstr ""
-#: builtin/merge.c:210 builtin/pull.c:152
-msgid "edit message before committing"
+#: builtin/config.c:615
+msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/merge.c:211
-msgid "allow fast-forward (default)"
+#: builtin/config.c:618
+msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/merge.c:213 builtin/pull.c:158
-msgid "abort if fast-forward is not possible"
+#: builtin/config.c:637
+msgid "$HOME not set"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:161
-msgid "verify that the named commit has a valid GPG signature"
+#: builtin/config.c:657
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
msgstr ""
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
-#: builtin/revert.c:109
-msgid "strategy"
+#: builtin/config.c:687
+msgid "--get-color and variable type are incoherent"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:166
-msgid "merge strategy to use"
+#: builtin/config.c:692
+msgid "only one action at a time"
msgstr ""
-#: builtin/merge.c:220 builtin/pull.c:169
-msgid "option=value"
+#: builtin/config.c:705
+msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/merge.c:221 builtin/pull.c:170
-msgid "option for selected merge strategy"
+#: builtin/config.c:711
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
msgstr ""
-#: builtin/merge.c:223
-msgid "merge commit message (for a non-fast-forward merge)"
+#: builtin/config.c:717
+msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/merge.c:227
-msgid "abort the current in-progress merge"
+#: builtin/config.c:730
+#, c-format
+msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/merge.c:229
-msgid "continue the current in-progress merge"
+#: builtin/config.c:733
+msgid "error processing config file(s)"
msgstr ""
-#: builtin/merge.c:231 builtin/pull.c:177
-msgid "allow merging unrelated histories"
+#: builtin/config.c:743
+msgid "editing stdin is not supported"
msgstr ""
-#: builtin/merge.c:259
-msgid "could not run stash."
+#: builtin/config.c:745
+msgid "editing blobs is not supported"
msgstr ""
-#: builtin/merge.c:264
-msgid "stash failed"
+#: builtin/config.c:759
+#, c-format
+msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/merge.c:269
+#: builtin/config.c:772
#, c-format
-msgid "not a valid object: %s"
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
msgstr ""
-#: builtin/merge.c:288 builtin/merge.c:305
-msgid "read-tree failed"
+#: builtin/config.c:846 builtin/config.c:857
+#, c-format
+msgid "no such section: %s"
msgstr ""
-#: builtin/merge.c:335
-msgid " (nothing to squash)"
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/merge.c:346
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
msgstr ""
-#: builtin/merge.c:396
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
+#: builtin/describe.c:26
+msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/merge.c:447
-#, c-format
-msgid "'%s' does not point to a commit"
+#: builtin/describe.c:27
+msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/merge.c:537
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+#: builtin/describe.c:62
+msgid "head"
msgstr ""
-#: builtin/merge.c:657
-msgid "Not handling anything other than two heads merge."
+#: builtin/describe.c:62
+msgid "lightweight"
msgstr ""
-#: builtin/merge.c:671
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+#: builtin/describe.c:62
+msgid "annotated"
msgstr ""
-#: builtin/merge.c:686
+#: builtin/describe.c:272
#, c-format
-msgid "unable to write %s"
+msgid "annotated tag %s not available"
msgstr ""
-#: builtin/merge.c:738
+#: builtin/describe.c:276
#, c-format
-msgid "Could not read from '%s'"
+msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/merge.c:747
+#: builtin/describe.c:278
#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/merge.c:753
+#: builtin/describe.c:322
#, 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/merge.c:777
-msgid "Empty commit message."
+msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/merge.c:797
+#: builtin/describe.c:324
#, c-format
-msgid "Wonderful.\n"
+msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/merge.c:850
+#: builtin/describe.c:378
#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgid "finished search at %s\n"
msgstr ""
-#: builtin/merge.c:889
-msgid "No current branch."
+#: builtin/describe.c:404
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/merge.c:891
-msgid "No remote for the current branch."
+#: builtin/describe.c:408
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
msgstr ""
-#: builtin/merge.c:893
-msgid "No default upstream defined for the current branch."
+#: builtin/describe.c:438
+#, c-format
+msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/merge.c:898
+#: builtin/describe.c:441
#, c-format
-msgid "No remote-tracking branch for %s from %s"
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
msgstr ""
-#: builtin/merge.c:945
+#: builtin/describe.c:509
#, c-format
-msgid "Bad value '%s' in environment '%s'"
+msgid "describe %s\n"
msgstr ""
-#: builtin/merge.c:1046
+#: builtin/describe.c:512 builtin/log.c:513
#, c-format
-msgid "not something we can merge in %s: %s"
+msgid "Not a valid object name %s"
msgstr ""
-#: builtin/merge.c:1080
-msgid "not something we can merge"
+#: builtin/describe.c:520
+#, c-format
+msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/merge.c:1145
-msgid "--abort expects no arguments"
+#: builtin/describe.c:534
+msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/merge.c:1149
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/describe.c:535
+msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/merge.c:1161
-msgid "--continue expects no arguments"
+#: builtin/describe.c:536
+msgid "use any ref"
msgstr ""
-#: builtin/merge.c:1165
-msgid "There is no merge in progress (MERGE_HEAD missing)."
+#: builtin/describe.c:537
+msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/merge.c:1181
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/describe.c:538
+msgid "always use long format"
msgstr ""
-#: builtin/merge.c:1188
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/describe.c:539
+msgid "only follow first parent"
msgstr ""
-#: builtin/merge.c:1191
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/describe.c:542
+msgid "only output exact matches"
msgstr ""
-#: builtin/merge.c:1200
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/describe.c:544
+msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/merge.c:1208
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/describe.c:546
+msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/merge.c:1225
-msgid "Squash commit into empty head not supported yet"
+#: builtin/describe.c:548
+msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/merge.c:1227
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/describe.c:550 builtin/name-rev.c:424
+msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/merge.c:1232
-#, c-format
-msgid "%s - not something we can merge"
+#: builtin/describe.c:551 builtin/describe.c:554
+msgid "mark"
msgstr ""
-#: builtin/merge.c:1234
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/describe.c:552
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/merge.c:1268
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+#: builtin/describe.c:555
+msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/merge.c:1271
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
+#: builtin/describe.c:573
+msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/merge.c:1274
-#, c-format
-msgid "Commit %s does not have a GPG signature."
+#: builtin/describe.c:602
+msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/merge.c:1277
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+#: builtin/describe.c:652
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/merge.c:1339
-msgid "refusing to merge unrelated histories"
+#: builtin/describe.c:654
+msgid "--broken is incompatible with commit-ishes"
msgstr ""
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/diff.c:83
+#, c-format
+msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/merge.c:1358
+#: builtin/diff.c:234
#, c-format
-msgid "Updating %s..%s\n"
+msgid "invalid option: %s"
+msgstr ""
+
+#: builtin/diff.c:363
+msgid "Not a git repository"
msgstr ""
-#: builtin/merge.c:1399
+#: builtin/diff.c:407
#, c-format
-msgid "Trying really trivial in-index merge...\n"
+msgid "invalid object '%s' given."
msgstr ""
-#: builtin/merge.c:1406
+#: builtin/diff.c:416
#, c-format
-msgid "Nope.\n"
+msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/diff.c:421
+#, c-format
+msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/merge.c:1437
-msgid "Not possible to fast-forward, aborting."
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/difftool.c:260
#, c-format
-msgid "Rewinding the tree to pristine...\n"
+msgid "failed: %d"
msgstr ""
-#: builtin/merge.c:1464
+#: builtin/difftool.c:302
#, c-format
-msgid "Trying merge strategy %s...\n"
+msgid "could not read symlink %s"
msgstr ""
-#: builtin/merge.c:1530
+#: builtin/difftool.c:304
#, c-format
-msgid "No merge strategy handled the merge.\n"
+msgid "could not read symlink file %s"
msgstr ""
-#: builtin/merge.c:1532
+#: builtin/difftool.c:312
#, c-format
-msgid "Merge with strategy %s failed.\n"
+msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/merge.c:1541
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+#: builtin/difftool.c:413
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/merge.c:1553
+#: builtin/difftool.c:633
#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/merge-base.c:30
-msgid "git merge-base [-a | --all] <commit> <commit>..."
+#: builtin/difftool.c:635
+msgid "working tree file has been left."
msgstr ""
-#: builtin/merge-base.c:31
-msgid "git merge-base [-a | --all] --octopus <commit>..."
+#: builtin/difftool.c:646
+#, c-format
+msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/merge-base.c:32
-msgid "git merge-base --independent <commit>..."
+#: builtin/difftool.c:647
+msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/merge-base.c:33
-msgid "git merge-base --is-ancestor <commit> <commit>"
+#: builtin/difftool.c:696
+msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/merge-base.c:34
-msgid "git merge-base --fork-point <ref> [<commit>]"
+#: builtin/difftool.c:698
+msgid "perform a full-directory diff"
msgstr ""
-#: builtin/merge-base.c:218
-msgid "output all common ancestors"
+#: builtin/difftool.c:700
+msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/merge-base.c:220
-msgid "find ancestors for a single n-way merge"
+#: builtin/difftool.c:705
+msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/merge-base.c:222
-msgid "list revs not reachable from others"
+#: builtin/difftool.c:706
+msgid "tool"
msgstr ""
-#: builtin/merge-base.c:224
-msgid "is the first one ancestor of the other?"
+#: builtin/difftool.c:707
+msgid "use the specified diff tool"
msgstr ""
-#: builtin/merge-base.c:226
-msgid "find where <commit> forked from reflog of <ref>"
+#: builtin/difftool.c:709
+msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/merge-file.c:9
+#: builtin/difftool.c:712
msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
msgstr ""
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
+#: builtin/difftool.c:715
+msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
+#: builtin/difftool.c:739
+msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
+#: builtin/difftool.c:746
+msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
+#: builtin/fast-export.c:1006
+msgid "show progress after <n> objects"
msgstr ""
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
+#: builtin/fast-export.c:1008
+msgid "select handling of signed tags"
msgstr ""
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
+#: builtin/fast-export.c:1011
+msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
+#: builtin/fast-export.c:1014
+msgid "Dump marks to this file"
msgstr ""
-#: builtin/merge-recursive.c:45
-#, c-format
-msgid "unknown option %s"
+#: builtin/fast-export.c:1016
+msgid "Import marks from this file"
msgstr ""
-#: builtin/merge-recursive.c:51
-#, c-format
-msgid "could not parse object '%s'"
+#: builtin/fast-export.c:1018
+msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/merge-recursive.c:55
-#, 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/fast-export.c:1020
+msgid "Output full tree for each commit"
+msgstr ""
-#: builtin/merge-recursive.c:63
-msgid "not handling anything other than two heads merge."
+#: builtin/fast-export.c:1022
+msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
-#, c-format
-msgid "could not resolve ref '%s'"
+#: builtin/fast-export.c:1023
+msgid "Skip output of blob data"
msgstr ""
-#: builtin/merge-recursive.c:77
-#, c-format
-msgid "Merging %s with %s\n"
+#: builtin/fast-export.c:1024 builtin/log.c:1588
+msgid "refspec"
msgstr ""
-#: builtin/mktree.c:65
-msgid "git mktree [-z] [--missing] [--batch]"
+#: builtin/fast-export.c:1025
+msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/mktree.c:153
-msgid "input is NUL terminated"
+#: builtin/fast-export.c:1026
+msgid "anonymize output"
msgstr ""
-#: builtin/mktree.c:154 builtin/write-tree.c:25
-msgid "allow missing objects"
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/mktree.c:155
-msgid "allow creation of more than one tree"
+#: builtin/fetch.c:29
+msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/mv.c:17
-msgid "git mv [<options>] <source>... <destination>"
+#: builtin/fetch.c:30
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/mv.c:83
-#, c-format
-msgid "Directory %s is in index and no submodule?"
+#: builtin/fetch.c:31
+msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/mv.c:85 builtin/rm.c:290
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
+#: builtin/fetch.c:115 builtin/pull.c:194
+msgid "fetch from all remotes"
msgstr ""
-#: builtin/mv.c:103
-#, c-format
-msgid "%.*s is in index"
+#: builtin/fetch.c:117 builtin/pull.c:197
+msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/mv.c:125
-msgid "force move/rename even if target exists"
+#: builtin/fetch.c:119 builtin/pull.c:200
+msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/mv.c:126
-msgid "skip move/rename errors"
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
msgstr ""
-#: builtin/mv.c:168
-#, c-format
-msgid "destination '%s' is not a directory"
+#: builtin/fetch.c:122
+msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/mv.c:179
-#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+#: builtin/fetch.c:124 builtin/pull.c:204
+msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/mv.c:183
-msgid "bad source"
+#: builtin/fetch.c:126
+msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/mv.c:186
-msgid "can not move directory into itself"
+#: builtin/fetch.c:128
+msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/mv.c:189
-msgid "cannot move directory over file"
+#: builtin/fetch.c:130 builtin/pull.c:207
+msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/mv.c:198
-msgid "source directory is empty"
+#: builtin/fetch.c:132
+msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/mv.c:223
-msgid "not under version control"
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+msgid "on-demand"
msgstr ""
-#: builtin/mv.c:226
-msgid "destination exists"
+#: builtin/fetch.c:134
+msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/mv.c:234
-#, c-format
-msgid "overwriting '%s'"
+#: builtin/fetch.c:138 builtin/pull.c:215
+msgid "keep downloaded pack"
msgstr ""
-#: builtin/mv.c:237
-msgid "Cannot overwrite"
+#: builtin/fetch.c:140
+msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/mv.c:240
-msgid "multiple sources for the same target"
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/mv.c:242
-msgid "destination directory does not exist"
+#: builtin/fetch.c:145
+msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/mv.c:249
-#, c-format
-msgid "%s, source=%s, destination=%s"
+#: builtin/fetch.c:151 builtin/pull.c:221
+msgid "convert to a complete repository"
msgstr ""
-#: builtin/mv.c:270
-#, c-format
-msgid "Renaming %s to %s\n"
+#: builtin/fetch.c:154
+msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
-#, c-format
-msgid "renaming '%s' failed"
+#: builtin/fetch.c:157
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
msgstr ""
-#: builtin/name-rev.c:338
-msgid "git name-rev [<options>] <commit>..."
+#: builtin/fetch.c:161 builtin/pull.c:224
+msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/name-rev.c:339
-msgid "git name-rev [<options>] --all"
+#: builtin/fetch.c:162 builtin/pull.c:226
+msgid "refmap"
msgstr ""
-#: builtin/name-rev.c:340
-msgid "git name-rev [<options>] --stdin"
+#: builtin/fetch.c:163 builtin/pull.c:227
+msgid "specify fetch refmap"
msgstr ""
-#: builtin/name-rev.c:395
-msgid "print only names (no SHA-1)"
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:172
+msgid "server-specific"
msgstr ""
-#: builtin/name-rev.c:396
-msgid "only use tags to name the commits"
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:173
+msgid "option to transmit"
msgstr ""
-#: builtin/name-rev.c:398
-msgid "only use refs matching <pattern>"
+#: builtin/fetch.c:170
+msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/name-rev.c:400
-msgid "ignore refs matching <pattern>"
+#: builtin/fetch.c:470
+msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/name-rev.c:402
-msgid "list all commits reachable from all refs"
+#: builtin/fetch.c:609
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/name-rev.c:403
-msgid "read from stdin"
+#: builtin/fetch.c:702
+#, c-format
+msgid "object %s not found"
msgstr ""
-#: builtin/name-rev.c:404
-msgid "allow to print `undefined` names (default)"
+#: builtin/fetch.c:706
+msgid "[up to date]"
msgstr ""
-#: builtin/name-rev.c:410
-msgid "dereference tags in the input (internal use)"
+#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+msgid "[rejected]"
msgstr ""
-#: builtin/notes.c:26
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+#: builtin/fetch.c:720
+msgid "can't fetch in current branch"
msgstr ""
-#: builtin/notes.c:27
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+#: builtin/fetch.c:730
+msgid "[tag update]"
msgstr ""
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
+#: builtin/fetch.c:802
+msgid "unable to update local ref"
msgstr ""
-#: builtin/notes.c:29
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+#: builtin/fetch.c:735
+msgid "would clobber existing tag"
msgstr ""
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+#: builtin/fetch.c:757
+msgid "[new tag]"
msgstr ""
-#: builtin/notes.c:31
-msgid "git notes [--ref <notes-ref>] show [<object>]"
+#: builtin/fetch.c:760
+msgid "[new branch]"
msgstr ""
-#: builtin/notes.c:32
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+#: builtin/fetch.c:763
+msgid "[new ref]"
msgstr ""
-#: builtin/notes.c:33
-msgid "git notes merge --commit [-v | -q]"
+#: builtin/fetch.c:802
+msgid "forced update"
msgstr ""
-#: builtin/notes.c:34
-msgid "git notes merge --abort [-v | -q]"
+#: builtin/fetch.c:807
+msgid "non-fast-forward"
msgstr ""
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+#: builtin/fetch.c:853
+#, c-format
+msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+#: builtin/fetch.c:874
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/notes.c:37
-msgid "git notes [--ref <notes-ref>] get-ref"
+#: builtin/fetch.c:963 builtin/fetch.c:1085
+#, c-format
+msgid "From %.*s\n"
msgstr ""
-#: builtin/notes.c:42
-msgid "git notes [list [<object>]]"
+#: builtin/fetch.c:974
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/notes.c:47
-msgid "git notes add [<options>] [<object>]"
+#: builtin/fetch.c:1055
+#, c-format
+msgid " (%s will become dangling)"
msgstr ""
-#: builtin/notes.c:52
-msgid "git notes copy [<options>] <from-object> <to-object>"
+#: builtin/fetch.c:1056
+#, c-format
+msgid " (%s has become dangling)"
msgstr ""
-#: builtin/notes.c:53
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
+#: builtin/fetch.c:1088
+msgid "[deleted]"
msgstr ""
-#: builtin/notes.c:58
-msgid "git notes append [<options>] [<object>]"
+#: builtin/fetch.c:1089 builtin/remote.c:1036
+msgid "(none)"
msgstr ""
-#: builtin/notes.c:63
-msgid "git notes edit [<object>]"
+#: builtin/fetch.c:1112
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/notes.c:68
-msgid "git notes show [<object>]"
+#: builtin/fetch.c:1131
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/notes.c:73
-msgid "git notes merge [<options>] <notes-ref>"
+#: builtin/fetch.c:1134
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/notes.c:74
-msgid "git notes merge --commit [<options>]"
+#: builtin/fetch.c:1433
+#, c-format
+msgid "Fetching %s\n"
msgstr ""
-#: builtin/notes.c:75
-msgid "git notes merge --abort [<options>]"
+#: builtin/fetch.c:1435 builtin/remote.c:100
+#, c-format
+msgid "Could not fetch %s"
msgstr ""
-#: builtin/notes.c:80
-msgid "git notes remove [<object>]"
+#: builtin/fetch.c:1481 builtin/fetch.c:1649
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
msgstr ""
-#: builtin/notes.c:85
-msgid "git notes prune [<options>]"
+#: builtin/fetch.c:1504
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/notes.c:90
-msgid "git notes get-ref"
+#: builtin/fetch.c:1541
+msgid "You need to specify a tag name."
msgstr ""
-#: builtin/notes.c:95
-msgid "Write/edit the notes for the following object:"
+#: builtin/fetch.c:1590
+msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/notes.c:148
-#, c-format
-msgid "unable to start 'show' for object '%s'"
+#: builtin/fetch.c:1592
+msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/notes.c:152
-msgid "could not read 'show' output"
+#: builtin/fetch.c:1597
+msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/notes.c:160
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
+#: builtin/fetch.c:1599
+msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/notes.c:195
-msgid "please supply the note contents using either -m or -F option"
+#: builtin/fetch.c:1615
+msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/notes.c:204
-msgid "unable to write note object"
+#: builtin/fetch.c:1617
+msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/notes.c:206
+#: builtin/fetch.c:1626
#, c-format
-msgid "the note contents have been left in %s"
+msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:517
-#, c-format
-msgid "cannot read '%s'"
+#: builtin/fetch.c:1633
+msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/notes.c:236 builtin/tag.c:520
-#, c-format
-msgid "could not open or read '%s'"
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
-#, c-format
-msgid "failed to resolve '%s' as a valid ref."
+#: builtin/fmt-merge-msg.c:672
+msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/notes.c:258
-#, c-format
-msgid "failed to read object '%s'."
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/notes.c:262
-#, c-format
-msgid "cannot read note data from non-blob object '%s'."
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
msgstr ""
-#: builtin/notes.c:302
-#, c-format
-msgid "malformed input line: '%s'."
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
msgstr ""
-#: builtin/notes.c:317
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
msgstr ""
-#. TRANSLATORS: the first %s will be replaced by a git
-#. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:348
-#, c-format
-msgid "refusing to %s notes in %s (outside of refs/notes/)"
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
msgstr ""
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
-msgid "too many parameters"
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
msgstr ""
-#: builtin/notes.c:381 builtin/notes.c:667
-#, c-format
-msgid "no note found for object %s."
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgstr ""
-#: builtin/notes.c:402 builtin/notes.c:565
-msgid "note contents as a string"
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
-#: builtin/notes.c:405 builtin/notes.c:568
-msgid "note contents in a file"
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/notes.c:408 builtin/notes.c:571
-msgid "reuse and edit specified note object"
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/notes.c:411 builtin/notes.c:574
-msgid "reuse specified note object"
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/notes.c:414 builtin/notes.c:577
-msgid "allow storing empty note"
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:486
-msgid "replace existing notes"
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
msgstr ""
-#: builtin/notes.c:440
-#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/for-each-ref.c:39 builtin/tag.c:424
+msgid "respect format colors"
msgstr ""
-#: builtin/notes.c:455 builtin/notes.c:534
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
+#: builtin/for-each-ref.c:43
+msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
-#, c-format
-msgid "Removing note for object %s\n"
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are merged"
msgstr ""
-#: builtin/notes.c:487
-msgid "read objects from stdin"
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are not merged"
msgstr ""
-#: builtin/notes.c:489
-msgid "load rewriting config for <command> (implies --stdin)"
+#: builtin/for-each-ref.c:47
+msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/notes.c:507
-msgid "too few parameters"
+#: builtin/for-each-ref.c:48
+msgid "print only refs which don't contain the commit"
msgstr ""
-#: builtin/notes.c:528
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/fsck.c:598
+msgid "Checking object directories"
msgstr ""
-#: builtin/notes.c:540
-#, c-format
-msgid "missing notes on source object %s. Cannot copy."
+#: builtin/fsck.c:693
+msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/notes.c:592
-#, 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"
+#: builtin/fsck.c:699
+msgid "show unreachable objects"
msgstr ""
-#: builtin/notes.c:687
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+#: builtin/fsck.c:700
+msgid "show dangling objects"
msgstr ""
-#: builtin/notes.c:689
-msgid "failed to delete ref NOTES_MERGE_REF"
+#: builtin/fsck.c:701
+msgid "report tags"
msgstr ""
-#: builtin/notes.c:691
-msgid "failed to remove 'git notes merge' worktree"
+#: builtin/fsck.c:702
+msgid "report root nodes"
msgstr ""
-#: builtin/notes.c:711
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
+#: builtin/fsck.c:703
+msgid "make index objects head nodes"
msgstr ""
-#: builtin/notes.c:713
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
+#: builtin/fsck.c:704
+msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/notes.c:715
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+#: builtin/fsck.c:705
+msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/notes.c:728
-msgid "failed to resolve NOTES_MERGE_REF"
+#: builtin/fsck.c:706
+msgid "check only connectivity"
msgstr ""
-#: builtin/notes.c:731
-msgid "failed to finalize notes merge"
+#: builtin/fsck.c:707
+msgid "enable more strict checking"
msgstr ""
-#: builtin/notes.c:757
-#, c-format
-msgid "unknown notes merge strategy %s"
+#: builtin/fsck.c:709
+msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/notes.c:773
-msgid "General options"
+#: builtin/fsck.c:710 builtin/prune.c:110
+msgid "show progress"
msgstr ""
-#: builtin/notes.c:775
-msgid "Merge options"
+#: builtin/fsck.c:711
+msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/notes.c:777
-msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+#: builtin/fsck.c:776
+msgid "Checking objects"
msgstr ""
-#: builtin/notes.c:779
-msgid "Committing unmerged notes"
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
msgstr ""
-#: builtin/notes.c:781
-msgid "finalize notes merge by committing unmerged notes"
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/notes.c:783
-msgid "Aborting notes merge resolution"
+#: builtin/gc.c:461 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
msgstr ""
-#: builtin/notes.c:785
-msgid "abort notes merge"
+#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#, c-format
+msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:796
-msgid "cannot mix --commit, --abort or -s/--strategy"
+#: builtin/gc.c:477
+#, 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"
msgstr ""
-#: builtin/notes.c:801
-msgid "must specify a notes ref to merge"
+#: builtin/gc.c:519
+msgid "prune unreferenced objects"
msgstr ""
-#: builtin/notes.c:825
-#, c-format
-msgid "unknown -s/--strategy: %s"
+#: builtin/gc.c:521
+msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/notes.c:862
-#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
+#: builtin/gc.c:522
+msgid "enable auto-gc mode"
msgstr ""
-#: builtin/notes.c:865
-#, c-format
-msgid "failed to store link to current notes ref (%s)"
+#: builtin/gc.c:525
+msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/notes.c:867
-#, c-format
-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"
+#: builtin/gc.c:528
+msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/notes.c:889
+#: builtin/gc.c:545
#, c-format
-msgid "Object %s has no note\n"
-msgstr ""
-
-#: builtin/notes.c:901
-msgid "attempt to remove non-existent note is not an error"
+msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/notes.c:904
-msgid "read object names from the standard input"
-msgstr ""
-
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
-msgid "do not remove, show only"
-msgstr ""
-
-#: builtin/notes.c:943
-msgid "report pruned notes"
+#: builtin/gc.c:556
+#, c-format
+msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/notes.c:985
-msgid "notes-ref"
+#: builtin/gc.c:576
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/notes.c:986
-msgid "use notes from <notes-ref>"
+#: builtin/gc.c:578
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/notes.c:1021
+#: builtin/gc.c:579
#, c-format
-msgid "unknown subcommand: %s"
+msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/pack-objects.c:30
+#: builtin/gc.c:619
+#, c-format
msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/pack-objects.c:31
+#: builtin/gc.c:670
msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
-#, c-format
-msgid "deflate error (%d)"
+#: builtin/grep.c:28
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/pack-objects.c:776
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+#: builtin/grep.c:224
+#, c-format
+msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/pack-objects.c:789
-msgid "Writing objects"
+#: builtin/grep.c:278
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/pack-objects.c:1069
-msgid "disabling bitmap writing, as some objects are not being packed"
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
+#: builtin/pack-objects.c:2719
+#, c-format
+msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/pack-objects.c:2434
-msgid "Compressing objects"
+#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#, c-format
+msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/pack-objects.c:2843
+#: builtin/grep.c:635
#, c-format
-msgid "unsupported index version %s"
+msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/pack-objects.c:2847
+#: builtin/grep.c:701
#, c-format
-msgid "bad index version '%s'"
+msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/pack-objects.c:2877
-msgid "do not show progress meter"
+#: builtin/grep.c:800
+msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/pack-objects.c:2879
-msgid "show progress meter"
+#: builtin/grep.c:802
+msgid "find in contents not managed by git"
msgstr ""
-#: builtin/pack-objects.c:2881
-msgid "show progress meter during object writing phase"
+#: builtin/grep.c:804
+msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/pack-objects.c:2884
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/grep.c:806
+msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/pack-objects.c:2885
-msgid "version[,offset]"
+#: builtin/grep.c:808
+msgid "recursively search in each submodule"
msgstr ""
-#: builtin/pack-objects.c:2886
-msgid "write the pack index file in the specified idx format version"
+#: builtin/grep.c:811
+msgid "show non-matching lines"
msgstr ""
-#: builtin/pack-objects.c:2889
-msgid "maximum size of each output pack file"
+#: builtin/grep.c:813
+msgid "case insensitive matching"
msgstr ""
-#: builtin/pack-objects.c:2891
-msgid "ignore borrowed objects from alternate object store"
+#: builtin/grep.c:815
+msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/pack-objects.c:2893
-msgid "ignore packed objects"
+#: builtin/grep.c:817
+msgid "process binary files as text"
msgstr ""
-#: builtin/pack-objects.c:2895
-msgid "limit pack window by objects"
+#: builtin/grep.c:819
+msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/pack-objects.c:2897
-msgid "limit pack window by memory in addition to object limit"
+#: builtin/grep.c:822
+msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/pack-objects.c:2899
-msgid "maximum length of delta chain allowed in the resulting pack"
+#: builtin/grep.c:824
+msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/pack-objects.c:2901
-msgid "reuse existing deltas"
+#: builtin/grep.c:826
+msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/pack-objects.c:2903
-msgid "reuse existing objects"
+#: builtin/grep.c:830
+msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/pack-objects.c:2905
-msgid "use OFS_DELTA objects"
+#: builtin/grep.c:833
+msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/pack-objects.c:2907
-msgid "use threads when searching for best delta matches"
+#: builtin/grep.c:836
+msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/pack-objects.c:2909
-msgid "do not create an empty pack output"
+#: builtin/grep.c:839
+msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/pack-objects.c:2911
-msgid "read revision arguments from standard input"
+#: builtin/grep.c:842
+msgid "show line numbers"
msgstr ""
-#: builtin/pack-objects.c:2913
-msgid "limit the objects to those that are not yet packed"
+#: builtin/grep.c:843
+msgid "show column number of first match"
msgstr ""
-#: builtin/pack-objects.c:2916
-msgid "include objects reachable from any reference"
+#: builtin/grep.c:844
+msgid "don't show filenames"
msgstr ""
-#: builtin/pack-objects.c:2919
-msgid "include objects referred by reflog entries"
+#: builtin/grep.c:845
+msgid "show filenames"
msgstr ""
-#: builtin/pack-objects.c:2922
-msgid "include objects referred to by the index"
+#: builtin/grep.c:847
+msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/pack-objects.c:2925
-msgid "output pack to stdout"
+#: builtin/grep.c:849
+msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/pack-objects.c:2927
-msgid "include tag objects that refer to objects to be packed"
+#: builtin/grep.c:851
+msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/pack-objects.c:2929
-msgid "keep unreachable objects"
+#: builtin/grep.c:854
+msgid "show only the names of files without match"
msgstr ""
-#: builtin/pack-objects.c:2931
-msgid "pack loose unreachable objects"
+#: builtin/grep.c:856
+msgid "print NUL after filenames"
msgstr ""
-#: builtin/pack-objects.c:2933
-msgid "unpack unreachable objects newer than <time>"
+#: builtin/grep.c:859
+msgid "show only matching parts of a line"
msgstr ""
-#: builtin/pack-objects.c:2936
-msgid "create thin packs"
+#: builtin/grep.c:861
+msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/pack-objects.c:2938
-msgid "create packs suitable for shallow fetches"
+#: builtin/grep.c:862
+msgid "highlight matches"
msgstr ""
-#: builtin/pack-objects.c:2940
-msgid "ignore packs that have companion .keep file"
+#: builtin/grep.c:864
+msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/pack-objects.c:2942
-msgid "pack compression level"
+#: builtin/grep.c:866
+msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/pack-objects.c:2944
-msgid "do not hide commits by grafts"
+#: builtin/grep.c:869
+msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/pack-objects.c:2946
-msgid "use a bitmap index if available to speed up counting objects"
+#: builtin/grep.c:872
+msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/pack-objects.c:2948
-msgid "write a bitmap index together with the pack index"
+#: builtin/grep.c:874
+msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/pack-objects.c:3075
-msgid "Counting objects"
+#: builtin/grep.c:876
+msgid "use <n> worker threads"
msgstr ""
-#: builtin/pack-refs.c:6
-msgid "git pack-refs [<options>]"
+#: builtin/grep.c:877
+msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/pack-refs.c:14
-msgid "pack everything"
+#: builtin/grep.c:880
+msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/pack-refs.c:15
-msgid "prune loose refs (default)"
+#: builtin/grep.c:882
+msgid "show the surrounding function"
msgstr ""
-#: builtin/prune-packed.c:7
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#: builtin/grep.c:885
+msgid "read patterns from file"
msgstr ""
-#: builtin/prune-packed.c:40
-msgid "Removing duplicate objects"
+#: builtin/grep.c:887
+msgid "match <pattern>"
msgstr ""
-#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+#: builtin/grep.c:889
+msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/prune.c:106
-msgid "report pruned objects"
+#: builtin/grep.c:901
+msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/prune.c:109
-msgid "expire objects older than <time>"
+#: builtin/grep.c:903
+msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/prune.c:123
-msgid "cannot prune in a precious-objects repo"
+#: builtin/grep.c:905
+msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/pull.c:54 builtin/pull.c:56
-#, c-format
-msgid "Invalid value for %s: %s"
+#: builtin/grep.c:909
+msgid "pager"
msgstr ""
-#: builtin/pull.c:76
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
+#: builtin/grep.c:909
+msgid "show matching files in the pager"
msgstr ""
-#: builtin/pull.c:124
-msgid "control for recursive fetching of submodules"
+#: builtin/grep.c:913
+msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/pull.c:128
-msgid "Options related to merging"
+#: builtin/grep.c:977
+msgid "no pattern given"
msgstr ""
-#: builtin/pull.c:131
-msgid "incorporate changes by rebasing rather than merging"
+#: builtin/grep.c:1013
+msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
-msgid "allow fast-forward"
+#: builtin/grep.c:1020
+#, c-format
+msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/pull.c:164
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/grep.c:1051
+msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/pull.c:180
-msgid "Options related to fetching"
+#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/pull.c:198
-msgid "number of submodules pulled in parallel"
+#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#, c-format
+msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/pull.c:287
-#, c-format
-msgid "Invalid value for pull.ff: %s"
+#: builtin/grep.c:1080
+msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/pull.c:399
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
+#: builtin/grep.c:1103
+msgid "option not supported with --recurse-submodules"
msgstr ""
-#: builtin/pull.c:401
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
+#: builtin/grep.c:1109
+msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/pull.c:402
-msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
+#: builtin/grep.c:1115
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/pull.c:405
-#, 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/grep.c:1123
+msgid "both --cached and trees are given"
msgstr ""
-#: builtin/pull.c:410 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
+#: builtin/hash-object.c:84
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
-msgid "Please specify which branch you want to rebase against."
+#: builtin/hash-object.c:85
+msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
-msgid "Please specify which branch you want to merge with."
+#: builtin/hash-object.c:97
+msgid "type"
msgstr ""
-#: builtin/pull.c:415 builtin/pull.c:430
-msgid "See git-pull(1) for details."
+#: builtin/hash-object.c:97
+msgid "object type"
msgstr ""
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
-#: git-parse-remote.sh:64
-msgid "<remote>"
+#: builtin/hash-object.c:98
+msgid "write the object into the object database"
msgstr ""
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
-#: git-parse-remote.sh:65
-msgid "<branch>"
+#: builtin/hash-object.c:100
+msgid "read the object from stdin"
msgstr ""
-#: builtin/pull.c:425 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
+#: builtin/hash-object.c:102
+msgid "store file as is without filters"
msgstr ""
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/hash-object.c:103
msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
+"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/pull.c:439
-#, c-format
-msgid ""
-"Your configuration specifies to merge with the ref '%s'\n"
-"from the remote, but no such ref was fetched."
+#: builtin/hash-object.c:104
+msgid "process file as it were from this path"
msgstr ""
-#: builtin/pull.c:792
-msgid "ignoring --verify-signatures for rebase"
+#: builtin/help.c:46
+msgid "print all available commands"
msgstr ""
-#: builtin/pull.c:840
-msgid "--[no-]autostash option is only valid with --rebase."
+#: builtin/help.c:47
+msgid "exclude guides"
msgstr ""
-#: builtin/pull.c:848
-msgid "Updating an unborn branch with changes added to the index."
+#: builtin/help.c:48
+msgid "print list of useful guides"
msgstr ""
-#: builtin/pull.c:851
-msgid "pull with rebase"
+#: builtin/help.c:49
+msgid "print all configuration variable names"
msgstr ""
-#: builtin/pull.c:852
-msgid "please commit or stash them."
+#: builtin/help.c:51
+msgid "show man page"
msgstr ""
-#: builtin/pull.c:877
-#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
+#: builtin/help.c:52
+msgid "show manual in web browser"
msgstr ""
-#: builtin/pull.c:882
-#, 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/help.c:54
+msgid "show info page"
msgstr ""
-#: builtin/pull.c:897
-msgid "Cannot merge multiple branches into empty head."
+#: builtin/help.c:56
+msgid "print command description"
msgstr ""
-#: builtin/pull.c:901
-msgid "Cannot rebase onto multiple branches."
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/pull.c:908
-msgid "cannot rebase with locally recorded submodule modifications"
+#: builtin/help.c:73
+#, c-format
+msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/push.c:17
-msgid "git push [<options>] [<repository> [<refspec>...]]"
+#: builtin/help.c:100
+msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/push.c:90
-msgid "tag shorthand without <tag>"
+#: builtin/help.c:113
+msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/push.c:100
-msgid "--delete only accepts plain target ref names"
+#: builtin/help.c:121
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/push.c:144
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+#: 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/push.c:147
+#: builtin/help.c:217
#, c-format
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"
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/push.c:162
+#: builtin/help.c:229
#, c-format
msgid ""
-"You are not currently on a branch.\n"
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+
+#: builtin/help.c:346
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr ""
+
+#: builtin/help.c:363
+msgid "no man viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:371
+msgid "no info viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr ""
+
+#: builtin/help.c:444
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr ""
+
+#: builtin/help.c:473 builtin/help.c:503
+#, c-format
+msgid "usage: %s%s"
+msgstr ""
+
+#: builtin/help.c:487
+msgid "'git help config' for more information"
+msgstr ""
+
+#: builtin/index-pack.c:184
+#, c-format
+msgid "object type mismatch at %s"
+msgstr ""
+
+#: builtin/index-pack.c:204
+#, c-format
+msgid "did not receive expected object %s"
+msgstr ""
+
+#: builtin/index-pack.c:207
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr ""
+
+#: builtin/index-pack.c:249
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:259
+msgid "early EOF"
+msgstr ""
+
+#: builtin/index-pack.c:260
+msgid "read error on input"
+msgstr ""
+
+#: builtin/index-pack.c:272
+msgid "used more bytes than were available"
+msgstr ""
+
+#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+msgid "pack too large for current definition of off_t"
+msgstr ""
+
+#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
+msgstr ""
+
+#: builtin/index-pack.c:297
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:303
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:317
+msgid "pack signature mismatch"
+msgstr ""
+
+#: builtin/index-pack.c:319
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr ""
+
+#: builtin/index-pack.c:337
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr ""
+
+#: builtin/index-pack.c:457
+#, c-format
+msgid "inflate returned %d"
+msgstr ""
+
+#: builtin/index-pack.c:506
+msgid "offset value overflow for delta base object"
+msgstr ""
+
+#: builtin/index-pack.c:514
+msgid "delta base offset is out of bound"
+msgstr ""
+
+#: builtin/index-pack.c:522
+#, c-format
+msgid "unknown object type %d"
+msgstr ""
+
+#: builtin/index-pack.c:553
+msgid "cannot pread pack file"
+msgstr ""
+
+#: 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/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
+#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr ""
+
+#: builtin/index-pack.c:729 builtin/pack-objects.c:151
+#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#, c-format
+msgid "unable to read %s"
+msgstr ""
+
+#: builtin/index-pack.c:792
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr ""
+
+#: builtin/index-pack.c:800
+#, c-format
+msgid "cannot read existing object %s"
+msgstr ""
+
+#: builtin/index-pack.c:814
+#, c-format
+msgid "invalid blob object %s"
+msgstr ""
+
+#: builtin/index-pack.c:817 builtin/index-pack.c:836
+msgid "fsck error in packed object"
+msgstr ""
+
+#: builtin/index-pack.c:833
+#, c-format
+msgid "invalid %s"
+msgstr ""
+
+#: builtin/index-pack.c:838
+#, c-format
+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/index-pack.c:1163
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr ""
+
+#: builtin/index-pack.c:1186
+msgid "Resolving deltas"
+msgstr ""
+
+#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#, c-format
+msgid "unable to create thread: %s"
+msgstr ""
+
+#: builtin/index-pack.c:1237
+msgid "confusion beyond insanity"
+msgstr ""
+
+#: builtin/index-pack.c:1243
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1255
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr ""
+
+#: builtin/index-pack.c:1259
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1283
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr ""
+
+#: builtin/index-pack.c:1360
+#, c-format
+msgid "local object %s is corrupt"
+msgstr ""
+
+#: builtin/index-pack.c:1374
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr ""
+
+#: builtin/index-pack.c:1399
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1407
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1431
+msgid "error while closing pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1445
+msgid "cannot store pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1453
+msgid "cannot store index file"
+msgstr ""
+
+#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr ""
+
+#: builtin/index-pack.c:1565
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1567
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1615
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1622
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1659
+msgid "Cannot come back to cwd"
+msgstr ""
+
+#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
+#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#, c-format
+msgid "bad %s"
+msgstr ""
+
+#: builtin/index-pack.c:1747
+msgid "--fix-thin cannot be used without --stdin"
+msgstr ""
+
+#: builtin/index-pack.c:1749
+msgid "--stdin requires a git repository"
+msgstr ""
+
+#: builtin/index-pack.c:1755
+msgid "--verify with no packfile name given"
+msgstr ""
+
+#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
+msgstr ""
+
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr ""
+
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr ""
+
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr ""
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr ""
+
+#: builtin/init-db.c:86
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr ""
+
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
+msgstr ""
+
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
+msgstr ""
+
+#: builtin/init-db.c:136
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr ""
+
+#: builtin/init-db.c:329
+#, c-format
+msgid "unable to handle file type %d"
+msgstr ""
+
+#: builtin/init-db.c:332
+#, c-format
+msgid "unable to move %s to %s"
+msgstr ""
+
+#: builtin/init-db.c:349 builtin/init-db.c:352
+#, c-format
+msgid "%s already exists"
+msgstr ""
+
+#: builtin/init-db.c:405
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:406
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:410
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:411
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:460
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+
+#: builtin/init-db.c:483
+msgid "permissions"
+msgstr ""
+
+#: builtin/init-db.c:484
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+
+#: builtin/init-db.c:518 builtin/init-db.c:523
+#, c-format
+msgid "cannot mkdir %s"
+msgstr ""
+
+#: builtin/init-db.c:527
+#, c-format
+msgid "cannot chdir to %s"
+msgstr ""
+
+#: builtin/init-db.c:548
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+
+#: builtin/init-db.c:576
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr ""
+
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+
+#: builtin/interpret-trailers.c:94
+msgid "edit files in place"
+msgstr ""
+
+#: builtin/interpret-trailers.c:95
+msgid "trim empty trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:98
+msgid "where to place the new trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer already exists"
+msgstr ""
+
+#: builtin/interpret-trailers.c:102
+msgid "action if trailer is missing"
+msgstr ""
+
+#: builtin/interpret-trailers.c:104
+msgid "output only the trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+msgid "do not apply config rules"
+msgstr ""
+
+#: builtin/interpret-trailers.c:106
+msgid "join whitespace-continued values"
+msgstr ""
+
+#: builtin/interpret-trailers.c:107
+msgid "set parsing options"
+msgstr ""
+
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
+msgstr ""
+
+#: builtin/interpret-trailers.c:110
+msgid "trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:111
+msgid "trailer(s) to add"
+msgstr ""
+
+#: builtin/interpret-trailers.c:120
+msgid "--trailer with --only-input does not make sense"
+msgstr ""
+
+#: builtin/interpret-trailers.c:130
+msgid "no input file given for in-place editing"
+msgstr ""
+
+#: builtin/log.c:54
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/log.c:55
+msgid "git show [<options>] <object>..."
+msgstr ""
+
+#: builtin/log.c:99
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr ""
+
+#: builtin/log.c:162
+msgid "suppress diff output"
+msgstr ""
+
+#: builtin/log.c:163
+msgid "show source"
+msgstr ""
+
+#: builtin/log.c:164
+msgid "Use mail map file"
+msgstr ""
+
+#: builtin/log.c:166
+msgid "only decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:168
+msgid "do not decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:169
+msgid "decorate options"
+msgstr ""
+
+#: builtin/log.c:172
+msgid "Process line range n,m in file, counting from 1"
+msgstr ""
+
+#: builtin/log.c:270
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+#: builtin/log.c:522
+#, c-format
+msgid "git show %s: bad file"
+msgstr ""
+
+#: builtin/log.c:537 builtin/log.c:631
+#, c-format
+msgid "Could not read object %s"
+msgstr ""
+
+#: builtin/log.c:655
+#, c-format
+msgid "Unknown type: %d"
+msgstr ""
+
+#: builtin/log.c:776
+msgid "format.headers without value"
+msgstr ""
+
+#: builtin/log.c:877
+msgid "name of output directory is too long"
+msgstr ""
+
+#: builtin/log.c:893
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr ""
+
+#: builtin/log.c:910
+msgid "Need exactly one range."
+msgstr ""
+
+#: builtin/log.c:920
+msgid "Not a range."
+msgstr ""
+
+#: builtin/log.c:1043
+msgid "Cover letter needs email format"
+msgstr ""
+
+#: builtin/log.c:1119
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr ""
+
+#: builtin/log.c:1146
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr ""
+
+#: builtin/log.c:1204
+msgid "Two output directories?"
+msgstr ""
+
+#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#, c-format
+msgid "Unknown commit %s"
+msgstr ""
+
+#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/log.c:1326
+msgid "Could not find exact merge base."
+msgstr ""
+
+#: builtin/log.c:1330
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+
+#: builtin/log.c:1350
+msgid "Failed to find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1361
+msgid "base commit should be the ancestor of revision list"
+msgstr ""
+
+#: builtin/log.c:1365
+msgid "base commit shouldn't be in revision list"
+msgstr ""
+
+#: builtin/log.c:1418
+msgid "cannot get patch id"
+msgstr ""
+
+#: builtin/log.c:1470
+msgid "failed to infer range-diff ranges"
+msgstr ""
+
+#: builtin/log.c:1515
+msgid "use [PATCH n/m] even with a single patch"
+msgstr ""
+
+#: builtin/log.c:1518
+msgid "use [PATCH] even with multiple patches"
+msgstr ""
+
+#: builtin/log.c:1522
+msgid "print patches to standard out"
+msgstr ""
+
+#: builtin/log.c:1524
+msgid "generate a cover letter"
+msgstr ""
+
+#: builtin/log.c:1526
+msgid "use simple number sequence for output file names"
+msgstr ""
+
+#: builtin/log.c:1527
+msgid "sfx"
+msgstr ""
+
+#: builtin/log.c:1528
+msgid "use <sfx> instead of '.patch'"
+msgstr ""
+
+#: builtin/log.c:1530
+msgid "start numbering patches at <n> instead of 1"
+msgstr ""
+
+#: builtin/log.c:1532
+msgid "mark the series as Nth re-roll"
+msgstr ""
+
+#: builtin/log.c:1534
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1537
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1540
+msgid "store resulting files in <dir>"
+msgstr ""
+
+#: builtin/log.c:1543
+msgid "don't strip/add [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1546
+msgid "don't output binary diffs"
+msgstr ""
+
+#: builtin/log.c:1548
+msgid "output all-zero hash in From header"
+msgstr ""
+
+#: builtin/log.c:1550
+msgid "don't include a patch matching a commit upstream"
+msgstr ""
+
+#: builtin/log.c:1552
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+
+#: builtin/log.c:1554
+msgid "Messaging"
+msgstr ""
+
+#: builtin/log.c:1555
+msgid "header"
+msgstr ""
+
+#: builtin/log.c:1556
+msgid "add email header"
+msgstr ""
+
+#: builtin/log.c:1557 builtin/log.c:1559
+msgid "email"
+msgstr ""
+
+#: builtin/log.c:1557
+msgid "add To: header"
+msgstr ""
+
+#: builtin/log.c:1559
+msgid "add Cc: header"
+msgstr ""
+
+#: builtin/log.c:1561
+msgid "ident"
+msgstr ""
+
+#: builtin/log.c:1562
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+
+#: builtin/log.c:1564
+msgid "message-id"
+msgstr ""
+
+#: builtin/log.c:1565
+msgid "make first mail a reply to <message-id>"
+msgstr ""
+
+#: builtin/log.c:1566 builtin/log.c:1569
+msgid "boundary"
+msgstr ""
+
+#: builtin/log.c:1567
+msgid "attach the patch"
+msgstr ""
+
+#: builtin/log.c:1570
+msgid "inline the patch"
+msgstr ""
+
+#: builtin/log.c:1574
+msgid "enable message threading, styles: shallow, deep"
+msgstr ""
+
+#: builtin/log.c:1576
+msgid "signature"
+msgstr ""
+
+#: builtin/log.c:1577
+msgid "add a signature"
+msgstr ""
+
+#: builtin/log.c:1578
+msgid "base-commit"
+msgstr ""
+
+#: builtin/log.c:1579
+msgid "add prerequisite tree info to the patch series"
+msgstr ""
+
+#: builtin/log.c:1581
+msgid "add a signature from a file"
+msgstr ""
+
+#: builtin/log.c:1582
+msgid "don't print the patch filenames"
+msgstr ""
+
+#: builtin/log.c:1584
+msgid "show progress while generating patches"
+msgstr ""
+
+#: builtin/log.c:1585
+msgid "rev"
+msgstr ""
+
+#: builtin/log.c:1586
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1589
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1591
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1666
+#, c-format
+msgid "invalid ident line: %s"
+msgstr ""
+
+#: builtin/log.c:1681
+msgid "-n and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1683
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1691
+msgid "--name-only does not make sense"
+msgstr ""
+
+#: builtin/log.c:1693
+msgid "--name-status does not make sense"
+msgstr ""
+
+#: builtin/log.c:1695
+msgid "--check does not make sense"
+msgstr ""
+
+#: builtin/log.c:1727
+msgid "standard output, or directory, which one?"
+msgstr ""
+
+#: builtin/log.c:1729
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr ""
+
+#: builtin/log.c:1816
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1820
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:1821
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1827
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:1831
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1839
+msgid "Range-diff:"
+msgstr ""
+
+#: builtin/log.c:1840
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1851
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:1887
+msgid "Generating patches"
+msgstr ""
+
+#: builtin/log.c:1931
+msgid "Failed to create output files"
+msgstr ""
+
+#: builtin/log.c:1989
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr ""
+
+#: builtin/log.c:2043
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+
+#: builtin/ls-files.c:469
+msgid "git ls-files [<options>] [<file>...]"
+msgstr ""
+
+#: builtin/ls-files.c:525
+msgid "identify the file status with tags"
+msgstr ""
+
+#: builtin/ls-files.c:527
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr ""
+
+#: builtin/ls-files.c:529
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr ""
+
+#: builtin/ls-files.c:531
+msgid "show cached files in the output (default)"
+msgstr ""
+
+#: builtin/ls-files.c:533
+msgid "show deleted files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:535
+msgid "show modified files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:537
+msgid "show other files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:539
+msgid "show ignored files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:542
+msgid "show staged contents' object name in the output"
+msgstr ""
+
+#: builtin/ls-files.c:544
+msgid "show files on the filesystem that need to be removed"
+msgstr ""
+
+#: builtin/ls-files.c:546
+msgid "show 'other' directories' names only"
+msgstr ""
+
+#: builtin/ls-files.c:548
+msgid "show line endings of files"
+msgstr ""
+
+#: builtin/ls-files.c:550
+msgid "don't show empty directories"
+msgstr ""
+
+#: builtin/ls-files.c:553
+msgid "show unmerged files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:555
+msgid "show resolve-undo information"
+msgstr ""
+
+#: builtin/ls-files.c:557
+msgid "skip files matching pattern"
+msgstr ""
+
+#: builtin/ls-files.c:560
+msgid "exclude patterns are read from <file>"
+msgstr ""
+
+#: builtin/ls-files.c:563
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+
+#: builtin/ls-files.c:565
+msgid "add the standard git exclusions"
+msgstr ""
+
+#: builtin/ls-files.c:569
+msgid "make the output relative to the project top directory"
+msgstr ""
+
+#: builtin/ls-files.c:572
+msgid "recurse through submodules"
+msgstr ""
+
+#: builtin/ls-files.c:574
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr ""
+
+#: builtin/ls-files.c:575
+msgid "tree-ish"
+msgstr ""
+
+#: builtin/ls-files.c:576
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+
+#: builtin/ls-files.c:578
+msgid "show debugging data"
+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/ls-remote.c:59
+msgid "do not print remote URL"
+msgstr ""
+
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
+msgid "exec"
+msgstr ""
+
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
+msgstr ""
+
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
+msgstr ""
+
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
+msgstr ""
+
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
+msgstr ""
+
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
+msgstr ""
+
+#: builtin/ls-remote.c:73
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr ""
+
+#: builtin/ls-remote.c:76
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr ""
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr ""
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr ""
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr ""
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr ""
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr ""
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr ""
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr ""
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr ""
+
+#: builtin/merge.c:52
+msgid "git merge [<options>] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:53
+msgid "git merge --abort"
+msgstr ""
+
+#: builtin/merge.c:54
+msgid "git merge --continue"
+msgstr ""
+
+#: builtin/merge.c:111
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:177
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:178
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:183
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:234 builtin/pull.c:143
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:237 builtin/pull.c:146
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:238 builtin/pull.c:149
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:240 builtin/pull.c:152
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:243 builtin/pull.c:158
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:245 builtin/pull.c:161
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:247 builtin/pull.c:164
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:248
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:250 builtin/pull.c:170
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:254 builtin/pull.c:173
+msgid "verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
+#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:256 builtin/pull.c:178
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:257 builtin/pull.c:181
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:258 builtin/pull.c:182
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:260
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:267
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:269
+msgid "continue the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:271 builtin/pull.c:189
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:277
+msgid "verify commit-msg hook"
+msgstr ""
+
+#: builtin/merge.c:302
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:307
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:312
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:334 builtin/merge.c:351
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:381
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:392
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:442
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:493
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:580
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:701
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:715
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:730
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:782
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:791
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:797
+#, 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/merge.c:833
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:852
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:905
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:944
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:946
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:948
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:953
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1010
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr ""
+
+#: builtin/merge.c:1113
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr ""
+
+#: builtin/merge.c:1147
+msgid "not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1250
+msgid "--abort expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1254
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1266
+msgid "--continue expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1270
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1286
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1293
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1296
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1305
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1313
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1330
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1332
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1337
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1339
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1421
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1430
+msgid "Already up to date."
+msgstr ""
+
+#: builtin/merge.c:1440
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1482
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1489
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1514
+msgid "Already up to date. Yeeah!"
+msgstr ""
+
+#: builtin/merge.c:1520
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1543 builtin/merge.c:1622
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1547
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1613
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1615
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1624
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1636
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr ""
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr ""
+
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
+msgstr ""
+
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
+msgstr ""
+
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
+msgstr ""
+
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
+msgstr ""
+
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr ""
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr ""
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr ""
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr ""
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr ""
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr ""
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr ""
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr ""
+
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr ""
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:55
+#, 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."
+msgstr ""
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr ""
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr ""
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr ""
+
+#: builtin/mktree.c:155 builtin/write-tree.c:25
+msgid "allow missing objects"
+msgstr ""
+
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr ""
+
+#: builtin/multi-pack-index.c:8
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgstr ""
+
+#: builtin/multi-pack-index.c:21
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+
+#: builtin/multi-pack-index.c:39
+msgid "too many arguments"
+msgstr ""
+
+#: builtin/multi-pack-index.c:48
+#, c-format
+msgid "unrecognized verb: %s"
+msgstr ""
+
+#: builtin/mv.c:17
+msgid "git mv [<options>] <source>... <destination>"
+msgstr ""
+
+#: builtin/mv.c:82
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr ""
+
+#: builtin/mv.c:84
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/mv.c:102
+#, c-format
+msgid "%.*s is in index"
+msgstr ""
+
+#: builtin/mv.c:124
+msgid "force move/rename even if target exists"
+msgstr ""
+
+#: builtin/mv.c:126
+msgid "skip move/rename errors"
+msgstr ""
+
+#: builtin/mv.c:168
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr ""
+
+#: builtin/mv.c:179
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr ""
+
+#: builtin/mv.c:183
+msgid "bad source"
+msgstr ""
+
+#: builtin/mv.c:186
+msgid "can not move directory into itself"
+msgstr ""
+
+#: builtin/mv.c:189
+msgid "cannot move directory over file"
+msgstr ""
+
+#: builtin/mv.c:198
+msgid "source directory is empty"
+msgstr ""
+
+#: builtin/mv.c:223
+msgid "not under version control"
+msgstr ""
+
+#: builtin/mv.c:226
+msgid "destination exists"
+msgstr ""
+
+#: builtin/mv.c:234
+#, c-format
+msgid "overwriting '%s'"
+msgstr ""
+
+#: builtin/mv.c:237
+msgid "Cannot overwrite"
+msgstr ""
+
+#: builtin/mv.c:240
+msgid "multiple sources for the same target"
+msgstr ""
+
+#: builtin/mv.c:242
+msgid "destination directory does not exist"
+msgstr ""
+
+#: builtin/mv.c:249
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr ""
+
+#: builtin/mv.c:270
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr ""
+
+#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#, c-format
+msgid "renaming '%s' failed"
+msgstr ""
+
+#: builtin/name-rev.c:355
+msgid "git name-rev [<options>] <commit>..."
+msgstr ""
+
+#: builtin/name-rev.c:356
+msgid "git name-rev [<options>] --all"
+msgstr ""
+
+#: builtin/name-rev.c:357
+msgid "git name-rev [<options>] --stdin"
+msgstr ""
+
+#: builtin/name-rev.c:413
+msgid "print only names (no SHA-1)"
+msgstr ""
+
+#: builtin/name-rev.c:414
+msgid "only use tags to name the commits"
+msgstr ""
+
+#: builtin/name-rev.c:416
+msgid "only use refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:418
+msgid "ignore refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:420
+msgid "list all commits reachable from all refs"
+msgstr ""
+
+#: builtin/name-rev.c:421
+msgid "read from stdin"
+msgstr ""
+
+#: builtin/name-rev.c:422
+msgid "allow to print `undefined` names (default)"
+msgstr ""
+
+#: builtin/name-rev.c:428
+msgid "dereference tags in the input (internal use)"
+msgstr ""
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr ""
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr ""
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr ""
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr ""
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr ""
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr ""
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr ""
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr ""
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr ""
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr ""
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr ""
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr ""
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr ""
+
+#: builtin/notes.c:206
+msgid "unable to write note object"
+msgstr ""
+
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr ""
+
+#: builtin/notes.c:242 builtin/tag.c:513
+#, c-format
+msgid "could not open or read '%s'"
+msgstr ""
+
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr ""
+
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr ""
+
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr ""
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:356
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr ""
+
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
+#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+msgid "too many parameters"
+msgstr ""
+
+#: builtin/notes.c:389 builtin/notes.c:675
+#, c-format
+msgid "no note found for object %s."
+msgstr ""
+
+#: builtin/notes.c:410 builtin/notes.c:573
+msgid "note contents as a string"
+msgstr ""
+
+#: builtin/notes.c:413 builtin/notes.c:576
+msgid "note contents in a file"
+msgstr ""
+
+#: builtin/notes.c:416 builtin/notes.c:579
+msgid "reuse and edit specified note object"
+msgstr ""
+
+#: builtin/notes.c:419 builtin/notes.c:582
+msgid "reuse specified note object"
+msgstr ""
+
+#: builtin/notes.c:422 builtin/notes.c:585
+msgid "allow storing empty note"
+msgstr ""
+
+#: builtin/notes.c:423 builtin/notes.c:494
+msgid "replace existing notes"
+msgstr ""
+
+#: builtin/notes.c:448
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:463 builtin/notes.c:542
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:495
+msgid "read objects from stdin"
+msgstr ""
+
+#: builtin/notes.c:497
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr ""
+
+#: builtin/notes.c:515
+msgid "too few parameters"
+msgstr ""
+
+#: builtin/notes.c:536
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:548
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr ""
+
+#: builtin/notes.c:600
+#, c-format
+msgid ""
+"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+msgstr ""
+
+#: builtin/notes.c:695
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:697
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:699
+msgid "failed to remove 'git notes merge' worktree"
+msgstr ""
+
+#: builtin/notes.c:719
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:721
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:723
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:736
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:739
+msgid "failed to finalize notes merge"
+msgstr ""
+
+#: builtin/notes.c:765
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr ""
+
+#: builtin/notes.c:781
+msgid "General options"
+msgstr ""
+
+#: builtin/notes.c:783
+msgid "Merge options"
+msgstr ""
+
+#: builtin/notes.c:785
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+
+#: builtin/notes.c:787
+msgid "Committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:789
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:791
+msgid "Aborting notes merge resolution"
+msgstr ""
+
+#: builtin/notes.c:793
+msgid "abort notes merge"
+msgstr ""
+
+#: builtin/notes.c:804
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr ""
+
+#: builtin/notes.c:809
+msgid "must specify a notes ref to merge"
+msgstr ""
+
+#: builtin/notes.c:833
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr ""
+
+#: builtin/notes.c:870
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr ""
+
+#: builtin/notes.c:873
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr ""
+
+#: builtin/notes.c:875
+#, c-format
+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/notes.c:897
+#, c-format
+msgid "Object %s has no note\n"
+msgstr ""
+
+#: builtin/notes.c:909
+msgid "attempt to remove non-existent note is not an error"
+msgstr ""
+
+#: builtin/notes.c:912
+msgid "read object names from the standard input"
+msgstr ""
+
+#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+msgid "do not remove, show only"
+msgstr ""
+
+#: builtin/notes.c:951
+msgid "report pruned notes"
+msgstr ""
+
+#: builtin/notes.c:993
+msgid "notes-ref"
+msgstr ""
+
+#: builtin/notes.c:994
+msgid "use notes from <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:1029
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:51
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:422
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:433
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:564
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
+
+#: builtin/pack-objects.c:775
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:788
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:792
+#, c-format
+msgid "unable to open packfile for reuse: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:796
+msgid "unable to seek in reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:807
+msgid "unable to read from reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:835
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:848
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#, c-format
+msgid "failed to stat %s"
+msgstr ""
+
+#: builtin/pack-objects.c:963
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1157
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:1585
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1594
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1863
+msgid "Counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1998
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2013
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
+#: builtin/pack-objects.c:2109
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
+
+#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
+
+#: builtin/pack-objects.c:2123
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2451
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2583
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2670
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2676
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: builtin/pack-objects.c:2753
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2759
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2857
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+msgid "cannot open pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2947
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3032
+msgid "unable to force loose object"
+msgstr ""
+
+#: builtin/pack-objects.c:3122
+#, c-format
+msgid "not a rev '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3125
+#, c-format
+msgid "bad revision '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3150
+msgid "unable to add recent objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3203
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3207
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3237
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3239
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3241
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/pack-objects.c:3244
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/pack-objects.c:3245
+msgid "<version>[,<offset>]"
+msgstr ""
+
+#: builtin/pack-objects.c:3246
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+
+#: builtin/pack-objects.c:3249
+msgid "maximum size of each output pack file"
+msgstr ""
+
+#: builtin/pack-objects.c:3251
+msgid "ignore borrowed objects from alternate object store"
+msgstr ""
+
+#: builtin/pack-objects.c:3253
+msgid "ignore packed objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3255
+msgid "limit pack window by objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3257
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+
+#: builtin/pack-objects.c:3259
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3261
+msgid "reuse existing deltas"
+msgstr ""
+
+#: builtin/pack-objects.c:3263
+msgid "reuse existing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3265
+msgid "use OFS_DELTA objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3267
+msgid "use threads when searching for best delta matches"
+msgstr ""
+
+#: builtin/pack-objects.c:3269
+msgid "do not create an empty pack output"
+msgstr ""
+
+#: builtin/pack-objects.c:3271
+msgid "read revision arguments from standard input"
+msgstr ""
+
+#: builtin/pack-objects.c:3273
+msgid "limit the objects to those that are not yet packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3276
+msgid "include objects reachable from any reference"
+msgstr ""
+
+#: builtin/pack-objects.c:3279
+msgid "include objects referred by reflog entries"
+msgstr ""
+
+#: builtin/pack-objects.c:3282
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:3285
+msgid "output pack to stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3287
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3289
+msgid "keep unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3291
+msgid "pack loose unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3293
+msgid "unpack unreachable objects newer than <time>"
+msgstr ""
+
+#: builtin/pack-objects.c:3296
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:3298
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:3300
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:3302
+msgid "ignore this pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3304
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:3306
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-objects.c:3308
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3310
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:3313
+msgid "handling for missing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3316
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3318
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3342
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3347
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3401
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+
+#: builtin/pack-objects.c:3403
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
+
+#: builtin/pack-objects.c:3408
+msgid "--thin cannot be used to build an indexable pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3411
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr ""
+
+#: builtin/pack-objects.c:3417
+msgid "cannot use --filter without --stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3476
+msgid "Enumerating objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3495
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgstr ""
+
+#: builtin/pack-refs.c:7
+msgid "git pack-refs [<options>]"
+msgstr ""
+
+#: builtin/pack-refs.c:15
+msgid "pack everything"
+msgstr ""
+
+#: builtin/pack-refs.c:16
+msgid "prune loose refs (default)"
+msgstr ""
+
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr ""
+
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
+msgstr ""
+
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr ""
+
+#: builtin/prune.c:109
+msgid "report pruned objects"
+msgstr ""
+
+#: 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:129
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+
+#: builtin/pull.c:60 builtin/pull.c:62
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr ""
+
+#: builtin/pull.c:82
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/pull.c:133
+msgid "control for recursive fetching of submodules"
+msgstr ""
+
+#: builtin/pull.c:137
+msgid "Options related to merging"
+msgstr ""
+
+#: builtin/pull.c:140
+msgid "incorporate changes by rebasing rather than merging"
+msgstr ""
+
+#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+msgid "allow fast-forward"
+msgstr ""
+
+#: builtin/pull.c:176
+msgid "automatically stash/stash pop before and after rebase"
+msgstr ""
+
+#: builtin/pull.c:192
+msgid "Options related to fetching"
+msgstr ""
+
+#: builtin/pull.c:202
+msgid "force overwrite of local branch"
+msgstr ""
+
+#: builtin/pull.c:210
+msgid "number of submodules pulled in parallel"
+msgstr ""
+
+#: builtin/pull.c:305
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr ""
+
+#: builtin/pull.c:421
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+
+#: builtin/pull.c:423
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+
+#: builtin/pull.c:424
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+
+#: builtin/pull.c:427
+#, 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."
+msgstr ""
+
+#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr ""
+
+#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr ""
+
+#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr ""
+
+#: builtin/pull.c:437 builtin/pull.c:452
+msgid "See git-pull(1) for details."
+msgstr ""
+
+#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
+#: builtin/rebase.c:767 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr ""
+
+#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
+#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+msgid "<branch>"
+msgstr ""
+
+#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr ""
+
+#: builtin/pull.c:456 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+
+#: builtin/pull.c:461
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+
+#: builtin/pull.c:565
+#, c-format
+msgid "unable to access commit %s"
+msgstr ""
+
+#: builtin/pull.c:843
+msgid "ignoring --verify-signatures for rebase"
+msgstr ""
+
+#: builtin/pull.c:891
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr ""
+
+#: builtin/pull.c:899
+msgid "Updating an unborn branch with changes added to the index."
+msgstr ""
+
+#: builtin/pull.c:902
+msgid "pull with rebase"
+msgstr ""
+
+#: builtin/pull.c:903
+msgid "please commit or stash them."
+msgstr ""
+
+#: builtin/pull.c:928
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+
+#: builtin/pull.c:934
+#, 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."
+msgstr ""
+
+#: builtin/pull.c:949
+msgid "Cannot merge multiple branches into empty head."
+msgstr ""
+
+#: builtin/pull.c:953
+msgid "Cannot rebase onto multiple branches."
+msgstr ""
+
+#: builtin/pull.c:960
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr ""
+
+#: builtin/push.c:121
+msgid "--delete only accepts plain target ref names"
+msgstr ""
+
+#: builtin/push.c:165
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+
+#: builtin/push.c:168
+#, c-format
+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/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"
+" git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+
+#: builtin/push.c:197
+#, 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/push.c:205
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+
+#: builtin/push.c:208
+#, 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."
+msgstr ""
+
+#: builtin/push.c:267
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+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."
+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."
+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."
+msgstr ""
+
+#: builtin/push.c:293
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+
+#: builtin/push.c:296
+msgid ""
+"You cannot update a remote ref that points at a non-commit object,\n"
+"or update a remote ref to make it point at a non-commit object,\n"
+"without using the '--force' option.\n"
+msgstr ""
+
+#: builtin/push.c:357
+#, c-format
+msgid "Pushing to %s\n"
+msgstr ""
+
+#: builtin/push.c:361
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr ""
+
+#: builtin/push.c:395
+#, 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"
+msgstr ""
+
+#: builtin/push.c:552 builtin/send-pack.c:164
+msgid "push all refs"
+msgstr ""
+
+#: builtin/push.c:553 builtin/send-pack.c:166
+msgid "mirror all refs"
+msgstr ""
+
+#: builtin/push.c:555
+msgid "delete refs"
+msgstr ""
+
+#: builtin/push.c:556
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr ""
+
+#: builtin/push.c:559 builtin/send-pack.c:167
+msgid "force updates"
+msgstr ""
+
+#: builtin/push.c:561 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
+msgstr ""
+
+#: builtin/push.c:562 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
+msgstr ""
+
+#: builtin/push.c:565
+msgid "control recursive pushing of submodules"
+msgstr ""
+
+#: builtin/push.c:567 builtin/send-pack.c:175
+msgid "use thin pack"
+msgstr ""
+
+#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
+msgstr ""
+
+#: builtin/push.c:570
+msgid "set upstream for git pull/status"
+msgstr ""
+
+#: builtin/push.c:573
+msgid "prune locally removed refs"
+msgstr ""
+
+#: builtin/push.c:575
+msgid "bypass pre-push hook"
+msgstr ""
+
+#: builtin/push.c:576
+msgid "push missing but relevant tags"
+msgstr ""
+
+#: builtin/push.c:579 builtin/send-pack.c:169
+msgid "GPG sign the push"
+msgstr ""
+
+#: builtin/push.c:581 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
+msgstr ""
+
+#: builtin/push.c:599
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr ""
+
+#: builtin/push.c:601
+msgid "--delete doesn't make sense without any refs"
+msgstr ""
+
+#: builtin/push.c:604
+msgid "--all and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:606
+msgid "--all can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:610
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:612
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:615
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+#: builtin/push.c:634
+msgid "push options must not have new line characters"
+msgstr ""
+
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:21
+msgid "Percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
+msgstr ""
+
+#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr ""
+
+#: builtin/range-diff.c:75
+msgid "single arg format must be symmetric range"
+msgstr ""
+
+#: builtin/range-diff.c:90
+msgid "need two commit ranges"
+msgstr ""
+
+#: builtin/read-tree.c:40
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+
+#: builtin/read-tree.c:123
+msgid "write resulting index to <file>"
+msgstr ""
+
+#: builtin/read-tree.c:126
+msgid "only empty the index"
+msgstr ""
+
+#: builtin/read-tree.c:128
+msgid "Merging"
+msgstr ""
+
+#: builtin/read-tree.c:130
+msgid "perform a merge in addition to a read"
+msgstr ""
+
+#: builtin/read-tree.c:132
+msgid "3-way merge if no file level merging required"
+msgstr ""
+
+#: builtin/read-tree.c:134
+msgid "3-way merge in presence of adds and removes"
+msgstr ""
+
+#: builtin/read-tree.c:136
+msgid "same as -m, but discard unmerged entries"
+msgstr ""
+
+#: builtin/read-tree.c:137
+msgid "<subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:138
+msgid "read the tree into the index under <subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:141
+msgid "update working tree with merge result"
+msgstr ""
+
+#: builtin/read-tree.c:143
+msgid "gitignore"
+msgstr ""
+
+#: builtin/read-tree.c:144
+msgid "allow explicitly ignored files to be overwritten"
+msgstr ""
+
+#: builtin/read-tree.c:147
+msgid "don't check the working tree after merging"
+msgstr ""
+
+#: builtin/read-tree.c:148
+msgid "don't update the index or the work tree"
+msgstr ""
+
+#: builtin/read-tree.c:150
+msgid "skip applying sparse checkout filter"
+msgstr ""
+
+#: builtin/read-tree.c:152
+msgid "debug unpack-trees"
+msgstr ""
+
+#: builtin/rebase.c:29
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:31
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:33
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr ""
+
+#: builtin/rebase.c:119
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:171
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr ""
+
+#: builtin/rebase.c:186
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:214
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:259
+#, c-format
+msgid "Could not read '%s'"
+msgstr ""
+
+#: builtin/rebase.c:277
+#, c-format
+msgid "Cannot store %s"
+msgstr ""
+
+#: builtin/rebase.c:337
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+
+#: builtin/rebase.c:561
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: builtin/rebase.c:753
+#, 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/rebase.c:769
+#, 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/rebase.c:832
+msgid "rebase onto given branch instead of upstream"
+msgstr ""
+
+#: builtin/rebase.c:834
+msgid "allow pre-rebase hook to run"
+msgstr ""
+
+#: builtin/rebase.c:836
+msgid "be quiet. implies --no-stat"
+msgstr ""
+
+#: builtin/rebase.c:839
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:842
+msgid "do not show diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:845
+msgid "add a Signed-off-by: line to each commit"
+msgstr ""
+
+#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+msgid "passed to 'git am'"
+msgstr ""
+
+#: builtin/rebase.c:855 builtin/rebase.c:857
+msgid "passed to 'git apply'"
+msgstr ""
+
+#: builtin/rebase.c:859 builtin/rebase.c:862
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
+
+#: builtin/rebase.c:864
+msgid "continue"
+msgstr ""
+
+#: builtin/rebase.c:867
+msgid "skip current patch and continue"
+msgstr ""
+
+#: builtin/rebase.c:869
+msgid "abort and check out the original branch"
+msgstr ""
+
+#: builtin/rebase.c:872
+msgid "abort but keep HEAD where it is"
+msgstr ""
+
+#: builtin/rebase.c:873
+msgid "edit the todo list during an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:876
+msgid "show the patch file being applied or merged"
+msgstr ""
+
+#: builtin/rebase.c:879
+msgid "use merging strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:883
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+
+#: builtin/rebase.c:887
+msgid "try to recreate merges instead of ignoring them"
+msgstr ""
+
+#: builtin/rebase.c:891
+msgid "allow rerere to update index with resolved conflict"
+msgstr ""
+
+#: builtin/rebase.c:894
+msgid "preserve empty commits during rebase"
+msgstr ""
+
+#: builtin/rebase.c:896
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
+
+#: builtin/rebase.c:902
+msgid "automatically stash/stash pop before and after"
+msgstr ""
+
+#: builtin/rebase.c:904
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
+
+#: builtin/rebase.c:908
+msgid "allow rebasing commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:911
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
+
+#: builtin/rebase.c:914
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr ""
+
+#: builtin/rebase.c:916
+msgid "use the given merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:918 builtin/revert.c:111
+msgid "option"
+msgstr ""
+
+#: builtin/rebase.c:919
+msgid "pass the argument through to the merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:922
+msgid "rebase all reachable commits up to the root(s)"
+msgstr ""
+
+#: builtin/rebase.c:938
+#, c-format
+msgid "could not exec %s"
+msgstr ""
+
+#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr ""
+
+#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+msgid "No rebase in progress?"
+msgstr ""
+
+#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+
+#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+msgid "Cannot read HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+
+#: builtin/rebase.c:1047
+msgid "could not discard worktree changes"
+msgstr ""
+
+#: builtin/rebase.c:1066
+#, c-format
+msgid "could not move back to %s"
+msgstr ""
+
+#: builtin/rebase.c:1077 builtin/rm.c:368
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1103
+#, c-format
+msgid ""
+"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/rebase.c:1124
+msgid "switch `C' expects a numerical value"
+msgstr ""
+
+#: builtin/rebase.c:1161
+#, c-format
+msgid "Unknown mode: %s"
+msgstr ""
+
+#: builtin/rebase.c:1183
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1226
+#, c-format
+msgid ""
+"error: cannot combine interactive options (--interactive, --exec, --rebase-"
+"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
+"(%s)"
+msgstr ""
+
+#: builtin/rebase.c:1231
+#, c-format
+msgid ""
+"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
+"with am options (%s)"
+msgstr ""
+
+#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
+msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
+msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+
+#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
+msgid "error: cannot combine '--rebase-merges' with '--strategy'"
+msgstr ""
+
+#: builtin/rebase.c:1283
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1289
+msgid "Could not create new root commit"
+msgstr ""
+
+#: builtin/rebase.c:1307
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
+
+#: builtin/rebase.c:1314
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1339
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
+#: builtin/submodule--helper.c:1930
+#, c-format
+msgid "No such ref: %s"
+msgstr ""
+
+#: builtin/rebase.c:1359
+msgid "Could not resolve HEAD to a revision"
+msgstr ""
+
+#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+msgid "Cannot autostash"
+msgstr ""
+
+#: builtin/rebase.c:1402
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1408
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1411
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: builtin/rebase.c:1414
+msgid "could not reset --hard"
+msgstr ""
+
+#: builtin/rebase.c:1415 builtin/reset.c:113
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
+#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+msgid "Please commit or stash them."
+msgstr ""
+
+#: builtin/rebase.c:1458
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1470
+#, c-format
+msgid "could not switch to %s"
+msgstr ""
+
+#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
+#, sh-format
+msgid "HEAD is up to date."
+msgstr ""
+
+#: builtin/rebase.c:1483
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr ""
+
+#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr ""
+
+#: builtin/rebase.c:1493
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr ""
+
+#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+msgid "The pre-rebase hook refused to rebase."
+msgstr ""
+
+#: builtin/rebase.c:1508
+#, c-format
+msgid "Changes to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:1511
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:1536
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+
+#: builtin/rebase.c:1543
+msgid "Could not detach HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1552
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr ""
+
+#: builtin/rebase--interactive.c:24
+msgid "no HEAD?"
+msgstr ""
+
+#: builtin/rebase--interactive.c:51
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
+
+#: builtin/rebase--interactive.c:57
+msgid "could not mark as interactive"
+msgstr ""
+
+#: builtin/rebase--interactive.c:101
+#, c-format
+msgid "could not open %s"
+msgstr ""
+
+#: builtin/rebase--interactive.c:114
+msgid "could not generate todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:129
+msgid "git rebase--interactive [<options>]"
+msgstr ""
+
+#: builtin/rebase--interactive.c:148
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:150 builtin/revert.c:124
+msgid "allow commits with empty messages"
+msgstr ""
+
+#: builtin/rebase--interactive.c:151
+msgid "rebase merge commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:153
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase--interactive.c:155
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase--interactive.c:156
+msgid "sign commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:158
+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase--interactive.c:160
+msgid "skip commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:161
+msgid "edit the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:163
+msgid "show the current patch"
+msgstr ""
+
+#: builtin/rebase--interactive.c:166
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:168
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:170
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:172
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase--interactive.c:174
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:175
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:177
+msgid "restrict-revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:177
+msgid "restrict revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:178
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:179
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:181
+msgid "the upstream commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:182
+msgid "head-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:182
+msgid "head name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:187
+msgid "rebase strategy"
+msgstr ""
+
+#: builtin/rebase--interactive.c:188
+msgid "strategy-opts"
+msgstr ""
+
+#: builtin/rebase--interactive.c:189
+msgid "strategy options"
+msgstr ""
+
+#: builtin/rebase--interactive.c:190
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase--interactive.c:191
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase--interactive.c:192
+msgid "onto-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:192
+msgid "onto name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:193
+msgid "cmd"
+msgstr ""
+
+#: builtin/rebase--interactive.c:193
+msgid "the command to run"
+msgstr ""
+
+#: builtin/rebase--interactive.c:220
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase--interactive.c:226
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/receive-pack.c:33
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:830
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:850
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:1929
+msgid "quiet"
+msgstr ""
+
+#: builtin/receive-pack.c:1943
+msgid "You must specify a directory."
+msgstr ""
+
+#: builtin/reflog.c:563 builtin/reflog.c:568
+#, c-format
+msgid "'%s' is not a valid timestamp"
+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:18 builtin/remote.c:38
+msgid "git remote rename <old> <new>"
+msgstr ""
+
+#: builtin/remote.c:19 builtin/remote.c:43
+msgid "git remote remove <name>"
+msgstr ""
+
+#: builtin/remote.c:20 builtin/remote.c:48
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr ""
+
+#: builtin/remote.c:21
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr ""
+
+#: builtin/remote.c:22
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr ""
+
+#: builtin/remote.c:23
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+
+#: builtin/remote.c:24
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:25 builtin/remote.c:74
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr ""
+
+#: builtin/remote.c:26 builtin/remote.c:79
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr ""
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url --add <name> <newurl>"
+msgstr ""
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --delete <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:33
+msgid "git remote add [<options>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:53
+msgid "git remote set-branches <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:54
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:59
+msgid "git remote show [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:64
+msgid "git remote prune [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:69
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr ""
+
+#: builtin/remote.c:98
+#, c-format
+msgid "Updating %s"
+msgstr ""
+
+#: builtin/remote.c:130
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+
+#: builtin/remote.c:147
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr ""
+
+#: builtin/remote.c:163
+msgid "fetch the remote branches"
+msgstr ""
+
+#: builtin/remote.c:165
+msgid "import all tags and associated objects when fetching"
+msgstr ""
+
+#: builtin/remote.c:168
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr ""
+
+#: builtin/remote.c:170
+msgid "branch(es) to track"
+msgstr ""
+
+#: builtin/remote.c:171
+msgid "master branch"
+msgstr ""
+
+#: builtin/remote.c:173
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+
+#: builtin/remote.c:185
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr ""
+
+#: builtin/remote.c:187
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+
+#: builtin/remote.c:194 builtin/remote.c:636
+#, c-format
+msgid "remote %s already exists."
+msgstr ""
+
+#: builtin/remote.c:198 builtin/remote.c:640
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr ""
+
+#: builtin/remote.c:238
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr ""
+
+#: builtin/remote.c:344
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr ""
+
+#: builtin/remote.c:443 builtin/remote.c:451
+msgid "(matching)"
+msgstr ""
+
+#: builtin/remote.c:455
+msgid "(delete)"
+msgstr ""
+
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#, c-format
+msgid "No such remote: '%s'"
+msgstr ""
+
+#: builtin/remote.c:646
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr ""
+
+#: builtin/remote.c:666
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+
+#: builtin/remote.c:702
+#, c-format
+msgid "deleting '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:736
+#, c-format
+msgid "creating '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:802
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:816
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr ""
+
+#: builtin/remote.c:917
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr ""
+
+#: builtin/remote.c:920
+msgid " tracked"
+msgstr ""
+
+#: builtin/remote.c:922
+msgid " stale (use 'git remote prune' to remove)"
+msgstr ""
+
+#: builtin/remote.c:924
+msgid " ???"
+msgstr ""
+
+#: builtin/remote.c:965
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr ""
+
+#: builtin/remote.c:974
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:976
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:979
+#, c-format
+msgid "rebases onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:983
+#, c-format
+msgid " merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:986
+#, c-format
+msgid "merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:989
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr ""
+
+#: builtin/remote.c:1032
+msgid "create"
+msgstr ""
+
+#: builtin/remote.c:1035
+msgid "delete"
+msgstr ""
+
+#: builtin/remote.c:1039
+msgid "up to date"
+msgstr ""
+
+#: builtin/remote.c:1042
+msgid "fast-forwardable"
+msgstr ""
+
+#: builtin/remote.c:1045
+msgid "local out of date"
+msgstr ""
+
+#: builtin/remote.c:1052
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1055
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1059
+#, c-format
+msgid " %-*s forces to %s"
+msgstr ""
+
+#: builtin/remote.c:1062
+#, c-format
+msgid " %-*s pushes to %s"
+msgstr ""
+
+#: builtin/remote.c:1130
+msgid "do not query remotes"
+msgstr ""
+
+#: builtin/remote.c:1157
+#, c-format
+msgid "* remote %s"
+msgstr ""
+
+#: builtin/remote.c:1158
+#, c-format
+msgid " Fetch URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+msgid "(no URL)"
+msgstr ""
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1173 builtin/remote.c:1175
+#, c-format
+msgid " Push URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#, c-format
+msgid " HEAD branch: %s"
+msgstr ""
+
+#: builtin/remote.c:1177
+msgid "(not queried)"
+msgstr ""
+
+#: builtin/remote.c:1179
+msgid "(unknown)"
+msgstr ""
+
+#: builtin/remote.c:1183
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+
+#: builtin/remote.c:1195
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1198 builtin/remote.c:1224
+msgid " (status not queried)"
+msgstr ""
+
+#: 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:1215
+msgid " Local refs will be mirrored by 'git push'"
+msgstr ""
+
+#: 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:1242
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr ""
+
+#: builtin/remote.c:1244
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr ""
+
+#: builtin/remote.c:1259
+msgid "Cannot determine remote HEAD"
+msgstr ""
+
+#: builtin/remote.c:1261
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr ""
+
+#: builtin/remote.c:1271
+#, c-format
+msgid "Could not delete %s"
+msgstr ""
+
+#: builtin/remote.c:1279
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr ""
+
+#: builtin/remote.c:1281
+#, c-format
+msgid "Could not setup %s"
+msgstr ""
+
+#: builtin/remote.c:1299
+#, c-format
+msgid " %s will become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1300
+#, c-format
+msgid " %s has become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1310
+#, c-format
+msgid "Pruning %s"
+msgstr ""
+
+#: builtin/remote.c:1311
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1327
+#, c-format
+msgid " * [would prune] %s"
+msgstr ""
+
+#: builtin/remote.c:1330
+#, c-format
+msgid " * [pruned] %s"
+msgstr ""
+
+#: builtin/remote.c:1375
+msgid "prune remotes after fetching"
+msgstr ""
+
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#, c-format
+msgid "No such remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1454
+msgid "add branch"
+msgstr ""
+
+#: builtin/remote.c:1461
+msgid "no remote specified"
+msgstr ""
+
+#: builtin/remote.c:1478
+msgid "query push URLs rather than fetch URLs"
+msgstr ""
+
+#: builtin/remote.c:1480
+msgid "return all URLs"
+msgstr ""
+
+#: builtin/remote.c:1508
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1534
+msgid "manipulate push URLs"
+msgstr ""
+
+#: builtin/remote.c:1536
+msgid "add URL"
+msgstr ""
+
+#: builtin/remote.c:1538
+msgid "delete URLs"
+msgstr ""
+
+#: builtin/remote.c:1545
+msgid "--add --delete doesn't make sense"
+msgstr ""
+
+#: builtin/remote.c:1584
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr ""
+
+#: builtin/remote.c:1592
+#, c-format
+msgid "No such URL found: %s"
+msgstr ""
+
+#: builtin/remote.c:1594
+msgid "Will not delete all non-push URLs"
+msgstr ""
+
+#: builtin/remote.c:1610
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/remote.c:1641
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: builtin/repack.c:22
+msgid "git repack [<options>]"
+msgstr ""
+
+#: 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:294
+msgid "pack everything in a single pack"
+msgstr ""
+
+#: builtin/repack.c:296
+msgid "same as -a, and turn unreachable objects loose"
+msgstr ""
+
+#: builtin/repack.c:299
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr ""
+
+#: builtin/repack.c:301
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:303
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:305
+msgid "do not run git-update-server-info"
+msgstr ""
+
+#: builtin/repack.c:308
+msgid "pass --local to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:310
+msgid "write bitmap index"
+msgstr ""
+
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:313
+msgid "approxidate"
+msgstr ""
+
+#: builtin/repack.c:314
+msgid "with -A, do not loosen objects older than this"
+msgstr ""
+
+#: builtin/repack.c:316
+msgid "with -a, repack unreachable objects"
+msgstr ""
+
+#: builtin/repack.c:318
+msgid "size of the window used for delta compression"
+msgstr ""
+
+#: builtin/repack.c:319 builtin/repack.c:325
+msgid "bytes"
+msgstr ""
+
+#: builtin/repack.c:320
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+
+#: builtin/repack.c:322
+msgid "limits the maximum delta depth"
+msgstr ""
+
+#: builtin/repack.c:324
+msgid "limits the maximum number of threads"
+msgstr ""
+
+#: builtin/repack.c:326
+msgid "maximum size of each packfile"
+msgstr ""
+
+#: builtin/repack.c:328
+msgid "repack objects in packs marked with .keep"
+msgstr ""
+
+#: builtin/repack.c:330
+msgid "do not repack this pack"
+msgstr ""
+
+#: builtin/repack.c:340
+msgid "cannot delete packs in a precious-objects repo"
+msgstr ""
+
+#: builtin/repack.c:344
+msgid "--keep-unreachable and -A are incompatible"
+msgstr ""
+
+#: builtin/repack.c:527
+#, c-format
+msgid "failed to remove '%s'"
+msgstr ""
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr ""
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr ""
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr ""
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr ""
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr ""
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr ""
+
+#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr ""
+
+#: builtin/replace.c:86
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+
+#: builtin/replace.c:121
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr ""
+
+#: builtin/replace.c:137
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr ""
+
+#: builtin/replace.c:149
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr ""
+
+#: builtin/replace.c:154
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr ""
+
+#: builtin/replace.c:174
+#, c-format
+msgid ""
+"Objects must be of the same type.\n"
+"'%s' points to a replaced object of type '%s'\n"
+"while '%s' points to a replacement object of type '%s'."
+msgstr ""
+
+#: builtin/replace.c:225
+#, c-format
+msgid "unable to open %s for writing"
+msgstr ""
+
+#: builtin/replace.c:238
+msgid "cat-file reported failure"
+msgstr ""
+
+#: builtin/replace.c:254
+#, c-format
+msgid "unable to open %s for reading"
+msgstr ""
+
+#: builtin/replace.c:268
+msgid "unable to spawn mktree"
+msgstr ""
+
+#: builtin/replace.c:272
+msgid "unable to read from mktree"
+msgstr ""
+
+#: builtin/replace.c:281
+msgid "mktree reported failure"
+msgstr ""
+
+#: builtin/replace.c:285
+msgid "mktree did not return an object name"
+msgstr ""
+
+#: builtin/replace.c:294
+#, c-format
+msgid "unable to fstat %s"
+msgstr ""
+
+#: builtin/replace.c:299
+msgid "unable to write object to database"
+msgstr ""
+
+#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
+#: builtin/replace.c:445
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr ""
+
+#: builtin/replace.c:322
+#, c-format
+msgid "unable to get object type for %s"
+msgstr ""
+
+#: builtin/replace.c:338
+msgid "editing object file failed"
+msgstr ""
+
+#: builtin/replace.c:347
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:407
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:409
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:421
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+
+#: builtin/replace.c:460
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr ""
+
+#: builtin/replace.c:461
+msgid "the signature will be removed in the replacement commit!"
+msgstr ""
+
+#: builtin/replace.c:471
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr ""
+
+#: builtin/replace.c:479
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr ""
+
+#: builtin/replace.c:482
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:515
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+
+#: builtin/replace.c:536
+msgid "list replace refs"
+msgstr ""
+
+#: builtin/replace.c:537
+msgid "delete replace refs"
+msgstr ""
+
+#: builtin/replace.c:538
+msgid "edit existing object"
+msgstr ""
+
+#: builtin/replace.c:539
+msgid "change a commit's parents"
+msgstr ""
+
+#: builtin/replace.c:540
+msgid "convert existing graft file"
msgstr ""
-#: builtin/push.c:176
+#: builtin/replace.c:541
+msgid "replace the ref if it exists"
+msgstr ""
+
+#: builtin/replace.c:543
+msgid "do not pretty-print contents for --edit"
+msgstr ""
+
+#: builtin/replace.c:544
+msgid "use this format"
+msgstr ""
+
+#: builtin/replace.c:557
+msgid "--format cannot be used when not listing"
+msgstr ""
+
+#: builtin/replace.c:565
+msgid "-f only makes sense when writing a replacement"
+msgstr ""
+
+#: builtin/replace.c:569
+msgid "--raw only makes sense with --edit"
+msgstr ""
+
+#: builtin/replace.c:575
+msgid "-d needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:581
+msgid "bad number of arguments"
+msgstr ""
+
+#: builtin/replace.c:587
+msgid "-e needs exactly one argument"
+msgstr ""
+
+#: builtin/replace.c:593
+msgid "-g needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:599
+msgid "--convert-graft-file takes no argument"
+msgstr ""
+
+#: builtin/replace.c:605
+msgid "only one pattern can be given with -l"
+msgstr ""
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr ""
+
+#: builtin/rerere.c:60
+msgid "register clean resolutions in index"
+msgstr ""
+
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr ""
+
+#: builtin/rerere.c:111
#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr ""
+
+#: builtin/reset.c:31
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"
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+
+#: builtin/reset.c:32
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr ""
+
+#: builtin/reset.c:33
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr ""
+
+#: builtin/reset.c:39
+msgid "mixed"
+msgstr ""
+
+#: builtin/reset.c:39
+msgid "soft"
+msgstr ""
+
+#: builtin/reset.c:39
+msgid "hard"
+msgstr ""
+
+#: builtin/reset.c:39
+msgid "merge"
+msgstr ""
+
+#: builtin/reset.c:39
+msgid "keep"
+msgstr ""
+
+#: builtin/reset.c:80
+msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/push.c:184
+#: builtin/reset.c:82
+msgid "Failed to find tree of HEAD."
+msgstr ""
+
+#: builtin/reset.c:88
#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/push.c:187
+#: builtin/reset.c:192
#, 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."
+msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/push.c:246
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/reset.c:292
+msgid "be quiet, only report errors"
msgstr ""
-#: builtin/push.c:253
-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/reset.c:294
+msgid "reset HEAD and index"
msgstr ""
-#: builtin/push.c:259
-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/reset.c:295
+msgid "reset only HEAD"
msgstr ""
-#: builtin/push.c:265
-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/reset.c:297 builtin/reset.c:299
+msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/push.c:272
-msgid "Updates were rejected because the tag already exists in the remote."
+#: builtin/reset.c:301
+msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/push.c:275
-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"
+#: builtin/reset.c:307
+msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/push.c:335
+#: builtin/reset.c:325
#, c-format
-msgid "Pushing to %s\n"
+msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/push.c:339
+#: builtin/reset.c:333
#, c-format
-msgid "failed to push some refs to '%s'"
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr ""
+
+#: builtin/reset.c:342
+msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/push.c:370
+#: builtin/reset.c:351
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+
+#: builtin/reset.c:353
#, c-format
-msgid "bad repository '%s'"
+msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/push.c:371
-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"
+#: builtin/reset.c:363
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/push.c:389
-msgid "--all and --tags are incompatible"
+#: builtin/reset.c:367
+msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/push.c:390
-msgid "--all can't be combined with refspecs"
+#: builtin/reset.c:387
+msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/push.c:395
-msgid "--mirror and --tags are incompatible"
+#: builtin/reset.c:390
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
msgstr ""
-#: builtin/push.c:396
-msgid "--mirror can't be combined with refspecs"
+#: builtin/reset.c:400
+#, c-format
+msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/push.c:401
-msgid "--all and --mirror are incompatible"
+#: builtin/reset.c:404
+msgid "Could not write new index file."
msgstr ""
-#: builtin/push.c:523
-msgid "repository"
+#: builtin/rev-list.c:403
+msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/push.c:524 builtin/send-pack.c:163
-msgid "push all refs"
+#: builtin/rev-list.c:461
+msgid "object filtering requires --objects"
msgstr ""
-#: builtin/push.c:525 builtin/send-pack.c:165
-msgid "mirror all refs"
+#: builtin/rev-list.c:464
+#, c-format
+msgid "invalid sparse value '%s'"
msgstr ""
-#: builtin/push.c:527
-msgid "delete refs"
+#: builtin/rev-list.c:505
+msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/push.c:528
-msgid "push tags (can't be used with --all or --mirror)"
+#: builtin/rev-list.c:508
+msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
-#: builtin/push.c:531 builtin/send-pack.c:166
-msgid "force updates"
+#: builtin/rev-parse.c:407
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/push.c:533 builtin/send-pack.c:180
-msgid "refname>:<expect"
+#: builtin/rev-parse.c:412
+msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/push.c:534 builtin/send-pack.c:181
-msgid "require old value of ref to be at this value"
+#: builtin/rev-parse.c:414
+msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/push.c:537
-msgid "control recursive pushing of submodules"
+#: builtin/rev-parse.c:417
+msgid "output in stuck long form"
msgstr ""
-#: builtin/push.c:539 builtin/send-pack.c:174
-msgid "use thin pack"
+#: builtin/rev-parse.c:550
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+" or: git rev-parse --sq-quote [<arg>...]\n"
+" or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
-#: builtin/send-pack.c:161
-msgid "receive pack program"
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
msgstr ""
-#: builtin/push.c:542
-msgid "set upstream for git pull/status"
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
msgstr ""
-#: builtin/push.c:545
-msgid "prune locally removed refs"
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr ""
-#: builtin/push.c:547
-msgid "bypass pre-push hook"
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/push.c:548
-msgid "push missing but relevant tags"
+#: builtin/revert.c:91
+#, c-format
+msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/push.c:551 builtin/send-pack.c:168
-msgid "GPG sign the push"
+#: builtin/revert.c:100
+msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:175
-msgid "request atomic transaction on remote side"
+#: builtin/revert.c:101
+msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/push.c:554 builtin/send-pack.c:171
-msgid "server-specific"
+#: builtin/revert.c:102
+msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/push.c:554 builtin/send-pack.c:172
-msgid "option to transmit"
+#: builtin/revert.c:103
+msgid "don't automatically commit"
msgstr ""
-#: builtin/push.c:568
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/revert.c:104
+msgid "edit the commit message"
msgstr ""
-#: builtin/push.c:570
-msgid "--delete doesn't make sense without any refs"
+#: builtin/revert.c:107
+msgid "parent-number"
msgstr ""
-#: builtin/push.c:589
-msgid "push options must not have new line characters"
+#: builtin/revert.c:108
+msgid "select mainline parent"
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/revert.c:110
+msgid "merge strategy"
msgstr ""
-#: builtin/read-tree.c:121
-msgid "write resulting index to <file>"
+#: builtin/revert.c:112
+msgid "option for merge strategy"
msgstr ""
-#: builtin/read-tree.c:124
-msgid "only empty the index"
+#: builtin/revert.c:121
+msgid "append commit name"
msgstr ""
-#: builtin/read-tree.c:126
-msgid "Merging"
+#: builtin/revert.c:123
+msgid "preserve initially empty commits"
msgstr ""
-#: builtin/read-tree.c:128
-msgid "perform a merge in addition to a read"
+#: builtin/revert.c:125
+msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/read-tree.c:130
-msgid "3-way merge if no file level merging required"
+#: builtin/revert.c:219
+msgid "revert failed"
msgstr ""
-#: builtin/read-tree.c:132
-msgid "3-way merge in presence of adds and removes"
+#: builtin/revert.c:232
+msgid "cherry-pick failed"
msgstr ""
-#: builtin/read-tree.c:134
-msgid "same as -m, but discard unmerged entries"
+#: builtin/rm.c:18
+msgid "git rm [<options>] [--] <file>..."
msgstr ""
-#: builtin/read-tree.c:135
-msgid "<subdirectory>/"
+#: builtin/rm.c:206
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:211
+msgid ""
+"\n"
+"(use -f to force removal)"
msgstr ""
-#: builtin/read-tree.c:136
-msgid "read the tree into the index under <subdirectory>/"
+#: builtin/rm.c:215
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:219 builtin/rm.c:228
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/read-tree.c:139
-msgid "update working tree with merge result"
-msgstr ""
+#: builtin/rm.c:225
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/read-tree.c:141
-msgid "gitignore"
+#: builtin/rm.c:241
+msgid "do not list removed files"
msgstr ""
-#: builtin/read-tree.c:142
-msgid "allow explicitly ignored files to be overwritten"
+#: builtin/rm.c:242
+msgid "only remove from the index"
msgstr ""
-#: builtin/read-tree.c:145
-msgid "don't check the working tree after merging"
+#: builtin/rm.c:243
+msgid "override the up-to-date check"
msgstr ""
-#: builtin/read-tree.c:146
-msgid "don't update the index or the work tree"
+#: builtin/rm.c:244
+msgid "allow recursive removal"
msgstr ""
-#: builtin/read-tree.c:148
-msgid "skip applying sparse checkout filter"
+#: builtin/rm.c:246
+msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/read-tree.c:150
-msgid "debug unpack-trees"
+#: builtin/rm.c:288
+msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
+#: builtin/rm.c:306
+#, c-format
+msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rebase--helper.c:20
-msgid "continue rebase"
+#: builtin/rm.c:345
+#, c-format
+msgid "git rm: unable to remove %s"
msgstr ""
-#: builtin/rebase--helper.c:22
-msgid "abort rebase"
+#: builtin/send-pack.c:20
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all and explicit <ref> specification are mutually exclusive."
msgstr ""
-#: builtin/receive-pack.c:28
-msgid "git receive-pack <git-dir>"
+#: builtin/send-pack.c:163
+msgid "remote name"
msgstr ""
-#: builtin/receive-pack.c:838
-msgid ""
-"By default, updating the current branch in a non-bare repository\n"
-"is denied, because it will make the index and work tree inconsistent\n"
-"with what you pushed, and will require 'git reset --hard' to match\n"
-"the work tree to HEAD.\n"
-"\n"
-"You can set the 'receive.denyCurrentBranch' configuration variable\n"
-"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
-"its current branch; however, this is not recommended unless you\n"
-"arranged to update its work tree to match what you pushed in some\n"
-"other way.\n"
-"\n"
-"To squelch this message and still keep the default behaviour, set\n"
-"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+#: builtin/send-pack.c:177
+msgid "use stateless RPC protocol"
msgstr ""
-#: builtin/receive-pack.c:858
-msgid ""
-"By default, deleting the current branch is denied, because the next\n"
-"'git clone' won't result in any file checked out, causing confusion.\n"
-"\n"
-"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
-"'warn' or 'ignore' in the remote repository to allow deleting the\n"
-"current branch, with or without a warning message.\n"
-"\n"
-"To squelch this message, you can set it to 'refuse'."
+#: builtin/send-pack.c:178
+msgid "read refs from stdin"
msgstr ""
-#: builtin/receive-pack.c:1933
-msgid "quiet"
+#: builtin/send-pack.c:179
+msgid "print status from remote helper"
msgstr ""
-#: builtin/receive-pack.c:1947
-msgid "You must specify a directory."
+#: builtin/serve.c:7
+msgid "git serve [<options>]"
msgstr ""
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
+#: builtin/serve.c:17 builtin/upload-pack.c:23
+msgid "quit after a single request/response exchange"
msgstr ""
-#: builtin/reflog.c:541 builtin/reflog.c:546
-#, c-format
-msgid "'%s' is not a valid timestamp"
+#: builtin/serve.c:19
+msgid "exit immediately after advertising capabilities"
msgstr ""
-#: builtin/remote.c:13
-msgid "git remote [-v | --verbose]"
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/remote.c:14
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:35
-msgid "git remote rename <old> <new>"
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
msgstr ""
-#: builtin/remote.c:16 builtin/remote.c:40
-msgid "git remote remove <name>"
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/remote.c:17 builtin/remote.c:45
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/remote.c:18
-msgid "git remote [-v | --verbose] show [-n] <name>"
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
msgstr ""
-#: builtin/remote.c:19
-msgid "git remote prune [-n | --dry-run] <name>"
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
-#: builtin/remote.c:20
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
msgstr ""
-#: builtin/remote.c:21
-msgid "git remote set-branches [--add] <name> <branch>..."
+#: builtin/shortlog.c:299
+msgid "too many arguments given outside repository"
msgstr ""
-#: builtin/remote.c:22 builtin/remote.c:71
-msgid "git remote get-url [--push] [--all] <name>"
+#: builtin/show-branch.c:13
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:76
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:77
-msgid "git remote set-url --add <name> <newurl>"
+#: builtin/show-branch.c:395
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:549
+#, c-format
+msgid "no matching refs with %s"
msgstr ""
-#: builtin/remote.c:25 builtin/remote.c:78
-msgid "git remote set-url --delete <name> <url>"
+#: builtin/show-branch.c:646
+msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/remote.c:30
-msgid "git remote add [<options>] <name> <url>"
+#: builtin/show-branch.c:648
+msgid "show remote-tracking branches"
msgstr ""
-#: builtin/remote.c:50
-msgid "git remote set-branches <name> <branch>..."
+#: builtin/show-branch.c:650
+msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/remote.c:51
-msgid "git remote set-branches --add <name> <branch>..."
+#: builtin/show-branch.c:652
+msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/remote.c:56
-msgid "git remote show [<options>] <name>"
+#: builtin/show-branch.c:654
+msgid "synonym to more=-1"
msgstr ""
-#: builtin/remote.c:61
-msgid "git remote prune [<options>] <name>"
+#: builtin/show-branch.c:655
+msgid "suppress naming strings"
msgstr ""
-#: builtin/remote.c:66
-msgid "git remote update [<options>] [<group> | <remote>]..."
+#: builtin/show-branch.c:657
+msgid "include the current branch"
msgstr ""
-#: builtin/remote.c:95
-#, c-format
-msgid "Updating %s"
+#: builtin/show-branch.c:659
+msgid "name commits with their object names"
msgstr ""
-#: builtin/remote.c:127
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/show-branch.c:661
+msgid "show possible merge bases"
msgstr ""
-#: builtin/remote.c:144
-#, c-format
-msgid "unknown mirror argument: %s"
+#: builtin/show-branch.c:663
+msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/remote.c:160
-msgid "fetch the remote branches"
+#: builtin/show-branch.c:665
+msgid "show commits in topological order"
msgstr ""
-#: builtin/remote.c:162
-msgid "import all tags and associated objects when fetching"
+#: builtin/show-branch.c:668
+msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/remote.c:165
-msgid "or do not fetch any tag at all (--no-tags)"
+#: builtin/show-branch.c:670
+msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/remote.c:167
-msgid "branch(es) to track"
+#: builtin/show-branch.c:672
+msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/remote.c:168
-msgid "master branch"
+#: builtin/show-branch.c:675
+msgid "<n>[,<base>]"
msgstr ""
-#: builtin/remote.c:169
-msgid "push|fetch"
+#: builtin/show-branch.c:676
+msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/remote.c:170
-msgid "set up remote as a mirror to push to or fetch from"
+#: builtin/show-branch.c:712
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/remote.c:182
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/show-branch.c:736
+msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/remote.c:184
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/show-branch.c:739
+msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/show-branch.c:742
#, c-format
-msgid "remote %s already exists."
-msgstr ""
+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/remote.c:195 builtin/remote.c:634
+#: builtin/show-branch.c:746
#, c-format
-msgid "'%s' is not a valid remote name"
+msgid "no such ref %s"
msgstr ""
-#: builtin/remote.c:235
+#: builtin/show-branch.c:830
#, c-format
-msgid "Could not setup master '%s'"
-msgstr ""
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/remote.c:337
+#: builtin/show-branch.c:834
#, c-format
-msgid "Could not get fetch map for refspec %s"
+msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/remote.c:438 builtin/remote.c:446
-msgid "(matching)"
+#: builtin/show-branch.c:837
+#, c-format
+msgid "cannot find commit %s (%s)"
msgstr ""
-#: builtin/remote.c:450
-msgid "(delete)"
+#: builtin/show-ref.c:11
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
-#, c-format
-msgid "No such remote: %s"
+#: builtin/show-ref.c:12
+msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
-#: builtin/remote.c:640
-#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+#: builtin/show-ref.c:161
+msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/remote.c:660
-#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+#: builtin/show-ref.c:162
+msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/remote.c:696
-#, c-format
-msgid "deleting '%s' failed"
+#: builtin/show-ref.c:163
+msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/remote.c:730
-#, c-format
-msgid "creating '%s' failed"
+#: builtin/show-ref.c:166 builtin/show-ref.c:168
+msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/remote.c:795
-msgid ""
-"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
-"to delete it, use:"
-msgid_plural ""
-"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
-"to delete them, use:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:809
-#, c-format
-msgid "Could not remove config section '%s'"
+#: builtin/show-ref.c:170
+msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/remote.c:910
-#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+#: builtin/show-ref.c:172
+msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/remote.c:913
-msgid " tracked"
+#: builtin/show-ref.c:176
+msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/remote.c:915
-msgid " stale (use 'git remote prune' to remove)"
+#: builtin/show-ref.c:178
+msgid "show refs from stdin that aren't in local repository"
msgstr ""
-#: builtin/remote.c:917
-msgid " ???"
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
msgstr ""
-#: builtin/remote.c:958
-#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
msgstr ""
-#: builtin/remote.c:966
-#, c-format
-msgid "rebases interactively onto remote %s"
+#: builtin/stripspace.c:36
+msgid "skip and remove all lines starting with comment character"
msgstr ""
-#: builtin/remote.c:967
-#, c-format
-msgid "rebases onto remote %s"
+#: builtin/stripspace.c:39
+msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/remote.c:970
+#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
#, c-format
-msgid " merges with remote %s"
+msgid "Expecting a full ref name, got %s"
msgstr ""
-#: builtin/remote.c:973
-#, c-format
-msgid "merges with remote %s"
+#: builtin/submodule--helper.c:61
+msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/remote.c:976
+#: builtin/submodule--helper.c:99
#, c-format
-msgid "%-*s and with remote %s\n"
-msgstr ""
-
-#: builtin/remote.c:1019
-msgid "create"
+msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/remote.c:1022
-msgid "delete"
+#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/remote.c:1026
-msgid "up to date"
+#: builtin/submodule--helper.c:412
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/remote.c:1029
-msgid "fast-forwardable"
+#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:649
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/remote.c:1032
-msgid "local out of date"
+#: builtin/submodule--helper.c:521
+#, c-format
+msgid "Entering '%s'\n"
msgstr ""
-#: builtin/remote.c:1039
+#: builtin/submodule--helper.c:524
#, c-format
-msgid " %-*s forces to %-*s (%s)"
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
msgstr ""
-#: builtin/remote.c:1042
+#: builtin/submodule--helper.c:545
#, c-format
-msgid " %-*s pushes to %-*s (%s)"
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
msgstr ""
-#: builtin/remote.c:1046
-#, c-format
-msgid " %-*s forces to %s"
+#: builtin/submodule--helper.c:561
+msgid "Suppress output of entering each submodule command"
msgstr ""
-#: builtin/remote.c:1049
-#, c-format
-msgid " %-*s pushes to %s"
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+msgid "Recurse into nested submodules"
msgstr ""
-#: builtin/remote.c:1117
-msgid "do not query remotes"
+#: builtin/submodule--helper.c:568
+msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
msgstr ""
-#: builtin/remote.c:1144
+#: builtin/submodule--helper.c:595
#, c-format
-msgid "* remote %s"
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
msgstr ""
-#: builtin/remote.c:1145
+#: builtin/submodule--helper.c:663
#, c-format
-msgid " Fetch URL: %s"
+msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
-msgid "(no URL)"
+#: builtin/submodule--helper.c:667
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#. TRANSLATORS: the colon ':' should align
-#. with the one in " Fetch URL: %s"
-#. translation.
-#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/submodule--helper.c:677
#, c-format
-msgid " Push URL: %s"
+msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/submodule--helper.c:684
#, c-format
-msgid " HEAD branch: %s"
+msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/remote.c:1164
-msgid "(not queried)"
+#: builtin/submodule--helper.c:706
+msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/remote.c:1166
-msgid "(unknown)"
+#: builtin/submodule--helper.c:711
+msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/remote.c:1170
+#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
#, c-format
-msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/remote.c:1182
+#: builtin/submodule--helper.c:822
#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1185 builtin/remote.c:1211
-msgid " (status not queried)"
+msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/remote.c:1194
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1202
-msgid " Local refs will be mirrored by 'git push'"
+#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#, c-format
+msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/remote.c:1208
-#, c-format
-msgid " Local ref configured for 'git push'%s:"
-msgid_plural " Local refs configured for 'git push'%s:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+msgid "Suppress submodule status output"
+msgstr ""
-#: builtin/remote.c:1229
-msgid "set refs/remotes/<name>/HEAD according to remote"
+#: builtin/submodule--helper.c:874
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
msgstr ""
-#: builtin/remote.c:1231
-msgid "delete refs/remotes/<name>/HEAD"
+#: builtin/submodule--helper.c:875
+msgid "recurse into nested submodules"
msgstr ""
-#: builtin/remote.c:1246
-msgid "Cannot determine remote HEAD"
+#: builtin/submodule--helper.c:880
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/remote.c:1248
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: builtin/submodule--helper.c:904
+msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/remote.c:1258
+#: builtin/submodule--helper.c:968
#, c-format
-msgid "Could not delete %s"
+msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/remote.c:1266
+#: builtin/submodule--helper.c:974
#, c-format
-msgid "Not a valid ref: %s"
+msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/remote.c:1268
+#: builtin/submodule--helper.c:988
#, c-format
-msgid "Could not setup %s"
+msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/remote.c:1286
+#: builtin/submodule--helper.c:999
#, c-format
-msgid " %s will become dangling!"
+msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/remote.c:1287
-#, c-format
-msgid " %s has become dangling!"
+#: builtin/submodule--helper.c:1046
+msgid "Suppress output of synchronizing submodule url"
+msgstr ""
+
+#: builtin/submodule--helper.c:1053
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/remote.c:1297
+#: builtin/submodule--helper.c:1107
#, c-format
-msgid "Pruning %s"
+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/remote.c:1298
+#: builtin/submodule--helper.c:1119
#, c-format
-msgid "URL: %s"
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
msgstr ""
-#: builtin/remote.c:1314
+#: builtin/submodule--helper.c:1127
#, c-format
-msgid " * [would prune] %s"
+msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/remote.c:1317
+#: builtin/submodule--helper.c:1129
#, c-format
-msgid " * [pruned] %s"
+msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/remote.c:1362
-msgid "prune remotes after fetching"
+#: builtin/submodule--helper.c:1138
+#, c-format
+msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/submodule--helper.c:1154
#, c-format
-msgid "No such remote '%s'"
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/remote.c:1441
-msgid "add branch"
+#: builtin/submodule--helper.c:1183
+msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/remote.c:1448
-msgid "no remote specified"
+#: builtin/submodule--helper.c:1184
+msgid "Unregister all submodules"
msgstr ""
-#: builtin/remote.c:1465
-msgid "query push URLs rather than fetch URLs"
+#: builtin/submodule--helper.c:1189
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/remote.c:1467
-msgid "return all URLs"
+#: builtin/submodule--helper.c:1203
+msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/remote.c:1495
+#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
#, c-format
-msgid "no URLs configured for remote '%s'"
+msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/remote.c:1521
-msgid "manipulate push URLs"
+#: builtin/submodule--helper.c:1336
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/remote.c:1523
-msgid "add URL"
+#: builtin/submodule--helper.c:1343
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/remote.c:1525
-msgid "delete URLs"
+#: builtin/submodule--helper.c:1366
+msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/remote.c:1532
-msgid "--add --delete doesn't make sense"
+#: builtin/submodule--helper.c:1369
+msgid "name of the new submodule"
msgstr ""
-#: builtin/remote.c:1573
-#, c-format
-msgid "Invalid old URL pattern: %s"
+#: builtin/submodule--helper.c:1372
+msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/remote.c:1581
-#, c-format
-msgid "No such URL found: %s"
+#: builtin/submodule--helper.c:1380
+msgid "depth for shallow clones"
msgstr ""
-#: builtin/remote.c:1583
-msgid "Will not delete all non-push URLs"
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+msgid "force cloning progress"
msgstr ""
-#: builtin/remote.c:1597
-msgid "be verbose; must be placed before a subcommand"
+#: builtin/submodule--helper.c:1388
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/remote.c:1628
+#: builtin/submodule--helper.c:1419
#, c-format
-msgid "Unknown subcommand: %s"
+msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/repack.c:18
-msgid "git repack [<options>]"
+#: builtin/submodule--helper.c:1433
+#, c-format
+msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/repack.c:23
-msgid ""
-"Incremental repacks are incompatible with bitmap indexes. Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+#: builtin/submodule--helper.c:1469
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/repack.c:168
-msgid "pack everything in a single pack"
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/repack.c:170
-msgid "same as -a, and turn unreachable objects loose"
+#: builtin/submodule--helper.c:1566
+#, c-format
+msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/repack.c:173
-msgid "remove redundant packs, and run git-prune-packed"
+#: builtin/submodule--helper.c:1570
+msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/repack.c:175
-msgid "pass --no-reuse-delta to git-pack-objects"
+#: builtin/submodule--helper.c:1600
+#, c-format
+msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/repack.c:177
-msgid "pass --no-reuse-object to git-pack-objects"
+#: builtin/submodule--helper.c:1629
+#, c-format
+msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/repack.c:179
-msgid "do not run git-update-server-info"
+#: builtin/submodule--helper.c:1773
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/repack.c:182
-msgid "pass --local to git-pack-objects"
+#: builtin/submodule--helper.c:1784
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/repack.c:184
-msgid "write bitmap index"
+#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+msgid "path into the working tree"
msgstr ""
-#: builtin/repack.c:185
-msgid "approxidate"
+#: builtin/submodule--helper.c:1850
+msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/repack.c:186
-msgid "with -A, do not loosen objects older than this"
+#: builtin/submodule--helper.c:1854
+msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/repack.c:188
-msgid "with -a, repack unreachable objects"
+#: builtin/submodule--helper.c:1860
+msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/repack.c:190
-msgid "size of the window used for delta compression"
+#: builtin/submodule--helper.c:1863
+msgid "parallel jobs"
msgstr ""
-#: builtin/repack.c:191 builtin/repack.c:197
-msgid "bytes"
+#: builtin/submodule--helper.c:1865
+msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/repack.c:192
-msgid "same as the above, but limit memory size instead of entries count"
+#: builtin/submodule--helper.c:1866
+msgid "don't print cloning progress"
msgstr ""
-#: builtin/repack.c:194
-msgid "limits the maximum delta depth"
+#: builtin/submodule--helper.c:1873
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/repack.c:196
-msgid "limits the maximum number of threads"
+#: builtin/submodule--helper.c:1886
+msgid "bad value for update parameter"
msgstr ""
-#: builtin/repack.c:198
-msgid "maximum size of each packfile"
+#: builtin/submodule--helper.c:1934
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
msgstr ""
-#: builtin/repack.c:200
-msgid "repack objects in packs marked with .keep"
+#: builtin/submodule--helper.c:2057
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/repack.c:210
-msgid "cannot delete packs in a precious-objects repo"
+#: builtin/submodule--helper.c:2090
+msgid "recurse into submodules"
msgstr ""
-#: builtin/repack.c:214
-msgid "--keep-unreachable and -A are incompatible"
+#: builtin/submodule--helper.c:2096
+msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr ""
-#: builtin/repack.c:406 builtin/worktree.c:116
-#, c-format
-msgid "failed to remove '%s'"
+#: builtin/submodule--helper.c:2152
+msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/replace.c:20
-msgid "git replace [-f] <object> <replacement>"
+#: builtin/submodule--helper.c:2157
+msgid "git submodule--helper config name [value]"
msgstr ""
-#: builtin/replace.c:21
-msgid "git replace [-f] --edit <object>"
+#: builtin/submodule--helper.c:2158
+msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/replace.c:22
-msgid "git replace [-f] --graft <commit> [<parent>...]"
+#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/replace.c:23
-msgid "git replace -d <object>..."
+#: builtin/submodule--helper.c:2225
+#, c-format
+msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/replace.c:24
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
+#: builtin/submodule--helper.c:2231
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
-#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
-#, c-format
-msgid "Not a valid object name: '%s'"
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
-#: builtin/replace.c:361
-#, c-format
-msgid "bad mergetag in commit '%s'"
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
-#: builtin/replace.c:363
-#, c-format
-msgid "malformed mergetag in commit '%s'"
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/replace.c:374
-#, c-format
-msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
msgstr ""
-#: builtin/replace.c:407
-#, c-format
-msgid "the original commit '%s' has a gpg signature."
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
msgstr ""
-#: builtin/replace.c:408
-msgid "the signature will be removed in the replacement commit!"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
msgstr ""
-#: builtin/replace.c:414
-#, c-format
-msgid "could not write replacement commit for: '%s'"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
msgstr ""
-#: builtin/replace.c:438
-msgid "list replace refs"
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
msgstr ""
-#: builtin/replace.c:439
-msgid "delete replace refs"
+#: builtin/tag.c:26
+msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/replace.c:440
-msgid "edit existing object"
+#: builtin/tag.c:27
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-#: builtin/replace.c:441
-msgid "change a commit's parents"
+#: builtin/tag.c:29
+msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/replace.c:442
-msgid "replace the ref if it exists"
+#: builtin/tag.c:87
+#, c-format
+msgid "tag '%s' not found."
msgstr ""
-#: builtin/replace.c:443
-msgid "do not pretty-print contents for --edit"
+#: builtin/tag.c:103
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/replace.c:444
-msgid "use this format"
+#: builtin/tag.c:133
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/rerere.c:13
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+#: builtin/tag.c:137
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
msgstr ""
-#: builtin/rerere.c:59
-msgid "register clean resolutions in index"
+#: builtin/tag.c:191
+msgid "unable to sign the tag"
msgstr ""
-#: builtin/reset.c:29
-msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+#: builtin/tag.c:193
+msgid "unable to write tag file"
msgstr ""
-#: builtin/reset.c:30
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+#: builtin/tag.c:218
+msgid "bad object type."
msgstr ""
-#: builtin/reset.c:31
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+#: builtin/tag.c:267
+msgid "no tag message?"
msgstr ""
-#: builtin/reset.c:37
-msgid "mixed"
+#: builtin/tag.c:274
+#, c-format
+msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/reset.c:37
-msgid "soft"
+#: builtin/tag.c:385
+msgid "list tag names"
msgstr ""
-#: builtin/reset.c:37
-msgid "hard"
+#: builtin/tag.c:387
+msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/reset.c:37
-msgid "merge"
+#: builtin/tag.c:389
+msgid "delete tags"
msgstr ""
-#: builtin/reset.c:37
-msgid "keep"
+#: builtin/tag.c:390
+msgid "verify tags"
msgstr ""
-#: builtin/reset.c:77
-msgid "You do not have a valid HEAD."
+#: builtin/tag.c:392
+msgid "Tag creation options"
msgstr ""
-#: builtin/reset.c:79
-msgid "Failed to find tree of HEAD."
+#: builtin/tag.c:394
+msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/reset.c:85
-#, c-format
-msgid "Failed to find tree of %s."
+#: builtin/tag.c:396
+msgid "tag message"
msgstr ""
-#: builtin/reset.c:103
-#, c-format
-msgid "HEAD is now at %s"
+#: builtin/tag.c:398
+msgid "force edit of tag message"
msgstr ""
-#: builtin/reset.c:186
-#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
+#: builtin/tag.c:399
+msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/reset.c:286
-msgid "be quiet, only report errors"
+#: builtin/tag.c:403
+msgid "use another key to sign the tag"
msgstr ""
-#: builtin/reset.c:288
-msgid "reset HEAD and index"
+#: builtin/tag.c:404
+msgid "replace the tag if exists"
msgstr ""
-#: builtin/reset.c:289
-msgid "reset only HEAD"
+#: builtin/tag.c:405 builtin/update-ref.c:369
+msgid "create a reflog"
msgstr ""
-#: builtin/reset.c:291 builtin/reset.c:293
-msgid "reset HEAD, index and working tree"
+#: builtin/tag.c:407
+msgid "Tag listing options"
msgstr ""
-#: builtin/reset.c:295
-msgid "reset HEAD but keep local changes"
+#: builtin/tag.c:408
+msgid "show tag list in columns"
msgstr ""
-#: builtin/reset.c:301
-msgid "record only the fact that removed paths will be added later"
+#: builtin/tag.c:409 builtin/tag.c:411
+msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/reset.c:320
-#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
+#: builtin/tag.c:410 builtin/tag.c:412
+msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/reset.c:328
-#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
+#: builtin/tag.c:413
+msgid "print only tags that are merged"
msgstr ""
-#: builtin/reset.c:337
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: builtin/tag.c:414
+msgid "print only tags that are not merged"
msgstr ""
-#: builtin/reset.c:346
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: builtin/tag.c:419
+msgid "print only tags of the object"
msgstr ""
-#: builtin/reset.c:348
-#, c-format
-msgid "Cannot do %s reset with paths."
+#: builtin/tag.c:463
+msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/reset.c:358
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
+#: builtin/tag.c:485
+msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/reset.c:362
-msgid "-N can only be used with --mixed"
+#: builtin/tag.c:487
+msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/reset.c:379
-msgid "Unstaged changes after reset:"
+#: builtin/tag.c:489
+msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/reset.c:385
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: builtin/tag.c:491
+msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/reset.c:389
-msgid "Could not write new index file."
+#: builtin/tag.c:493
+msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/rev-list.c:358
-msgid "rev-list does not support display of notes"
+#: builtin/tag.c:504
+msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/rev-parse.c:394
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+#: builtin/tag.c:523
+msgid "too many params"
msgstr ""
-#: builtin/rev-parse.c:399
-msgid "keep the `--` passed as an arg"
+#: builtin/tag.c:529
+#, c-format
+msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/rev-parse.c:401
-msgid "stop parsing after the first non-option argument"
+#: builtin/tag.c:534
+#, c-format
+msgid "tag '%s' already exists"
msgstr ""
-#: builtin/rev-parse.c:404
-msgid "output in stuck long form"
+#: builtin/tag.c:565
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/rev-parse.c:535
-msgid ""
-"git rev-parse --parseopt [<options>] -- [<args>...]\n"
-" or: git rev-parse --sq-quote [<arg>...]\n"
-" or: git rev-parse [<options>] [<arg>...]\n"
-"\n"
-"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+#: builtin/unpack-objects.c:500
+msgid "Unpacking objects"
msgstr ""
-#: builtin/revert.c:23
-msgid "git revert [<options>] <commit-ish>..."
+#: builtin/update-index.c:82
+#, c-format
+msgid "failed to create directory %s"
msgstr ""
-#: builtin/revert.c:24
-msgid "git revert <subcommand>"
+#: builtin/update-index.c:98
+#, c-format
+msgid "failed to create file %s"
msgstr ""
-#: builtin/revert.c:29
-msgid "git cherry-pick [<options>] <commit-ish>..."
+#: builtin/update-index.c:106
+#, c-format
+msgid "failed to delete file %s"
msgstr ""
-#: builtin/revert.c:30
-msgid "git cherry-pick <subcommand>"
+#: builtin/update-index.c:113 builtin/update-index.c:219
+#, c-format
+msgid "failed to delete directory %s"
msgstr ""
-#: builtin/revert.c:90
+#: builtin/update-index.c:138
#, c-format
-msgid "%s: %s cannot be used with %s"
+msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/revert.c:99
-msgid "end revert or cherry-pick sequence"
+#: builtin/update-index.c:152
+msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/revert.c:100
-msgid "resume revert or cherry-pick sequence"
+#: builtin/update-index.c:165
+msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/revert.c:101
-msgid "cancel revert or cherry-pick sequence"
+#: builtin/update-index.c:178
+msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/revert.c:102
-msgid "don't automatically commit"
+#: builtin/update-index.c:189
+msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/revert.c:103
-msgid "edit the commit message"
+#: builtin/update-index.c:200
+msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/revert.c:106
-msgid "parent-number"
+#: builtin/update-index.c:213
+msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/revert.c:107
-msgid "select mainline parent"
+#: builtin/update-index.c:220
+msgid " OK"
msgstr ""
-#: builtin/revert.c:109
-msgid "merge strategy"
+#: builtin/update-index.c:588
+msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/revert.c:110
-msgid "option"
+#: builtin/update-index.c:961
+msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/revert.c:111
-msgid "option for merge strategy"
+#: builtin/update-index.c:964
+msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/revert.c:120
-msgid "append commit name"
+#: builtin/update-index.c:967
+msgid "do not ignore new files"
msgstr ""
-#: builtin/revert.c:122
-msgid "preserve initially empty commits"
+#: builtin/update-index.c:969
+msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
+#: builtin/update-index.c:971
+msgid "notice files missing from worktree"
msgstr ""
-#: builtin/revert.c:124
-msgid "keep redundant, empty commits"
+#: builtin/update-index.c:973
+msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/revert.c:212
-msgid "revert failed"
+#: builtin/update-index.c:976
+msgid "refresh stat information"
msgstr ""
-#: builtin/revert.c:225
-msgid "cherry-pick failed"
+#: builtin/update-index.c:980
+msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/rm.c:18
-msgid "git rm [<options>] [--] <file>..."
+#: builtin/update-index.c:984
+msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/rm.c:206
-msgid ""
-"the following file has staged content different from both the\n"
-"file and the HEAD:"
-msgid_plural ""
-"the following files have staged content different from both the\n"
-"file and the HEAD:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/rm.c:211
-msgid ""
-"\n"
-"(use -f to force removal)"
+#: builtin/update-index.c:985
+msgid "add the specified entry to the index"
msgstr ""
-#: builtin/rm.c:215
-msgid "the following file has changes staged in the index:"
-msgid_plural "the following files have changes staged in the index:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/update-index.c:994
+msgid "mark files as \"not changing\""
+msgstr ""
-#: builtin/rm.c:219 builtin/rm.c:228
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/update-index.c:997
+msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/rm.c:225
-msgid "the following file has local modifications:"
-msgid_plural "the following files have local modifications:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/update-index.c:1000
+msgid "mark files as \"index-only\""
+msgstr ""
-#: builtin/rm.c:243
-msgid "do not list removed files"
+#: builtin/update-index.c:1003
+msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/rm.c:244
-msgid "only remove from the index"
+#: builtin/update-index.c:1006
+msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/rm.c:245
-msgid "override the up-to-date check"
+#: builtin/update-index.c:1008
+msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/rm.c:246
-msgid "allow recursive removal"
+#: builtin/update-index.c:1010
+msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/rm.c:248
-msgid "exit with a zero status even if nothing matched"
+#: builtin/update-index.c:1012
+msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/rm.c:308
-#, c-format
-msgid "not removing '%s' recursively without -r"
+#: builtin/update-index.c:1016
+msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/rm.c:347
-#, c-format
-msgid "git rm: unable to remove %s"
+#: builtin/update-index.c:1020
+msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/rm.c:370
-#, c-format
-msgid "could not remove '%s'"
+#: builtin/update-index.c:1024
+msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/send-pack.c:19
-msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+#: builtin/update-index.c:1028
+msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/send-pack.c:162
-msgid "remote name"
+#: builtin/update-index.c:1031
+msgid "report actions to standard output"
msgstr ""
-#: builtin/send-pack.c:176
-msgid "use stateless RPC protocol"
+#: builtin/update-index.c:1033
+msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/send-pack.c:177
-msgid "read refs from stdin"
+#: builtin/update-index.c:1037
+msgid "write index in this format"
msgstr ""
-#: builtin/send-pack.c:178
-msgid "print status from remote helper"
+#: builtin/update-index.c:1039
+msgid "enable or disable split index"
msgstr ""
-#: builtin/shortlog.c:14
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+#: builtin/update-index.c:1041
+msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/shortlog.c:249
-msgid "Group by committer rather than author"
+#: builtin/update-index.c:1043
+msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/shortlog.c:251
-msgid "sort output according to the number of commits per author"
+#: builtin/update-index.c:1045
+msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/shortlog.c:253
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/update-index.c:1047
+msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/shortlog.c:255
-msgid "Show the email address of each author"
+#: builtin/update-index.c:1049
+msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/shortlog.c:256
-msgid "w[,i1[,i2]]"
+#: builtin/update-index.c:1051
+msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/shortlog.c:257
-msgid "Linewrap output"
+#: builtin/update-index.c:1054
+msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/show-branch.c:12
+#: builtin/update-index.c:1153
msgid ""
-"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
msgstr ""
-#: builtin/show-branch.c:16
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+#: builtin/update-index.c:1162
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
msgstr ""
-#: builtin/show-branch.c:376
-#, c-format
-msgid "ignoring %s; cannot handle more than %d ref"
-msgid_plural "ignoring %s; cannot handle more than %d refs"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/update-index.c:1173
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
-#: builtin/show-branch.c:530
-#, c-format
-msgid "no matching refs with %s"
+#: builtin/update-index.c:1177
+msgid "Untracked cache disabled"
msgstr ""
-#: builtin/show-branch.c:626
-msgid "show remote-tracking and local branches"
+#: builtin/update-index.c:1185
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
msgstr ""
-#: builtin/show-branch.c:628
-msgid "show remote-tracking branches"
+#: builtin/update-index.c:1189
+#, c-format
+msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/show-branch.c:630
-msgid "color '*!+-' corresponding to the branch"
+#: builtin/update-index.c:1197
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/show-branch.c:632
-msgid "show <n> more commits after the common ancestor"
+#: builtin/update-index.c:1201
+msgid "fsmonitor enabled"
msgstr ""
-#: builtin/show-branch.c:634
-msgid "synonym to more=-1"
+#: builtin/update-index.c:1204
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/show-branch.c:635
-msgid "suppress naming strings"
+#: builtin/update-index.c:1208
+msgid "fsmonitor disabled"
msgstr ""
-#: builtin/show-branch.c:637
-msgid "include the current branch"
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
-#: builtin/show-branch.c:639
-msgid "name commits with their object names"
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-#: builtin/show-branch.c:641
-msgid "show possible merge bases"
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/show-branch.c:643
-msgid "show refs unreachable from any other ref"
+#: builtin/update-ref.c:364
+msgid "delete the reference"
msgstr ""
-#: builtin/show-branch.c:645
-msgid "show commits in topological order"
+#: builtin/update-ref.c:366
+msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/show-branch.c:648
-msgid "show only commits not on the first branch"
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/show-branch.c:650
-msgid "show merges reachable from only one tip"
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
msgstr ""
-#: builtin/show-branch.c:652
-msgid "topologically sort, maintaining date order where possible"
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
msgstr ""
-#: builtin/show-branch.c:655
-msgid "<n>[,<base>]"
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
msgstr ""
-#: builtin/show-branch.c:656
-msgid "show <n> most recent ref-log entries starting at base"
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
msgstr ""
-#: builtin/show-branch.c:690
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
msgstr ""
-#: builtin/show-branch.c:714
-msgid "no branches given, and HEAD is not valid"
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
-#: builtin/show-branch.c:717
-msgid "--reflog option needs one branch name"
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: builtin/show-branch.c:720
-#, c-format
-msgid "only %d entry can be shown at one time."
-msgid_plural "only %d entries can be shown at one time."
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/verify-commit.c:20
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr ""
-#: builtin/show-branch.c:724
-#, c-format
-msgid "no such ref %s"
+#: builtin/verify-commit.c:76
+msgid "print commit contents"
msgstr ""
-#: builtin/show-branch.c:808
-#, c-format
-msgid "cannot handle more than %d rev."
-msgid_plural "cannot handle more than %d revs."
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+msgid "print raw gpg status output"
+msgstr ""
-#: builtin/show-branch.c:812
-#, c-format
-msgid "'%s' is not a valid ref."
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr ""
-#: builtin/show-branch.c:815
-#, c-format
-msgid "cannot find commit %s (%s)"
+#: builtin/verify-pack.c:65
+msgid "verbose"
msgstr ""
-#: builtin/show-ref.c:10
-msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
msgstr ""
-#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>]"
+#: builtin/verify-tag.c:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr ""
-#: builtin/show-ref.c:159
-msgid "only show tags (can be combined with heads)"
+#: builtin/verify-tag.c:37
+msgid "print tag contents"
msgstr ""
-#: builtin/show-ref.c:160
-msgid "only show heads (can be combined with tags)"
+#: builtin/worktree.c:17
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/show-ref.c:161
-msgid "stricter reference checking, requires exact ref path"
+#: builtin/worktree.c:18
+msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/show-ref.c:164 builtin/show-ref.c:166
-msgid "show the HEAD reference, even if it would be filtered out"
+#: builtin/worktree.c:19
+msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/show-ref.c:168
-msgid "dereference tags into object IDs"
+#: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/show-ref.c:170
-msgid "only show SHA1 hash using <n> digits"
+#: builtin/worktree.c:21
+msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/show-ref.c:174
-msgid "do not print results to stdout (useful with --verify)"
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/show-ref.c:176
-msgid "show refs from stdin that aren't in local repository"
+#: builtin/worktree.c:23
+msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
+#: builtin/worktree.c:60 builtin/worktree.c:871
+#, c-format
+msgid "failed to delete '%s'"
msgstr ""
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
+#: builtin/worktree.c:79
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/stripspace.c:36
-msgid "skip and remove all lines starting with comment character"
+#: builtin/worktree.c:85
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/stripspace.c:39
-msgid "prepend comment character and space to each line"
+#: builtin/worktree.c:90 builtin/worktree.c:99
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/worktree.c:109
#, c-format
-msgid "No such ref: %s"
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
msgstr ""
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/worktree.c:117
#, c-format
-msgid "Expecting a full ref name, got %s"
+msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/submodule--helper.c:72
+#: builtin/worktree.c:126
#, c-format
-msgid "cannot strip one component off url '%s'"
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
-msgid "alternative anchor for relative paths"
+#: builtin/worktree.c:165
+msgid "report pruned working trees"
msgstr ""
-#: builtin/submodule--helper.c:310
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+#: builtin/worktree.c:167
+msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/worktree.c:234
#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
+msgid "'%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:251
+#, c-format
+msgid "unable to re-add worktree '%s'"
msgstr ""
-#: builtin/submodule--helper.c:395
+#: builtin/worktree.c:256
#, c-format
msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/submodule--helper.c:406
+#: builtin/worktree.c:258
#, c-format
-msgid "Failed to register url for submodule path '%s'"
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/submodule--helper.c:410
+#: builtin/worktree.c:309
#, c-format
-msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/submodule--helper.c:420
+#: builtin/worktree.c:428 builtin/worktree.c:434
#, c-format
-msgid "warning: command update mode suggested for submodule '%s'\n"
+msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/submodule--helper.c:427
+#: builtin/worktree.c:430
#, c-format
-msgid "Failed to register update mode for submodule path '%s'"
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/submodule--helper.c:443
-msgid "Suppress output for initializing a submodule"
+#: builtin/worktree.c:439
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/submodule--helper.c:448
-msgid "git submodule--helper init [<path>]"
+#: builtin/worktree.c:445
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
+#: builtin/worktree.c:486
+msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/submodule--helper.c:482
-#, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
+#: builtin/worktree.c:489
+msgid "create a new branch"
msgstr ""
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
-#, c-format
-msgid "submodule '%s' cannot add alternate: %s"
+#: builtin/worktree.c:491
+msgid "create or reset a branch"
msgstr ""
-#: builtin/submodule--helper.c:604
-#, c-format
-msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+#: builtin/worktree.c:493
+msgid "populate the new working tree"
msgstr ""
-#: builtin/submodule--helper.c:611
-#, c-format
-msgid "Value '%s' for submodule.alternateLocation is not recognized"
+#: builtin/worktree.c:494
+msgid "keep the new working tree locked"
msgstr ""
-#: builtin/submodule--helper.c:633
-msgid "where the new submodule will be cloned to"
+#: builtin/worktree.c:497
+msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/submodule--helper.c:636
-msgid "name of the new submodule"
+#: builtin/worktree.c:500
+msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/submodule--helper.c:639
-msgid "url where to clone the submodule from"
+#: builtin/worktree.c:508
+msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/submodule--helper.c:645
-msgid "depth for shallow clones"
+#: builtin/worktree.c:569
+msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
-msgid "force cloning progress"
+#: builtin/worktree.c:669
+msgid "reason for locking"
msgstr ""
-#: builtin/submodule--helper.c:653
-msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
+#: builtin/worktree.c:899
+#, c-format
+msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/submodule--helper.c:684
+#: builtin/worktree.c:683 builtin/worktree.c:716
+msgid "The main working tree cannot be locked or unlocked"
+msgstr ""
+
+#: builtin/worktree.c:688
#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
+msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/submodule--helper.c:699
+#: builtin/worktree.c:690
#, c-format
-msgid "could not get submodule directory for '%s'"
+msgid "'%s' is already locked"
msgstr ""
-#: builtin/submodule--helper.c:764
+#: builtin/worktree.c:718
#, c-format
-msgid "Submodule path '%s' not initialized"
+msgid "'%s' is not locked"
msgstr ""
-#: builtin/submodule--helper.c:768
-msgid "Maybe you want to use 'update --init'?"
+#: builtin/worktree.c:743
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:751
+msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/submodule--helper.c:793
+#: builtin/worktree.c:774 builtin/worktree.c:901
#, c-format
-msgid "Skipping unmerged submodule %s"
+msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/submodule--helper.c:814
+#: builtin/worktree.c:779
#, c-format
-msgid "Skipping submodule '%s'"
+msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/submodule--helper.c:942
+#: builtin/worktree.c:785
#, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
+msgid "target '%s' already exists"
msgstr ""
-#: builtin/submodule--helper.c:953
+#: builtin/worktree.c:793
#, c-format
-msgid "Failed to clone '%s' a second time, aborting"
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
-msgid "path into the working tree"
+#: builtin/worktree.c:795
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/submodule--helper.c:977
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/worktree.c:798
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/submodule--helper.c:981
-msgid "rebase, merge, checkout or none"
+#: builtin/worktree.c:803
+#, c-format
+msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/submodule--helper.c:985
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/worktree.c:851
+#, c-format
+msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/submodule--helper.c:988
-msgid "parallel jobs"
+#: builtin/worktree.c:855
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/submodule--helper.c:990
-msgid "whether the initial clone should follow the shallow recommendation"
+#: builtin/worktree.c:860
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/submodule--helper.c:991
-msgid "don't print cloning progress"
+#: builtin/worktree.c:883
+msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/submodule--helper.c:998
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/worktree.c:906
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/submodule--helper.c:1008
-msgid "bad value for update parameter"
+#: builtin/worktree.c:908
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/submodule--helper.c:1079
+#: builtin/worktree.c:911
#, c-format
-msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
+msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/submodule--helper.c:1163
-msgid "recurse into submodules"
+#: builtin/write-tree.c:14
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: builtin/submodule--helper.c:1169
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/write-tree.c:27
+msgid "<prefix>/"
msgstr ""
-#: builtin/submodule--helper.c:1232
-#, c-format
-msgid "%s doesn't support --super-prefix"
+#: builtin/write-tree.c:28
+msgid "write tree object for a subdirectory <prefix>"
+msgstr ""
+
+#: builtin/write-tree.c:30
+msgid "only useful for debugging"
msgstr ""
-#: builtin/submodule--helper.c:1238
+#: credential-cache--daemon.c:222
#, c-format
-msgid "'%s' is not a valid submodule--helper subcommand"
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
msgstr ""
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
+#: credential-cache--daemon.c:271
+msgid "print debugging messages to stderr"
msgstr ""
-#: builtin/symbolic-ref.c:9
-msgid "git symbolic-ref -d [-q] <name>"
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
msgstr ""
-#: builtin/symbolic-ref.c:41
-msgid "suppress error message for non-symbolic (detached) refs"
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
msgstr ""
-#: builtin/symbolic-ref.c:42
-msgid "delete symbolic ref"
+#: git.c:27
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" <command> [<args>]"
msgstr ""
-#: builtin/symbolic-ref.c:43
-msgid "shorten ref output"
+#: git.c:34
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
msgstr ""
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
-msgid "reason"
+#: git.c:173
+#, c-format
+msgid "no directory given for --git-dir\n"
msgstr ""
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
-msgid "reason of the update"
+#: git.c:187
+#, c-format
+msgid "no namespace given for --namespace\n"
msgstr ""
-#: builtin/tag.c:24
-msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+#: git.c:201
+#, c-format
+msgid "no directory given for --work-tree\n"
msgstr ""
-#: builtin/tag.c:25
-msgid "git tag -d <tagname>..."
+#: git.c:215
+#, c-format
+msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: builtin/tag.c:26
-msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+#: git.c:237
+#, c-format
+msgid "-c expects a configuration string\n"
msgstr ""
-#: builtin/tag.c:28
-msgid "git tag -v [--format=<format>] <tagname>..."
+#: git.c:275
+#, c-format
+msgid "no directory given for -C\n"
msgstr ""
-#: builtin/tag.c:84
+#: git.c:300
#, c-format
-msgid "tag '%s' not found."
+msgid "unknown option: %s\n"
msgstr ""
-#: builtin/tag.c:100
+#: git.c:719
#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: builtin/tag.c:129
+#: git.c:802
#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be ignored.\n"
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: builtin/tag.c:133
+#: git.c:814
#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you "
-"want to.\n"
+msgid "failed to run command '%s': %s\n"
msgstr ""
-#: builtin/tag.c:211
-msgid "unable to sign the tag"
+#: http.c:374
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: builtin/tag.c:213
-msgid "unable to write tag file"
+#: http.c:395
+msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: builtin/tag.c:237
-msgid "bad object type."
+#: http.c:404
+msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: builtin/tag.c:283
-msgid "no tag message?"
+#: http.c:837
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: builtin/tag.c:290
-#, c-format
-msgid "The tag message has been left in %s\n"
+#: http.c:910
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr ""
-#: builtin/tag.c:398
-msgid "list tag names"
+#: http.c:1046
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: builtin/tag.c:400
-msgid "print <n> lines of each tag message"
+#: http.c:1053
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: builtin/tag.c:402
-msgid "delete tags"
+#: http.c:1057
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: builtin/tag.c:403
-msgid "verify tags"
+#: http.c:1921
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
msgstr ""
-#: builtin/tag.c:405
-msgid "Tag creation options"
+#: remote-curl.c:401
+#, c-format
+msgid "redirecting to %s"
msgstr ""
-#: builtin/tag.c:407
-msgid "annotated tag, needs a message"
+#: list-objects-filter-options.h:60
+msgid "args"
msgstr ""
-#: builtin/tag.c:409
-msgid "tag message"
+#: list-objects-filter-options.h:61
+msgid "object filtering"
msgstr ""
-#: builtin/tag.c:411
-msgid "annotated and GPG-signed tag"
+#: parse-options.h:154
+msgid "expiry-date"
msgstr ""
-#: builtin/tag.c:415
-msgid "use another key to sign the tag"
+#: parse-options.h:169
+msgid "no-op (backward compatibility)"
msgstr ""
-#: builtin/tag.c:416
-msgid "replace the tag if exists"
+#: parse-options.h:261
+msgid "be more verbose"
msgstr ""
-#: builtin/tag.c:417 builtin/update-ref.c:369
-msgid "create a reflog"
+#: parse-options.h:263
+msgid "be more quiet"
msgstr ""
-#: builtin/tag.c:419
-msgid "Tag listing options"
+#: parse-options.h:269
+msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: builtin/tag.c:420
-msgid "show tag list in columns"
+#: command-list.h:50
+msgid "Add file contents to the index"
msgstr ""
-#: builtin/tag.c:421 builtin/tag.c:423
-msgid "print only tags that contain the commit"
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
msgstr ""
-#: builtin/tag.c:422 builtin/tag.c:424
-msgid "print only tags that don't contain the commit"
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
msgstr ""
-#: builtin/tag.c:425
-msgid "print only tags that are merged"
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
msgstr ""
-#: builtin/tag.c:426
-msgid "print only tags that are not merged"
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
msgstr ""
-#: builtin/tag.c:431
-msgid "print only tags of the object"
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
msgstr ""
-#: builtin/tag.c:470
-msgid "--column and -n are incompatible"
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
msgstr ""
-#: builtin/tag.c:492
-msgid "-n option is only allowed in list mode"
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
msgstr ""
-#: builtin/tag.c:494
-msgid "--contains option is only allowed in list mode"
+#: command-list.h:58
+msgid "List, create, or delete branches"
msgstr ""
-#: builtin/tag.c:496
-msgid "--no-contains option is only allowed in list mode"
+#: command-list.h:59
+msgid "Move objects and refs by archive"
msgstr ""
-#: builtin/tag.c:498
-msgid "--points-at option is only allowed in list mode"
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
msgstr ""
-#: builtin/tag.c:500
-msgid "--merged and --no-merged options are only allowed in list mode"
+#: command-list.h:61
+msgid "Display gitattributes information"
msgstr ""
-#: builtin/tag.c:511
-msgid "only one -F or -m option is allowed."
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
msgstr ""
-#: builtin/tag.c:530
-msgid "too many params"
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
msgstr ""
-#: builtin/tag.c:536
-#, c-format
-msgid "'%s' is not a valid tag name."
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
msgstr ""
-#: builtin/tag.c:541
-#, c-format
-msgid "tag '%s' already exists"
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
msgstr ""
-#: builtin/tag.c:571
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
msgstr ""
-#: builtin/unpack-objects.c:494
-msgid "Unpacking objects"
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
msgstr ""
-#: builtin/update-index.c:80
-#, c-format
-msgid "failed to create directory %s"
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
msgstr ""
-#: builtin/update-index.c:86
-#, c-format
-msgid "failed to stat %s"
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
msgstr ""
-#: builtin/update-index.c:96
-#, c-format
-msgid "failed to create file %s"
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
msgstr ""
-#: builtin/update-index.c:104
-#, c-format
-msgid "failed to delete file %s"
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
msgstr ""
-#: builtin/update-index.c:111 builtin/update-index.c:217
-#, c-format
-msgid "failed to delete directory %s"
+#: command-list.h:72
+msgid "Display data in columns"
msgstr ""
-#: builtin/update-index.c:136
-#, c-format
-msgid "Testing mtime in '%s' "
+#: command-list.h:73
+msgid "Record changes to the repository"
msgstr ""
-#: builtin/update-index.c:150
-msgid "directory stat info does not change after adding a new file"
+#: command-list.h:74
+msgid "Write and verify Git commit-graph files"
msgstr ""
-#: builtin/update-index.c:163
-msgid "directory stat info does not change after adding a new directory"
+#: command-list.h:75
+msgid "Create a new commit object"
msgstr ""
-#: builtin/update-index.c:176
-msgid "directory stat info changes after updating a file"
+#: command-list.h:76
+msgid "Get and set repository or global options"
msgstr ""
-#: builtin/update-index.c:187
-msgid "directory stat info changes after adding a file inside subdirectory"
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
-#: builtin/update-index.c:198
-msgid "directory stat info does not change after deleting a file"
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
msgstr ""
-#: builtin/update-index.c:211
-msgid "directory stat info does not change after deleting a directory"
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
msgstr ""
-#: builtin/update-index.c:218
-msgid " OK"
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
msgstr ""
-#: builtin/update-index.c:569
-msgid "git update-index [<options>] [--] [<file>...]"
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
msgstr ""
-#: builtin/update-index.c:924
-msgid "continue refresh even when index needs update"
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
msgstr ""
-#: builtin/update-index.c:927
-msgid "refresh: ignore submodules"
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
msgstr ""
-#: builtin/update-index.c:930
-msgid "do not ignore new files"
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
msgstr ""
-#: builtin/update-index.c:932
-msgid "let files replace directories and vice-versa"
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
msgstr ""
-#: builtin/update-index.c:934
-msgid "notice files missing from worktree"
+#: command-list.h:86
+msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
-#: builtin/update-index.c:936
-msgid "refresh even if index contains unmerged entries"
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
msgstr ""
-#: builtin/update-index.c:939
-msgid "refresh stat information"
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
msgstr ""
-#: builtin/update-index.c:943
-msgid "like --refresh, but ignore assume-unchanged setting"
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
-#: builtin/update-index.c:947
-msgid "<mode>,<object>,<path>"
+#: command-list.h:90
+msgid "Show changes using common diff tools"
msgstr ""
-#: builtin/update-index.c:948
-msgid "add the specified entry to the index"
+#: command-list.h:91
+msgid "Git data exporter"
msgstr ""
-#: builtin/update-index.c:957
-msgid "mark files as \"not changing\""
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
msgstr ""
-#: builtin/update-index.c:960
-msgid "clear assumed-unchanged bit"
+#: command-list.h:93
+msgid "Download objects and refs from another repository"
msgstr ""
-#: builtin/update-index.c:963
-msgid "mark files as \"index-only\""
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
msgstr ""
-#: builtin/update-index.c:966
-msgid "clear skip-worktree bit"
+#: command-list.h:95
+msgid "Rewrite branches"
msgstr ""
-#: builtin/update-index.c:969
-msgid "add to index only; do not add content to object database"
+#: command-list.h:96
+msgid "Produce a merge commit message"
msgstr ""
-#: builtin/update-index.c:971
-msgid "remove named paths even if present in worktree"
+#: command-list.h:97
+msgid "Output information on each ref"
msgstr ""
-#: builtin/update-index.c:973
-msgid "with --stdin: input lines are terminated by null bytes"
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
msgstr ""
-#: builtin/update-index.c:975
-msgid "read list of paths to be updated from standard input"
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
-#: builtin/update-index.c:979
-msgid "add entries from standard input to the index"
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
msgstr ""
-#: builtin/update-index.c:983
-msgid "repopulate stages #2 and #3 for the listed paths"
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
-#: builtin/update-index.c:987
-msgid "only update entries that differ from HEAD"
+#: command-list.h:102
+msgid "Print lines matching a pattern"
msgstr ""
-#: builtin/update-index.c:991
-msgid "ignore files missing from worktree"
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
msgstr ""
-#: builtin/update-index.c:994
-msgid "report actions to standard output"
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
-#: builtin/update-index.c:996
-msgid "(for porcelains) forget saved unresolved conflicts"
+#: command-list.h:105
+msgid "Display help information about Git"
msgstr ""
-#: builtin/update-index.c:1000
-msgid "write index in this format"
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
msgstr ""
-#: builtin/update-index.c:1002
-msgid "enable or disable split index"
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
msgstr ""
-#: builtin/update-index.c:1004
-msgid "enable/disable untracked cache"
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
msgstr ""
-#: builtin/update-index.c:1006
-msgid "test if the filesystem supports untracked cache"
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
-#: builtin/update-index.c:1008
-msgid "enable untracked cache without testing the filesystem"
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
msgstr ""
-#: builtin/update-index.c:1108
-msgid ""
-"core.splitIndex is set to false; remove or change it, if you really want to "
-"enable split index"
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
-#: builtin/update-index.c:1117
-msgid ""
-"core.splitIndex is set to true; remove or change it, if you really want to "
-"disable split index"
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
msgstr ""
-#: builtin/update-index.c:1128
-msgid ""
-"core.untrackedCache is set to true; remove or change it, if you really want "
-"to disable the untracked cache"
+#: command-list.h:113
+msgid "add or parse structured information in commit messages"
msgstr ""
-#: builtin/update-index.c:1132
-msgid "Untracked cache disabled"
+#: command-list.h:114
+msgid "The Git repository browser"
msgstr ""
-#: builtin/update-index.c:1140
-msgid ""
-"core.untrackedCache is set to false; remove or change it, if you really want "
-"to enable the untracked cache"
+#: command-list.h:115
+msgid "Show commit logs"
msgstr ""
-#: builtin/update-index.c:1144
-#, c-format
-msgid "Untracked cache enabled for '%s'"
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
msgstr ""
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+#: command-list.h:117
+msgid "List references in a remote repository"
msgstr ""
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+#: command-list.h:118
+msgid "List the contents of a tree object"
msgstr ""
-#: builtin/update-ref.c:12
-msgid "git update-ref [<options>] --stdin [-z]"
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
-#: builtin/update-ref.c:364
-msgid "delete the reference"
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
msgstr ""
-#: builtin/update-ref.c:366
-msgid "update <refname> not the one it points to"
+#: command-list.h:121
+msgid "Join two or more development histories together"
msgstr ""
-#: builtin/update-ref.c:367
-msgid "stdin has NUL-terminated arguments"
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
-#: builtin/update-ref.c:368
-msgid "read updates from stdin"
+#: command-list.h:123
+msgid "Run a three-way file merge"
msgstr ""
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
msgstr ""
-#: builtin/update-server-info.c:15
-msgid "update the info files from scratch"
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
-#: builtin/verify-commit.c:18
-msgid "git verify-commit [-v | --verbose] <commit>..."
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
-#: builtin/verify-commit.c:73
-msgid "print commit contents"
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
msgstr ""
-#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
-msgid "print raw gpg status output"
+#: command-list.h:128
+msgid "Write and verify multi-pack-indexes"
msgstr ""
-#: builtin/verify-pack.c:55
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+#: command-list.h:129
+msgid "Creates a tag object"
msgstr ""
-#: builtin/verify-pack.c:65
-msgid "verbose"
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
-#: builtin/verify-pack.c:67
-msgid "show statistics only"
+#: command-list.h:131
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
-#: builtin/verify-tag.c:19
-msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
msgstr ""
-#: builtin/verify-tag.c:37
-msgid "print tag contents"
+#: command-list.h:133
+msgid "Add or inspect object notes"
msgstr ""
-#: builtin/worktree.c:16
-msgid "git worktree add [<options>] <path> [<branch>]"
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
msgstr ""
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
+#: command-list.h:135
+msgid "Create a packed archive of objects"
msgstr ""
-#: builtin/worktree.c:18
-msgid "git worktree lock [<options>] <path>"
+#: command-list.h:136
+msgid "Find redundant pack files"
msgstr ""
-#: builtin/worktree.c:19
-msgid "git worktree prune [<options>]"
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
-#: builtin/worktree.c:20
-msgid "git worktree unlock <path>"
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
msgstr ""
-#: builtin/worktree.c:44
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
msgstr ""
-#: builtin/worktree.c:50
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
msgstr ""
-#: builtin/worktree.c:55
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
msgstr ""
-#: builtin/worktree.c:66
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
+#: command-list.h:142
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
-#: builtin/worktree.c:82
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+#: command-list.h:143
+msgid "Update remote refs along with associated objects"
msgstr ""
-#: builtin/worktree.c:129
-msgid "report pruned working trees"
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
-#: builtin/worktree.c:131
-msgid "expire working trees older than <time>"
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
-#: builtin/worktree.c:205
-#, c-format
-msgid "'%s' already exists"
+#: command-list.h:146
+msgid "Reads tree information into the index"
msgstr ""
-#: builtin/worktree.c:236
-#, c-format
-msgid "could not create directory of '%s'"
+#: command-list.h:147
+msgid "Reapply commits on top of another base tip"
msgstr ""
-#: builtin/worktree.c:275
-#, c-format
-msgid "Preparing %s (identifier %s)"
+#: command-list.h:148
+msgid "Receive what is pushed into the repository"
msgstr ""
-#: builtin/worktree.c:327
-msgid "checkout <branch> even if already checked out in other worktree"
+#: command-list.h:149
+msgid "Manage reflog information"
msgstr ""
-#: builtin/worktree.c:329
-msgid "create a new branch"
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
msgstr ""
-#: builtin/worktree.c:331
-msgid "create or reset a branch"
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
msgstr ""
-#: builtin/worktree.c:333
-msgid "populate the new working tree"
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
msgstr ""
-#: builtin/worktree.c:334
-msgid "keep the new working tree locked"
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
msgstr ""
-#: builtin/worktree.c:342
-msgid "-b, -B, and --detach are mutually exclusive"
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
-#: builtin/worktree.c:479
-msgid "reason for locking"
+#: command-list.h:155
+msgid "Reset current HEAD to the specified state"
msgstr ""
-#: builtin/worktree.c:491 builtin/worktree.c:524
-#, c-format
-msgid "'%s' is not a working tree"
+#: command-list.h:156
+msgid "Revert some existing commits"
msgstr ""
-#: builtin/worktree.c:493 builtin/worktree.c:526
-msgid "The main working tree cannot be locked or unlocked"
+#: command-list.h:157
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
-#: builtin/worktree.c:498
-#, c-format
-msgid "'%s' is already locked, reason: %s"
+#: command-list.h:158
+msgid "Pick out and massage parameters"
msgstr ""
-#: builtin/worktree.c:500
-#, c-format
-msgid "'%s' is already locked"
+#: command-list.h:159
+msgid "Remove files from the working tree and from the index"
msgstr ""
-#: builtin/worktree.c:528
-#, c-format
-msgid "'%s' is not locked"
+#: command-list.h:160
+msgid "Send a collection of patches as emails"
msgstr ""
-#: builtin/write-tree.c:14
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: command-list.h:161
+msgid "Push objects over Git protocol to another repository"
msgstr ""
-#: builtin/write-tree.c:27
-msgid "<prefix>/"
+#: command-list.h:162
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
-#: builtin/write-tree.c:28
-msgid "write tree object for a subdirectory <prefix>"
+#: command-list.h:163
+msgid "Summarize 'git log' output"
msgstr ""
-#: builtin/write-tree.c:31
-msgid "only useful for debugging"
+#: command-list.h:164
+msgid "Show various types of objects"
msgstr ""
-#: upload-pack.c:23
-msgid "git upload-pack [<options>] <dir>"
+#: command-list.h:165
+msgid "Show branches and their commits"
msgstr ""
-#: upload-pack.c:1041
-msgid "quit after a single request/response exchange"
+#: command-list.h:166
+msgid "Show packed archive index"
msgstr ""
-#: upload-pack.c:1043
-msgid "exit immediately after initial ref advertisement"
+#: command-list.h:167
+msgid "List references in a local repository"
msgstr ""
-#: upload-pack.c:1045
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+#: command-list.h:168
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
-#: upload-pack.c:1047
-msgid "interrupt transfer after <n> seconds of inactivity"
+#: command-list.h:169
+msgid "Common Git shell script setup code"
msgstr ""
-#: credential-cache--daemon.c:224
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
+#: command-list.h:170
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
+#: command-list.h:171
+msgid "Add file contents to the staging area"
msgstr ""
-#: git.c:15
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
+#: command-list.h:172
+msgid "Show the working tree status"
msgstr ""
-#: http.c:337
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
+#: command-list.h:173
+msgid "Remove unnecessary whitespace"
msgstr ""
-#: http.c:358
-msgid "Delegation control is not supported with cURL < 7.22.0"
+#: command-list.h:174
+msgid "Initialize, update or inspect submodules"
msgstr ""
-#: http.c:367
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: command-list.h:175
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
-#: http.c:1764
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-" asked for: %s\n"
-" redirect: %s"
+#: command-list.h:176
+msgid "Read, modify and delete symbolic refs"
msgstr ""
-#: remote-curl.c:324
-#, c-format
-msgid "redirecting to %s"
+#: command-list.h:177
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
+#: command-list.h:178
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
+#: command-list.h:179
+msgid "Unpack objects from a packed archive"
msgstr ""
-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
+#: command-list.h:180
+msgid "Register file contents in the working tree to the index"
msgstr ""
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
+#: command-list.h:181
+msgid "Update the object name stored in a ref safely"
msgstr ""
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
+#: command-list.h:182
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-#: common-cmds.h:17
-msgid "Add file contents to the index"
+#: command-list.h:183
+msgid "Send archive back to git-archive"
msgstr ""
-#: common-cmds.h:18
-msgid "Use binary search to find the commit that introduced a bug"
+#: command-list.h:184
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
-#: common-cmds.h:19
-msgid "List, create, or delete branches"
+#: command-list.h:185
+msgid "Show a Git logical variable"
msgstr ""
-#: common-cmds.h:20
-msgid "Switch branches or restore working tree files"
+#: command-list.h:186
+msgid "Check the GPG signature of commits"
msgstr ""
-#: common-cmds.h:21
-msgid "Clone a repository into a new directory"
+#: command-list.h:187
+msgid "Validate packed Git archive files"
msgstr ""
-#: common-cmds.h:22
-msgid "Record changes to the repository"
+#: command-list.h:188
+msgid "Check the GPG signature of tags"
msgstr ""
-#: common-cmds.h:23
-msgid "Show changes between commits, commit and working tree, etc"
+#: command-list.h:189
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
-#: common-cmds.h:24
-msgid "Download objects and refs from another repository"
+#: command-list.h:190
+msgid "Show logs with difference each commit introduces"
msgstr ""
-#: common-cmds.h:25
-msgid "Print lines matching a pattern"
+#: command-list.h:191
+msgid "Manage multiple working trees"
msgstr ""
-#: common-cmds.h:26
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: command-list.h:192
+msgid "Create a tree object from the current index"
msgstr ""
-#: common-cmds.h:27
-msgid "Show commit logs"
+#: command-list.h:193
+msgid "Defining attributes per path"
msgstr ""
-#: common-cmds.h:28
-msgid "Join two or more development histories together"
+#: command-list.h:194
+msgid "Git command-line interface and conventions"
msgstr ""
-#: common-cmds.h:29
-msgid "Move or rename a file, a directory, or a symlink"
+#: command-list.h:195
+msgid "A Git core tutorial for developers"
msgstr ""
-#: common-cmds.h:30
-msgid "Fetch from and integrate with another repository or a local branch"
+#: command-list.h:196
+msgid "Git for CVS users"
msgstr ""
-#: common-cmds.h:31
-msgid "Update remote refs along with associated objects"
+#: command-list.h:197
+msgid "Tweaking diff output"
msgstr ""
-#: common-cmds.h:32
-msgid "Reapply commits on top of another base tip"
+#: command-list.h:198
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
-#: common-cmds.h:33
-msgid "Reset current HEAD to the specified state"
+#: command-list.h:199
+msgid "A Git Glossary"
msgstr ""
-#: common-cmds.h:34
-msgid "Remove files from the working tree and from the index"
+#: command-list.h:200
+msgid "Hooks used by Git"
msgstr ""
-#: common-cmds.h:35
-msgid "Show various types of objects"
+#: command-list.h:201
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: common-cmds.h:36
-msgid "Show the working tree status"
+#: command-list.h:202
+msgid "Defining submodule properties"
msgstr ""
-#: common-cmds.h:37
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: command-list.h:203
+msgid "Git namespaces"
msgstr ""
-#: parse-options.h:145
-msgid "expiry-date"
+#: command-list.h:204
+msgid "Git Repository Layout"
msgstr ""
-#: parse-options.h:160
-msgid "no-op (backward compatibility)"
+#: command-list.h:205
+msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: parse-options.h:238
-msgid "be more verbose"
+#: command-list.h:206
+msgid "A tutorial introduction to Git: part two"
msgstr ""
-#: parse-options.h:240
-msgid "be more quiet"
+#: command-list.h:207
+msgid "A tutorial introduction to Git"
msgstr ""
-#: parse-options.h:246
-msgid "use <n> digits to display SHA-1s"
+#: command-list.h:208
+msgid "An overview of recommended workflows with Git"
msgstr ""
-#: rerere.h:40
+#: rerere.h:44
msgid "update the index with reused conflict resolution if possible"
msgstr ""
msgid "Bad bisect_write argument: $state"
msgstr ""
-#: git-bisect.sh:262
+#: git-bisect.sh:246
#, sh-format
msgid "Bad rev input: $arg"
msgstr ""
-#: git-bisect.sh:281
+#: git-bisect.sh:265
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr ""
-#: git-bisect.sh:290
+#: git-bisect.sh:274
#, sh-format
msgid "Bad rev input: $rev"
msgstr ""
-#: git-bisect.sh:299
+#: git-bisect.sh:283
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-bisect.sh:322
+#: 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:328
+#: git-bisect.sh:312
msgid "Are you sure [Y/n]? "
msgstr ""
-#: git-bisect.sh:340
+#: 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:343
+#: git-bisect.sh:327
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
msgid "We are not bisecting."
msgstr ""
-#: git-bisect.sh:421
+#: git-bisect.sh:405
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr ""
-#: git-bisect.sh:430
+#: git-bisect.sh:414
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
-#: git-bisect.sh:458
+#: git-bisect.sh:422
msgid "No logfile given"
msgstr ""
-#: git-bisect.sh:459
+#: git-bisect.sh:423
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:480
+#: git-bisect.sh:444
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr ""
+
+#: git-bisect.sh:458
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:499
+#: git-bisect.sh:465
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:525
+#: git-bisect.sh:491
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:531
+#: git-bisect.sh:497
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:538
+#: git-bisect.sh:504
msgid "bisect run success"
msgstr ""
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr ""
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr ""
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr ""
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr ""
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
-#: git-bisect.sh:636
+#: git-bisect.sh:567
msgid "no terms defined"
msgstr ""
-#: git-bisect.sh:653
+#: git-bisect.sh:584
#, sh-format
msgid ""
"invalid argument $arg for 'git bisect terms'.\n"
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr ""
#: git-merge-octopus.sh:89
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-rebase.sh:58
-msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
-msgstr ""
-
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-legacy-rebase.sh:434
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:169
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase.sh:172
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase.sh:212
-msgid "The pre-rebase hook refused to rebase."
-msgstr ""
-
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr ""
-
-#: git-rebase.sh:358
-msgid "No rebase in progress?"
-msgstr ""
-
-#: git-rebase.sh:369
-msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr ""
-
-#: git-rebase.sh:376
-msgid "Cannot read HEAD"
-msgstr ""
-
-#: git-rebase.sh:379
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
-msgstr ""
-
-#: git-rebase.sh:419
+#: git-legacy-rebase.sh:460
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"valuable there."
msgstr ""
-#: git-rebase.sh:470
+#: git-legacy-rebase.sh:525
+msgid "error: cannot combine '--signoff' with '--preserve-merges'"
+msgstr ""
+
+#: git-legacy-rebase.sh:570
#, sh-format
-msgid "invalid upstream $upstream_name"
+msgid "invalid upstream '$upstream_name'"
msgstr ""
-#: git-rebase.sh:494
+#: git-legacy-rebase.sh:594
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:506
+#: git-legacy-rebase.sh:606
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:529
+#: git-legacy-rebase.sh:632
#, sh-format
-msgid "fatal: no such branch: $branch_name"
+msgid "fatal: no such branch/commit '$branch_name'"
msgstr ""
-#: git-rebase.sh:562
-msgid "Cannot autostash"
-msgstr ""
-
-#: git-rebase.sh:567
+#: git-legacy-rebase.sh:670
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:571
-msgid "Please commit or stash them."
-msgstr ""
-
-#: git-rebase.sh:591
+#: git-legacy-rebase.sh:699
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:595
+#: git-legacy-rebase.sh:709
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:606
+#: git-legacy-rebase.sh:723
+#, sh-format
+msgid "Changes to $onto:"
+msgstr ""
+
+#: git-legacy-rebase.sh:725
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:615
+#: git-legacy-rebase.sh:736
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:625
+#: git-legacy-rebase.sh:746
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr ""
-#: git-stash.sh:95
+#: git-stash.sh:108
msgid "You do not have the initial commit yet"
msgstr ""
-#: git-stash.sh:110
+#: git-stash.sh:123
msgid "Cannot save the current index state"
msgstr ""
-#: git-stash.sh:125
+#: git-stash.sh:138
msgid "Cannot save the untracked files"
msgstr ""
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:158 git-stash.sh:171
msgid "Cannot save the current worktree state"
msgstr ""
-#: git-stash.sh:162
+#: git-stash.sh:175
msgid "No changes selected"
msgstr ""
-#: git-stash.sh:165
+#: git-stash.sh:178
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:178
+#: git-stash.sh:191
msgid "Cannot record working tree state"
msgstr ""
-#: git-stash.sh:210
+#: git-stash.sh:229
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
+#: git-stash.sh:281
#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
+msgid "error: unknown option for 'stash push': $option"
msgstr ""
-#: git-stash.sh:281
+#: git-stash.sh:295
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: git-stash.sh:289
+#: git-stash.sh:303
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:294
+#: git-stash.sh:308
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:298
+#: git-stash.sh:312
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:299
+#: git-stash.sh:313
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:326
+#: git-stash.sh:342
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:474
+#: git-stash.sh:490
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:487
+#: git-stash.sh:503
msgid "No stash entries found."
msgstr ""
-#: git-stash.sh:494
+#: git-stash.sh:510
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:509
+#: git-stash.sh:525
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:537
+#: git-stash.sh:553
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:548
+#: git-stash.sh:564
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:556
+#: git-stash.sh:572
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:560
+#: git-stash.sh:576
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:568
+#: git-stash.sh:584
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:570
+#: git-stash.sh:586
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:579
+#: git-stash.sh:595
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:604
+#: git-stash.sh:620
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:619
+#: git-stash.sh:635
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:633
+#: git-stash.sh:649
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: git-stash.sh:642
+#: git-stash.sh:658
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:643
+#: git-stash.sh:659
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:651
+#: git-stash.sh:667
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:730
+#: git-stash.sh:746
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:181
+#: git-submodule.sh:198
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:191
+#: git-submodule.sh:208
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:210
+#: git-submodule.sh:227
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:213
+#: git-submodule.sh:230
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: git-submodule.sh:219
+#: git-submodule.sh:236
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:237
+#: git-submodule.sh:259
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:239
+#: git-submodule.sh:261
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:247
+#: git-submodule.sh:269
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:249
+#: git-submodule.sh:271
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"option."
msgstr ""
-#: git-submodule.sh:255
+#: git-submodule.sh:277
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:267
+#: git-submodule.sh:289
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:272
+#: git-submodule.sh:294
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:281
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:342
-#, sh-format
-msgid "Entering '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:362
-#, sh-format
-msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr ""
-
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr ""
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:638
+#: git-submodule.sh:563
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:648
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:653
+#: git-submodule.sh:578
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:671
+#: git-submodule.sh:596
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:677
+#: 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:684
+#: git-submodule.sh:609
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:685
+#: git-submodule.sh:610
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:689
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:690
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:695
+#: git-submodule.sh:620
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:696
+#: git-submodule.sh:621
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:701
+#: git-submodule.sh:626
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:702
+#: git-submodule.sh:627
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:733
+#: git-submodule.sh:658
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:841
+#: git-submodule.sh:754
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:893
+#: git-submodule.sh:806
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:913
+#: git-submodule.sh:826
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:916
+#: git-submodule.sh:829
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:919
+#: git-submodule.sh:832
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1065
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:1137
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr ""
-
#: git-parse-remote.sh:89
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr ""
-#: git-rebase--interactive.sh:140
+#: git-rebase--preserve-merges.sh:136
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr ""
-#: git-rebase--interactive.sh:156
+#: git-rebase--preserve-merges.sh:152
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: git-rebase--interactive.sh:171
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:175
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:211
+#: git-rebase--preserve-merges.sh:215
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:236
+#: git-rebase--preserve-merges.sh:240
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr ""
-#: git-rebase--interactive.sh:275
+#: git-rebase--preserve-merges.sh:279
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:317
+#: git-rebase--preserve-merges.sh:309
msgid "Cannot write current commit's replacement sha1"
msgstr ""
-#: git-rebase--interactive.sh:369
+#: git-rebase--preserve-merges.sh:360
#, sh-format
msgid "Fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:371
+#: git-rebase--preserve-merges.sh:362
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:380
+#: git-rebase--preserve-merges.sh:371
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr ""
-#: git-rebase--interactive.sh:385
+#: git-rebase--preserve-merges.sh:376
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:399
+#: git-rebase--preserve-merges.sh:394
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--interactive.sh:407
+#: git-rebase--preserve-merges.sh:403
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--interactive.sh:416
+#: git-rebase--preserve-merges.sh:412
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--interactive.sh:421
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--interactive.sh:432
+#: git-rebase--preserve-merges.sh:428
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:441
+#: git-rebase--preserve-merges.sh:437
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--interactive.sh:444
+#: git-rebase--preserve-merges.sh:440
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
+#: git-rebase--preserve-merges.sh:527
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr ""
-#: git-rebase--interactive.sh:559
+#: git-rebase--preserve-merges.sh:556
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"you are able to reword the commit."
msgstr ""
-#: git-rebase--interactive.sh:574
+#: git-rebase--preserve-merges.sh:571
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--interactive.sh:589
+#: git-rebase--preserve-merges.sh:586
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--interactive.sh:631
+#: git-rebase--preserve-merges.sh:628
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--interactive.sh:639
+#: git-rebase--preserve-merges.sh:636
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--interactive.sh:641
+#: git-rebase--preserve-merges.sh:638
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--interactive.sh:643
+#: git-rebase--preserve-merges.sh:640
msgid ""
"You can fix the problem, and then run\n"
"\n"
msgstr ""
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--preserve-merges.sh:653
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:667
+#: git-rebase--preserve-merges.sh:664
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--interactive.sh:668
+#: git-rebase--preserve-merges.sh:665
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--interactive.sh:703
+#: git-rebase--preserve-merges.sh:700
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr ""
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:980
-msgid "could not detach HEAD"
-msgstr ""
-
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--preserve-merges.sh:757
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--interactive.sh:1088
+#: git-rebase--preserve-merges.sh:762
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
" git rebase --continue\n"
msgstr ""
-#: git-rebase--interactive.sh:1105
+#: git-rebase--preserve-merges.sh:779
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--interactive.sh:1110
+#: git-rebase--preserve-merges.sh:784
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--interactive.sh:1147
-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:1155 git-rebase--interactive.sh:1313
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
msgid "Could not execute editor"
msgstr ""
-#: git-rebase--interactive.sh:1168
+#: git-rebase--preserve-merges.sh:845
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase--interactive.sh:1173
+#: git-rebase--preserve-merges.sh:852
msgid "No HEAD?"
msgstr ""
-#: git-rebase--interactive.sh:1174
+#: git-rebase--preserve-merges.sh:853
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase--interactive.sh:1176
+#: git-rebase--preserve-merges.sh:856
msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
-msgid "Could not init rewritten commits"
-msgstr ""
-
-#: git-rebase--interactive.sh:1291
+#: 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:1296
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:1303
-msgid "Note that empty commits are commented out"
+#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+msgid "Could not init rewritten commits"
msgstr ""
#: git-sh-setup.sh:89 git-sh-setup.sh:94
msgid "unstaged"
msgstr ""
-#: git-add--interactive.perl:246 git-add--interactive.perl:271
+#: git-add--interactive.perl:253 git-add--interactive.perl:278
msgid "binary"
msgstr ""
-#: git-add--interactive.perl:255 git-add--interactive.perl:309
+#: git-add--interactive.perl:262 git-add--interactive.perl:316
msgid "nothing"
msgstr ""
-#: git-add--interactive.perl:291 git-add--interactive.perl:306
+#: git-add--interactive.perl:298 git-add--interactive.perl:313
msgid "unchanged"
msgstr ""
-#: git-add--interactive.perl:602
+#: git-add--interactive.perl:609
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:605
+#: git-add--interactive.perl:612
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:608
+#: git-add--interactive.perl:615
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:611
+#: git-add--interactive.perl:618
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:620
+#: git-add--interactive.perl:627
msgid "Update"
msgstr ""
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:639
msgid "Revert"
msgstr ""
-#: git-add--interactive.perl:655
+#: git-add--interactive.perl:662
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
-#: git-add--interactive.perl:666
+#: git-add--interactive.perl:673
msgid "Add untracked"
msgstr ""
-#: git-add--interactive.perl:672
+#: git-add--interactive.perl:679
msgid "No untracked files.\n"
msgstr ""
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1039
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1085
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1086
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1092
#, perl-format
msgid ""
"---\n"
msgstr ""
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1100
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1213
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1222
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1228
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1234
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1240
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1246
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1252
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1258
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1273
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1304
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1305
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1308
msgid "Nothing was applied.\n"
msgstr ""
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1319
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1328
msgid "Only binary files changed.\n"
msgstr ""
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1330
msgid "No changes.\n"
msgstr ""
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1338
msgid "Patch update"
msgstr ""
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1390
#, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1391
#, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1392
#, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1395
#, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1396
#, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1397
#, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1400
#, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1401
#, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1402
#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1405
#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1406
#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1407
#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1410
#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1411
#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1412
#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1415
#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1416
#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1417
#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1420
#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1421
#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1422
#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1522
+msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1529
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1531
msgid "go to which hunk? "
msgstr ""
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1540
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1545
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1571
+msgid "No other hunks to search\n"
+msgstr ""
+
+#: git-add--interactive.perl:1575
msgid "search for regex? "
msgstr ""
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1588
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1598
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1644
+msgid "Sorry, cannot split this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1650
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1660
+msgid "Sorry, cannot edit this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1706
msgid "Review diff"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1725
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
+#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
+#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1763
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:126
+#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
-#: git-send-email.perl:133 git-send-email.perl:139
+#: 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:208 git-send-email.perl:214
+#: git-send-email.perl:219 git-send-email.perl:225
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:291
+#: 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:296
+#: git-send-email.perl:307
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:314
+#: git-send-email.perl:326
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:379 git-send-email.perl:634
+#: 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:448
+#: 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:468
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:477
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:509
+#: git-send-email.perl:525
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:511
+#: git-send-email.perl:527
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:513
+#: git-send-email.perl:529
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:518
+#: git-send-email.perl:534
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:600
+#: 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:621
+#: git-send-email.perl:637
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:645
+#: git-send-email.perl:661
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:656
+#: git-send-email.perl:672
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:669
+#: git-send-email.perl:685
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:679
+#: git-send-email.perl:695
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:689
+#: 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:712
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr ""
-
-#: git-send-email.perl:715
+#: git-send-email.perl:730
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:750
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#: git-send-email.perl:747
+#, perl-format
+msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:759
+#: 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:791
+#: git-send-email.perl:825
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:820
+#: 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:825
+#: git-send-email.perl:885
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:833
+#: git-send-email.perl:893
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:852
+#: git-send-email.perl:912
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:870
+#: git-send-email.perl:930
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:882
+#: 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:932 git-send-email.perl:940
+#: 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:944
+#: git-send-email.perl:1012
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1245
+#: git-send-email.perl:1329
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1320
+#: git-send-email.perl:1412
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
"\n"
msgstr ""
-#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
-msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+#: git-send-email.perl:1427
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1338
+#: git-send-email.perl:1430
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1364
+#: git-send-email.perl:1458
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1411
+#: git-send-email.perl:1505
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1510 git-send-email.perl:1514
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1430
+#: git-send-email.perl:1523
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1448
+#: git-send-email.perl:1541
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1451
+#: git-send-email.perl:1544
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1451
+#: git-send-email.perl:1544
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1453
+#: git-send-email.perl:1546
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1453
+#: git-send-email.perl:1546
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1465
+#: git-send-email.perl:1558
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1468
+#: git-send-email.perl:1561
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1481
+#: git-send-email.perl:1579
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: 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:1534
+#: git-send-email.perl:1632
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1582
+#: git-send-email.perl:1685
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1605
+#: git-send-email.perl:1720
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1711
+#: git-send-email.perl:1831
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1718
+#: git-send-email.perl:1838
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1722
+#: git-send-email.perl:1842
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1749
+#: git-send-email.perl:1872
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1757
+#: git-send-email.perl:1880
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: 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:1798
+#: git-send-email.perl:1924
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1814
+#: 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:1818
+#: git-send-email.perl:1945
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""