msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-04-23 09:54+0800\n"
+"POT-Creation-Date: 2019-02-15 10:09+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: advice.c:55
+#: advice.c:101
#, c-format
-msgid "hint: %.*s\n"
+msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:83
+#: advice.c:154
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:85
+#: advice.c:156
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:87
+#: advice.c:158
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:89
+#: advice.c:160
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:91
+#: advice.c:162
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:93
+#: advice.c:164
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:101
+#: advice.c:172
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: advice.c:109
+#: advice.c:180
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:114 builtin/merge.c:1185
+#: advice.c:185 builtin/merge.c:1290
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:116
+#: advice.c:187
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:117
+#: advice.c:188
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:123
+#: advice.c:194
#, c-format
msgid ""
"Note: checking out '%s'.\n"
"\n"
msgstr ""
-#: apply.c:57
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr ""
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr ""
+
+#: apply.c:59
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: apply.c:73
+#: apply.c:75
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:845
+#: apply.c:825
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:854
+#: apply.c:834
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:938
+#: apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:977
+#: apply.c:946
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:983
+#: apply.c:952
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:984
+#: apply.c:953
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:990
+#: apply.c:958
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:1488
+#: apply.c:987
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr ""
+
+#: apply.c:1306
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr ""
+
+#: apply.c:1478
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1557
+#: apply.c:1547
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1577
+#: apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1589
+#: apply.c:1580
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1759
+#: apply.c:1768
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1761
+#: apply.c:1770
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1795
+#: apply.c:1804
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1832
+#: apply.c:1841
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1834
+#: apply.c:1843
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1837
+#: apply.c:1846
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1984
+#: apply.c:1993
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2021
+#: apply.c:2030
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2182
+#: apply.c:2192
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2265
+#: apply.c:2278
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2269
+#: apply.c:2282
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2922
+#: apply.c:2941
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3041
+#: apply.c:3062
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:3053
+#: apply.c:3074
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3059
+#: apply.c:3080
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3081
+#: apply.c:3102
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3089
+#: apply.c:3110
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3135
+#: apply.c:3157
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3145
+#: apply.c:3167
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3153
+#: apply.c:3175
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3171
+#: apply.c:3193
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3184
+#: apply.c:3206
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3190
+#: apply.c:3212
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3211
+#: apply.c:3233
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3333
+#: apply.c:3356
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
+#: 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:3389
+#: apply.c:3416
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3418 apply.c:3658
+#: apply.c:3445 apply.c:3688
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3501 apply.c:3672
+#: apply.c:3531 apply.c:3703
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3510 apply.c:3680
+#: apply.c:3540 apply.c:3711
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3545
+#: apply.c:3575
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3548
+#: apply.c:3578
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3564 apply.c:3568
+#: apply.c:3594 apply.c:3598
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3580
+#: apply.c:3610
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3594
+#: apply.c:3624
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3599
+#: apply.c:3629
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3625
+#: apply.c:3655
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3697
+#: apply.c:3728
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3699
+#: apply.c:3730
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3850 apply.c:3852
+#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846
+#: read-cache.c:1299
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3908
+#: apply.c:3939
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3911
+#: apply.c:3942
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3931
+#: apply.c:3962
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3936
+#: apply.c:3967
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3956
+#: apply.c:3987
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3960
+#: apply.c:3991
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3975
+#: apply.c:4006
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4066
+#: apply.c:4098
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4073
+#: apply.c:4105
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4076
+#: apply.c:4108
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
+#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4085
+#: apply.c:4117
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4095
+#: apply.c:4127
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4233
+#: apply.c:4265
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4268
+#: apply.c:4299
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4274
+#: apply.c:4305
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4282
+#: apply.c:4313
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4288 apply.c:4432
+#: apply.c:4319 apply.c:4464
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4329
+#: apply.c:4362
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4333
+#: apply.c:4366
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4403
+#: apply.c:4436
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4501
+#: apply.c:4534
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4509
+#: apply.c:4542
msgid "internal error"
msgstr ""
-#: apply.c:4512
+#: 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:4523
+#: apply.c:4556
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
+#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4545
+#: apply.c:4578
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4549
+#: apply.c:4582
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4659
+#: apply.c:4692
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4667
+#: apply.c:4700
msgid "unrecognized input"
msgstr ""
-#: apply.c:4686
+#: apply.c:4720
msgid "unable to read index file"
msgstr ""
-#: apply.c:4823
+#: apply.c:4875
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4850
+#: apply.c:4902
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4856 apply.c:4871
+#: apply.c:4908 apply.c:4923
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4864
+#: apply.c:4916
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
-#: 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:239
+#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263
+#: builtin/pull.c:200 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197
msgid "path"
msgstr ""
-#: apply.c:4912
+#: apply.c:4960
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4915
+#: apply.c:4963
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4917 builtin/am.c:2286
+#: apply.c:4965 builtin/am.c:2212
msgid "num"
msgstr ""
-#: apply.c:4918
+#: apply.c:4966
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4921
+#: apply.c:4969
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4923
+#: apply.c:4971
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4927
+#: apply.c:4975
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4929
+#: apply.c:4977
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4931
+#: apply.c:4979
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4933
+#: apply.c:4981
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4935
+#: apply.c:4983
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:4985
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4937
+#: apply.c:4987
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4939
+#: apply.c:4990
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4941
+#: apply.c:4992
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4943
+#: apply.c:4994
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508
+#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4948
+#: apply.c:4999
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4949 builtin/am.c:2265
+#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3314 builtin/rebase.c:1065
msgid "action"
msgstr ""
-#: apply.c:4950
+#: apply.c:5001
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4953 apply.c:4956
+#: apply.c:5004 apply.c:5007
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4959
+#: apply.c:5010
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4961
+#: apply.c:5012
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4963
+#: apply.c:5014
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4965
+#: apply.c:5016
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19
-#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
-#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
+#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724
+#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128
+#: builtin/rebase--interactive.c:159
msgid "be verbose"
msgstr ""
-#: apply.c:4968
+#: apply.c:5019
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4971
+#: apply.c:5022
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4973 builtin/am.c:2274
+#: apply.c:5024 builtin/am.c:2200
msgid "root"
msgstr ""
-#: apply.c:4974
+#: apply.c:5025
msgid "prepend <root> to all filenames"
msgstr ""
-#: archive.c:12
+#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: archive.c:13
+#: archive.c:15
msgid "git archive --list"
msgstr ""
-#: archive.c:14
+#: archive.c:16
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: archive.c:15
+#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:417
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr ""
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr ""
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr ""
+
+#: archive.c:424
+msgid "current working directory is untracked"
+msgstr ""
+
+#: archive.c:455
msgid "fmt"
msgstr ""
-#: archive.c:417
+#: archive.c:455
msgid "archive format"
msgstr ""
-#: archive.c:418 builtin/log.c:1436
+#: archive.c:456 builtin/log.c:1549
msgid "prefix"
msgstr ""
-#: archive.c:419
+#: archive.c:457
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
-#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
-#: parse-options.h:153
+#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
+#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:162
msgid "file"
msgstr ""
-#: archive.c:421 builtin/archive.c:89
+#: archive.c:459 builtin/archive.c:90
msgid "write the archive to this file"
msgstr ""
-#: archive.c:423
+#: archive.c:461
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:424
+#: archive.c:462
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:425
+#: archive.c:463
msgid "store only"
msgstr ""
-#: archive.c:426
+#: archive.c:464
msgid "compress faster"
msgstr ""
-#: archive.c:434
+#: archive.c:472
msgid "compress better"
msgstr ""
-#: archive.c:437
+#: archive.c:475
msgid "list supported archive formats"
msgstr ""
-#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
+#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859
msgid "repo"
msgstr ""
-#: archive.c:440 builtin/archive.c:91
+#: archive.c:478 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
msgid "command"
msgstr ""
-#: archive.c:442 builtin/archive.c:93
+#: archive.c:480 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:449
+#: archive.c:487
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:451
+#: archive.c:489
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:453
+#: archive.c:491
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:475
+#: archive.c:513
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:482
+#: archive.c:520
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
-#: attr.c:212
+#: 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:225 builtin/pack-objects.c:228
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: archive-zip.c:609
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr ""
+
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr ""
+
#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:443
-#, c-format
-msgid "Could not open file '%s'"
-msgstr ""
-
-#: bisect.c:448
+#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:656
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:709
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:733
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-#: bisect.c:738
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:743
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-#: bisect.c:751
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: bisect.c:764
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr ""
-#: bisect.c:799
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:850
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:918
+#: bisect.c:937 builtin/merge.c:139
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:948
+#: bisect.c:967
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:968
+#: bisect.c:986
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:976
+#: bisect.c:994
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:995
+#: bisect.c:1013
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
msgstr[0] ""
msgstr[1] ""
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:999
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1019
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] ""
msgstr[1] ""
-#: branch.c:53
+#: blame.c:1792
+msgid "--contents and --reverse do not blend well."
+msgstr ""
+
+#: blame.c:1806
+msgid "cannot use --contents with final commit object name"
+msgstr ""
+
+#: blame.c:1827
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+
+#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993
+#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936
+#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407
+#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: builtin/shortlog.c:192
+msgid "revision walk setup failed"
+msgstr ""
+
+#: blame.c:1854
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+
+#: blame.c:1865
+#, c-format
+msgid "no such path %s in %s"
+msgstr ""
+
+#: blame.c:1876
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr ""
+
+#: 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."
-msgstr ""
-
-#: branch.c:110
-#, c-format
-msgid "Branch %s set up to track local ref %s."
+msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
-#: branch.c:119
+#: 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:280
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:285
+#: branch.c:300
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:290
+#: branch.c:305
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:344
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:364
+#: branch.c:382
#, 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:61
+#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763
+#: builtin/commit.c:776
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:139
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299
-#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
-#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
-#: builtin/merge.c:359 builtin/shortlog.c:176
-msgid "revision walk setup failed"
-msgstr ""
-
-#: bundle.c:185
+#: bundle.c:194
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:192
+#: bundle.c:201
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:194
+#: bundle.c:203
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:253
+#: bundle.c:269
+msgid "unable to dup bundle descriptor"
+msgstr ""
+
+#: bundle.c:276
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:264
+#: bundle.c:287
msgid "pack-objects died"
msgstr ""
-#: bundle.c:304
+#: bundle.c:329
msgid "rev-list died"
msgstr ""
-#: bundle.c:353
+#: bundle.c:378
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
+#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:451
+#: bundle.c:465
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:463
+#: bundle.c:475
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:491
+#: bundle.c:500
msgid "index-pack died"
msgstr ""
-#: color.c:300
+#: color.c:296
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376
+#: builtin/replace.c:448
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:42
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:1511
+#: commit.c:193
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"
+"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 ""
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
+#: commit.c:1122
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: config.c:191
-msgid "relative config include conditionals must come from files"
+#: commit.c:1125
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: config.c:701
+#: commit.c:1128
#, c-format
-msgid "bad config line %d in blob %s"
+msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: config.c:705
+#: commit.c:1131
#, c-format
-msgid "bad config line %d in file %s"
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: commit.c:1385
+msgid ""
+"Warning: commit message did not conform to UTF-8.\n"
+"You may want to amend it after fixing the message, or set the config\n"
+"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
-#: config.c:709
+#: commit-graph.c:101
#, c-format
-msgid "bad config line %d in standard input"
+msgid "graph file %s is too small"
msgstr ""
-#: config.c:713
+#: commit-graph.c:136
#, c-format
-msgid "bad config line %d in submodule-blob %s"
+msgid "graph signature %X does not match signature %X"
msgstr ""
-#: config.c:717
+#: commit-graph.c:143
#, c-format
-msgid "bad config line %d in command line %s"
+msgid "graph version %X does not match version %X"
msgstr ""
-#: config.c:721
+#: commit-graph.c:150
#, c-format
-msgid "bad config line %d in %s"
+msgid "hash version %X does not match version %X"
msgstr ""
-#: config.c:840
-msgid "out of range"
+#: commit-graph.c:173
+msgid "chunk lookup table entry missing; graph file may be incomplete"
msgstr ""
-#: config.c:840
-msgid "invalid unit"
+#: commit-graph.c:184
+#, c-format
+msgid "improper chunk offset %08x%08x"
msgstr ""
-#: config.c:846
+#: commit-graph.c:221
#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
+msgid "chunk id %08x appears multiple times"
msgstr ""
-#: config.c:851
+#: commit-graph.c:334
#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgid "could not find commit %s"
msgstr ""
-#: config.c:854
+#: commit-graph.c:671 builtin/pack-objects.c:2646
#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgid "unable to get type of object %s"
+msgstr ""
+
+#: commit-graph.c:704
+msgid "Loading known commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:720
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:732
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: commit-graph.c:752
+msgid "Computing commit graph generation numbers"
msgstr ""
-#: config.c:857
+#: commit-graph.c:869
#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:882
+#, c-format
+msgid "error adding pack %s"
msgstr ""
-#: config.c:860
+#: commit-graph.c:884
#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgid "error opening index for %s"
msgstr ""
-#: config.c:863
+#: commit-graph.c:898
#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:930
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+
+#: commit-graph.c:943
+msgid "Counting distinct commits in commit graph"
msgstr ""
-#: config.c:866
+#: commit-graph.c:956
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgid "the commit graph format cannot write %d commits"
msgstr ""
-#: config.c:953
+#: commit-graph.c:965
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c:989
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:996 midx.c:769
#, c-format
-msgid "failed to expand user dir in: '%s'"
+msgid "unable to create leading directories of %s"
msgstr ""
-#: config.c:1048 config.c:1059
+#: commit-graph.c:1036
#, c-format
-msgid "bad zlib compression level %d"
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:1109
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:1153
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
msgstr ""
-#: config.c:1176
+#: 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:1332
+#: config.c:139
#, c-format
-msgid "bad pack compression level %d"
+msgid "could not expand include path '%s'"
msgstr ""
-#: config.c:1522
-msgid "unable to parse command-line config"
+#: config.c:150
+msgid "relative config includes must come from files"
msgstr ""
-#: config.c:1572
-msgid "unknown error occurred while reading the configuration files"
+#: config.c:190
+msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:1931
+#: config.c:348
#, c-format
-msgid "Invalid %s: '%s'"
+msgid "key does not contain a section: %s"
msgstr ""
-#: config.c:1952
+#: 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:1978
+#: config.c:378 sequencer.c:2330
#, c-format
-msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgid "invalid key: %s"
msgstr ""
-#: config.c:1989
+#: config.c:384
#, c-format
-msgid "unable to parse '%s' from command-line config"
+msgid "invalid key (newline): %s"
msgstr ""
-#: config.c:1991
+#: 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:2050
+#: config.c:467
#, c-format
-msgid "%s has multiple values"
+msgid "bogus format in %s"
msgstr ""
-#: config.c:2384 config.c:2609
+#: config.c:793
#, c-format
-msgid "fstat on %s failed"
+msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:2502
+#: config.c:797
#, c-format
-msgid "could not set '%s' to '%s'"
+msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:2504 builtin/remote.c:774
+#: config.c:801
#, c-format
-msgid "could not unset '%s'"
+msgid "bad config line %d in standard input"
msgstr ""
-#: connect.c:49
-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:51
-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:190 builtin/prune.c:140
-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:201
+#: 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:205
+#: 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:211
+#: 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:215
+#: 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:97
-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:103
+#: config.c:978
#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr ""
-#: date.c:110
+#: config.c:1073
#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "failed to expand user dir in: '%s'"
+msgstr ""
-#: date.c:117
+#: config.c:1082
#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr ""
-#: date.c:124
+#: config.c:1173
#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "abbrev length out of range: %d"
+msgstr ""
-#: date.c:130
+#: config.c:1187 config.c:1198
#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad zlib compression level %d"
+msgstr ""
-#: date.c:137
-#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:148
-#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] ""
-msgstr[1] ""
+#: config.c:1290
+msgid "core.commentChar should only be one character"
+msgstr ""
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
+#: config.c:1323
#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "invalid mode for object creation: %s"
+msgstr ""
-#: date.c:156 date.c:161
+#: config.c:1395
#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "malformed value for %s"
+msgstr ""
-#: diffcore-order.c:24
+#: config.c:1421
#, c-format
-msgid "failed to read orderfile '%s'"
+msgid "malformed value for %s: %s"
msgstr ""
-#: diffcore-rename.c:536
-msgid "Performing inexact rename detection"
+#: config.c:1422
+msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: diff.c:62
+#: config.c:1481 builtin/pack-objects.c:3394
#, c-format
-msgid "option '%s' requires a value"
+msgid "bad pack compression level %d"
msgstr ""
-#: diff.c:124
+#: config.c:1602
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgid "unable to load config blob object '%s'"
msgstr ""
-#: diff.c:129
+#: config.c:1605
#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
+msgid "reference '%s' does not point to a blob"
msgstr ""
-#: diff.c:281
+#: config.c:1622
#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgid "unable to resolve config blob '%s'"
msgstr ""
-#: diff.c:344
+#: config.c:1652
#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
+msgid "failed to parse %s"
msgstr ""
-#: diff.c:3102
-#, c-format
-msgid "external diff died, stopping at %s"
+#: config.c:1705
+msgid "unable to parse command-line config"
msgstr ""
-#: diff.c:3428
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#: config.c:2037
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: diff.c:3518
-msgid "--follow requires exactly one pathspec"
+#: config.c:2207
+#, c-format
+msgid "Invalid %s: '%s'"
msgstr ""
-#: diff.c:3681
+#: config.c:2250
#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: diff.c:3695
+#: config.c:2276
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: diff.c:4719
-msgid "inexact rename detection was skipped due to too many files."
+#: config.c:2322
+#, c-format
+msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: diff.c:4722
-msgid "only found copies from modified paths due to too many files."
+#: config.c:2324
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: diff.c:4725
+#: config.c:2405
#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
+msgid "invalid section name '%s'"
msgstr ""
-#: dir.c:1899
-msgid "failed to get kernel name and information"
+#: config.c:2437
+#, c-format
+msgid "%s has multiple values"
msgstr ""
-#: dir.c:2018
-msgid "Untracked cache is disabled on this system or location."
+#: config.c:2466
+#, c-format
+msgid "failed to write new configuration file %s"
msgstr ""
-#: dir.c:2776 dir.c:2781
+#: config.c:2716 config.c:3040
#, c-format
-msgid "could not create directories for %s"
+msgid "could not lock config file %s"
msgstr ""
-#: dir.c:2806
+#: config.c:2727
#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
+msgid "opening %s"
msgstr ""
-#: entry.c:280
+#: config.c:2762 builtin/config.c:328
#, c-format
-msgid "could not stat file '%s'"
+msgid "invalid pattern: %s"
msgstr ""
-#: fetch-pack.c:249
-msgid "git fetch-pack: expected shallow list"
+#: config.c:2787
+#, c-format
+msgid "invalid config file %s"
msgstr ""
-#: fetch-pack.c:261
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#: config.c:2800 config.c:3053
+#, c-format
+msgid "fstat on %s failed"
msgstr ""
-#: fetch-pack.c:279
+#: config.c:2811
#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgid "unable to mmap '%s'"
msgstr ""
-#: fetch-pack.c:331
-msgid "--stateless-rpc requires multi_ack_detailed"
+#: config.c:2820 config.c:3058
+#, c-format
+msgid "chmod on %s failed"
msgstr ""
-#: fetch-pack.c:417
+#: config.c:2905 config.c:3155
#, c-format
-msgid "invalid shallow line: %s"
+msgid "could not write config file %s"
msgstr ""
-#: fetch-pack.c:423
+#: config.c:2939
#, c-format
-msgid "invalid unshallow line: %s"
+msgid "could not set '%s' to '%s'"
msgstr ""
-#: fetch-pack.c:425
+#: config.c:2941 builtin/remote.c:782
#, c-format
-msgid "object not found: %s"
+msgid "could not unset '%s'"
msgstr ""
-#: fetch-pack.c:428
+#: config.c:3031
#, c-format
-msgid "error in object: %s"
+msgid "invalid section name: %s"
msgstr ""
-#: fetch-pack.c:430
+#: config.c:3198
#, c-format
-msgid "no shallow found: %s"
+msgid "missing value for '%s'"
msgstr ""
-#: fetch-pack.c:433
-#, c-format
-msgid "expected shallow/unshallow, got %s"
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
msgstr ""
-#: fetch-pack.c:472
-#, c-format
-msgid "got %s %d %s"
+#: 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:486
+#: connect.c:81
#, c-format
-msgid "invalid commit %s"
+msgid "server doesn't support '%s'"
msgstr ""
-#: fetch-pack.c:519
-msgid "giving up"
+#: connect.c:103
+#, c-format
+msgid "server doesn't support feature '%s'"
msgstr ""
-#: fetch-pack.c:529 progress.c:235
-msgid "done"
+#: connect.c:114
+msgid "expected flush after capabilities"
msgstr ""
-#: fetch-pack.c:541
+#: connect.c:233
#, c-format
-msgid "got %s (%d) %s"
+msgid "ignoring capabilities after first line '%s'"
msgstr ""
-#: fetch-pack.c:587
-#, c-format
-msgid "Marking %s as complete"
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: fetch-pack.c:735
+#: connect.c:273
#, c-format
-msgid "already have %s (%s)"
+msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: fetch-pack.c:773
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
msgstr ""
-#: fetch-pack.c:781
-msgid "protocol error: bad pack header"
+#: connect.c:313
+msgid "invalid packet"
msgstr ""
-#: fetch-pack.c:837
+#: connect.c:333
#, c-format
-msgid "fetch-pack: unable to fork off %s"
+msgid "protocol error: unexpected '%s'"
msgstr ""
-#: fetch-pack.c:853
+#: connect.c:441
#, c-format
-msgid "%s failed"
+msgid "invalid ls-refs response: %s"
msgstr ""
-#: fetch-pack.c:855
-msgid "error in sideband demultiplexer"
+#: connect.c:445
+msgid "expected flush after ref listing"
msgstr ""
-#: fetch-pack.c:882
-msgid "Server does not support shallow clients"
+#: connect.c:544
+#, c-format
+msgid "protocol '%s' is not supported"
msgstr ""
-#: fetch-pack.c:886
-msgid "Server supports multi_ack_detailed"
+#: connect.c:595
+msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: fetch-pack.c:889
-msgid "Server supports no-done"
+#: connect.c:635 connect.c:698
+#, c-format
+msgid "Looking up %s ... "
msgstr ""
-#: fetch-pack.c:895
-msgid "Server supports multi_ack"
+#: connect.c:639
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
msgstr ""
-#: fetch-pack.c:899
-msgid "Server supports side-band-64k"
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:643 connect.c:714
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
msgstr ""
-#: fetch-pack.c:903
-msgid "Server supports side-band"
+#: connect.c:665 connect.c:742
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
msgstr ""
-#: fetch-pack.c:907
-msgid "Server supports allow-tip-sha1-in-want"
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:671 connect.c:748
+msgid "done."
msgstr ""
-#: fetch-pack.c:911
-msgid "Server supports allow-reachable-sha1-in-want"
+#: connect.c:702
+#, c-format
+msgid "unable to look up %s (%s)"
msgstr ""
-#: fetch-pack.c:921
-msgid "Server supports ofs-delta"
+#: connect.c:708
+#, c-format
+msgid "unknown port %s"
msgstr ""
-#: fetch-pack.c:928
+#: connect.c:845 connect.c:1171
#, c-format
-msgid "Server version is %.*s"
+msgid "strange hostname '%s' blocked"
msgstr ""
-#: fetch-pack.c:934
-msgid "Server does not support --shallow-since"
+#: connect.c:847
+#, c-format
+msgid "strange port '%s' blocked"
msgstr ""
-#: fetch-pack.c:938
-msgid "Server does not support --shallow-exclude"
+#: connect.c:857
+#, c-format
+msgid "cannot start proxy %s"
msgstr ""
-#: fetch-pack.c:940
-msgid "Server does not support --deepen"
+#: connect.c:924
+msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: fetch-pack.c:951
-msgid "no common commits"
+#: connect.c:1119
+msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: fetch-pack.c:963
-msgid "git fetch-pack: fetch failed."
+#: connect.c:1131
+msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: fetch-pack.c:1125
-msgid "no matching remote head"
+#: connect.c:1148
+msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: fetch-pack.c:1147
+#: connect.c:1259
#, c-format
-msgid "no such remote ref %s"
+msgid "strange pathname '%s' blocked"
msgstr ""
-#: fetch-pack.c:1150
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
+#: connect.c:1304
+msgid "unable to fork"
msgstr ""
-#: gpg-interface.c:185
-msgid "gpg failed to sign the data"
+#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146
+msgid "Checking connectivity"
msgstr ""
-#: gpg-interface.c:215
-msgid "could not create temporary file"
+#: connected.c:80
+msgid "Could not run 'git rev-list'"
msgstr ""
-#: gpg-interface.c:217
-#, c-format
-msgid "failed writing detached signature to '%s'"
+#: connected.c:100
+msgid "failed write to rev-list"
msgstr ""
-#: graph.c:96
-#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+#: connected.c:107
+msgid "failed to close rev-list's stdin"
msgstr ""
-#: grep.c:1796
+#: convert.c:193
#, c-format
-msgid "'%s': unable to read %s"
+msgid "illegal crlf_action %d"
msgstr ""
-#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
+#: convert.c:206
#, c-format
-msgid "failed to stat '%s'"
+msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: grep.c:1824
+#: convert.c:208
#, c-format
-msgid "'%s': short read"
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
msgstr ""
-#: help.c:218
+#: convert.c:216
#, c-format
-msgid "available git commands in '%s'"
+msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: help.c:225
-msgid "git commands available from elsewhere on your $PATH"
+#: convert.c:218
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
msgstr ""
-#: help.c:256
-msgid "These are common Git commands used in various situations:"
+#: convert.c:279
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
-#: help.c:321
+#: convert.c:286
#, c-format
msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
msgstr ""
-#: help.c:376
-msgid "Uh oh. Your system reports no Git commands at all."
+#: convert.c:304
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
-#: help.c:398
+#: convert.c:306
#, c-format
msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
+"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 ""
-#: help.c:403
+#: convert.c:424 convert.c:495
#, c-format
-msgid "in %0.1f seconds automatically..."
+msgid "failed to encode '%s' from %s to %s"
msgstr ""
-#: help.c:410
+#: convert.c:467
#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
+msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
-#: help.c:414 help.c:480
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: help.c:476
+#: convert.c:673
#, c-format
-msgid "%s: %s - %s"
+msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: ident.c:343
-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:693
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: ident.c:367
-msgid "no email was given and auto-detection is disabled"
+#: convert.c:700
+#, c-format
+msgid "external filter '%s' failed %d"
msgstr ""
-#: ident.c:372
+#: convert.c:735 convert.c:738
#, c-format
-msgid "unable to auto-detect email address (got '%s')"
+msgid "read from external filter '%s' failed"
msgstr ""
-#: ident.c:382
-msgid "no name was given and auto-detection is disabled"
+#: convert.c:741 convert.c:796
+#, c-format
+msgid "external filter '%s' failed"
msgstr ""
-#: ident.c:388
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
+#: convert.c:844
+msgid "unexpected filter type"
msgstr ""
-#: ident.c:396
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
+#: convert.c:855
+msgid "path name too long for external filter"
msgstr ""
-#: ident.c:402
+#: convert.c:929
#, c-format
-msgid "name consists only of disallowed characters: %s"
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
msgstr ""
-#: ident.c:417 builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: lockfile.c:152
+#: convert.c:1398 convert.c:1432
#, 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 "%s: clean filter '%s' failed"
msgstr ""
-#: lockfile.c:160
+#: convert.c:1476
#, c-format
-msgid "Unable to create '%s.lock': %s"
+msgid "%s: smudge filter %s failed"
msgstr ""
-#: merge.c:41
-msgid "failed to read the cache"
+#: date.c:137
+msgid "in the future"
msgstr ""
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393
-#: builtin/checkout.c:607 builtin/clone.c:749
-msgid "unable to write new index file"
-msgstr ""
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:209
-msgid "(bad commit)\n"
-msgstr ""
+#: date.c:150
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:231 merge-recursive.c:239
+#: date.c:157
#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr ""
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:303
-msgid "error building trees"
-msgstr ""
+#: date.c:164
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:727
+#: date.c:170
#, c-format
-msgid "failed to create path '%s'%s"
-msgstr ""
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:738
+#: date.c:177
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr ""
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:752 merge-recursive.c:771
-msgid ": perhaps a D/F conflict?"
-msgstr ""
+#: date.c:188
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:761
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:191
#, c-format
-msgid "refusing to lose untracked file at '%s'"
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:196 date.c:201
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: delta-islands.c:272
+msgid "Propagating island marks"
msgstr ""
-#: merge-recursive.c:803 builtin/cat-file.c:34
+#: delta-islands.c:290
#, c-format
-msgid "cannot read object %s '%s'"
+msgid "bad tree object %s"
msgstr ""
-#: merge-recursive.c:805
+#: delta-islands.c:334
#, c-format
-msgid "blob expected for %s '%s'"
+msgid "failed to load island regex for '%s': %s"
msgstr ""
-#: merge-recursive.c:829
+#: delta-islands.c:390
#, c-format
-msgid "failed to open '%s': %s"
+msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
-#: merge-recursive.c:840
+#: delta-islands.c:466
#, c-format
-msgid "failed to symlink '%s': %s"
+msgid "Marked %d islands, done.\n"
msgstr ""
-#: merge-recursive.c:845
+#: diffcore-order.c:24
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
+msgid "failed to read orderfile '%s'"
msgstr ""
-#: merge-recursive.c:985
-msgid "Failed to execute internal merge"
+#: diffcore-rename.c:544
+msgid "Performing inexact rename detection"
msgstr ""
-#: merge-recursive.c:989
+#: diff.c:108
#, c-format
-msgid "Unable to add %s to database"
+msgid "option '%s' requires a value"
msgstr ""
-#: merge-recursive.c:1092
+#: diff.c:158
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: merge-recursive.c:1097
+#: diff.c:163
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
+msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: merge-recursive.c:1104
-#, c-format
+#: diff.c:291
msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
msgstr ""
-#: merge-recursive.c:1109
+#: diff.c:319
#, 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."
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-#: merge-recursive.c:1143
-msgid "rename"
+#: diff.c:327
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
-#: merge-recursive.c:1143
-msgid "renamed"
+#: diff.c:400
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: merge-recursive.c:1200
+#: diff.c:460
#, c-format
-msgid "%s is a directory in %s adding as %s instead"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
msgstr ""
-#: merge-recursive.c:1225
+#: diff.c:4211
#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+msgid "external diff died, stopping at %s"
msgstr ""
-#: merge-recursive.c:1230
-msgid " (left unresolved)"
+#: diff.c:4553
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: merge-recursive.c:1292
-#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+#: diff.c:4556
+msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: merge-recursive.c:1325
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
+#: diff.c:4634
+msgid "--follow requires exactly one pathspec"
msgstr ""
-#: merge-recursive.c:1528
+#: diff.c:4800
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
msgstr ""
-#: merge-recursive.c:1543
+#: diff.c:4814
#, c-format
-msgid "Adding merged %s"
+msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: merge-recursive.c:1550 merge-recursive.c:1780
-#, c-format
-msgid "Adding as %s instead"
+#: diff.c:5900
+msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: merge-recursive.c:1607
+#: diff.c:5903
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+
+#: diff.c:5906
#, c-format
-msgid "cannot read object %s"
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: merge-recursive.c:1610
+#: dir.c:538
#, c-format
-msgid "object %s is not a blob"
+msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: merge-recursive.c:1679
-msgid "modify"
+#: dir.c:927
+#, c-format
+msgid "cannot use %s as an exclude file"
msgstr ""
-#: merge-recursive.c:1679
-msgid "modified"
+#: dir.c:1842
+#, c-format
+msgid "could not open directory '%s'"
msgstr ""
-#: merge-recursive.c:1689
-msgid "content"
+#: dir.c:2084
+msgid "failed to get kernel name and information"
msgstr ""
-#: merge-recursive.c:1696
-msgid "add/add"
+#: dir.c:2208
+msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: merge-recursive.c:1732
+#: dir.c:3009
#, c-format
-msgid "Skipped %s (merged same as existing)"
+msgid "index file corrupt in repo %s"
msgstr ""
-#: merge-recursive.c:1746
+#: dir.c:3054 dir.c:3059
#, c-format
-msgid "Auto-merging %s"
+msgid "could not create directories for %s"
msgstr ""
-#: merge-recursive.c:1750 git-submodule.sh:944
-msgid "submodule"
+#: dir.c:3088
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: merge-recursive.c:1751
+#: editor.c:73
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
+msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: merge-recursive.c:1845
-#, c-format
-msgid "Removing %s"
+#: entry.c:178
+msgid "Filtering content"
msgstr ""
-#: merge-recursive.c:1871
-msgid "file/directory"
+#: entry.c:465
+#, c-format
+msgid "could not stat file '%s'"
msgstr ""
-#: merge-recursive.c:1877
-msgid "directory/file"
+#: environment.c:150
+#, c-format
+msgid "bad git namespace path \"%s\""
msgstr ""
-#: merge-recursive.c:1883
+#: environment.c:332
#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgid "could not set GIT_DIR to '%s'"
msgstr ""
-#: merge-recursive.c:1892
+#: exec-cmd.c:361
#, c-format
-msgid "Adding %s"
+msgid "too many args to run %s"
msgstr ""
-#: merge-recursive.c:1929
-msgid "Already up-to-date!"
+#: fetch-object.c:17
+msgid "Remote with no URL"
msgstr ""
-#: merge-recursive.c:1938
-#, c-format
-msgid "merging of trees %s and %s failed"
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: merge-recursive.c:2021
-msgid "Merging:"
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+
+#: fetch-pack.c:165
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: merge-recursive.c:2034
+#: fetch-pack.c:185
#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] ""
-msgstr[1] ""
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr ""
-#: merge-recursive.c:2073
-msgid "merge returned no commit"
+#: fetch-pack.c:256
+msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: merge-recursive.c:2136
+#: fetch-pack.c:358 fetch-pack.c:1264
#, c-format
-msgid "Could not parse object '%s'"
+msgid "invalid shallow line: %s"
msgstr ""
-#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
-msgid "Unable to write index."
+#: fetch-pack.c:364 fetch-pack.c:1271
+#, c-format
+msgid "invalid unshallow line: %s"
msgstr ""
-#: notes-merge.c:273
+#: fetch-pack.c:366 fetch-pack.c:1273
#, 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 "object not found: %s"
msgstr ""
-#: notes-merge.c:280
+#: fetch-pack.c:369 fetch-pack.c:1276
#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
+msgid "error in object: %s"
msgstr ""
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: fetch-pack.c:371 fetch-pack.c:1278
+#, c-format
+msgid "no shallow found: %s"
msgstr ""
-#: notes-utils.c:100
+#: fetch-pack.c:374 fetch-pack.c:1282
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: notes-utils.c:110
+#: fetch-pack.c:415
#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgid "got %s %d %s"
msgstr ""
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#: fetch-pack.c:432
#, c-format
-msgid "Bad %s value: '%s'"
+msgid "invalid commit %s"
msgstr ""
-#: object.c:240
-#, c-format
-msgid "unable to parse object: %s"
+#: fetch-pack.c:463
+msgid "giving up"
msgstr ""
-#: parse-options.c:572
-msgid "..."
+#: fetch-pack.c:475 progress.c:229
+msgid "done"
msgstr ""
-#: parse-options.c:590
+#: fetch-pack.c:487
#, c-format
-msgid "usage: %s"
+msgid "got %s (%d) %s"
msgstr ""
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#: fetch-pack.c:533
#, c-format
-msgid " or: %s"
+msgid "Marking %s as complete"
msgstr ""
-#: parse-options.c:597
+#: fetch-pack.c:740
#, c-format
-msgid " %s"
+msgid "already have %s (%s)"
msgstr ""
-#: parse-options.c:631
-msgid "-NUM"
+#: fetch-pack.c:779
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr ""
+
+#: fetch-pack.c:787
+msgid "protocol error: bad pack header"
msgstr ""
-#: parse-options-cb.c:108
+#: fetch-pack.c:855
#, c-format
-msgid "malformed object name '%s'"
+msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: path.c:805
+#: fetch-pack.c:871
#, c-format
-msgid "Could not make %s writable by group"
+msgid "%s failed"
msgstr ""
-#: pathspec.c:125
-msgid "Escape character '\\' not allowed as last character in attr value"
+#: fetch-pack.c:873
+msgid "error in sideband demultiplexer"
msgstr ""
-#: pathspec.c:143
-msgid "Only one 'attr:' specification is allowed."
+#: fetch-pack.c:902
+msgid "Server does not support shallow clients"
msgstr ""
-#: pathspec.c:146
-msgid "attr spec must not be empty"
+#: fetch-pack.c:906
+msgid "Server supports multi_ack_detailed"
msgstr ""
-#: pathspec.c:189
-#, c-format
-msgid "invalid attribute name %s"
+#: fetch-pack.c:909
+msgid "Server supports no-done"
msgstr ""
-#: pathspec.c:254
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+#: fetch-pack.c:915
+msgid "Server supports multi_ack"
msgstr ""
-#: pathspec.c:261
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
+#: fetch-pack.c:919
+msgid "Server supports side-band-64k"
msgstr ""
-#: pathspec.c:301
-msgid "invalid parameter for pathspec magic 'prefix'"
+#: fetch-pack.c:923
+msgid "Server supports side-band"
msgstr ""
-#: pathspec.c:322
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
+#: fetch-pack.c:927
+msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: pathspec.c:327
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
+#: fetch-pack.c:931
+msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: pathspec.c:365
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
+#: fetch-pack.c:941
+msgid "Server supports ofs-delta"
msgstr ""
-#: pathspec.c:421 pathspec.c:443
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+#: fetch-pack.c:947 fetch-pack.c:1140
+msgid "Server supports filter"
msgstr ""
-#: pathspec.c:483
+#: fetch-pack.c:955
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
+msgid "Server version is %.*s"
msgstr ""
-#: pathspec.c:496
-#, c-format
-msgid "%s: '%s' is outside repository"
+#: fetch-pack.c:961
+msgid "Server does not support --shallow-since"
msgstr ""
-#: pathspec.c:584
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
+#: fetch-pack.c:965
+msgid "Server does not support --shallow-exclude"
msgstr ""
-#: pathspec.c:594
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
+#: fetch-pack.c:967
+msgid "Server does not support --deepen"
msgstr ""
-#: pathspec.c:644
-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:984
+msgid "no common commits"
msgstr ""
-#: pathspec.c:668
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
+#: fetch-pack.c:996 fetch-pack.c:1419
+msgid "git fetch-pack: fetch failed."
msgstr ""
-#: pretty.c:982
-msgid "unable to parse --pretty format"
+#: fetch-pack.c:1134
+msgid "Server does not support shallow requests"
msgstr ""
-#: read-cache.c:1307
+#: fetch-pack.c:1184
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+msgid "error reading section header '%s'"
msgstr ""
-#: read-cache.c:1317
+#: fetch-pack.c:1190
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+msgid "expected '%s', received '%s'"
msgstr ""
-#: read-cache.c:2232
+#: fetch-pack.c:1229
#, c-format
-msgid "could not stat '%s"
+msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: read-cache.c:2245
+#: fetch-pack.c:1234
#, c-format
-msgid "unable to open git dir: %s"
+msgid "error processing acks: %d"
msgstr ""
-#: read-cache.c:2257
-#, c-format
-msgid "unable to unlink: %s"
+#: fetch-pack.c:1244
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1246
+msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: refs.c:619 builtin/merge.c:844
+#: fetch-pack.c:1287
#, c-format
-msgid "Could not open '%s' for writing"
+msgid "error processing shallow info: %d"
msgstr ""
-#: refs/files-backend.c:2531
+#: fetch-pack.c:1308
#, c-format
-msgid "could not delete reference %s: %s"
+msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: refs/files-backend.c:2534
+#: fetch-pack.c:1318
#, c-format
-msgid "could not delete references: %s"
+msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: refs/files-backend.c:2543
+#: fetch-pack.c:1322
#, c-format
-msgid "could not remove reference %s"
+msgid "error processing wanted refs: %d"
msgstr ""
-#: ref-filter.c:35 wt-status.c:1780
-msgid "gone"
+#: fetch-pack.c:1646
+msgid "no matching remote head"
msgstr ""
-#: ref-filter.c:36
-#, c-format
-msgid "ahead %d"
+#: fetch-pack.c:1664 builtin/clone.c:671
+msgid "remote did not send all necessary objects"
msgstr ""
-#: ref-filter.c:37
+#: fetch-pack.c:1690
#, c-format
-msgid "behind %d"
+msgid "no such remote ref %s"
msgstr ""
-#: ref-filter.c:38
+#: fetch-pack.c:1693
#, c-format
-msgid "ahead %d, behind %d"
+msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: ref-filter.c:104
-#, c-format
-msgid "expected format: %%(color:<color>)"
+#: gpg-interface.c:318
+msgid "gpg failed to sign the data"
msgstr ""
-#: ref-filter.c:106
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
+#: gpg-interface.c:344
+msgid "could not create temporary file"
msgstr ""
-#: ref-filter.c:120
+#: gpg-interface.c:347
#, c-format
-msgid "Integer value expected refname:lstrip=%s"
+msgid "failed writing detached signature to '%s'"
msgstr ""
-#: ref-filter.c:124
+#: graph.c:97
#, c-format
-msgid "Integer value expected refname:rstrip=%s"
+msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: ref-filter.c:126
+#: grep.c:2113
#, c-format
-msgid "unrecognized %%(%s) argument: %s"
+msgid "'%s': unable to read %s"
msgstr ""
-#: ref-filter.c:166
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
-msgid "%%(body) does not take arguments"
+msgid "failed to stat '%s'"
msgstr ""
-#: ref-filter.c:173
+#: grep.c:2141
#, c-format
-msgid "%%(subject) does not take arguments"
+msgid "'%s': short read"
msgstr ""
-#: ref-filter.c:180
-#, c-format
-msgid "%%(trailers) does not take arguments"
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
msgstr ""
-#: ref-filter.c:199
-#, c-format
-msgid "positive value expected contents:lines=%s"
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
msgstr ""
-#: ref-filter.c:201
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
msgstr ""
-#: ref-filter.c:214
-#, c-format
-msgid "positive value expected objectname:short=%s"
+#: help.c:26
+msgid "grow, mark and tweak your common history"
msgstr ""
-#: ref-filter.c:218
-#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
msgstr ""
-#: ref-filter.c:245
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+#: help.c:31
+msgid "Main Porcelain Commands"
msgstr ""
-#: ref-filter.c:257
-#, c-format
-msgid "unrecognized position:%s"
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
msgstr ""
-#: ref-filter.c:261
-#, c-format
-msgid "unrecognized width:%s"
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
msgstr ""
-#: ref-filter.c:267
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
+#: help.c:34
+msgid "Interacting with Others"
msgstr ""
-#: ref-filter.c:271
-#, c-format
-msgid "positive width expected with the %%(align) atom"
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
msgstr ""
-#: ref-filter.c:286
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
msgstr ""
-#: ref-filter.c:371
-#, c-format
-msgid "malformed field name: %.*s"
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
msgstr ""
-#: ref-filter.c:397
-#, c-format
-msgid "unknown field name: %.*s"
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
msgstr ""
-#: ref-filter.c:501
+#: help.c:298
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
+msgid "available git commands in '%s'"
msgstr ""
-#: ref-filter.c:561
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+#: help.c:305
+msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: ref-filter.c:563
-#, c-format
-msgid "format: %%(then) atom used more than once"
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
msgstr ""
-#: ref-filter.c:565
+#: help.c:363 git.c:90
#, c-format
-msgid "format: %%(then) atom used after %%(else)"
+msgid "unsupported command listing type '%s'"
msgstr ""
-#: ref-filter.c:591
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+#: help.c:410
+msgid "The common Git guides are:"
msgstr ""
-#: ref-filter.c:593
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
+#: help.c:519
+msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
-#: ref-filter.c:595
-#, c-format
-msgid "format: %%(else) atom used more than once"
+#: help.c:524
+msgid "External commands"
msgstr ""
-#: ref-filter.c:608
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+#: help.c:539
+msgid "Command aliases"
msgstr ""
-#: ref-filter.c:663
+#: help.c:603
#, c-format
-msgid "malformed format string %s"
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+
+#: help.c:662
+msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: ref-filter.c:1247
+#: help.c:684
#, c-format
-msgid "(no branch, rebasing %s)"
+msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-#: ref-filter.c:1250
+#: help.c:689
#, c-format
-msgid "(no branch, bisect started on %s)"
+msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: ref-filter.c:1256
+#: help.c:694
#, c-format
-msgid "(HEAD detached at %s)"
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: ref-filter.c:1261
+#: help.c:702
#, c-format
-msgid "(HEAD detached from %s)"
+msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: ref-filter.c:1265
-msgid "(no branch)"
+#: help.c:706
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+msgstr[1] ""
+
+#: help.c:721
+msgid "git version [<options>]"
msgstr ""
-#: ref-filter.c:1420 ref-filter.c:1451
+#: help.c:789
#, c-format
-msgid "missing object %s for %s"
+msgid "%s: %s - %s"
msgstr ""
-#: ref-filter.c:1423 ref-filter.c:1454
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
+#: help.c:793
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: 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 ""
-#: ref-filter.c:1692
-#, c-format
-msgid "malformed object at '%s'"
+#: ident.c:369
+msgid "no email was given and auto-detection is disabled"
msgstr ""
-#: ref-filter.c:1759
+#: ident.c:374
#, c-format
-msgid "ignoring ref with broken name %s"
+msgid "unable to auto-detect email address (got '%s')"
msgstr ""
-#: ref-filter.c:1764
-#, c-format
-msgid "ignoring broken ref %s"
+#: ident.c:384
+msgid "no name was given and auto-detection is disabled"
msgstr ""
-#: ref-filter.c:2028
+#: ident.c:390
#, c-format
-msgid "format: %%(end) atom missing"
+msgid "unable to auto-detect name (got '%s')"
msgstr ""
-#: ref-filter.c:2109
+#: ident.c:398
#, c-format
-msgid "malformed object name %s"
+msgid "empty ident name (for <%s>) not allowed"
msgstr ""
-#: remote.c:754
+#: ident.c:404
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
+msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: remote.c:758
+#: ident.c:419 builtin/commit.c:608
#, c-format
-msgid "%s usually tracks %s, not %s"
+msgid "invalid date format: %s"
msgstr ""
-#: remote.c:762
-#, c-format
-msgid "%s tracks both %s and %s"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: remote.c:770
-msgid "Internal error"
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
msgstr ""
-#: remote.c:1685 remote.c:1787
-msgid "HEAD does not point to a branch"
+#: list-objects-filter-options.c:152
+msgid "cannot change partial clone promisor remote"
msgstr ""
-#: remote.c:1694
+#: lockfile.c:151
#, c-format
-msgid "no such branch: '%s'"
+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."
msgstr ""
-#: remote.c:1697
+#: lockfile.c:159
#, c-format
-msgid "no upstream configured for branch '%s'"
+msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: remote.c:1703
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
+#: merge.c:41
+msgid "failed to read the cache"
msgstr ""
-#: remote.c:1718
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
+#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918
+#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771
+msgid "unable to write new index file"
msgstr ""
-#: remote.c:1730
+#: merge-recursive.c:332
+msgid "(bad commit)\n"
+msgstr ""
+
+#: merge-recursive.c:355
#, c-format
-msgid "branch '%s' has no remote for pushing"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: remote.c:1741
+#: merge-recursive.c:364
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: remote.c:1754
-msgid "push has no destination (push.default is 'nothing')"
+#: merge-recursive.c:447
+msgid "error building trees"
msgstr ""
-#: remote.c:1776
-msgid "cannot resolve 'simple' push to a single destination"
+#: merge-recursive.c:902
+#, c-format
+msgid "failed to create path '%s'%s"
msgstr ""
-#: remote.c:2081
+#: merge-recursive.c:913
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: remote.c:2085
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+#: merge-recursive.c:927 merge-recursive.c:946
+msgid ": perhaps a D/F conflict?"
msgstr ""
-#: remote.c:2088
+#: merge-recursive.c:936
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: remote.c:2092
+#: merge-recursive.c:978 builtin/cat-file.c:40
#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2098
-msgid " (use \"git push\" to publish your local commits)\n"
+msgid "cannot read object %s '%s'"
msgstr ""
-#: remote.c:2101
+#: merge-recursive.c:980
#, 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:2109
-msgid " (use \"git pull\" to update your local branch)\n"
+msgid "blob expected for %s '%s'"
msgstr ""
-#: remote.c:2112
+#: merge-recursive.c:1004
#, 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] ""
+msgid "failed to open '%s': %s"
+msgstr ""
-#: remote.c:2122
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+#: merge-recursive.c:1015
+#, c-format
+msgid "failed to symlink '%s': %s"
msgstr ""
-#: revision.c:2158
-msgid "your current branch appears to be broken"
+#: merge-recursive.c:1020
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: revision.c:2161
+#: merge-recursive.c:1211
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
+msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: revision.c:2355
-msgid "--first-parent is incompatible with --bisect"
+#: merge-recursive.c:1218
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: run-command.c:125
-msgid "open /dev/null failed"
+#: merge-recursive.c:1225
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: run-command.c:127
+#: merge-recursive.c:1233 merge-recursive.c:1245
#, c-format
-msgid "dup2(%d,%d) failed"
+msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: send-pack.c:150
+#: merge-recursive.c:1236 merge-recursive.c:1248
#, c-format
-msgid "unable to parse remote unpack status: %s"
+msgid "Fast-forwarding submodule %s"
msgstr ""
-#: send-pack.c:152
+#: merge-recursive.c:1271
#, c-format
-msgid "remote unpack failed: %s"
+msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: send-pack.c:315
-msgid "failed to sign the push certificate"
+#: merge-recursive.c:1275
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: send-pack.c:428
-msgid "the receiving end does not support --signed push"
+#: merge-recursive.c:1276
+msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: send-pack.c:430
+#: merge-recursive.c:1279
+#, c-format
msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+"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 ""
-#: send-pack.c:442
-msgid "the receiving end does not support --atomic push"
+#: merge-recursive.c:1288
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: send-pack.c:447
-msgid "the receiving end does not support push options"
+#: merge-recursive.c:1361
+msgid "Failed to execute internal merge"
msgstr ""
-#: sequencer.c:215
-msgid "revert"
+#: merge-recursive.c:1366
+#, c-format
+msgid "Unable to add %s to database"
msgstr ""
-#: sequencer.c:217
-msgid "cherry-pick"
+#: merge-recursive.c:1398
+#, c-format
+msgid "Auto-merging %s"
msgstr ""
-#: sequencer.c:219
-msgid "rebase -i"
+#: merge-recursive.c:1419
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: sequencer.c:221
+#: merge-recursive.c:1486
#, c-format
-msgid "Unknown action: %d"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-#: sequencer.c:278
+#: merge-recursive.c:1491
+#, c-format
msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
msgstr ""
-#: sequencer.c:281
+#: merge-recursive.c:1498
+#, c-format
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'"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-#: sequencer.c:294 sequencer.c:1675
+#: merge-recursive.c:1503
#, c-format
-msgid "could not lock '%s'"
+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:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694
-#, c-format
-msgid "could not write to '%s'"
+#: merge-recursive.c:1537
+msgid "rename"
msgstr ""
-#: sequencer.c:301
-#, c-format
-msgid "could not write eol to '%s'"
+#: merge-recursive.c:1537
+msgid "renamed"
msgstr ""
-#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682
+#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213
#, c-format
-msgid "failed to finalize '%s'."
+msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1018
+#: merge-recursive.c:1643
#, c-format
-msgid "could not read '%s'"
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: sequencer.c:355
+#: merge-recursive.c:1706
#, c-format
-msgid "your local changes would be overwritten by %s."
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
-#: sequencer.c:359
-msgid "commit your changes or stash them to proceed."
+#: merge-recursive.c:1734
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: sequencer.c:388
+#: merge-recursive.c:1739
#, c-format
-msgid "%s: fast-forward"
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. * "rebase -i".
-#.
-#: sequencer.c:470
+#: merge-recursive.c:1759
#, c-format
-msgid "%s: Unable to write new index file"
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: sequencer.c:489
-msgid "could not resolve HEAD commit\n"
+#: merge-recursive.c:1764
+msgid " (left unresolved)"
msgstr ""
-#: sequencer.c:509
-msgid "unable to update cache tree\n"
+#: merge-recursive.c:1868
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: sequencer.c:592
+#: merge-recursive.c:2064
#, 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"
+"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:694
+#: merge-recursive.c:2096
#, c-format
-msgid "could not parse commit %s\n"
+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:699
+#: merge-recursive.c:2106
#, c-format
-msgid "could not parse parent commit %s\n"
+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:821
+#: merge-recursive.c:2198
#, c-format
msgid ""
-"unexpected 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
msgstr ""
-#: sequencer.c:827
+#: merge-recursive.c:2443
#, c-format
msgid ""
-"invalid 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
msgstr ""
-#: sequencer.c:833 sequencer.c:858
+#: merge-recursive.c:3022
#, c-format
-msgid "This is a combination of %d commits."
+msgid "cannot read object %s"
msgstr ""
-#: sequencer.c:842
-msgid "need a HEAD to fixup"
+#: merge-recursive.c:3025
+#, c-format
+msgid "object %s is not a blob"
msgstr ""
-#: sequencer.c:844
-msgid "could not read HEAD"
+#: merge-recursive.c:3094
+msgid "modify"
msgstr ""
-#: sequencer.c:846
-msgid "could not read HEAD's commit message"
+#: merge-recursive.c:3094
+msgid "modified"
msgstr ""
-#: sequencer.c:852
-#, c-format
-msgid "cannot write '%s'"
+#: merge-recursive.c:3105
+msgid "content"
msgstr ""
-#: sequencer.c:861 git-rebase--interactive.sh:445
-msgid "This is the 1st commit message:"
+#: merge-recursive.c:3112
+msgid "add/add"
msgstr ""
-#: sequencer.c:869
+#: merge-recursive.c:3160
#, c-format
-msgid "could not read commit message of %s"
+msgid "Skipped %s (merged same as existing)"
+msgstr ""
+
+#: merge-recursive.c:3182 git-submodule.sh:861
+msgid "submodule"
msgstr ""
-#: sequencer.c:876
+#: merge-recursive.c:3183
#, c-format
-msgid "This is the commit message #%d:"
+msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: sequencer.c:881
+#: merge-recursive.c:3216
#, c-format
-msgid "The commit message #%d will be skipped:"
+msgid "Adding as %s instead"
msgstr ""
-#: sequencer.c:886
+#: merge-recursive.c:3319
#, c-format
-msgid "unknown command: %d"
+msgid "Removing %s"
msgstr ""
-#: sequencer.c:952
-msgid "your index file is unmerged."
+#: merge-recursive.c:3345
+msgid "file/directory"
msgstr ""
-#: sequencer.c:970
-#, c-format
-msgid "commit %s is a merge but no -m option was given."
+#: merge-recursive.c:3351
+msgid "directory/file"
msgstr ""
-#: sequencer.c:978
+#: merge-recursive.c:3358
#, c-format
-msgid "commit %s does not have parent %d"
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: sequencer.c:982
+#: merge-recursive.c:3367
#, c-format
-msgid "mainline was specified but commit %s is not a merge."
+msgid "Adding %s"
msgstr ""
-#: sequencer.c:988
+#: merge-recursive.c:3376
#, c-format
-msgid "cannot get commit message for %s"
+msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1009
+#: merge-recursive.c:3417
#, c-format
-msgid "%s: cannot parse parent commit %s"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
msgstr ""
-#: sequencer.c:1071 sequencer.c:1820
-#, c-format
-msgid "could not rename '%s' to '%s'"
+#: merge-recursive.c:3428
+msgid "Already up to date!"
msgstr ""
-#: sequencer.c:1122
+#: merge-recursive.c:3437
#, c-format
-msgid "could not revert %s... %s"
+msgid "merging of trees %s and %s failed"
msgstr ""
-#: sequencer.c:1123
-#, c-format
-msgid "could not apply %s... %s"
+#: merge-recursive.c:3536
+msgid "Merging:"
msgstr ""
-#: sequencer.c:1165
-msgid "empty commit set passed"
+#: merge-recursive.c:3549
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: merge-recursive.c:3588
+msgid "merge returned no commit"
msgstr ""
-#: sequencer.c:1175
+#: merge-recursive.c:3654
#, c-format
-msgid "git %s: failed to read the index"
+msgid "Could not parse object '%s'"
+msgstr ""
+
+#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850
+msgid "Unable to write index."
msgstr ""
-#: sequencer.c:1182
+#: midx.c:65
#, c-format
-msgid "git %s: failed to refresh the index"
+msgid "multi-pack-index file %s is too small"
msgstr ""
-#: sequencer.c:1302
+#: midx.c:81
#, c-format
-msgid "invalid line %d: %.*s"
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: sequencer.c:1310
+#: midx.c:86
#, c-format
-msgid "cannot '%s' without a previous commit"
+msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: sequencer.c:1342
+#: midx.c:91
#, c-format
-msgid "could not read '%s'."
+msgid "hash version %u does not match"
msgstr ""
-#: sequencer.c:1349
-msgid "please fix this using 'git rebase --edit-todo'."
+#: midx.c:105
+msgid "invalid chunk offset (too large)"
msgstr ""
-#: sequencer.c:1351
-#, c-format
-msgid "unusable instruction sheet: '%s'"
+#: midx.c:129
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: sequencer.c:1356
-msgid "no commits parsed."
+#: midx.c:142
+msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: sequencer.c:1367
-msgid "cannot cherry-pick during a revert."
+#: midx.c:144
+msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: sequencer.c:1369
-msgid "cannot revert during a cherry-pick."
+#: midx.c:146
+msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: sequencer.c:1432
-#, c-format
-msgid "invalid key: %s"
+#: midx.c:148
+msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: sequencer.c:1435
+#: midx.c:162
#, c-format
-msgid "invalid value for %s: %s"
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: sequencer.c:1492
+#: midx.c:205
#, c-format
-msgid "malformed options sheet: '%s'"
+msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: sequencer.c:1530
-msgid "a cherry-pick or revert is already in progress"
+#: midx.c:246
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: sequencer.c:1531
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: midx.c:271
+msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: sequencer.c:1534
+#: midx.c:407
#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr ""
-
-#: sequencer.c:1548
-msgid "could not lock HEAD"
+msgid "failed to add packfile '%s'"
msgstr ""
-#: sequencer.c:1604 sequencer.c:2159
-msgid "no cherry-pick or revert in progress"
+#: midx.c:413
+#, c-format
+msgid "failed to open pack-index '%s'"
msgstr ""
-#: sequencer.c:1606
-msgid "cannot resolve HEAD"
+#: midx.c:507
+#, c-format
+msgid "failed to locate object %d in packfile"
msgstr ""
-#: sequencer.c:1608 sequencer.c:1642
-msgid "cannot abort from a branch yet to be born"
+#: midx.c:943
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: sequencer.c:1628 builtin/grep.c:910
+#: midx.c:981
#, c-format
-msgid "cannot open '%s'"
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: sequencer.c:1630
+#: midx.c:992
#, c-format
-msgid "cannot read '%s': %s"
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: sequencer.c:1631
-msgid "unexpected end of file"
+#: midx.c:996
+msgid "Verifying object offsets"
msgstr ""
-#: sequencer.c:1637
+#: midx.c:1004
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: sequencer.c:1648
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr ""
-
-#: sequencer.c:1785 sequencer.c:2058
-msgid "cannot read HEAD"
+#: midx.c:1010
+#, c-format
+msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: sequencer.c:1825 builtin/difftool.c:616
+#: midx.c:1019
#, c-format
-msgid "could not copy '%s' to '%s'"
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: sequencer.c:1841
-msgid "could not read index"
+#: name-hash.c:531
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: sequencer.c:1846
+#: name-hash.c:553
#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: sequencer.c:1852
-msgid "and made changes to the index and/or the working tree\n"
+#: name-hash.c:559
+#, c-format
+msgid "unable to join lazy_name thread: %s"
msgstr ""
-#: sequencer.c:1858
+#: notes-merge.c:277
#, 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"
+"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:1913 git-rebase.sh:168
+#: notes-merge.c:284
#, c-format
-msgid "Applied autostash."
+msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: sequencer.c:1925
-#, c-format
-msgid "cannot store %s"
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: sequencer.c:1927 git-rebase.sh:172
+#: notes-utils.c:105
#, c-format
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: sequencer.c:2009
+#: notes-utils.c:115
#, c-format
-msgid "Stopped at %s... %.*s\n"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-#: sequencer.c:2036
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:145
#, c-format
-msgid "unknown command %d"
+msgid "Bad %s value: '%s'"
msgstr ""
-#: sequencer.c:2066
-msgid "could not read orig-head"
+#: object.c:54
+#, c-format
+msgid "invalid object type \"%s\""
msgstr ""
-#: sequencer.c:2070
-msgid "could not read 'onto'"
+#: object.c:174
+#, c-format
+msgid "object %s is a %s, not a %s"
msgstr ""
-#: sequencer.c:2077
+#: object.c:234
#, c-format
-msgid "could not update %s"
+msgid "object %s has unknown type id %d"
msgstr ""
-#: sequencer.c:2084
+#: object.c:247
#, c-format
-msgid "could not update HEAD to %s"
+msgid "unable to parse object: %s"
msgstr ""
-#: sequencer.c:2168
-msgid "cannot rebase: You have unstaged changes."
+#: object.c:267 object.c:278
+#, c-format
+msgid "hash mismatch %s"
msgstr ""
-#: sequencer.c:2173
-msgid "could not remove CHERRY_PICK_HEAD"
+#: packfile.c:607
+msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: sequencer.c:2182
-msgid "cannot amend non-existing commit"
+#: packfile.c:1870
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: sequencer.c:2184
+#: packfile.c:1874
#, c-format
-msgid "invalid file: '%s'"
+msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: sequencer.c:2186
+#: parse-options.c:35
#, c-format
-msgid "invalid contents: '%s'"
+msgid "%s requires a value"
msgstr ""
-#: sequencer.c:2189
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
+#: parse-options.c:69
+#, c-format
+msgid "%s is incompatible with %s"
msgstr ""
-#: sequencer.c:2199
-msgid "could not commit staged changes."
+#: parse-options.c:74
+#, c-format
+msgid "%s : incompatible with something else"
msgstr ""
-#: sequencer.c:2279
+#: parse-options.c:88 parse-options.c:92 parse-options.c:260
#, c-format
-msgid "%s: can't cherry-pick a %s"
+msgid "%s takes no value"
msgstr ""
-#: sequencer.c:2283
+#: parse-options.c:90
#, c-format
-msgid "%s: bad revision"
+msgid "%s isn't available"
msgstr ""
-#: sequencer.c:2316
-msgid "can't revert as initial commit"
+#: parse-options.c:178
+#, c-format
+msgid "%s expects a numerical value"
msgstr ""
-#: setup.c:165
+#: parse-options.c:194
#, 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 "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: setup.c:178
+#: parse-options.c:322
#, 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 "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: setup.c:228
+#: parse-options.c:356 parse-options.c:364
#, 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 "did you mean `--%s` (with two dashes ?)"
msgstr ""
-#: setup.c:475
+#: parse-options.c:649
#, c-format
-msgid "Expected git repo version <= %d, found %d"
+msgid "unknown option `%s'"
msgstr ""
-#: setup.c:483
-msgid "unknown repository extensions found:"
+#: parse-options.c:651
+#, c-format
+msgid "unknown switch `%c'"
msgstr ""
-#: setup.c:776
+#: parse-options.c:653
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
+msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: setup.c:778 builtin/index-pack.c:1646
-msgid "Cannot come back to cwd"
+#: parse-options.c:675
+msgid "..."
msgstr ""
-#: setup.c:1010
-msgid "Unable to read current working directory"
+#: parse-options.c:694
+#, c-format
+msgid "usage: %s"
msgstr ""
-#: setup.c:1022 setup.c:1028
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:700
#, c-format
-msgid "Cannot change to '%s'"
+msgid " or: %s"
msgstr ""
-#: setup.c:1041
+#: parse-options.c:703
#, c-format
-msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
-"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgid " %s"
msgstr ""
-#: setup.c:1106
-#, c-format
-msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+#: parse-options.c:742
+msgid "-NUM"
msgstr ""
-#: sha1_file.c:559
+#: parse-options-cb.c:21
#, c-format
-msgid "path '%s' does not exist"
+msgid "option `%s' expects a numerical value"
msgstr ""
-#: sha1_file.c:585
+#: parse-options-cb.c:38
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgid "malformed expiration date '%s'"
msgstr ""
-#: sha1_file.c:591
+#: parse-options-cb.c:51
#, c-format
-msgid "reference repository '%s' is not a local repository."
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: sha1_file.c:597
+#: parse-options-cb.c:110
#, c-format
-msgid "reference repository '%s' is shallow"
+msgid "malformed object name '%s'"
msgstr ""
-#: sha1_file.c:605
+#: 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:128
+msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: sha1_file.c:2721
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
+#: pathspec.c:146
+msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: sha1_file.c:2725
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
+#: pathspec.c:149
+msgid "attr spec must not be empty"
msgstr ""
-#: sha1_name.c:409
+#: pathspec.c:192
#, c-format
-msgid "short SHA1 %s is ambiguous"
+msgid "invalid attribute name %s"
msgstr ""
-#: sha1_name.c:420
-msgid "The candidates are:"
+#: pathspec.c:257
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: sha1_name.c:580
+#: pathspec.c:264
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:67 submodule.c:101
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: pathspec.c:304
+msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: submodule.c:71 submodule.c:105
+#: pathspec.c:325
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: submodule.c:79
+#: pathspec.c:330
#, c-format
-msgid "Could not update .gitmodules entry %s"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: submodule.c:112
+#: pathspec.c:368
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr ""
-
-#: submodule.c:123
-msgid "staging updated .gitmodules failed"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: submodule.c:161
-msgid "negative values not allowed for submodule.fetchJobs"
+#: pathspec.c:427
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: submodule.c:1194
+#: pathspec.c:440
#, c-format
-msgid "'%s' not recognized as a git repository"
+msgid "%s: '%s' is outside repository"
msgstr ""
-#: submodule.c:1332
+#: pathspec.c:514
#, c-format
-msgid "could not start 'git status' in submodule '%s'"
+msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: submodule.c:1345
+#: pathspec.c:524
#, c-format
-msgid "could not run 'git status' in submodule '%s'"
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: submodule.c:1421
+#: pathspec.c:591
#, c-format
-msgid "submodule '%s' has dirty index"
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: submodule.c:1679
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+#: pkt-line.c:104
+msgid "flush packet write failed"
msgstr ""
-#: submodule.c:1691 submodule.c:1747
-#, c-format
-msgid "could not lookup name for submodule '%s'"
+#: pkt-line.c:144 pkt-line.c:230
+msgid "protocol error: impossibly long line"
msgstr ""
-#: submodule.c:1695 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
-#, c-format
-msgid "could not create directory '%s'"
+#: pkt-line.c:160 pkt-line.c:162
+msgid "packet write with format failed"
msgstr ""
-#: submodule.c:1698
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
+#: pkt-line.c:194
+msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: submodule.c:1782
-#, c-format
-msgid "could not recurse into submodule '%s'"
+#: pkt-line.c:201 pkt-line.c:208
+msgid "packet write failed"
msgstr ""
-#: submodule.c:1826
-msgid "could not start ls-files in .."
+#: pkt-line.c:293
+msgid "read error"
msgstr ""
-#: submodule.c:1846
-msgid "BUG: returned path string doesn't match cwd?"
+#: pkt-line.c:301
+msgid "the remote end hung up unexpectedly"
msgstr ""
-#: submodule.c:1865
+#: pkt-line.c:329
#, c-format
-msgid "ls-tree returned unexpected return code %d"
+msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: submodule-config.c:380
+#: pkt-line.c:339 pkt-line.c:344
#, c-format
-msgid "invalid value for %s"
+msgid "protocol error: bad line length %d"
msgstr ""
-#: trailer.c:240
+#: pkt-line.c:353
#, c-format
-msgid "running trailer command '%s' failed"
+msgid "remote error: %s"
msgstr ""
-#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
-#: trailer.c:543
-#, c-format
-msgid "unknown value '%s' for key '%s'"
+#: preload-index.c:119
+msgid "Refreshing index"
msgstr ""
-#: trailer.c:525 trailer.c:530 builtin/remote.c:289
+#: preload-index.c:138
#, c-format
-msgid "more than one %s"
+msgid "unable to create threaded lstat: %s"
msgstr ""
-#: trailer.c:702
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
+#: pretty.c:963
+msgid "unable to parse --pretty format"
msgstr ""
-#: trailer.c:722
-#, c-format
-msgid "could not read input file '%s'"
+#: range-diff.c:56
+msgid "could not start `log`"
msgstr ""
-#: trailer.c:725
-msgid "could not read from stdin"
+#: range-diff.c:59
+msgid "could not read `log` output"
msgstr ""
-#: trailer.c:949 builtin/am.c:44
+#: range-diff.c:74 sequencer.c:4828
#, c-format
-msgid "could not stat %s"
+msgid "could not parse commit '%s'"
+msgstr ""
+
+#: range-diff.c:224
+msgid "failed to generate diff"
msgstr ""
-#: trailer.c:951
+#: range-diff.c:455 range-diff.c:457
#, c-format
-msgid "file %s is not a regular file"
+msgid "could not parse log for '%s'"
msgstr ""
-#: trailer.c:953
+#: read-cache.c:673
#, c-format
-msgid "file %s is not writable by user"
+msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
-#: trailer.c:965
-msgid "could not open temporary file"
+#: read-cache.c:689
+msgid "cannot create an empty blob in the object database"
msgstr ""
-#: trailer.c:1001
+#: read-cache.c:710
#, c-format
-msgid "could not rename temporary file to %s"
+msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: transport.c:62
+#: read-cache.c:765
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgid "unable to index file '%s'"
msgstr ""
-#: transport.c:151
+#: read-cache.c:784
#, c-format
-msgid "transport: invalid depth option '%s'"
+msgid "unable to add '%s' to index"
msgstr ""
-#: transport.c:889
+#: read-cache.c:795
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+msgid "unable to stat '%s'"
msgstr ""
-#: transport.c:893
+#: read-cache.c:1304
#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
+msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: transport.c:901
-msgid "Aborting."
+#: read-cache.c:1489
+msgid "Refresh index"
msgstr ""
-#: transport-helper.c:1080
+#: read-cache.c:1603
#, c-format
-msgid "Could not read ref %s"
-msgstr ""
-
-#: tree-walk.c:31
-msgid "too-short tree object"
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: tree-walk.c:37
-msgid "malformed mode in tree entry"
-msgstr ""
-
-#: tree-walk.c:41
-msgid "empty filename in tree entry"
+#: read-cache.c:1613
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: tree-walk.c:113
-msgid "too-short tree file"
+#: read-cache.c:1684
+#, c-format
+msgid "bad signature 0x%08x"
msgstr ""
-#: unpack-trees.c:104
+#: read-cache.c:1687
#, 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 "bad index version %d"
msgstr ""
-#: unpack-trees.c:106
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+#: read-cache.c:1696
+msgid "bad index file sha1 signature"
msgstr ""
-#: unpack-trees.c:109
+#: read-cache.c:1726
#, 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 "index uses %.4s extension, which we do not understand"
msgstr ""
-#: unpack-trees.c:111
+#: read-cache.c:1728
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+msgid "ignoring %.4s extension"
msgstr ""
-#: unpack-trees.c:114
+#: read-cache.c:1765
#, 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 "unknown index entry format 0x%08x"
msgstr ""
-#: unpack-trees.c:116
+#: read-cache.c:1781
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: unpack-trees.c:121
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
+#: read-cache.c:1836
+msgid "unordered stage entries in index"
msgstr ""
-#: unpack-trees.c:125
+#: read-cache.c:1839
#, 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 "multiple stage entries for merged file '%s'"
msgstr ""
-#: unpack-trees.c:127
+#: read-cache.c:1842
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+msgid "unordered stage entries for '%s'"
msgstr ""
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
+#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294
+#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955
+#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498
+#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
+#: builtin/submodule--helper.c:330
+msgid "index file corrupt"
msgstr ""
-#: unpack-trees.c:132
+#: read-cache.c:2090
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: unpack-trees.c:135
+#: read-cache.c:2103
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: unpack-trees.c:137
+#: read-cache.c:2136
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+msgid "%s: index file open failed"
msgstr ""
-#: unpack-trees.c:142
+#: read-cache.c:2140
#, 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: cannot stat the open index"
msgstr ""
-#: unpack-trees.c:144
+#: read-cache.c:2144
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+msgid "%s: index file smaller than expected"
msgstr ""
-#: unpack-trees.c:147
+#: read-cache.c:2148
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "%s: unable to map index file"
msgstr ""
-#: unpack-trees.c:149
+#: read-cache.c:2190
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: unpack-trees.c:152
+#: read-cache.c:2217
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: unpack-trees.c:154
+#: read-cache.c:2239
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+msgid "could not freshen shared index '%s'"
msgstr ""
-#: unpack-trees.c:161
+#: read-cache.c:2274
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: unpack-trees.c:164
+#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
+msgid "could not close '%s'"
msgstr ""
-#: unpack-trees.c:166
+#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647
#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+msgid "could not stat '%s'"
msgstr ""
-#: unpack-trees.c:168
+#: read-cache.c:3057
#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+msgid "unable to open git dir: %s"
msgstr ""
-#: unpack-trees.c:170
+#: read-cache.c:3069
#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
+msgid "unable to unlink: %s"
msgstr ""
-#: unpack-trees.c:247
+#: read-cache.c:3088
#, c-format
-msgid "Aborting\n"
+msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: unpack-trees.c:272
+#: read-cache.c:3237
#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
+msgid "%s: cannot drop to stage #0"
msgstr ""
-#: unpack-trees.c:340
-msgid "Checking out files"
+#: rebase-interactive.c:10
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
+#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
+#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
+#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
+#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
msgstr ""
-#: urlmatch.c:247
-msgid "invalid characters in host name"
+#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
msgstr ""
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
+#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219
+#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900
+#, c-format
+msgid "could not read '%s'."
msgstr ""
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
+#: refs.c:192
+#, c-format
+msgid "%s does not point to a valid object!"
msgstr ""
-#: worktree.c:285
+#: refs.c:583
#, c-format
-msgid "failed to read '%s'"
+msgid "ignoring dangling symref %s"
msgstr ""
-#: wrapper.c:222 wrapper.c:392
+#: refs.c:585 ref-filter.c:1976
#, c-format
-msgid "could not open '%s' for reading and writing"
+msgid "ignoring broken ref %s"
msgstr ""
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#: refs.c:711
#, c-format
-msgid "could not open '%s' for writing"
+msgid "could not open '%s' for writing: %s"
msgstr ""
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015
-#: builtin/pull.c:341
+#: refs.c:721 refs.c:772
#, c-format
-msgid "could not open '%s' for reading"
+msgid "could not read ref '%s'"
msgstr ""
-#: wrapper.c:581 wrapper.c:602
+#: refs.c:727
#, c-format
-msgid "unable to access '%s'"
+msgid "ref '%s' already exists"
msgstr ""
-#: wrapper.c:610
-msgid "unable to get current working directory"
+#: refs.c:732
+#, c-format
+msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: wrapper.c:634
+#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675
+#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852
+#: wrapper.c:656
#, c-format
-msgid "could not write to %s"
+msgid "could not write to '%s'"
msgstr ""
-#: wrapper.c:636
+#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:713 builtin/rebase.c:575
#, c-format
-msgid "could not close %s"
+msgid "could not open '%s' for writing"
msgstr ""
-#: wt-status.c:151
-msgid "Unmerged paths:"
+#: refs.c:774
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: wt-status.c:178 wt-status.c:205
+#: refs.c:905
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid "log for ref %s has gap after %s"
msgstr ""
-#: wt-status.c:180 wt-status.c:207
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: refs.c:911
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: wt-status.c:184
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: refs.c:969
+#, c-format
+msgid "log for %s is empty"
msgstr ""
-#: wt-status.c:186 wt-status.c:190
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: refs.c:1061
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: wt-status.c:188
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: refs.c:1137
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: wt-status.c:199 wt-status.c:958
-msgid "Changes to be committed:"
+#: refs.c:1911
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: wt-status.c:217 wt-status.c:967
-msgid "Changes not staged for commit:"
+#: refs.c:1943
+msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: wt-status.c:221
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: refs.c:2039 refs.c:2069
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: wt-status.c:223
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: refs.c:2045 refs.c:2080
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: wt-status.c:224
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
msgstr ""
-#: wt-status.c:226
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
+#, c-format
+msgid "could not delete reference %s: %s"
msgstr ""
-#: wt-status.c:238
+#: refs/files-backend.c:1245 refs/packed-backend.c:1545
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid "could not delete references: %s"
msgstr ""
-#: wt-status.c:253
-msgid "both deleted:"
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
msgstr ""
-#: wt-status.c:255
-msgid "added by us:"
+#: ref-filter.c:39 wt-status.c:1861
+msgid "gone"
msgstr ""
-#: wt-status.c:257
-msgid "deleted by them:"
+#: ref-filter.c:40
+#, c-format
+msgid "ahead %d"
msgstr ""
-#: wt-status.c:259
-msgid "added by them:"
+#: ref-filter.c:41
+#, c-format
+msgid "behind %d"
msgstr ""
-#: wt-status.c:261
-msgid "deleted by us:"
+#: ref-filter.c:42
+#, c-format
+msgid "ahead %d, behind %d"
msgstr ""
-#: wt-status.c:263
-msgid "both added:"
+#: ref-filter.c:138
+#, c-format
+msgid "expected format: %%(color:<color>)"
msgstr ""
-#: wt-status.c:265
-msgid "both modified:"
+#: ref-filter.c:140
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: wt-status.c:275
-msgid "new file:"
+#: ref-filter.c:162
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: wt-status.c:277
-msgid "copied:"
+#: ref-filter.c:166
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: wt-status.c:279
-msgid "deleted:"
+#: ref-filter.c:168
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: wt-status.c:281
-msgid "modified:"
+#: ref-filter.c:223
+#, c-format
+msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: wt-status.c:283
-msgid "renamed:"
+#: ref-filter.c:245
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: wt-status.c:285
-msgid "typechange:"
+#: ref-filter.c:253
+#, c-format
+msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: wt-status.c:287
-msgid "unknown:"
+#: ref-filter.c:265
+#, c-format
+msgid "%%(body) does not take arguments"
msgstr ""
-#: wt-status.c:289
-msgid "unmerged:"
+#: ref-filter.c:274
+#, c-format
+msgid "%%(subject) does not take arguments"
msgstr ""
-#: wt-status.c:371
-msgid "new commits, "
+#: ref-filter.c:296
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: wt-status.c:373
-msgid "modified content, "
+#: ref-filter.c:325
+#, c-format
+msgid "positive value expected contents:lines=%s"
msgstr ""
-#: wt-status.c:375
-msgid "untracked content, "
+#: ref-filter.c:327
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: wt-status.c:831
-msgid "Submodules changed but not updated:"
+#: ref-filter.c:342
+#, c-format
+msgid "positive value expected objectname:short=%s"
msgstr ""
-#: wt-status.c:833
-msgid "Submodule changes to be committed:"
+#: ref-filter.c:346
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: wt-status.c:914
-msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+#: ref-filter.c:376
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: wt-status.c:1026
-msgid "You have unmerged paths."
+#: ref-filter.c:388
+#, c-format
+msgid "unrecognized position:%s"
msgstr ""
-#: wt-status.c:1029
-msgid " (fix conflicts and run \"git commit\")"
+#: ref-filter.c:395
+#, c-format
+msgid "unrecognized width:%s"
msgstr ""
-#: wt-status.c:1031
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr ""
-
-#: wt-status.c:1036
-msgid "All conflicts fixed but you are still merging."
-msgstr ""
-
-#: wt-status.c:1039
-msgid " (use \"git commit\" to conclude merge)"
+#: ref-filter.c:404
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: wt-status.c:1049
-msgid "You are in the middle of an am session."
+#: ref-filter.c:412
+#, c-format
+msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: wt-status.c:1052
-msgid "The current patch is empty."
+#: ref-filter.c:430
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: wt-status.c:1056
-msgid " (fix conflicts and then run \"git am --continue\")"
+#: ref-filter.c:527
+#, c-format
+msgid "malformed field name: %.*s"
msgstr ""
-#: wt-status.c:1058
-msgid " (use \"git am --skip\" to skip this patch)"
+#: ref-filter.c:554
+#, c-format
+msgid "unknown field name: %.*s"
msgstr ""
-#: wt-status.c:1060
-msgid " (use \"git am --abort\" to restore the original branch)"
+#: ref-filter.c:558
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: wt-status.c:1189
-msgid "git-rebase-todo is missing."
+#: ref-filter.c:682
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: wt-status.c:1191
-msgid "No commands done."
+#: ref-filter.c:745
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: wt-status.c:1194
+#: ref-filter.c:747
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] ""
-msgstr[1] ""
+msgid "format: %%(then) atom used more than once"
+msgstr ""
-#: wt-status.c:1205
+#: ref-filter.c:749
#, c-format
-msgid " (see more in file %s)"
+msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: wt-status.c:1210
-msgid "No commands remaining."
+#: ref-filter.c:777
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: wt-status.c:1213
+#: ref-filter.c:779
#, 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:1221
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: wt-status.c:1234
+#: ref-filter.c:781
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+msgid "format: %%(else) atom used more than once"
msgstr ""
-#: wt-status.c:1239
-msgid "You are currently rebasing."
+#: ref-filter.c:796
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: wt-status.c:1253
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: ref-filter.c:853
+#, c-format
+msgid "malformed format string %s"
msgstr ""
-#: wt-status.c:1255
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#: ref-filter.c:1447
+#, c-format
+msgid "(no branch, rebasing %s)"
msgstr ""
-#: wt-status.c:1257
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: ref-filter.c:1450
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: wt-status.c:1263
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: ref-filter.c:1453
+#, c-format
+msgid "(no branch, bisect started on %s)"
msgstr ""
-#: wt-status.c:1267
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1461
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgid "(HEAD detached at %s)"
msgstr ""
-#: wt-status.c:1272
-msgid "You are currently splitting a commit during a rebase."
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1468
+#, c-format
+msgid "(HEAD detached from %s)"
msgstr ""
-#: wt-status.c:1275
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: ref-filter.c:1472
+msgid "(no branch)"
msgstr ""
-#: wt-status.c:1279
+#: ref-filter.c:1506 ref-filter.c:1663
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgid "missing object %s for %s"
msgstr ""
-#: wt-status.c:1284
-msgid "You are currently editing a commit during a rebase."
+#: ref-filter.c:1516
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: wt-status.c:1287
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: ref-filter.c:1882
+#, c-format
+msgid "malformed object at '%s'"
msgstr ""
-#: wt-status.c:1289
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: ref-filter.c:1971
+#, c-format
+msgid "ignoring ref with broken name %s"
msgstr ""
-#: wt-status.c:1299
+#: ref-filter.c:2257
#, c-format
-msgid "You are currently cherry-picking commit %s."
+msgid "format: %%(end) atom missing"
msgstr ""
-#: wt-status.c:1304
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+#: ref-filter.c:2352
+#, c-format
+msgid "option `%s' is incompatible with --merged"
msgstr ""
-#: wt-status.c:1307
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: ref-filter.c:2355
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
msgstr ""
-#: wt-status.c:1309
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: ref-filter.c:2365
+#, c-format
+msgid "malformed object name %s"
msgstr ""
-#: wt-status.c:1318
+#: ref-filter.c:2370
#, c-format
-msgid "You are currently reverting commit %s."
+msgid "option `%s' must point to a commit"
msgstr ""
-#: wt-status.c:1323
-msgid " (fix conflicts and run \"git revert --continue\")"
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: wt-status.c:1326
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
msgstr ""
-#: wt-status.c:1328
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
msgstr ""
-#: wt-status.c:1339
+#: remote.c:608
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr ""
-
-#: wt-status.c:1343
-msgid "You are currently bisecting."
+msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: wt-status.c:1346
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: remote.c:612
+#, c-format
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: wt-status.c:1543
-msgid "On branch "
+#: remote.c:616
+#, c-format
+msgid "%s tracks both %s and %s"
msgstr ""
-#: wt-status.c:1549
-msgid "interactive rebase in progress; onto "
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: wt-status.c:1551
-msgid "rebase in progress; onto "
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: wt-status.c:1556
-msgid "HEAD detached at "
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
msgstr ""
-#: wt-status.c:1558
-msgid "HEAD detached from "
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
msgstr ""
-#: wt-status.c:1561
-msgid "Not currently on any branch."
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+" refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: wt-status.c:1579
-msgid "Initial commit"
+#: remote.c:1040
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
msgstr ""
-#: wt-status.c:1593
-msgid "Untracked files"
+#: remote.c:1045
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: wt-status.c:1595
-msgid "Ignored files"
+#: remote.c:1050
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: wt-status.c:1599
+#: remote.c:1055
#, 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')."
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: wt-status.c:1605
+#: remote.c:1091
#, c-format
-msgid "Untracked files not listed%s"
+msgid "%s cannot be resolved to branch"
msgstr ""
-#: wt-status.c:1607
-msgid " (use -u option to show untracked files)"
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
-#: wt-status.c:1613
-msgid "No changes"
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
msgstr ""
-#: wt-status.c:1618
+#: remote.c:1121
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid "dst ref %s receives from more than one src"
msgstr ""
-#: wt-status.c:1621
-#, c-format
-msgid "no changes added to commit\n"
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
msgstr ""
-#: wt-status.c:1624
+#: remote.c:1633
#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+msgid "no such branch: '%s'"
msgstr ""
-#: wt-status.c:1627
+#: remote.c:1636
#, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid "no upstream configured for branch '%s'"
msgstr ""
-#: wt-status.c:1630
+#: remote.c:1642
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: wt-status.c:1633 wt-status.c:1638
+#: remote.c:1657
#, c-format
-msgid "nothing to commit\n"
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: wt-status.c:1636
+#: remote.c:1669
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: wt-status.c:1640
+#: remote.c:1679
#, c-format
-msgid "nothing to commit, working tree clean\n"
+msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: wt-status.c:1749
-msgid "Initial commit on "
+#: remote.c:1692
+msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: wt-status.c:1753
-msgid "HEAD (no branch)"
+#: remote.c:1714
+msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: wt-status.c:1782 wt-status.c:1790
-msgid "behind "
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
msgstr ""
-#: wt-status.c:1785 wt-status.c:1788
-msgid "ahead "
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2280
+#: remote.c:1990
#, c-format
-msgid "cannot %s: You have unstaged changes."
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: wt-status.c:2286
-msgid "additionally, your index contains uncommitted changes."
+#: remote.c:1994
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: wt-status.c:2288
+#: remote.c:1997
#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
+msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: compat/precompose_utf8.c:57 builtin/clone.c:432
+#: remote.c:2001
#, c-format
-msgid "failed to unlink '%s'"
+msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
+#: remote.c:2004
+#, c-format
+msgid " (use \"%s\" for details)\n"
msgstr ""
-#: builtin/add.c:80
+#: remote.c:2008
#, c-format
-msgid "unexpected diff status %c"
-msgstr ""
+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] ""
-#: builtin/add.c:85 builtin/commit.c:291
-msgid "updating files failed"
+#: remote.c:2014
+msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: builtin/add.c:95
+#: remote.c:2017
#, c-format
-msgid "remove '%s'\n"
-msgstr ""
+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] ""
-#: builtin/add.c:149
-msgid "Unstaged changes after refreshing the index:"
+#: remote.c:2025
+msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: builtin/add.c:209 builtin/rev-parse.c:872
-msgid "Could not read the index"
+#: remote.c:2028
+#, 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:2038
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: builtin/add.c:220
+#: remote.c:2221
#, c-format
-msgid "Could not open '%s' for writing."
+msgid "cannot parse expected object name '%s'"
msgstr ""
-#: builtin/add.c:224
-msgid "Could not write patch"
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
msgstr ""
-#: builtin/add.c:227
-msgid "editing patch failed"
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
msgstr ""
-#: builtin/add.c:230
+#: replace-object.c:73
#, c-format
-msgid "Could not stat '%s'"
+msgid "replace depth too high for object %s"
msgstr ""
-#: builtin/add.c:232
-msgid "Empty patch. Aborted."
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
msgstr ""
-#: builtin/add.c:237
-#, c-format
-msgid "Could not apply '%s'"
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
msgstr ""
-#: builtin/add.c:247
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212
+#: builtin/fsck.c:314
+#, c-format
+msgid "could not write '%s'"
msgstr ""
-#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
-#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
-#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
-msgid "dry run"
+#: rerere.c:495
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: builtin/add.c:269
-msgid "interactive picking"
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
msgstr ""
-#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
-msgid "select hunks interactively"
+#: rerere.c:503 rerere.c:1039
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
msgstr ""
-#: builtin/add.c:271
-msgid "edit current diff and apply"
+#: rerere.c:684
+#, c-format
+msgid "failed utime() on '%s'"
msgstr ""
-#: builtin/add.c:272
-msgid "allow adding otherwise ignored files"
+#: rerere.c:694
+#, c-format
+msgid "writing '%s' failed"
msgstr ""
-#: builtin/add.c:273
-msgid "update tracked files"
+#: rerere.c:714
+#, c-format
+msgid "Staged '%s' using previous resolution."
msgstr ""
-#: builtin/add.c:274
-msgid "record only the fact that the path will be added later"
+#: rerere.c:753
+#, c-format
+msgid "Recorded resolution for '%s'."
msgstr ""
-#: builtin/add.c:275
-msgid "add changes from all tracked and untracked files"
+#: rerere.c:788
+#, c-format
+msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: builtin/add.c:278
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: rerere.c:803
+#, c-format
+msgid "cannot unlink stray '%s'"
msgstr ""
-#: builtin/add.c:280
-msgid "don't add, only refresh the index"
+#: rerere.c:807
+#, c-format
+msgid "Recorded preimage for '%s'"
msgstr ""
-#: builtin/add.c:281
-msgid "just skip files which cannot be added because of errors"
+#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417
+#: builtin/submodule--helper.c:1427
+#, c-format
+msgid "could not create directory '%s'"
msgstr ""
-#: builtin/add.c:282
-msgid "check if - even missing - files are ignored in dry run"
+#: rerere.c:1057
+#, c-format
+msgid "failed to update conflicted state in '%s'"
msgstr ""
-#: builtin/add.c:283 builtin/update-index.c:951
-msgid "(+/-)x"
+#: rerere.c:1068 rerere.c:1075
+#, c-format
+msgid "no remembered resolution for '%s'"
msgstr ""
-#: builtin/add.c:283 builtin/update-index.c:952
-msgid "override the executable bit of the listed files"
+#: rerere.c:1077
+#, c-format
+msgid "cannot unlink '%s'"
msgstr ""
-#: builtin/add.c:305
+#: rerere.c:1087
#, c-format
-msgid "Use -f if you really want to add them.\n"
+msgid "Updated preimage for '%s'"
msgstr ""
-#: builtin/add.c:312
-msgid "adding files failed"
+#: rerere.c:1096
+#, c-format
+msgid "Forgot resolution for '%s'\n"
msgstr ""
-#: builtin/add.c:348
-msgid "-A and -u are mutually incompatible"
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
msgstr ""
-#: builtin/add.c:355
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: revision.c:2484
+msgid "your current branch appears to be broken"
msgstr ""
-#: builtin/add.c:359
+#: revision.c:2487
#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
+msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: builtin/add.c:374
-#, c-format
-msgid "Nothing specified, nothing added.\n"
+#: revision.c:2684
+msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: builtin/add.c:375
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+#: run-command.c:742
+msgid "open /dev/null failed"
msgstr ""
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298
-#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350
-#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
-#: builtin/submodule--helper.c:244
-msgid "index file corrupt"
+#: run-command.c:1231
+#, c-format
+msgid "cannot create async thread: %s"
msgstr ""
-#: builtin/am.c:414
-msgid "could not parse author script"
+#: run-command.c:1295
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: builtin/am.c:491
-#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: builtin/am.c:532
+#: send-pack.c:143
#, c-format
-msgid "Malformed input line: '%s'."
+msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: builtin/am.c:569
+#: send-pack.c:145
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "remote unpack failed: %s"
msgstr ""
-#: builtin/am.c:595
-msgid "fseek failed"
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
msgstr ""
-#: builtin/am.c:775
-#, c-format
-msgid "could not parse patch '%s'"
+#: send-pack.c:420
+msgid "the receiving end does not support --signed push"
msgstr ""
-#: builtin/am.c:840
-msgid "Only one StGIT patch series can be applied at once"
+#: send-pack.c:422
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-#: builtin/am.c:887
-msgid "invalid timestamp"
+#: send-pack.c:434
+msgid "the receiving end does not support --atomic push"
msgstr ""
-#: builtin/am.c:890 builtin/am.c:898
-msgid "invalid Date line"
+#: send-pack.c:439
+msgid "the receiving end does not support push options"
msgstr ""
-#: builtin/am.c:895
-msgid "invalid timezone offset"
+#: sequencer.c:184
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: builtin/am.c:984
-msgid "Patch format detection failed."
+#: sequencer.c:288
+#, c-format
+msgid "could not delete '%s'"
msgstr ""
-#: builtin/am.c:989 builtin/clone.c:397
-#, c-format
-msgid "failed to create directory '%s'"
+#: sequencer.c:314
+msgid "revert"
msgstr ""
-#: builtin/am.c:993
-msgid "Failed to split patches."
+#: sequencer.c:316
+msgid "cherry-pick"
msgstr ""
-#: builtin/am.c:1125 builtin/commit.c:376
-msgid "unable to write index file"
+#: sequencer.c:318
+msgid "rebase -i"
msgstr ""
-#: builtin/am.c:1176
+#: sequencer.c:320
#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+msgid "unknown action: %d"
msgstr ""
-#: builtin/am.c:1177
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+#: sequencer.c:378
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+
+#: sequencer.c:381
+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 ""
-#: builtin/am.c:1178
+#: sequencer.c:394 sequencer.c:2671
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid "could not lock '%s'"
msgstr ""
-#: builtin/am.c:1316
-msgid "Patch is empty. Was it split wrong?"
+#: sequencer.c:401
+#, c-format
+msgid "could not write eol to '%s'"
msgstr ""
-#: builtin/am.c:1390 builtin/log.c:1557
+#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691
+#: sequencer.c:2931
#, c-format
-msgid "invalid ident line: %s"
+msgid "failed to finalize '%s'"
msgstr ""
-#: builtin/am.c:1417
+#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574
+#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748
+#: builtin/merge.c:1085 builtin/rebase.c:154
#, c-format
-msgid "unable to parse commit %s"
+msgid "could not read '%s'"
msgstr ""
-#: builtin/am.c:1610
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: sequencer.c:455
+#, c-format
+msgid "your local changes would be overwritten by %s."
msgstr ""
-#: builtin/am.c:1612
-msgid "Using index info to reconstruct a base tree..."
+#: sequencer.c:459
+msgid "commit your changes or stash them to proceed."
msgstr ""
-#: builtin/am.c:1631
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+#: sequencer.c:491
+#, c-format
+msgid "%s: fast-forward"
msgstr ""
-#: builtin/am.c:1637
-msgid "Falling back to patching base and 3-way merge..."
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:582
+#, c-format
+msgid "%s: Unable to write new index file"
msgstr ""
-#: builtin/am.c:1662
-msgid "Failed to merge in the changes."
+#: sequencer.c:598
+msgid "unable to update cache tree"
msgstr ""
-#: builtin/am.c:1686 builtin/merge.c:631
-msgid "git write-tree failed to write a tree"
+#: sequencer.c:612
+msgid "could not resolve HEAD commit"
msgstr ""
-#: builtin/am.c:1693
-msgid "applying to an empty history"
+#: sequencer.c:692
+#, c-format
+msgid "no key present in '%.*s'"
msgstr ""
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
-#: builtin/merge.c:827
-msgid "failed to write commit object"
+#: sequencer.c:703
+#, c-format
+msgid "unable to dequote value of '%s'"
msgstr ""
-#: builtin/am.c:1739 builtin/am.c:1743
+#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704
+#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617
#, c-format
-msgid "cannot resume: %s does not exist."
+msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/am.c:1759
-msgid "cannot be interactive without stdin connected to a terminal."
+#: sequencer.c:750
+msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: builtin/am.c:1764
-msgid "Commit Body is:"
+#: sequencer.c:755
+msgid "'GIT_AUTHOR_EMAIL' already given"
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:1774
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: sequencer.c:760
+msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: builtin/am.c:1824
+#: sequencer.c:764
#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgid "unknown variable '%s'"
msgstr ""
-#: builtin/am.c:1861 builtin/am.c:1933
-#, c-format
-msgid "Applying: %.*s"
+#: sequencer.c:769
+msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: builtin/am.c:1877
-msgid "No changes -- Patch already applied."
+#: sequencer.c:771
+msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: builtin/am.c:1885
-#, c-format
-msgid "Patch failed at %s %.*s"
+#: sequencer.c:773
+msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: builtin/am.c:1891
+#: sequencer.c:833
#, c-format
-msgid "The copy of the patch that failed is found in: %s"
+msgid "invalid date format '%s' in '%s'"
msgstr ""
-#: builtin/am.c:1936
+#: sequencer.c:850
+#, c-format
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."
+"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/am.c:1943
-msgid ""
-"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+#: sequencer.c:945
+msgid "writing root commit"
msgstr ""
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
-#: builtin/reset.c:316
-#, c-format
-msgid "Could not parse object '%s'."
+#: sequencer.c:1155
+msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: builtin/am.c:2103
-msgid "failed to clean index"
+#: 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. 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/am.c:2137
+#: sequencer.c:1175
msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+"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/am.c:2200
-#, c-format
-msgid "Invalid value for --patch-format: %s"
+#: sequencer.c:1217
+msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/am.c:2233
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+#: sequencer.c:1219
+msgid "could not parse newly created commit"
msgstr ""
-#: builtin/am.c:2234
-msgid "git am [<options>] (--continue | --skip | --abort)"
+#: sequencer.c:1265
+msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: builtin/am.c:2240
-msgid "run interactively"
+#: sequencer.c:1267
+msgid "detached HEAD"
msgstr ""
-#: builtin/am.c:2242
-msgid "historical option -- no-op"
+#: sequencer.c:1271
+msgid " (root-commit)"
msgstr ""
-#: builtin/am.c:2244
-msgid "allow fall back on 3way merging if needed"
+#: sequencer.c:1292
+msgid "could not parse HEAD"
msgstr ""
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
-#: builtin/repack.c:178
-msgid "be quiet"
+#: sequencer.c:1294
+#, c-format
+msgid "HEAD %s is not a commit!"
msgstr ""
-#: builtin/am.c:2247
-msgid "add a Signed-off-by line to the commit message"
+#: sequencer.c:1298 builtin/commit.c:1546
+msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/am.c:2250
-msgid "recode into utf8 (default)"
+#: sequencer.c:1350 sequencer.c:1964
+msgid "unable to parse commit author"
msgstr ""
-#: builtin/am.c:2252
-msgid "pass -k flag to git-mailinfo"
+#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678
+msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/am.c:2254
-msgid "pass -b flag to git-mailinfo"
+#: sequencer.c:1377 sequencer.c:1433
+#, c-format
+msgid "unable to read commit message from '%s'"
msgstr ""
-#: builtin/am.c:2256
-msgid "pass -m flag to git-mailinfo"
+#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859
+#: builtin/merge.c:884
+msgid "failed to write commit object"
msgstr ""
-#: builtin/am.c:2258
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+#: sequencer.c:1460
+#, c-format
+msgid "could not parse commit %s"
msgstr ""
-#: builtin/am.c:2261
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: sequencer.c:1465
+#, c-format
+msgid "could not parse parent commit %s"
msgstr ""
-#: builtin/am.c:2264
-msgid "strip everything before a scissors line"
+#: sequencer.c:1565 sequencer.c:1675
+#, c-format
+msgid "unknown command: %d"
msgstr ""
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
-msgid "pass it through git-apply"
+#: sequencer.c:1622 sequencer.c:1647
+#, c-format
+msgid "This is a combination of %d commits."
msgstr ""
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
-#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
-#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
-msgid "n"
+#: sequencer.c:1632 sequencer.c:4808
+msgid "need a HEAD to fixup"
msgstr ""
-#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37
-#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38
-msgid "format"
+#: sequencer.c:1634 sequencer.c:2958
+msgid "could not read HEAD"
msgstr ""
-#: builtin/am.c:2290
-msgid "format the patch(es) are in"
+#: sequencer.c:1636
+msgid "could not read HEAD's commit message"
msgstr ""
-#: builtin/am.c:2296
-msgid "override error message when patch failure occurs"
+#: sequencer.c:1642
+#, c-format
+msgid "cannot write '%s'"
msgstr ""
-#: builtin/am.c:2298
-msgid "continue applying patches after resolving a conflict"
+#: sequencer.c:1649 git-rebase--preserve-merges.sh:441
+msgid "This is the 1st commit message:"
msgstr ""
-#: builtin/am.c:2301
-msgid "synonyms for --continue"
+#: sequencer.c:1657
+#, c-format
+msgid "could not read commit message of %s"
msgstr ""
-#: builtin/am.c:2304
-msgid "skip the current patch"
+#: sequencer.c:1664
+#, c-format
+msgid "This is the commit message #%d:"
msgstr ""
-#: builtin/am.c:2307
-msgid "restore the original branch and abort the patching operation."
+#: sequencer.c:1670
+#, c-format
+msgid "The commit message #%d will be skipped:"
msgstr ""
-#: builtin/am.c:2311
-msgid "lie about committer date"
+#: sequencer.c:1758
+msgid "your index file is unmerged."
msgstr ""
-#: builtin/am.c:2313
-msgid "use current timestamp for author date"
+#: sequencer.c:1765
+msgid "cannot fixup root commit"
msgstr ""
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232
-#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
-msgid "key-id"
+#: sequencer.c:1784
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: builtin/am.c:2316
-msgid "GPG-sign commits"
+#: sequencer.c:1792 sequencer.c:1800
+#, c-format
+msgid "commit %s does not have parent %d"
msgstr ""
-#: builtin/am.c:2319
-msgid "(internal use for git-rebase)"
+#: sequencer.c:1806
+#, c-format
+msgid "cannot get commit message for %s"
msgstr ""
-#: builtin/am.c:2334
-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."
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1825
+#, c-format
+msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: builtin/am.c:2341
-msgid "failed to read the index"
+#: sequencer.c:1890
+#, c-format
+msgid "could not rename '%s' to '%s'"
msgstr ""
-#: builtin/am.c:2356
+#: sequencer.c:1945
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
+msgid "could not revert %s... %s"
msgstr ""
-#: builtin/am.c:2380
+#: sequencer.c:1946
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+msgid "could not apply %s... %s"
msgstr ""
-#: builtin/am.c:2386
-msgid "Resolve operation not in progress, we are not resuming."
+#: sequencer.c:2005
+#, c-format
+msgid "git %s: failed to read the index"
msgstr ""
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
+#: sequencer.c:2012
+#, c-format
+msgid "git %s: failed to refresh the index"
msgstr ""
-#: builtin/archive.c:17
+#: sequencer.c:2094
#, c-format
-msgid "could not create archive file '%s'"
+msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: sequencer.c:2103
+#, c-format
+msgid "missing arguments for %s"
msgstr ""
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: sequencer.c:2163
+#, c-format
+msgid "invalid line %d: %.*s"
msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
+#: sequencer.c:2171
+#, c-format
+msgid "cannot '%s' without a previous commit"
msgstr ""
-#: builtin/archive.c:61
-#, c-format
-msgid "git archive: NACK %s"
+#: sequencer.c:2243
+msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: builtin/archive.c:63
+#: sequencer.c:2245
#, c-format
-msgid "remote error: %s"
+msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
+#: sequencer.c:2250
+msgid "no commits parsed."
msgstr ""
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
+#: sequencer.c:2261
+msgid "cannot cherry-pick during a revert."
msgstr ""
-#: builtin/bisect--helper.c:7
-msgid "git bisect--helper --next-all [--no-checkout]"
+#: sequencer.c:2263
+msgid "cannot revert during a cherry-pick."
msgstr ""
-#: builtin/bisect--helper.c:17
-msgid "perform 'git bisect next'"
+#: sequencer.c:2333
+#, c-format
+msgid "invalid value for %s: %s"
msgstr ""
-#: builtin/bisect--helper.c:19
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: sequencer.c:2420
+msgid "unusable squash-onto"
msgstr ""
-#: builtin/blame.c:33
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+#: sequencer.c:2436
+#, c-format
+msgid "malformed options sheet: '%s'"
msgstr ""
-#: builtin/blame.c:38
-msgid "<rev-opts> are documented in git-rev-list(1)"
+#: sequencer.c:2518 sequencer.c:4067
+msgid "empty commit set passed"
msgstr ""
-#: builtin/blame.c:1777
-msgid "Blaming lines"
+#: sequencer.c:2526
+msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: builtin/blame.c:2573
-msgid "Show blame entries as we find them, incrementally"
+#: sequencer.c:2527
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: builtin/blame.c:2574
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: sequencer.c:2530
+#, c-format
+msgid "could not create sequencer directory '%s'"
msgstr ""
-#: builtin/blame.c:2575
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: sequencer.c:2544
+msgid "could not lock HEAD"
msgstr ""
-#: builtin/blame.c:2576
-msgid "Show work cost statistics"
+#: sequencer.c:2599 sequencer.c:3819
+msgid "no cherry-pick or revert in progress"
msgstr ""
-#: builtin/blame.c:2577
-msgid "Force progress reporting"
+#: sequencer.c:2601
+msgid "cannot resolve HEAD"
msgstr ""
-#: builtin/blame.c:2578
-msgid "Show output score for blame entries"
+#: sequencer.c:2603 sequencer.c:2638
+msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: builtin/blame.c:2579
-msgid "Show original filename (Default: auto)"
+#: sequencer.c:2624 builtin/grep.c:732
+#, c-format
+msgid "cannot open '%s'"
msgstr ""
-#: builtin/blame.c:2580
-msgid "Show original linenumber (Default: off)"
+#: sequencer.c:2626
+#, c-format
+msgid "cannot read '%s': %s"
msgstr ""
-#: builtin/blame.c:2581
-msgid "Show in a format designed for machine consumption"
+#: sequencer.c:2627
+msgid "unexpected end of file"
msgstr ""
-#: builtin/blame.c:2582
-msgid "Show porcelain format with per-line commit information"
+#: sequencer.c:2633
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: builtin/blame.c:2583
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: sequencer.c:2644
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: builtin/blame.c:2584
-msgid "Show raw timestamp (Default: off)"
+#: sequencer.c:2750 sequencer.c:3735
+#, c-format
+msgid "could not update %s"
msgstr ""
-#: builtin/blame.c:2585
-msgid "Show long commit SHA1 (Default: off)"
+#: sequencer.c:2788 sequencer.c:3715
+msgid "cannot read HEAD"
msgstr ""
-#: builtin/blame.c:2586
-msgid "Suppress author name and timestamp (Default: off)"
+#: sequencer.c:2805
+#, c-format
+msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: builtin/blame.c:2587
-msgid "Show author email instead of name (Default: off)"
+#: sequencer.c:2813
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-#: builtin/blame.c:2588
-msgid "Ignore whitespace differences"
+#: sequencer.c:2823
+#, c-format
+msgid "Could not apply %s... %.*s"
msgstr ""
-#: builtin/blame.c:2595
-msgid "Use an experimental heuristic to improve diffs"
+#: sequencer.c:2830
+#, c-format
+msgid "Could not merge %.*s"
msgstr ""
-#: builtin/blame.c:2597
-msgid "Spend extra cycles to find better match"
+#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641
+#, c-format
+msgid "could not copy '%s' to '%s'"
msgstr ""
-#: builtin/blame.c:2598
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230
+#: builtin/rebase.c:1591 builtin/rebase.c:1646
+msgid "could not read index"
msgstr ""
-#: builtin/blame.c:2599
-msgid "Use <file>'s contents as the final image"
+#: sequencer.c:2875
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: builtin/blame.c:2600 builtin/blame.c:2601
-msgid "score"
+#: sequencer.c:2881
+msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: builtin/blame.c:2600
-msgid "Find line copies within and across files"
+#: sequencer.c:2887
+#, 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/blame.c:2601
-msgid "Find line movements within and across files"
+#: sequencer.c:2948
+#, c-format
+msgid "illegal label name: '%.*s'"
msgstr ""
-#: builtin/blame.c:2602
-msgid "n,m"
+#: sequencer.c:3002
+msgid "writing fake root commit"
msgstr ""
-#: builtin/blame.c:2602
-msgid "Process only line range n,m, counting from 1"
+#: sequencer.c:3007
+msgid "writing squash-onto"
msgstr ""
-#: builtin/blame.c:2649
-msgid "--progress can't be used with --incremental or porcelain formats"
+#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435
+#, c-format
+msgid "failed to find tree of %s"
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:2697
-msgid "4 years, 11 months ago"
+#: sequencer.c:3063 builtin/rebase.c:448
+msgid "could not write index"
msgstr ""
-#: builtin/blame.c:2777
-msgid "--contents and --reverse do not blend well."
+#: sequencer.c:3090
+#, c-format
+msgid "could not resolve '%s'"
msgstr ""
-#: builtin/blame.c:2797
-msgid "cannot use --contents with final commit object name"
+#: sequencer.c:3118
+msgid "cannot merge without a current revision"
msgstr ""
-#: builtin/blame.c:2802
-msgid "--reverse and --first-parent together require specified latest commit"
+#: sequencer.c:3140
+#, c-format
+msgid "unable to parse '%.*s'"
msgstr ""
-#: builtin/blame.c:2829
-msgid ""
-"--reverse --first-parent together require range along first-parent chain"
+#: sequencer.c:3149
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr ""
+
+#: sequencer.c:3161
+msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: builtin/blame.c:2840
+#: sequencer.c:3176
#, c-format
-msgid "no such path %s in %s"
+msgid "could not get commit message of '%s'"
msgstr ""
-#: builtin/blame.c:2851
+#: sequencer.c:3325
#, c-format
-msgid "cannot read blob %s for path %s"
+msgid "could not even attempt to merge '%.*s'"
+msgstr ""
+
+#: sequencer.c:3341
+msgid "merge: Unable to write new index file"
msgstr ""
-#: builtin/blame.c:2870
+#: sequencer.c:3409 builtin/rebase.c:298
#, c-format
-msgid "file %s has only %lu line"
-msgid_plural "file %s has only %lu lines"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Applied autostash.\n"
+msgstr ""
-#: builtin/branch.c:26
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+#: sequencer.c:3421
+#, c-format
+msgid "cannot store %s"
msgstr ""
-#: builtin/branch.c:27
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+#: sequencer.c:3424 builtin/rebase.c:314
+#, 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/branch.c:28
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+#: sequencer.c:3478
+#, c-format
+msgid "could not checkout %s"
msgstr ""
-#: builtin/branch.c:29
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+#: sequencer.c:3492
+#, c-format
+msgid "%s: not a valid OID"
msgstr ""
-#: builtin/branch.c:30
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+#: sequencer.c:3497 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
msgstr ""
-#: builtin/branch.c:31
-msgid "git branch [<options>] [-r | -a] [--format]"
+#: sequencer.c:3512
+#, c-format
+msgid "Stopped at HEAD\n"
msgstr ""
-#: builtin/branch.c:144
+#: sequencer.c:3514
#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
+msgid "Stopped at %s\n"
msgstr ""
-#: builtin/branch.c:148
+#: sequencer.c:3522
#, c-format
msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
+"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/branch.c:162
+#: sequencer.c:3597
#, c-format
-msgid "Couldn't look up commit object for '%s'"
+msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: builtin/branch.c:166
+#: sequencer.c:3677
#, 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 "unknown command %d"
msgstr ""
-#: builtin/branch.c:179
-msgid "Update of config-file failed"
+#: sequencer.c:3723
+msgid "could not read orig-head"
msgstr ""
-#: builtin/branch.c:210
-msgid "cannot use -a with -d"
+#: sequencer.c:3728 sequencer.c:4805
+msgid "could not read 'onto'"
msgstr ""
-#: builtin/branch.c:216
-msgid "Couldn't look up commit object for HEAD"
+#: sequencer.c:3742
+#, c-format
+msgid "could not update HEAD to %s"
msgstr ""
-#: builtin/branch.c:230
-#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
+#: sequencer.c:3831
+msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: builtin/branch.c:245
-#, c-format
-msgid "remote-tracking branch '%s' not found."
+#: sequencer.c:3840
+msgid "cannot amend non-existing commit"
msgstr ""
-#: builtin/branch.c:246
+#: sequencer.c:3842
#, c-format
-msgid "branch '%s' not found."
+msgid "invalid file: '%s'"
msgstr ""
-#: builtin/branch.c:261
+#: sequencer.c:3844
#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
+msgid "invalid contents: '%s'"
msgstr ""
-#: builtin/branch.c:262
-#, c-format
-msgid "Error deleting branch '%s'"
+#: sequencer.c:3847
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
msgstr ""
-#: builtin/branch.c:269
+#: sequencer.c:3883 sequencer.c:3921
#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgid "could not write file: '%s'"
msgstr ""
-#: builtin/branch.c:270
-#, c-format
-msgid "Deleted branch %s (was %s).\n"
+#: sequencer.c:3936
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: sequencer.c:3943
+msgid "could not commit staged changes."
msgstr ""
-#: builtin/branch.c:441
+#: sequencer.c:4044
#, c-format
-msgid "Branch %s is being rebased at %s"
+msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: builtin/branch.c:445
+#: sequencer.c:4048
#, c-format
-msgid "Branch %s is being bisected at %s"
+msgid "%s: bad revision"
msgstr ""
-#: builtin/branch.c:460
-msgid "cannot rename the current branch while not on any."
+#: sequencer.c:4083
+msgid "can't revert as initial commit"
msgstr ""
-#: builtin/branch.c:470
-#, c-format
-msgid "Invalid branch name: '%s'"
+#: sequencer.c:4529
+msgid "make_script: unhandled options"
msgstr ""
-#: builtin/branch.c:487
-msgid "Branch rename failed"
+#: sequencer.c:4532
+msgid "make_script: error preparing revisions"
msgstr ""
-#: builtin/branch.c:490
+#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904
#, c-format
-msgid "Renamed a misnamed branch '%s' away"
+msgid "unusable todo list: '%s'"
msgstr ""
-#: builtin/branch.c:493
+#: sequencer.c:4684
#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-#: builtin/branch.c:502
-msgid "Branch is renamed, but update of config-file failed"
+#: sequencer.c:4754
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
msgstr ""
-#: builtin/branch.c:518
+#: sequencer.c:4761
#, c-format
msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
+"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/branch.c:551
-msgid "Generic options"
+#: sequencer.c:4774
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-#: builtin/branch.c:553
-msgid "show hash and subject, give twice for upstream branch"
+#: sequencer.c:4912 sequencer.c:4950
+msgid "nothing to do"
msgstr ""
-#: builtin/branch.c:554
-msgid "suppress informational messages"
-msgstr ""
+#: sequencer.c:4916
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/branch.c:555
-msgid "set up tracking mode (see git-pull(1))"
+#: sequencer.c:4928
+#, c-format
+msgid "could not copy '%s' to '%s'."
msgstr ""
-#: builtin/branch.c:557
-msgid "change upstream info"
+#: sequencer.c:4932 sequencer.c:4961
+msgid "could not transform the todo list"
msgstr ""
-#: builtin/branch.c:559
-msgid "upstream"
+#: sequencer.c:4964
+msgid "could not skip unnecessary pick commands"
msgstr ""
-#: builtin/branch.c:559
-msgid "change the upstream info"
+#: sequencer.c:5047
+msgid "the script was already rearranged."
msgstr ""
-#: builtin/branch.c:560
-msgid "Unset the upstream info"
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
msgstr ""
-#: builtin/branch.c:561
-msgid "use colored output"
+#: 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/branch.c:562
-msgid "act on remote-tracking branches"
+#: 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/branch.c:564 builtin/branch.c:566
-msgid "print only branches that contain the commit"
+#: setup.c:234
+#, c-format
+msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: builtin/branch.c:565 builtin/branch.c:567
-msgid "print only branches that don't contain the commit"
+#: 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/branch.c:570
-msgid "Specific git-branch actions:"
+#: setup.c:389
+msgid "unable to set up work tree using invalid config"
msgstr ""
-#: builtin/branch.c:571
-msgid "list both remote-tracking and local branches"
+#: setup.c:393
+msgid "this operation must be run in a work tree"
msgstr ""
-#: builtin/branch.c:573
-msgid "delete fully merged branch"
+#: setup.c:527
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: builtin/branch.c:574
-msgid "delete branch (even if not merged)"
+#: setup.c:535
+msgid "unknown repository extensions found:"
msgstr ""
-#: builtin/branch.c:575
-msgid "move/rename a branch and its reflog"
+#: setup.c:554
+#, c-format
+msgid "error opening '%s'"
msgstr ""
-#: builtin/branch.c:576
-msgid "move/rename a branch, even if target exists"
+#: setup.c:556
+#, c-format
+msgid "too large to be a .git file: '%s'"
msgstr ""
-#: builtin/branch.c:577
-msgid "list branch names"
+#: setup.c:558
+#, c-format
+msgid "error reading %s"
msgstr ""
-#: builtin/branch.c:578
-msgid "create the branch's reflog"
+#: setup.c:560
+#, c-format
+msgid "invalid gitfile format: %s"
msgstr ""
-#: builtin/branch.c:580
-msgid "edit the description for the branch"
+#: setup.c:562
+#, c-format
+msgid "no path in gitfile: %s"
msgstr ""
-#: builtin/branch.c:581
-msgid "force creation, move/rename, deletion"
+#: setup.c:564
+#, c-format
+msgid "not a git repository: %s"
msgstr ""
-#: builtin/branch.c:582
-msgid "print only branches that are merged"
+#: setup.c:663
+#, c-format
+msgid "'$%s' too big"
msgstr ""
-#: builtin/branch.c:583
-msgid "print only branches that are not merged"
+#: setup.c:677
+#, c-format
+msgid "not a git repository: '%s'"
msgstr ""
-#: builtin/branch.c:584
-msgid "list branches in columns"
+#: setup.c:706 setup.c:708 setup.c:739
+#, c-format
+msgid "cannot chdir to '%s'"
msgstr ""
-#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
-msgid "key"
+#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824
+msgid "cannot come back to cwd"
msgstr ""
-#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
-msgid "field name to sort on"
+#: setup.c:838
+#, c-format
+msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404
-#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
-#: builtin/tag.c:429
-msgid "object"
+#: setup.c:1068
+msgid "Unable to read current working directory"
msgstr ""
-#: builtin/branch.c:589
-msgid "print only branches of the object"
+#: setup.c:1077 setup.c:1083
+#, c-format
+msgid "cannot change to '%s'"
msgstr ""
-#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
-msgid "sorting and filtering are case insensitive"
+#: setup.c:1088
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
-#: builtin/verify-tag.c:38
-msgid "format to use for the output"
+#: setup.c:1094
+#, 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:611
-msgid "Failed to resolve HEAD as a valid ref."
+#: setup.c:1204
+#, 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:615 builtin/clone.c:724
-msgid "HEAD not found below refs/heads!"
+#: setup.c:1247
+msgid "open /dev/null or dup failed"
msgstr ""
-#: builtin/branch.c:638
-msgid "--column and --verbose are incompatible"
+#: setup.c:1262
+msgid "fork failed"
msgstr ""
-#: builtin/branch.c:649 builtin/branch.c:701
-msgid "branch name required"
+#: setup.c:1267
+msgid "setsid failed"
msgstr ""
-#: builtin/branch.c:677
-msgid "Cannot give description to detached HEAD"
+#: sha1-file.c:445
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: builtin/branch.c:682
-msgid "cannot edit description of more than one branch"
+#: sha1-file.c:496
+#, c-format
+msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: builtin/branch.c:689
+#: sha1-file.c:568
#, c-format
-msgid "No commit on branch '%s' yet."
+msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: builtin/branch.c:692
+#: sha1-file.c:575
#, c-format
-msgid "No branch named '%s'."
+msgid "unable to normalize object directory: %s"
msgstr ""
-#: builtin/branch.c:707
-msgid "too many branches for a rename operation"
+#: sha1-file.c:618
+msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: builtin/branch.c:712
-msgid "too many branches to set new upstream"
+#: sha1-file.c:636
+msgid "unable to read alternates file"
msgstr ""
-#: builtin/branch.c:716
+#: sha1-file.c:643
+msgid "unable to move new alternates file into place"
+msgstr ""
+
+#: sha1-file.c:678
#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
+msgid "path '%s' does not exist"
msgstr ""
-#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
+#: sha1-file.c:704
#, c-format
-msgid "no such branch '%s'"
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: builtin/branch.c:723
+#: sha1-file.c:710
#, c-format
-msgid "branch '%s' does not exist"
+msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/branch.c:735
-msgid "too many branches to unset upstream"
+#: sha1-file.c:716
+#, c-format
+msgid "reference repository '%s' is shallow"
msgstr ""
-#: builtin/branch.c:739
-msgid "could not unset upstream of HEAD when it does not point to any branch."
+#: sha1-file.c:724
+#, c-format
+msgid "reference repository '%s' is grafted"
msgstr ""
-#: builtin/branch.c:745
+#: sha1-file.c:838
#, c-format
-msgid "Branch '%s' has no upstream information"
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: builtin/branch.c:759
-msgid "it does not make sense to create 'HEAD' manually"
+#: sha1-file.c:863
+msgid "mmap failed"
msgstr ""
-#: builtin/branch.c:765
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: sha1-file.c:1027
+#, c-format
+msgid "object file %s is empty"
msgstr ""
-#: builtin/branch.c:768
+#: sha1-file.c:1151 sha1-file.c:2288
#, c-format
-msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+msgid "corrupt loose object '%s'"
msgstr ""
-#: builtin/branch.c:785
+#: sha1-file.c:1153 sha1-file.c:2292
#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+msgid "garbage at end of loose object '%s'"
msgstr ""
-#: builtin/bundle.c:45
+#: sha1-file.c:1195
+msgid "invalid object type"
+msgstr ""
+
+#: sha1-file.c:1279
#, c-format
-msgid "%s is okay\n"
+msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
+#: sha1-file.c:1282
+#, c-format
+msgid "unable to unpack %s header"
msgstr ""
-#: builtin/bundle.c:62
-msgid "Need a repository to unbundle."
+#: sha1-file.c:1288
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: builtin/cat-file.c:513
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#: sha1-file.c:1291
+#, c-format
+msgid "unable to parse %s header"
msgstr ""
-#: builtin/cat-file.c:514
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+#: sha1-file.c:1481
+#, c-format
+msgid "failed to read object %s"
msgstr ""
-#: builtin/cat-file.c:551
-msgid "<type> can be one of: blob, tree, commit, tag"
+#: sha1-file.c:1485
+#, c-format
+msgid "replacement %s not found for %s"
msgstr ""
-#: builtin/cat-file.c:552
-msgid "show object type"
+#: sha1-file.c:1489
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/cat-file.c:553
-msgid "show object size"
+#: sha1-file.c:1493
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/cat-file.c:555
-msgid "exit with zero when there's no error"
+#: sha1-file.c:1595
+#, c-format
+msgid "unable to write file %s"
msgstr ""
-#: builtin/cat-file.c:556
-msgid "pretty-print object's content"
+#: sha1-file.c:1602
+#, c-format
+msgid "unable to set permission to '%s'"
msgstr ""
-#: builtin/cat-file.c:558
-msgid "for blob objects, run textconv on object's content"
+#: sha1-file.c:1609
+msgid "file write error"
msgstr ""
-#: builtin/cat-file.c:560
-msgid "for blob objects, run filters on object's content"
+#: sha1-file.c:1628
+msgid "error when closing loose object file"
msgstr ""
-#: builtin/cat-file.c:561 git-submodule.sh:943
-msgid "blob"
+#: sha1-file.c:1693
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: builtin/cat-file.c:562
-msgid "use a specific path for --textconv/--filters"
+#: sha1-file.c:1695
+msgid "unable to create temporary file"
msgstr ""
-#: builtin/cat-file.c:564
-msgid "allow -s and -t to work with broken/corrupt objects"
+#: sha1-file.c:1719
+msgid "unable to write loose object file"
msgstr ""
-#: builtin/cat-file.c:565
-msgid "buffer --batch output"
+#: sha1-file.c:1725
+#, c-format
+msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: builtin/cat-file.c:567
-msgid "show info and content of objects fed from the standard input"
+#: sha1-file.c:1729
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: builtin/cat-file.c:570
-msgid "show info about objects fed from the standard input"
+#: sha1-file.c:1733
+#, c-format
+msgid "confused by unstable object source data for %s"
msgstr ""
-#: builtin/cat-file.c:573
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: sha1-file.c:1743 builtin/pack-objects.c:919
+#, c-format
+msgid "failed utime() on %s"
msgstr ""
-#: builtin/cat-file.c:575
-msgid "show all objects with --batch or --batch-check"
+#: sha1-file.c:1818
+#, c-format
+msgid "cannot read object for %s"
msgstr ""
-#: builtin/check-attr.c:11
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+#: sha1-file.c:1858
+msgid "corrupt commit"
msgstr ""
-#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+#: sha1-file.c:1866
+msgid "corrupt tag"
msgstr ""
-#: builtin/check-attr.c:19
-msgid "report all attributes set on file"
+#: sha1-file.c:1965
+#, c-format
+msgid "read error while indexing %s"
msgstr ""
-#: builtin/check-attr.c:20
-msgid "use .gitattributes only from the index"
+#: sha1-file.c:1968
+#, c-format
+msgid "short read while indexing %s"
msgstr ""
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
-msgid "read file names from stdin"
+#: sha1-file.c:2041 sha1-file.c:2050
+#, c-format
+msgid "%s: failed to insert into database"
msgstr ""
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "terminate input and output records by a NUL character"
+#: sha1-file.c:2056
+#, c-format
+msgid "%s: unsupported file type"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352
-msgid "suppress progress reporting"
+#: sha1-file.c:2080
+#, c-format
+msgid "%s is not a valid object"
msgstr ""
-#: builtin/check-ignore.c:26
-msgid "show non-matching input paths"
+#: sha1-file.c:2082
+#, c-format
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/check-ignore.c:28
-msgid "ignore index when checking"
+#: sha1-file.c:2109 builtin/index-pack.c:154
+#, c-format
+msgid "unable to open %s"
msgstr ""
-#: builtin/check-ignore.c:154
-msgid "cannot specify pathnames with --stdin"
+#: sha1-file.c:2299 sha1-file.c:2351
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: builtin/check-ignore.c:157
-msgid "-z only makes sense with --stdin"
+#: sha1-file.c:2323
+#, c-format
+msgid "unable to mmap %s"
msgstr ""
-#: builtin/check-ignore.c:159
-msgid "no path specified"
+#: sha1-file.c:2328
+#, c-format
+msgid "unable to unpack header of %s"
msgstr ""
-#: builtin/check-ignore.c:163
-msgid "--quiet is only valid with a single pathname"
+#: sha1-file.c:2334
+#, c-format
+msgid "unable to parse header of %s"
msgstr ""
-#: builtin/check-ignore.c:165
-msgid "cannot have both --quiet and --verbose"
+#: sha1-file.c:2345
+#, c-format
+msgid "unable to unpack contents of %s"
msgstr ""
-#: builtin/check-ignore.c:168
-msgid "--non-matching is only valid with --verbose"
+#: sha1-name.c:448
+#, c-format
+msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: builtin/check-mailmap.c:8
-msgid "git check-mailmap [<options>] <contact>..."
+#: sha1-name.c:459
+msgid "The candidates are:"
msgstr ""
-#: builtin/check-mailmap.c:13
-msgid "also read contacts from stdin"
+#: sha1-name.c:742
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: builtin/check-mailmap.c:24
+#: submodule.c:118 submodule.c:147
#, c-format
-msgid "unable to parse contact: %s"
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: builtin/check-mailmap.c:47
-msgid "no contacts specified"
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: builtin/checkout-index.c:127
-msgid "git checkout-index [<options>] [--] [<file>...]"
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: builtin/checkout-index.c:144
-msgid "stage should be between 1 and 3 or all"
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
msgstr ""
-#: builtin/checkout-index.c:160
-msgid "check out all files in the index"
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: builtin/checkout-index.c:161
-msgid "force overwrite of existing files"
+#: submodule.c:906
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: builtin/checkout-index.c:163
-msgid "no warning for existing files and files not in index"
+#: submodule.c:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/checkout-index.c:165
-msgid "don't checkout new files"
+#: submodule.c:1477
+#, c-format
+msgid "Could not access submodule '%s'"
msgstr ""
-#: builtin/checkout-index.c:167
-msgid "update stat information in the index file"
+#: submodule.c:1639
+#, c-format
+msgid "'%s' not recognized as a git repository"
msgstr ""
-#: builtin/checkout-index.c:171
-msgid "read list of paths from the standard input"
+#: submodule.c:1777
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: builtin/checkout-index.c:173
-msgid "write the content to temporary files"
+#: submodule.c:1790
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:472
-msgid "string"
+#: submodule.c:1805
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: builtin/checkout-index.c:175
-msgid "when creating files, prepend <string>"
+#: submodule.c:1895
+#, c-format
+msgid "submodule '%s' has dirty index"
msgstr ""
-#: builtin/checkout-index.c:177
-msgid "copy out the files from named stage"
+#: submodule.c:1947
+#, c-format
+msgid "Submodule '%s' could not be updated."
msgstr ""
-#: builtin/checkout.c:27
-msgid "git checkout [<options>] <branch>"
+#: submodule.c:1996
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: builtin/checkout.c:28
-msgid "git checkout [<options>] [<branch>] -- <file>..."
+#: submodule.c:2008 submodule.c:2064
+#, c-format
+msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: builtin/checkout.c:153 builtin/checkout.c:186
+#: submodule.c:2015
#, c-format
-msgid "path '%s' does not have our version"
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
msgstr ""
-#: builtin/checkout.c:155 builtin/checkout.c:188
+#: submodule.c:2099
#, c-format
-msgid "path '%s' does not have their version"
+msgid "could not recurse into submodule '%s'"
+msgstr ""
+
+#: submodule.c:2143
+msgid "could not start ls-files in .."
msgstr ""
-#: builtin/checkout.c:171
+#: submodule.c:2182
#, c-format
-msgid "path '%s' does not have all necessary versions"
+msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: builtin/checkout.c:215
+#: submodule-config.c:232
#, c-format
-msgid "path '%s' does not have necessary versions"
+msgid "ignoring suspicious submodule name: %s"
+msgstr ""
+
+#: submodule-config.c:296
+msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: builtin/checkout.c:232
+#: submodule-config.c:390
#, c-format
-msgid "path '%s': cannot merge"
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: builtin/checkout.c:249
+#: submodule-config.c:479
#, c-format
-msgid "Unable to add merge result for '%s'"
+msgid "invalid value for %s"
msgstr ""
-#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
-#: builtin/checkout.c:278
+#: submodule-config.c:754
#, c-format
-msgid "'%s' cannot be used with updating paths"
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: builtin/checkout.c:281 builtin/checkout.c:284
+#: trailer.c:238
#, c-format
-msgid "'%s' cannot be used with %s"
+msgid "running trailer command '%s' failed"
msgstr ""
-#: builtin/checkout.c:287
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: builtin/checkout.c:358 builtin/checkout.c:365
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
#, c-format
-msgid "path '%s' is unmerged"
+msgid "more than one %s"
msgstr ""
-#: builtin/checkout.c:513
-msgid "you need to resolve your current index first"
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: builtin/checkout.c:644
+#: trailer.c:750
#, c-format
-msgid "Can not do reflog for '%s': %s\n"
+msgid "could not read input file '%s'"
msgstr ""
-#: builtin/checkout.c:685
-msgid "HEAD is now at"
+#: trailer.c:753
+msgid "could not read from stdin"
msgstr ""
-#: builtin/checkout.c:689 builtin/clone.c:678
-msgid "unable to update HEAD"
+#: trailer.c:1011 wrapper.c:701
+#, c-format
+msgid "could not stat %s"
msgstr ""
-#: builtin/checkout.c:693
+#: trailer.c:1013
#, c-format
-msgid "Reset branch '%s'\n"
+msgid "file %s is not a regular file"
msgstr ""
-#: builtin/checkout.c:696
+#: trailer.c:1015
#, c-format
-msgid "Already on '%s'\n"
+msgid "file %s is not writable by user"
msgstr ""
-#: builtin/checkout.c:700
+#: trailer.c:1027
+msgid "could not open temporary file"
+msgstr ""
+
+#: trailer.c:1067
#, c-format
-msgid "Switched to and reset branch '%s'\n"
+msgid "could not rename temporary file to %s"
msgstr ""
-#: builtin/checkout.c:702 builtin/checkout.c:1090
+#: transport.c:116
#, c-format
-msgid "Switched to a new branch '%s'\n"
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: builtin/checkout.c:704
+#: transport.c:142
#, c-format
-msgid "Switched to branch '%s'\n"
+msgid "could not read bundle '%s'"
msgstr ""
-#: builtin/checkout.c:755
+#: transport.c:208
#, c-format
-msgid " ... and %d more.\n"
+msgid "transport: invalid depth option '%s'"
+msgstr ""
+
+#: transport.c:617
+msgid "could not parse transport.color.* config"
msgstr ""
-#: builtin/checkout.c:761
+#: transport.c:690
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#: transport.c:817
#, 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] ""
+msgid "unknown value for config '%s': %s"
+msgstr ""
-#: builtin/checkout.c:780
+#: transport.c:883
#, 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"
+msgid "transport '%s' not allowed"
+msgstr ""
+
+#: transport.c:937
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#: transport.c:1032
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+
+#: transport.c:1036
+#, c-format
+msgid ""
"\n"
-" git branch <new-branch-name> %s\n"
+"Please try\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"
+"\tgit push --recurse-submodules=on-demand\n"
"\n"
-" git branch <new-branch-name> %s\n"
+"or cd to the path and use\n"
"\n"
-msgstr[0] ""
-msgstr[1] ""
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
-#: builtin/checkout.c:816
-msgid "internal error in revision walk"
+#: transport.c:1044
+msgid "Aborting."
msgstr ""
-#: builtin/checkout.c:820
-msgid "Previous HEAD position was"
+#: transport.c:1184
+msgid "failed to push all needed submodules"
msgstr ""
-#: builtin/checkout.c:847 builtin/checkout.c:1085
-msgid "You are on a branch yet to be born"
+#: transport.c:1317 transport-helper.c:643
+msgid "operation not supported by protocol"
msgstr ""
-#: builtin/checkout.c:991
+#: transport.c:1421
#, c-format
-msgid "only one reference expected, %d given."
+msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: builtin/checkout.c:1031 builtin/worktree.c:214
-#, c-format
-msgid "invalid reference: %s"
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
msgstr ""
-#: builtin/checkout.c:1060
+#: transport-helper.c:132
#, c-format
-msgid "reference is not a tree: %s"
+msgid "unable to find remote helper for '%s'"
msgstr ""
-#: builtin/checkout.c:1099
-msgid "paths cannot be used with switching branches"
+#: transport-helper.c:148 transport-helper.c:557
+msgid "can't dup helper output fd"
msgstr ""
-#: builtin/checkout.c:1102 builtin/checkout.c:1106
+#: transport-helper.c:199
#, c-format
-msgid "'%s' cannot be used with switching branches"
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
msgstr ""
-#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
-#: builtin/checkout.c:1121
+#: transport-helper.c:205
+msgid "this remote helper should implement refspec capability"
+msgstr ""
+
+#: transport-helper.c:272 transport-helper.c:412
#, c-format
-msgid "'%s' cannot be used with '%s'"
+msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: builtin/checkout.c:1126
+#: transport-helper.c:401
#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+msgid "%s also locked %s"
msgstr ""
-#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325
-#: builtin/worktree.c:327
-msgid "branch"
+#: transport-helper.c:479
+msgid "couldn't run fast-import"
msgstr ""
-#: builtin/checkout.c:1160
-msgid "create and checkout a new branch"
+#: transport-helper.c:502
+msgid "error while running fast-import"
msgstr ""
-#: builtin/checkout.c:1162
-msgid "create/reset and checkout a branch"
+#: transport-helper.c:531 transport-helper.c:1097
+#, c-format
+msgid "could not read ref %s"
msgstr ""
-#: builtin/checkout.c:1163
-msgid "create reflog for new branch"
+#: transport-helper.c:576
+#, c-format
+msgid "unknown response to connect: %s"
msgstr ""
-#: builtin/checkout.c:1164 builtin/worktree.c:329
-msgid "detach HEAD at named commit"
+#: transport-helper.c:598
+msgid "setting remote service path not supported by protocol"
msgstr ""
-#: builtin/checkout.c:1165
-msgid "set upstream info for new branch"
+#: transport-helper.c:600
+msgid "invalid remote service path"
msgstr ""
-#: builtin/checkout.c:1167
-msgid "new-branch"
+#: transport-helper.c:646
+#, c-format
+msgid "can't connect to subservice %s"
msgstr ""
-#: builtin/checkout.c:1167
-msgid "new unparented branch"
+#: transport-helper.c:718
+#, c-format
+msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: builtin/checkout.c:1168
-msgid "checkout our version for unmerged files"
+#: transport-helper.c:771
+#, c-format
+msgid "helper reported unexpected status of %s"
msgstr ""
-#: builtin/checkout.c:1170
-msgid "checkout their version for unmerged files"
+#: transport-helper.c:832
+#, c-format
+msgid "helper %s does not support dry-run"
msgstr ""
-#: builtin/checkout.c:1172
-msgid "force checkout (throw away local modifications)"
+#: transport-helper.c:835
+#, c-format
+msgid "helper %s does not support --signed"
msgstr ""
-#: builtin/checkout.c:1173
-msgid "perform a 3-way merge with the new branch"
+#: transport-helper.c:838
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: builtin/checkout.c:1174 builtin/merge.c:234
-msgid "update ignored files (default)"
+#: transport-helper.c:845
+#, c-format
+msgid "helper %s does not support 'push-option'"
msgstr ""
-#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
-msgid "style"
+#: transport-helper.c:937
+msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: builtin/checkout.c:1176
-msgid "conflict style (merge or diff3)"
+#: transport-helper.c:942
+#, c-format
+msgid "helper %s does not support 'force'"
msgstr ""
-#: builtin/checkout.c:1179
-msgid "do not limit pathspecs to sparse entries only"
+#: transport-helper.c:989
+msgid "couldn't run fast-export"
msgstr ""
-#: builtin/checkout.c:1181
-msgid "second guess 'git checkout <no-such-branch>'"
+#: transport-helper.c:994
+msgid "error while running fast-export"
msgstr ""
-#: builtin/checkout.c:1183
-msgid "do not check if another worktree is holding the given ref"
+#: transport-helper.c:1019
+#, c-format
+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:1187 builtin/clone.c:78 builtin/fetch.c:119
-#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:172
-msgid "force progress reporting"
+#: transport-helper.c:1083
+#, c-format
+msgid "malformed response in ref list: %s"
msgstr ""
-#: builtin/checkout.c:1224
-msgid "-b, -B and --orphan are mutually exclusive"
+#: transport-helper.c:1236
+#, c-format
+msgid "read(%s) failed"
msgstr ""
-#: builtin/checkout.c:1241
-msgid "--track needs a branch name"
+#: transport-helper.c:1263
+#, c-format
+msgid "write(%s) failed"
msgstr ""
-#: builtin/checkout.c:1246
-msgid "Missing branch name; try -b"
+#: transport-helper.c:1312
+#, c-format
+msgid "%s thread failed"
msgstr ""
-#: builtin/checkout.c:1282
-msgid "invalid path specification"
+#: transport-helper.c:1316
+#, c-format
+msgid "%s thread failed to join: %s"
msgstr ""
-#: builtin/checkout.c:1289
+#: transport-helper.c:1335 transport-helper.c:1339
#, c-format
-msgid ""
-"Cannot update paths and switch to branch '%s' at the same time.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgid "can't start thread for copying data: %s"
msgstr ""
-#: builtin/checkout.c:1294
+#: transport-helper.c:1376
#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
+msgid "%s process failed to wait"
msgstr ""
-#: builtin/checkout.c:1298
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: transport-helper.c:1380
+#, c-format
+msgid "%s process failed"
msgstr ""
-#: builtin/clean.c:25
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+#: transport-helper.c:1398 transport-helper.c:1407
+msgid "can't start thread for copying data"
msgstr ""
-#: builtin/clean.c:29
-#, c-format
-msgid "Removing %s\n"
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr ""
+
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr ""
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
msgstr ""
-#: builtin/clean.c:30
+#: tree-walk.c:116
+msgid "too-short tree file"
+msgstr ""
+
+#: unpack-trees.c:111
#, c-format
-msgid "Would remove %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/clean.c:31
+#: unpack-trees.c:113
#, c-format
-msgid "Skipping repository %s\n"
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:32
+#: unpack-trees.c:116
#, c-format
-msgid "Would skip repository %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/clean.c:33
+#: unpack-trees.c:118
#, c-format
-msgid "failed to remove %s"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:297 git-add--interactive.perl:614
+#: unpack-trees.c:121
#, c-format
msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing\n"
+"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/clean.c:301 git-add--interactive.perl:623
+#: unpack-trees.c:123
#, 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"
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:517 git-add--interactive.perl:589
-#: git-add--interactive.perl:594
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
msgstr ""
-#: builtin/clean.c:659
+#: unpack-trees.c:132
#, c-format
-msgid "Input ignore patterns>> "
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/clean.c:696
+#: unpack-trees.c:134
#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:717
-msgid "Select items to delete"
+#: unpack-trees.c:137
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: unpack-trees.c:139
#, c-format
-msgid "Remove %s [y/N]? "
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:783 git-add--interactive.perl:1660
+#: unpack-trees.c:142
#, c-format
-msgid "Bye.\n"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/clean.c:791
+#: unpack-trees.c:144
+#, c-format
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"
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:818 git-add--interactive.perl:1736
-msgid "*** Commands ***"
+#: unpack-trees.c:150
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/clean.c:819 git-add--interactive.perl:1733
-msgid "What now"
+#: unpack-trees.c:152
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:827
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
+#: unpack-trees.c:155
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
-#: builtin/clean.c:844
-msgid "No more files to clean, exiting."
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:875
-msgid "do not print names of files removed"
+#: unpack-trees.c:160
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/clean.c:877
-msgid "force"
+#: unpack-trees.c:162
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:878
-msgid "interactive cleaning"
+#: unpack-trees.c:170
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: builtin/clean.c:880
-msgid "remove whole directories"
+#: unpack-trees.c:173
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
msgstr ""
-#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
-#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348
-#: builtin/name-rev.c:350 builtin/show-ref.c:176
-msgid "pattern"
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/clean.c:882
-msgid "add <pattern> to ignore rules"
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/clean.c:883
-msgid "remove ignored files, too"
+#: unpack-trees.c:179
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
msgstr ""
-#: builtin/clean.c:885
-msgid "remove only ignored files"
+#: unpack-trees.c:253
+#, c-format
+msgid "Aborting\n"
msgstr ""
-#: builtin/clean.c:903
-msgid "-x and -X cannot be used together"
+#: unpack-trees.c:335
+msgid "Checking out files"
msgstr ""
-#: builtin/clean.c:907
+#: unpack-trees.c:367
msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+"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/clean.c:910
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: builtin/clone.c:37
-msgid "git clone [<options>] [--] <repo> [<dir>]"
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
msgstr ""
-#: builtin/clone.c:80
-msgid "don't create a checkout"
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
msgstr ""
-#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
-msgid "create a bare repository"
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: builtin/clone.c:85
-msgid "create a mirror repository (implies bare)"
+#: urlmatch.c:247
+msgid "invalid characters in host name"
msgstr ""
-#: builtin/clone.c:87
-msgid "to clone from a local repository"
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
msgstr ""
-#: builtin/clone.c:89
-msgid "don't use local hardlinks, always copy"
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
msgstr ""
-#: builtin/clone.c:91
-msgid "setup as shared repository"
+#: worktree.c:249 builtin/am.c:2094
+#, c-format
+msgid "failed to read '%s'"
msgstr ""
-#: builtin/clone.c:93 builtin/clone.c:97
-msgid "pathspec"
+#: worktree.c:295
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: builtin/clone.c:93 builtin/clone.c:97
-msgid "initialize submodules in the clone"
+#: worktree.c:306
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: builtin/clone.c:100
-msgid "number of submodules cloned in parallel"
+#: worktree.c:318
+#, c-format
+msgid "'%s' does not exist"
msgstr ""
-#: builtin/clone.c:101 builtin/init-db.c:475
-msgid "template-directory"
+#: worktree.c:324
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: builtin/clone.c:102 builtin/init-db.c:476
-msgid "directory from which templates will be used"
+#: worktree.c:332
+#, c-format
+msgid "'%s' does not point back to '%s'"
msgstr ""
-#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
-msgid "reference repository"
+#: wrapper.c:223 wrapper.c:393
+#, c-format
+msgid "could not open '%s' for reading and writing"
msgstr ""
-#: builtin/clone.c:108
-msgid "use --reference only while cloning"
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
msgstr ""
-#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
-msgid "name"
+#: wrapper.c:632
+msgid "unable to get current working directory"
msgstr ""
-#: builtin/clone.c:110
-msgid "use <name> instead of 'origin' to track upstream"
+#: wt-status.c:155
+msgid "Unmerged paths:"
msgstr ""
-#: builtin/clone.c:112
-msgid "checkout <branch> instead of the remote's HEAD"
+#: wt-status.c:182 wt-status.c:209
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: builtin/clone.c:114
-msgid "path to git-upload-pack on the remote"
+#: wt-status.c:184 wt-status.c:211
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
-#: builtin/pull.c:202
-msgid "depth"
+#: wt-status.c:188
+msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: builtin/clone.c:116
-msgid "create a shallow clone of that depth"
+#: wt-status.c:190 wt-status.c:194
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
-#: parse-options.h:142
-msgid "time"
+#: wt-status.c:192
+msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: builtin/clone.c:118
-msgid "create a shallow clone since a specific time"
+#: wt-status.c:203 wt-status.c:1046
+msgid "Changes to be committed:"
msgstr ""
-#: builtin/clone.c:119 builtin/fetch.c:124
-msgid "revision"
+#: wt-status.c:221 wt-status.c:1055
+msgid "Changes not staged for commit:"
msgstr ""
-#: builtin/clone.c:120 builtin/fetch.c:125
-msgid "deepen history of shallow clone, excluding rev"
+#: wt-status.c:225
+msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/clone.c:122
-msgid "clone only one branch, HEAD or --branch"
+#: wt-status.c:227
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/clone.c:124
-msgid "any cloned submodules will be shallow"
+#: wt-status.c:228
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: builtin/clone.c:125 builtin/init-db.c:484
-msgid "gitdir"
+#: wt-status.c:230
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: builtin/clone.c:126 builtin/init-db.c:485
-msgid "separate git dir from working tree"
+#: wt-status.c:242
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: builtin/clone.c:127
-msgid "key=value"
+#: wt-status.c:257
+msgid "both deleted:"
msgstr ""
-#: builtin/clone.c:128
-msgid "set config inside the new repository"
+#: wt-status.c:259
+msgid "added by us:"
msgstr ""
-#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
-msgid "use IPv4 addresses only"
+#: wt-status.c:261
+msgid "deleted by them:"
msgstr ""
-#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
-msgid "use IPv6 addresses only"
+#: wt-status.c:263
+msgid "added by them:"
msgstr ""
-#: builtin/clone.c:268
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
+#: wt-status.c:265
+msgid "deleted by us:"
msgstr ""
-#: builtin/clone.c:321
-#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
+#: wt-status.c:267
+msgid "both added:"
msgstr ""
-#: builtin/clone.c:393
-#, c-format
-msgid "failed to open '%s'"
+#: wt-status.c:269
+msgid "both modified:"
msgstr ""
-#: builtin/clone.c:401
-#, c-format
-msgid "%s exists and is not a directory"
+#: wt-status.c:279
+msgid "new file:"
msgstr ""
-#: builtin/clone.c:415
-#, c-format
-msgid "failed to stat %s\n"
+#: wt-status.c:281
+msgid "copied:"
msgstr ""
-#: builtin/clone.c:437
-#, c-format
-msgid "failed to create link '%s'"
+#: wt-status.c:283
+msgid "deleted:"
msgstr ""
-#: builtin/clone.c:441
-#, c-format
-msgid "failed to copy file to '%s'"
+#: wt-status.c:285
+msgid "modified:"
msgstr ""
-#: builtin/clone.c:466
-#, c-format
-msgid "done.\n"
+#: wt-status.c:287
+msgid "renamed:"
msgstr ""
-#: builtin/clone.c:478
-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:289
+msgid "typechange:"
msgstr ""
-#: builtin/clone.c:555
-#, c-format
-msgid "Could not find remote branch %s to clone."
+#: wt-status.c:291
+msgid "unknown:"
msgstr ""
-#: builtin/clone.c:650
-msgid "remote did not send all necessary objects"
+#: wt-status.c:293
+msgid "unmerged:"
+msgstr ""
+
+#: wt-status.c:373
+msgid "new commits, "
+msgstr ""
+
+#: wt-status.c:375
+msgid "modified content, "
+msgstr ""
+
+#: wt-status.c:377
+msgid "untracked content, "
msgstr ""
-#: builtin/clone.c:666
+#: wt-status.c:884
#, c-format
-msgid "unable to update %s"
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:916
+msgid "Submodules changed but not updated:"
msgstr ""
-#: builtin/clone.c:715
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: wt-status.c:918
+msgid "Submodule changes to be committed:"
msgstr ""
-#: builtin/clone.c:746
-msgid "unable to checkout working tree"
+#: wt-status.c:1000
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-#: builtin/clone.c:786
-msgid "unable to write parameters to config file"
+#: wt-status.c:1101
+msgid "You have unmerged paths."
msgstr ""
-#: builtin/clone.c:849
-msgid "cannot repack to clean up"
+#: wt-status.c:1104
+msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: builtin/clone.c:851
-msgid "cannot unlink temporary alternates file"
+#: wt-status.c:1106
+msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: builtin/clone.c:884 builtin/receive-pack.c:1901
-msgid "Too many arguments."
+#: wt-status.c:1110
+msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: builtin/clone.c:888
-msgid "You must specify a repository to clone."
+#: wt-status.c:1113
+msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: builtin/clone.c:901
-#, c-format
-msgid "--bare and --origin %s options are incompatible."
+#: wt-status.c:1122
+msgid "You are in the middle of an am session."
msgstr ""
-#: builtin/clone.c:904
-msgid "--bare and --separate-git-dir are incompatible."
+#: wt-status.c:1125
+msgid "The current patch is empty."
msgstr ""
-#: builtin/clone.c:917
-#, c-format
-msgid "repository '%s' does not exist"
+#: wt-status.c:1129
+msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: builtin/clone.c:923 builtin/fetch.c:1337
-#, c-format
-msgid "depth %s is not a positive number"
+#: wt-status.c:1131
+msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: builtin/clone.c:933
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+#: wt-status.c:1133
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: builtin/clone.c:943
-#, c-format
-msgid "working tree '%s' already exists."
+#: wt-status.c:1264
+msgid "git-rebase-todo is missing."
msgstr ""
-#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
-#: builtin/worktree.c:222 builtin/worktree.c:249
-#, c-format
-msgid "could not create leading directories of '%s'"
+#: wt-status.c:1266
+msgid "No commands done."
msgstr ""
-#: builtin/clone.c:961
+#: wt-status.c:1269
#, c-format
-msgid "could not create work tree dir '%s'"
-msgstr ""
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/clone.c:973
+#: wt-status.c:1280
#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+msgid " (see more in file %s)"
+msgstr ""
+
+#: wt-status.c:1285
+msgid "No commands remaining."
msgstr ""
-#: builtin/clone.c:975
+#: wt-status.c:1288
#, c-format
-msgid "Cloning into '%s'...\n"
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:1296
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: builtin/clone.c:999
-msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+#: wt-status.c:1308
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/clone.c:1055
-msgid "--depth is ignored in local clones; use file:// instead."
+#: wt-status.c:1313
+msgid "You are currently rebasing."
msgstr ""
-#: builtin/clone.c:1057
-msgid "--shallow-since is ignored in local clones; use file:// instead."
+#: wt-status.c:1326
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: builtin/clone.c:1059
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+#: wt-status.c:1328
+msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: builtin/clone.c:1062
-msgid "source repository is shallow, ignoring --local"
+#: wt-status.c:1330
+msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: builtin/clone.c:1067
-msgid "--local is ignored"
+#: wt-status.c:1337
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: builtin/clone.c:1071
+#: wt-status.c:1341
#, c-format
-msgid "Don't know how to clone %s"
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/clone.c:1126 builtin/clone.c:1134
-#, c-format
-msgid "Remote branch %s not found in upstream %s"
+#: wt-status.c:1346
+msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: builtin/clone.c:1137
-msgid "You appear to have cloned an empty repository."
+#: wt-status.c:1349
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: builtin/column.c:9
-msgid "git column [<options>]"
+#: wt-status.c:1353
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/column.c:26
-msgid "lookup config vars"
+#: wt-status.c:1358
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: builtin/column.c:27 builtin/column.c:28
-msgid "layout to use"
+#: wt-status.c:1361
+msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: builtin/column.c:29
-msgid "Maximum width"
+#: wt-status.c:1363
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: builtin/column.c:30
-msgid "Padding space on left border"
+#: wt-status.c:1372
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: builtin/column.c:31
-msgid "Padding space on right border"
+#: wt-status.c:1377
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/column.c:32
-msgid "Padding space between columns"
+#: wt-status.c:1380
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/column.c:51
-msgid "--command must be the first argument"
+#: wt-status.c:1382
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: builtin/commit.c:38
-msgid "git commit [<options>] [--] <pathspec>..."
+#: wt-status.c:1390
+#, c-format
+msgid "You are currently reverting commit %s."
msgstr ""
-#: builtin/commit.c:43
-msgid "git status [<options>] [--] <pathspec>..."
+#: wt-status.c:1395
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: builtin/commit.c:48
-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/commit.c:61
-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"
+#: wt-status.c:1398
+msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: builtin/commit.c:73
-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"
+#: wt-status.c:1400
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: builtin/commit.c:78
-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"
+#: wt-status.c:1410
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: builtin/commit.c:85
-msgid "Otherwise, please use 'git reset'\n"
+#: wt-status.c:1414
+msgid "You are currently bisecting."
msgstr ""
-#: builtin/commit.c:88
-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"
+#: wt-status.c:1417
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: builtin/commit.c:318
-msgid "failed to unpack HEAD tree object"
+#: wt-status.c:1617
+msgid "On branch "
msgstr ""
-#: builtin/commit.c:359
-msgid "unable to create temporary index"
+#: wt-status.c:1624
+msgid "interactive rebase in progress; onto "
msgstr ""
-#: builtin/commit.c:365
-msgid "interactive add failed"
+#: wt-status.c:1626
+msgid "rebase in progress; onto "
msgstr ""
-#: builtin/commit.c:378
-msgid "unable to update temporary index"
+#: wt-status.c:1631
+msgid "HEAD detached at "
msgstr ""
-#: builtin/commit.c:380
-msgid "Failed to update main cache tree"
+#: wt-status.c:1633
+msgid "HEAD detached from "
msgstr ""
-#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
-msgid "unable to write new_index file"
+#: wt-status.c:1636
+msgid "Not currently on any branch."
msgstr ""
-#: builtin/commit.c:458
-msgid "cannot do a partial commit during a merge."
+#: wt-status.c:1653
+msgid "Initial commit"
msgstr ""
-#: builtin/commit.c:460
-msgid "cannot do a partial commit during a cherry-pick."
+#: wt-status.c:1654
+msgid "No commits yet"
msgstr ""
-#: builtin/commit.c:469
-msgid "cannot read the index"
+#: wt-status.c:1668
+msgid "Untracked files"
msgstr ""
-#: builtin/commit.c:488
-msgid "unable to write temporary index file"
+#: wt-status.c:1670
+msgid "Ignored files"
msgstr ""
-#: builtin/commit.c:582
+#: wt-status.c:1674
#, c-format
-msgid "commit '%s' lacks author header"
+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/commit.c:584
+#: wt-status.c:1680
#, c-format
-msgid "commit '%s' has malformed author line"
+msgid "Untracked files not listed%s"
msgstr ""
-#: builtin/commit.c:603
-msgid "malformed --author parameter"
+#: wt-status.c:1682
+msgid " (use -u option to show untracked files)"
msgstr ""
-#: builtin/commit.c:655
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
+#: wt-status.c:1688
+msgid "No changes"
msgstr ""
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
+#: wt-status.c:1693
#, c-format
-msgid "could not lookup commit %s"
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: builtin/commit.c:704 builtin/shortlog.c:294
+#: wt-status.c:1696
#, c-format
-msgid "(reading log message from standard input)\n"
+msgid "no changes added to commit\n"
msgstr ""
-#: builtin/commit.c:706
-msgid "could not read log from standard input"
+#: wt-status.c:1699
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: builtin/commit.c:710
+#: wt-status.c:1702
#, c-format
-msgid "could not read log file '%s'"
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: builtin/commit.c:737 builtin/commit.c:745
-msgid "could not read SQUASH_MSG"
+#: wt-status.c:1705
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: builtin/commit.c:742
-msgid "could not read MERGE_MSG"
+#: wt-status.c:1708 wt-status.c:1713
+#, c-format
+msgid "nothing to commit\n"
msgstr ""
-#: builtin/commit.c:796
-msgid "could not write commit template"
+#: wt-status.c:1711
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: builtin/commit.c:814
+#: wt-status.c:1715
#, 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 "nothing to commit, working tree clean\n"
msgstr ""
-#: builtin/commit.c:819
-#, 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"
+#: wt-status.c:1828
+msgid "No commits yet on "
msgstr ""
-#: builtin/commit.c:832
-#, 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"
+#: wt-status.c:1832
+msgid "HEAD (no branch)"
msgstr ""
-#: builtin/commit.c:839
-#, 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"
+#: wt-status.c:1863
+msgid "different"
msgstr ""
-#: builtin/commit.c:859
-#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
+#: wt-status.c:1865 wt-status.c:1873
+msgid "behind "
msgstr ""
-#: builtin/commit.c:867
-#, c-format
-msgid "%sDate: %s"
+#: wt-status.c:1868 wt-status.c:1871
+msgid "ahead "
msgstr ""
-#: builtin/commit.c:874
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2386
#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
+msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: builtin/commit.c:892
-msgid "Cannot read index"
+#: wt-status.c:2392
+msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/commit.c:954
-msgid "Error building trees"
+#: wt-status.c:2394
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: builtin/commit.c:968 builtin/tag.c:273
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+#: builtin/add.c:25
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:1071
+#: builtin/add.c:84
#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgid "unexpected diff status %c"
+msgstr ""
+
+#: builtin/add.c:89 builtin/commit.c:285
+msgid "updating files failed"
msgstr ""
-#: builtin/commit.c:1086 builtin/commit.c:1325
+#: builtin/add.c:99
#, c-format
-msgid "Invalid untracked files mode '%s'"
+msgid "remove '%s'\n"
msgstr ""
-#: builtin/commit.c:1124
-msgid "--long and -z are incompatible"
+#: builtin/add.c:174
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/commit.c:1154
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/add.c:234 builtin/rev-parse.c:896
+msgid "Could not read the index"
msgstr ""
-#: builtin/commit.c:1163
-msgid "You have nothing to amend."
+#: builtin/add.c:245
+#, c-format
+msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/commit.c:1166
-msgid "You are in the middle of a merge -- cannot amend."
+#: builtin/add.c:249
+msgid "Could not write patch"
msgstr ""
-#: builtin/commit.c:1168
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: builtin/add.c:252
+msgid "editing patch failed"
msgstr ""
-#: builtin/commit.c:1171
-msgid "Options --squash and --fixup cannot be used together"
+#: builtin/add.c:255
+#, c-format
+msgid "Could not stat '%s'"
msgstr ""
-#: builtin/commit.c:1181
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: builtin/add.c:257
+msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/commit.c:1183
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+#: builtin/add.c:262
+#, c-format
+msgid "Could not apply '%s'"
msgstr ""
-#: builtin/commit.c:1191
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: builtin/add.c:270
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/commit.c:1208
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:214 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+msgid "dry run"
msgstr ""
-#: builtin/commit.c:1210
-msgid "No paths with --include/--only does not make sense."
+#: builtin/add.c:293
+msgid "interactive picking"
msgstr ""
-#: builtin/commit.c:1212
-msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306
+msgid "select hunks interactively"
msgstr ""
-#: builtin/commit.c:1224 builtin/tag.c:551
-#, c-format
-msgid "Invalid cleanup mode %s"
+#: builtin/add.c:295
+msgid "edit current diff and apply"
msgstr ""
-#: builtin/commit.c:1229
-msgid "Paths with -a does not make sense."
+#: builtin/add.c:296
+msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/commit.c:1339 builtin/commit.c:1612
-msgid "show status concisely"
+#: builtin/add.c:297
+msgid "update tracked files"
msgstr ""
-#: builtin/commit.c:1341 builtin/commit.c:1614
-msgid "show branch information"
+#: builtin/add.c:298
+msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/commit.c:1343
-msgid "version"
+#: builtin/add.c:299
+msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:443
-msgid "machine-readable output"
+#: builtin/add.c:300
+msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/commit.c:1346 builtin/commit.c:1618
-msgid "show status in long format (default)"
+#: builtin/add.c:303
+msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/commit.c:1349 builtin/commit.c:1621
-msgid "terminate entries with NUL"
+#: builtin/add.c:305
+msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:411
-msgid "mode"
+#: builtin/add.c:306
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/commit.c:1352 builtin/commit.c:1624
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+#: builtin/add.c:307
+msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/commit.c:1355
-msgid "show ignored files"
+#: builtin/add.c:309 builtin/update-index.c:991
+msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/commit.c:1356 parse-options.h:155
-msgid "when"
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/commit.c:1357
+#: builtin/add.c:326
+#, c-format
msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+"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:1359
-msgid "list untracked files in columns"
+#: builtin/add.c:354
+#, c-format
+msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/commit.c:1435
-msgid "couldn't look up newly created commit"
+#: builtin/add.c:372
+#, c-format
+msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/commit.c:1437
-msgid "could not parse newly created commit"
+#: builtin/add.c:380
+msgid "adding files failed"
msgstr ""
-#: builtin/commit.c:1482
-msgid "detached HEAD"
+#: builtin/add.c:418
+msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/commit.c:1485
-msgid " (root-commit)"
+#: builtin/add.c:425
+msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/commit.c:1582
-msgid "suppress summary after successful commit"
+#: builtin/add.c:429
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/commit.c:1583
-msgid "show diff in commit message template"
+#: builtin/add.c:444
+#, c-format
+msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/commit.c:1585
-msgid "Commit message options"
+#: builtin/add.c:445
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/commit.c:1586 builtin/tag.c:409
-msgid "read message from file"
+#: builtin/am.c:348
+msgid "could not parse author script"
msgstr ""
-#: builtin/commit.c:1587
-msgid "author"
+#: builtin/am.c:432
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/commit.c:1587
-msgid "override author for commit"
+#: builtin/am.c:473
+#, c-format
+msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/commit.c:1588 builtin/gc.c:353
-msgid "date"
+#: builtin/am.c:510
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/commit.c:1588
-msgid "override date for commit"
+#: builtin/am.c:536
+msgid "fseek failed"
msgstr ""
-#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:407
-msgid "message"
+#: builtin/am.c:724
+#, c-format
+msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/commit.c:1589
-msgid "commit message"
+#: builtin/am.c:789
+msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
-msgid "commit"
+#: builtin/am.c:837
+msgid "invalid timestamp"
msgstr ""
-#: builtin/commit.c:1590
-msgid "reuse and edit message from specified commit"
+#: builtin/am.c:842 builtin/am.c:854
+msgid "invalid Date line"
msgstr ""
-#: builtin/commit.c:1591
-msgid "reuse message from specified commit"
+#: builtin/am.c:849
+msgid "invalid timezone offset"
msgstr ""
-#: builtin/commit.c:1592
-msgid "use autosquash formatted message to fixup specified commit"
+#: builtin/am.c:942
+msgid "Patch format detection failed."
msgstr ""
-#: builtin/commit.c:1593
-msgid "use autosquash formatted message to squash specified commit"
-msgstr ""
-
-#: builtin/commit.c:1594
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
+#: builtin/am.c:947 builtin/clone.c:409
+#, c-format
+msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
-msgid "add Signed-off-by:"
+#: builtin/am.c:952
+msgid "Failed to split patches."
msgstr ""
-#: builtin/commit.c:1596
-msgid "use specified template file"
+#: builtin/am.c:1082 builtin/commit.c:371
+msgid "unable to write index file"
msgstr ""
-#: builtin/commit.c:1597
-msgid "force edit of commit"
+#: builtin/am.c:1096
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/commit.c:1598
-msgid "default"
+#: builtin/am.c:1097
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/commit.c:1598 builtin/tag.c:412
-msgid "how to strip spaces and #comments from message"
+#: builtin/am.c:1098
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/commit.c:1599
-msgid "include status in commit message template"
+#: builtin/am.c:1181
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
-#: builtin/revert.c:112
-msgid "GPG sign commit"
+#: builtin/am.c:1209
+msgid "Patch is empty."
msgstr ""
-#: builtin/commit.c:1604
-msgid "Commit contents options"
+#: builtin/am.c:1275
+#, c-format
+msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/commit.c:1605
-msgid "commit all changed files"
+#: builtin/am.c:1297
+#, c-format
+msgid "unable to parse commit %s"
msgstr ""
-#: builtin/commit.c:1606
-msgid "add specified files to index for commit"
+#: builtin/am.c:1493
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/commit.c:1607
-msgid "interactively add files"
+#: builtin/am.c:1495
+msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/commit.c:1608
-msgid "interactively add changes"
+#: builtin/am.c:1514
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/commit.c:1609
-msgid "commit only specified files"
+#: builtin/am.c:1520
+msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/commit.c:1610
-msgid "bypass pre-commit and commit-msg hooks"
+#: builtin/am.c:1546
+msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/commit.c:1611
-msgid "show what would be committed"
+#: builtin/am.c:1578
+msgid "applying to an empty history"
msgstr ""
-#: builtin/commit.c:1622
-msgid "amend previous commit"
+#: builtin/am.c:1624 builtin/am.c:1628
+#, c-format
+msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/commit.c:1623
-msgid "bypass post-rewrite hook"
+#: builtin/am.c:1644
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/commit.c:1628
-msgid "ok to record an empty change"
+#: builtin/am.c:1649
+msgid "Commit Body is:"
msgstr ""
-#: builtin/commit.c:1630
-msgid "ok to record a change with an empty message"
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1659
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/commit.c:1659
-msgid "could not parse HEAD commit"
+#: builtin/am.c:1709
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/commit.c:1707
+#: builtin/am.c:1749 builtin/am.c:1817
#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+msgid "Applying: %.*s"
msgstr ""
-#: builtin/commit.c:1714
-msgid "could not read MERGE_MODE"
+#: builtin/am.c:1766
+msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/commit.c:1733
+#: builtin/am.c:1772
#, c-format
-msgid "could not read commit message: %s"
+msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/commit.c:1744
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+#: builtin/am.c:1776
+msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/commit.c:1749
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+#: builtin/am.c:1820
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/commit.c:1797
+#: builtin/am.c:1827
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."
+"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/config.c:9
-msgid "git config [<options>]"
+#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329
+#: builtin/reset.c:337
+#, c-format
+msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/config.c:55
-msgid "Config file location"
+#: builtin/am.c:1986
+msgid "failed to clean index"
msgstr ""
-#: builtin/config.c:56
-msgid "use global config file"
+#: builtin/am.c:2030
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/config.c:57
-msgid "use system config file"
+#: builtin/am.c:2123
+#, c-format
+msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/config.c:58
-msgid "use repository config file"
+#: builtin/am.c:2159
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/config.c:59
-msgid "use given config file"
+#: builtin/am.c:2160
+msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/config.c:60
-msgid "blob-id"
+#: builtin/am.c:2166
+msgid "run interactively"
msgstr ""
-#: builtin/config.c:60
-msgid "read config from given blob object"
+#: builtin/am.c:2168
+msgid "historical option -- no-op"
msgstr ""
-#: builtin/config.c:61
-msgid "Action"
+#: builtin/am.c:2170
+msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/config.c:62
-msgid "get value: name [value-regex]"
+#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58
+#: builtin/repack.c:306
+msgid "be quiet"
msgstr ""
-#: builtin/config.c:63
-msgid "get all values: key [value-regex]"
+#: builtin/am.c:2173
+msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/config.c:64
-msgid "get values for regexp: name-regex [value-regex]"
+#: builtin/am.c:2176
+msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/config.c:65
-msgid "get value specific for the URL: section[.var] URL"
+#: builtin/am.c:2178
+msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/config.c:66
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/am.c:2180
+msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/config.c:67
-msgid "add a new variable: name value"
+#: builtin/am.c:2182
+msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/config.c:68
-msgid "remove a variable: name [value-regex]"
+#: builtin/am.c:2184
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/config.c:69
-msgid "remove all matches: name [value-regex]"
+#: builtin/am.c:2187
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/config.c:70
-msgid "rename section: old-name new-name"
+#: builtin/am.c:2190
+msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/config.c:71
-msgid "remove a section: name"
+#: builtin/am.c:2192 builtin/am.c:2195 builtin/am.c:2198 builtin/am.c:2201
+#: builtin/am.c:2204 builtin/am.c:2207 builtin/am.c:2210 builtin/am.c:2213
+#: builtin/am.c:2219
+msgid "pass it through git-apply"
msgstr ""
-#: builtin/config.c:72
-msgid "list all"
+#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:240
+#: builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062
+#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
+#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
+#: parse-options.h:144 parse-options.h:146 parse-options.h:266
+msgid "n"
msgstr ""
-#: builtin/config.c:73
-msgid "open an editor"
+#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38
+#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+msgid "format"
msgstr ""
-#: builtin/config.c:74
-msgid "find the color configured: slot [default]"
+#: builtin/am.c:2216
+msgid "format the patch(es) are in"
msgstr ""
-#: builtin/config.c:75
-msgid "find the color setting: slot [stdout-is-tty]"
+#: builtin/am.c:2222
+msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/config.c:76
-msgid "Type"
+#: builtin/am.c:2224
+msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/config.c:77
-msgid "value is \"true\" or \"false\""
+#: builtin/am.c:2227
+msgid "synonyms for --continue"
msgstr ""
-#: builtin/config.c:78
-msgid "value is decimal number"
+#: builtin/am.c:2230
+msgid "skip the current patch"
msgstr ""
-#: builtin/config.c:79
-msgid "value is --bool or --int"
+#: builtin/am.c:2233
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/config.c:80
-msgid "value is a path (file or directory name)"
+#: builtin/am.c:2236
+msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/config.c:81
-msgid "Other"
+#: builtin/am.c:2239
+msgid "show the patch being applied."
msgstr ""
-#: builtin/config.c:82
-msgid "terminate values with NUL byte"
+#: builtin/am.c:2243
+msgid "lie about committer date"
msgstr ""
-#: builtin/config.c:83
-msgid "show variable names only"
+#: builtin/am.c:2245
+msgid "use current timestamp for author date"
msgstr ""
-#: builtin/config.c:84
-msgid "respect include directives on lookup"
+#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274
+#: builtin/pull.c:185 builtin/rebase.c:1106 builtin/rebase--interactive.c:185
+#: builtin/revert.c:114 builtin/tag.c:402
+msgid "key-id"
msgstr ""
-#: builtin/config.c:85
-msgid "show origin of config (file, standard input, blob, command line)"
+#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186
+msgid "GPG-sign commits"
msgstr ""
-#: builtin/config.c:327
-msgid "unable to parse default color value"
+#: builtin/am.c:2251
+msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/config.c:471
-#, c-format
+#: builtin/am.c:2269
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"
+"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/config.c:611
-#, c-format
-msgid "cannot create configuration file %s"
+#: builtin/am.c:2276
+msgid "failed to read the index"
msgstr ""
-#: builtin/config.c:623
+#: builtin/am.c:2291
#, c-format
-msgid ""
-"cannot overwrite multiple values with a single value\n"
-" Use a regexp, --add or --replace-all to change %s."
-msgstr ""
-
-#: builtin/count-objects.c:86
-msgid "git count-objects [-v] [-H | --human-readable]"
+msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/count-objects.c:96
-msgid "print sizes in human readable format"
+#: builtin/am.c:2315
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/describe.c:18
-msgid "git describe [<options>] [<commit-ish>...]"
+#: builtin/am.c:2321
+msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/describe.c:19
-msgid "git describe [<options>] --dirty"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/describe.c:53
-msgid "head"
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
msgstr ""
-#: builtin/describe.c:53
-msgid "lightweight"
+#: builtin/archive.c:20
+msgid "could not redirect output"
msgstr ""
-#: builtin/describe.c:53
-msgid "annotated"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/describe.c:250
-#, c-format
-msgid "annotated tag %s not available"
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
-#: builtin/describe.c:254
+#: builtin/archive.c:64
#, c-format
-msgid "annotated tag %s has no embedded name"
+msgid "git archive: NACK %s"
msgstr ""
-#: builtin/describe.c:256
-#, c-format
-msgid "tag '%s' is really '%s' here"
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
msgstr ""
-#: builtin/describe.c:283 builtin/log.c:487
-#, c-format
-msgid "Not a valid object name %s"
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
msgstr ""
-#: builtin/describe.c:286
-#, c-format
-msgid "%s is not a valid '%s' object"
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/describe.c:303
-#, c-format
-msgid "no tag exactly matches '%s'"
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr ""
-#: builtin/describe.c:305
-#, c-format
-msgid "searching to describe %s\n"
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
msgstr ""
-#: builtin/describe.c:352
-#, c-format
-msgid "finished search at %s\n"
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr ""
-#: builtin/describe.c:379
-#, c-format
+#: builtin/bisect--helper.c:26
msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
msgstr ""
-#: builtin/describe.c:383
-#, c-format
+#: builtin/bisect--helper.c:27
msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
msgstr ""
-#: builtin/describe.c:413
-#, c-format
-msgid "traversed %lu commits\n"
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
-#: builtin/describe.c:416
-#, c-format
+#: builtin/bisect--helper.c:29
msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
msgstr ""
-#: builtin/describe.c:438
-msgid "find the tag that comes after the commit"
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
msgstr ""
-#: builtin/describe.c:439
-msgid "debug search strategy on stderr"
+#: builtin/bisect--helper.c:86
+#, c-format
+msgid "'%s' is not a valid term"
msgstr ""
-#: builtin/describe.c:440
-msgid "use any ref"
+#: builtin/bisect--helper.c:90
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
msgstr ""
-#: builtin/describe.c:441
-msgid "use any tag, even unannotated"
+#: builtin/bisect--helper.c:100
+#, c-format
+msgid "can't change the meaning of the term '%s'"
msgstr ""
-#: builtin/describe.c:442
-msgid "always use long format"
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
msgstr ""
-#: builtin/describe.c:443
-msgid "only follow first parent"
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
msgstr ""
-#: builtin/describe.c:446
-msgid "only output exact matches"
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
msgstr ""
-#: builtin/describe.c:448
-msgid "consider <n> most recent tags (default: 10)"
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
msgstr ""
-#: builtin/describe.c:450
-msgid "only consider tags matching <pattern>"
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
-#: builtin/describe.c:452
-msgid "do not consider tags matching <pattern>"
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
msgstr ""
-#: builtin/describe.c:454 builtin/name-rev.c:357
-msgid "show abbreviated commit object as fallback"
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
msgstr ""
-#: builtin/describe.c:455 builtin/describe.c:458
-msgid "mark"
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
msgstr ""
-#: builtin/describe.c:456
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
-#: builtin/describe.c:459
-msgid "append <mark> on broken working tree (default: \"-broken\")"
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/describe.c:477
-msgid "--long is incompatible with --abbrev=0"
+#: builtin/bisect--helper.c:289
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/describe.c:506
-msgid "No names found, cannot describe anything."
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
msgstr ""
-#: builtin/describe.c:549
-msgid "--dirty is incompatible with commit-ishes"
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
msgstr ""
-#: builtin/describe.c:551
-msgid "--broken is incompatible with commit-ishes"
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
msgstr ""
-#: builtin/diff.c:83
+#: builtin/bisect--helper.c:379
#, c-format
-msgid "'%s': not a regular file or symlink"
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
msgstr ""
-#: builtin/diff.c:234
+#: builtin/bisect--helper.c:389
#, c-format
-msgid "invalid option: %s"
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-#: builtin/diff.c:358
-msgid "Not a git repository"
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
msgstr ""
-#: builtin/diff.c:401
+#: builtin/bisect--helper.c:479
#, c-format
-msgid "invalid object '%s' given."
+msgid "'%s' does not appear to be a valid revision"
msgstr ""
-#: builtin/diff.c:410
-#, c-format
-msgid "more than two blobs given: '%s'"
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
msgstr ""
-#: builtin/diff.c:417
+#: builtin/bisect--helper.c:526
#, c-format
-msgid "unhandled object '%s' given."
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-#: builtin/difftool.c:28
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: builtin/difftool.c:241
-#, c-format
-msgid "failed: %d"
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/difftool.c:283
-#, c-format
-msgid "could not read symlink %s"
+#: builtin/bisect--helper.c:627
+msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/difftool.c:285
-#, c-format
-msgid "could not read symlink file %s"
+#: builtin/bisect--helper.c:629
+msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
-#: builtin/difftool.c:293
-#, c-format
-msgid "could not read object %s for symlink %s"
+#: builtin/bisect--helper.c:631
+msgid "cleanup the bisection state"
msgstr ""
-#: builtin/difftool.c:395
-msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+#: builtin/bisect--helper.c:633
+msgid "check for expected revs"
msgstr ""
-#: builtin/difftool.c:609
-#, c-format
-msgid "both files modified: '%s' and '%s'."
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
msgstr ""
-#: builtin/difftool.c:611
-msgid "working tree file has been left."
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
msgstr ""
-#: builtin/difftool.c:622
-#, c-format
-msgid "temporary files exist in '%s'."
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
msgstr ""
-#: builtin/difftool.c:623
-msgid "you may want to cleanup or recover these."
+#: builtin/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/difftool.c:669
-msgid "use `diff.guitool` instead of `diff.tool`"
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
msgstr ""
-#: builtin/difftool.c:671
-msgid "perform a full-directory diff"
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
msgstr ""
-#: builtin/difftool.c:673
-msgid "do not prompt before launching a diff tool"
+#: builtin/bisect--helper.c:647
+msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/difftool.c:679
-msgid "use symlinks in dir-diff mode"
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/difftool.c:680
-msgid "<tool>"
+#: builtin/bisect--helper.c:666
+msgid "--write-terms requires two arguments"
msgstr ""
-#: builtin/difftool.c:681
-msgid "use the specified diff tool"
+#: builtin/bisect--helper.c:670
+msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/difftool.c:683
-msgid "print a list of diff tools that may be used with `--tool`"
+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/difftool.c:686
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
msgstr ""
-#: builtin/difftool.c:688
-msgid "<command>"
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
msgstr ""
-#: builtin/difftool.c:689
-msgid "specify a custom command for viewing diffs"
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/difftool.c:713
-msgid "no <tool> given for --tool=<tool>"
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
-#: builtin/difftool.c:720
-msgid "no <cmd> given for --extcmd=<cmd>"
+#: builtin/blame.c:31
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/fast-export.c:25
-msgid "git fast-export [rev-list-opts]"
+#: builtin/blame.c:36
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/fast-export.c:980
-msgid "show progress after <n> objects"
+#: builtin/blame.c:406
+#, c-format
+msgid "expecting a color: %s"
msgstr ""
-#: builtin/fast-export.c:982
-msgid "select handling of signed tags"
+#: builtin/blame.c:413
+msgid "must end with a color"
msgstr ""
-#: builtin/fast-export.c:985
-msgid "select handling of tags that tag filtered objects"
+#: builtin/blame.c:700
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/fast-export.c:988
-msgid "Dump marks to this file"
+#: builtin/blame.c:718
+msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/fast-export.c:990
-msgid "Import marks from this file"
+#: builtin/blame.c:793
+msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/fast-export.c:992
-msgid "Fake a tagger when tags lack one"
+#: builtin/blame.c:794
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/fast-export.c:994
-msgid "Output full tree for each commit"
+#: builtin/blame.c:795
+msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/fast-export.c:996
-msgid "Use the done feature to terminate the stream"
+#: builtin/blame.c:796
+msgid "Show work cost statistics"
msgstr ""
-#: builtin/fast-export.c:997
-msgid "Skip output of blob data"
+#: builtin/blame.c:797
+msgid "Force progress reporting"
msgstr ""
-#: builtin/fast-export.c:998
-msgid "refspec"
+#: builtin/blame.c:798
+msgid "Show output score for blame entries"
msgstr ""
-#: builtin/fast-export.c:999
-msgid "Apply refspec to exported refs"
+#: builtin/blame.c:799
+msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/fast-export.c:1000
-msgid "anonymize output"
+#: builtin/blame.c:800
+msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/fetch.c:21
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/blame.c:801
+msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/fetch.c:22
-msgid "git fetch [<options>] <group>"
+#: builtin/blame.c:802
+msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/fetch.c:23
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+#: builtin/blame.c:803
+msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/fetch.c:24
-msgid "git fetch --all [<options>]"
+#: builtin/blame.c:804
+msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/fetch.c:95 builtin/pull.c:175
-msgid "fetch from all remotes"
+#: builtin/blame.c:805
+msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/fetch.c:97 builtin/pull.c:178
-msgid "append to .git/FETCH_HEAD instead of overwriting"
+#: builtin/blame.c:806
+msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/fetch.c:99 builtin/pull.c:181
-msgid "path to upload pack on remote end"
+#: builtin/blame.c:807
+msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/fetch.c:100 builtin/pull.c:183
-msgid "force overwrite of local branch"
+#: builtin/blame.c:808
+msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/fetch.c:102
-msgid "fetch from multiple remotes"
+#: builtin/blame.c:809
+msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/fetch.c:104 builtin/pull.c:185
-msgid "fetch all tags and associated objects"
+#: builtin/blame.c:810
+msgid "color lines by age"
msgstr ""
-#: builtin/fetch.c:106
-msgid "do not fetch all tags (--no-tags)"
+#: builtin/blame.c:817
+msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/fetch.c:108
-msgid "number of submodules fetched in parallel"
+#: builtin/blame.c:819
+msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/fetch.c:110 builtin/pull.c:188
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/blame.c:820
+msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/fetch.c:111 builtin/pull.c:191
-msgid "on-demand"
+#: builtin/blame.c:821
+msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/fetch.c:112 builtin/pull.c:192
-msgid "control recursive fetching of submodules"
+#: builtin/blame.c:822 builtin/blame.c:823
+msgid "score"
msgstr ""
-#: builtin/fetch.c:116 builtin/pull.c:200
-msgid "keep downloaded pack"
+#: builtin/blame.c:822
+msgid "Find line copies within and across files"
msgstr ""
-#: builtin/fetch.c:118
-msgid "allow updating of HEAD ref"
+#: builtin/blame.c:823
+msgid "Find line movements within and across files"
msgstr ""
-#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
-msgid "deepen history of shallow clone"
+#: builtin/blame.c:824
+msgid "n,m"
msgstr ""
-#: builtin/fetch.c:123
-msgid "deepen history of shallow repository based on time"
+#: builtin/blame.c:824
+msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/fetch.c:129 builtin/pull.c:206
-msgid "convert to a complete repository"
+#: builtin/blame.c:875
+msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
-#: builtin/fetch.c:131 builtin/log.c:1440
-msgid "dir"
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output. For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:926
+msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/fetch.c:132
-msgid "prepend this to submodule path output"
+#: builtin/blame.c:1018
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/blame.c:1064
+msgid "Blaming lines"
msgstr ""
-#: builtin/fetch.c:135
-msgid "default mode for recursion"
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/fetch.c:137 builtin/pull.c:209
-msgid "accept refs that update .git/shallow"
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/fetch.c:138 builtin/pull.c:211
-msgid "refmap"
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/fetch.c:139 builtin/pull.c:212
-msgid "specify fetch refmap"
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/fetch.c:395
-msgid "Couldn't find remote ref HEAD"
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/fetch.c:513
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/fetch.c:606
-#, c-format
-msgid "object %s not found"
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/fetch.c:610
-msgid "[up to date]"
+#: 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/fetch.c:623 builtin/fetch.c:703
-msgid "[rejected]"
+#: 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/fetch.c:624
-msgid "can't fetch in current branch"
+#: builtin/branch.c:169
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/fetch.c:633
-msgid "[tag update]"
+#: 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/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
-#: builtin/fetch.c:698
-msgid "unable to update local ref"
+#: builtin/branch.c:186
+msgid "Update of config-file failed"
msgstr ""
-#: builtin/fetch.c:653
-msgid "[new tag]"
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
msgstr ""
-#: builtin/fetch.c:656
-msgid "[new branch]"
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/fetch.c:659
-msgid "[new ref]"
+#: builtin/branch.c:237
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/fetch.c:698
-msgid "forced update"
+#: builtin/branch.c:252
+#, c-format
+msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/fetch.c:703
-msgid "non-fast-forward"
+#: builtin/branch.c:253
+#, c-format
+msgid "branch '%s' not found."
msgstr ""
-#: builtin/fetch.c:748
+#: builtin/branch.c:268
#, c-format
-msgid "%s did not send all necessary objects\n"
+msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/fetch.c:768
+#: builtin/branch.c:269
#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/branch.c:276
#, c-format
-msgid "From %.*s\n"
+msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/fetch.c:866
+#: builtin/branch.c:277
#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+msgid "Deleted branch %s (was %s).\n"
+msgstr ""
+
+#: builtin/branch.c:421 builtin/tag.c:59
+msgid "unable to parse format string"
msgstr ""
-#: builtin/fetch.c:921
+#: builtin/branch.c:458
#, c-format
-msgid " (%s will become dangling)"
+msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/fetch.c:922
+#: builtin/branch.c:462
#, c-format
-msgid " (%s has become dangling)"
+msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/fetch.c:954
-msgid "[deleted]"
+#: builtin/branch.c:479
+msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/fetch.c:955 builtin/remote.c:1022
-msgid "(none)"
+#: builtin/branch.c:481
+msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/fetch.c:978
+#: builtin/branch.c:492
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/fetch.c:997
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+#: builtin/branch.c:519
+msgid "Branch rename failed"
msgstr ""
-#: builtin/fetch.c:1000
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: builtin/branch.c:521
+msgid "Branch copy failed"
msgstr ""
-#: builtin/fetch.c:1076
+#: builtin/branch.c:525
#, c-format
-msgid "Don't know how to fetch from %s"
+msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/fetch.c:1236
+#: builtin/branch.c:528
#, c-format
-msgid "Fetching %s\n"
+msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/fetch.c:1238 builtin/remote.c:96
+#: builtin/branch.c:534
#, c-format
-msgid "Could not fetch %s"
+msgid "Branch renamed to %s, but HEAD is not updated!"
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/branch.c:543
+msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/fetch.c:1279
-msgid "You need to specify a tag name."
+#: builtin/branch.c:545
+msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/fetch.c:1321
-msgid "Negative depth in --deepen is not supported"
+#: builtin/branch.c:561
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/fetch.c:1323
-msgid "--deepen and --depth are mutually exclusive"
+#: builtin/branch.c:594
+msgid "Generic options"
msgstr ""
-#: builtin/fetch.c:1328
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/branch.c:596
+msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/fetch.c:1330
-msgid "--unshallow on a complete repository does not make sense"
+#: builtin/branch.c:597
+msgid "suppress informational messages"
msgstr ""
-#: builtin/fetch.c:1352
-msgid "fetch --all does not take a repository argument"
+#: builtin/branch.c:598
+msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/fetch.c:1354
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/branch.c:600
+msgid "do not use"
msgstr ""
-#: builtin/fetch.c:1365
-#, c-format
-msgid "No such remote or remote group: %s"
+#: builtin/branch.c:602 builtin/rebase--interactive.c:182
+msgid "upstream"
msgstr ""
-#: builtin/fetch.c:1373
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/branch.c:602
+msgid "change the upstream info"
msgstr ""
-#: builtin/fmt-merge-msg.c:14
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+#: builtin/branch.c:603
+msgid "Unset the upstream info"
msgstr ""
-#: builtin/fmt-merge-msg.c:663
-msgid "populate log with at most <n> entries from shortlog"
+#: builtin/branch.c:604
+msgid "use colored output"
msgstr ""
-#: builtin/fmt-merge-msg.c:666
-msgid "alias for --log (deprecated)"
+#: builtin/branch.c:605
+msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/fmt-merge-msg.c:669
-msgid "text"
+#: builtin/branch.c:607 builtin/branch.c:609
+msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
-msgid "use <text> as start of message"
+#: builtin/branch.c:608 builtin/branch.c:610
+msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/fmt-merge-msg.c:671
-msgid "file to read from"
+#: builtin/branch.c:613
+msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/for-each-ref.c:9
-msgid "git for-each-ref [<options>] [<pattern>]"
+#: builtin/branch.c:614
+msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [--points-at <object>]"
+#: builtin/branch.c:616
+msgid "delete fully merged branch"
msgstr ""
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#: builtin/branch.c:617
+msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+#: builtin/branch.c:618
+msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/for-each-ref.c:27
-msgid "quote placeholders suitably for shells"
+#: builtin/branch.c:619
+msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/for-each-ref.c:29
-msgid "quote placeholders suitably for perl"
+#: builtin/branch.c:620
+msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/for-each-ref.c:31
-msgid "quote placeholders suitably for python"
+#: builtin/branch.c:621
+msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/for-each-ref.c:33
-msgid "quote placeholders suitably for Tcl"
+#: builtin/branch.c:622
+msgid "list branch names"
msgstr ""
-#: builtin/for-each-ref.c:36
-msgid "show only <n> matched refs"
+#: builtin/branch.c:623
+msgid "create the branch's reflog"
msgstr ""
-#: builtin/for-each-ref.c:41
-msgid "print only refs which points at the given object"
+#: builtin/branch.c:625
+msgid "edit the description for the branch"
msgstr ""
-#: builtin/for-each-ref.c:43
-msgid "print only refs that are merged"
+#: builtin/branch.c:626
+msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/for-each-ref.c:44
-msgid "print only refs that are not merged"
+#: builtin/branch.c:627
+msgid "print only branches that are merged"
msgstr ""
-#: builtin/for-each-ref.c:45
-msgid "print only refs which contain the commit"
+#: builtin/branch.c:628
+msgid "print only branches that are not merged"
msgstr ""
-#: builtin/for-each-ref.c:46
-msgid "print only refs which don't contain the commit"
+#: builtin/branch.c:629
+msgid "list branches in columns"
msgstr ""
-#: builtin/fsck.c:554
-msgid "Checking object directories"
+#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:415
+msgid "key"
msgstr ""
-#: builtin/fsck.c:646
-msgid "git fsck [<options>] [<object>...]"
+#: 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/fsck.c:652
-msgid "show unreachable objects"
+#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
+#: builtin/tag.c:418
+msgid "object"
msgstr ""
-#: builtin/fsck.c:653
-msgid "show dangling objects"
+#: builtin/branch.c:634
+msgid "print only branches of the object"
msgstr ""
-#: builtin/fsck.c:654
-msgid "report tags"
+#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/fsck.c:655
-msgid "report root nodes"
+#: 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/fsck.c:656
-msgid "make index objects head nodes"
+#: builtin/branch.c:660 builtin/clone.c:746
+msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/fsck.c:657
-msgid "make reflogs head nodes (default)"
+#: builtin/branch.c:683
+msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/fsck.c:658
-msgid "also consider packs and alternate objects"
+#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+msgid "branch name required"
msgstr ""
-#: builtin/fsck.c:659
-msgid "check only connectivity"
+#: builtin/branch.c:725
+msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/fsck.c:660
-msgid "enable more strict checking"
+#: builtin/branch.c:730
+msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/fsck.c:662
-msgid "write dangling objects in .git/lost-found"
+#: builtin/branch.c:737
+#, c-format
+msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/fsck.c:663 builtin/prune.c:107
-msgid "show progress"
+#: builtin/branch.c:740
+#, c-format
+msgid "No branch named '%s'."
msgstr ""
-#: builtin/fsck.c:664
-msgid "show verbose names for reachable objects"
+#: builtin/branch.c:755
+msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/fsck.c:725
-msgid "Checking objects"
+#: builtin/branch.c:764
+msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/gc.c:25
-msgid "git gc [<options>]"
+#: builtin/branch.c:769
+msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/gc.c:78
+#: builtin/branch.c:773
#, c-format
-msgid "Failed to fstat %s: %s"
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/gc.c:306
+#: builtin/branch.c:776 builtin/branch.c:799
#, c-format
-msgid "Can't stat %s"
+msgid "no such branch '%s'"
msgstr ""
-#: builtin/gc.c:315
+#: builtin/branch.c:780
#, c-format
-msgid ""
-"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
-"Automatic cleanup will not be performed until the file is removed.\n"
-"\n"
-"%s"
+msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/gc.c:354
-msgid "prune unreferenced objects"
+#: builtin/branch.c:793
+msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/gc.c:356
-msgid "be more thorough (increased runtime)"
+#: builtin/branch.c:797
+msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/gc.c:357
-msgid "enable auto-gc mode"
+#: builtin/branch.c:803
+#, c-format
+msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/gc.c:358
-msgid "force running gc even if there may be another gc running"
+#: builtin/branch.c:813
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/gc.c:375
-#, c-format
-msgid "Failed to parse gc.logexpiry value %s"
+#: builtin/branch.c:816
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-#: builtin/gc.c:403
+#: builtin/bundle.c:45
#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
+msgid "%s is okay\n"
msgstr ""
-#: builtin/gc.c:405
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/gc.c:406
-#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/gc.c:427
-#, c-format
+#: builtin/cat-file.c:593
msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-#: builtin/gc.c:471
+#: builtin/cat-file.c:594
msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
msgstr ""
-#: builtin/grep.c:25
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+#: builtin/cat-file.c:615
+msgid "only one batch option may be specified"
msgstr ""
-#: builtin/grep.c:232
-#, c-format
-msgid "grep: failed to create thread: %s"
+#: builtin/cat-file.c:633
+msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/grep.c:290
-#, c-format
-msgid "invalid number of threads specified (%d) for %s"
+#: builtin/cat-file.c:634
+msgid "show object type"
msgstr ""
-#: builtin/grep.c:769 builtin/grep.c:810
-#, c-format
-msgid "unable to read tree (%s)"
+#: builtin/cat-file.c:635
+msgid "show object size"
msgstr ""
-#: builtin/grep.c:829
-#, c-format
-msgid "unable to grep from object of type %s"
+#: builtin/cat-file.c:637
+msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/grep.c:893
-#, c-format
-msgid "switch `%c' expects a numerical value"
+#: builtin/cat-file.c:638
+msgid "pretty-print object's content"
msgstr ""
-#: builtin/grep.c:980
-msgid "search in index instead of in the work tree"
+#: builtin/cat-file.c:640
+msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/grep.c:982
-msgid "find in contents not managed by git"
+#: builtin/cat-file.c:642
+msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/grep.c:984
-msgid "search in both tracked and untracked files"
+#: builtin/cat-file.c:643 git-submodule.sh:860
+msgid "blob"
msgstr ""
-#: builtin/grep.c:986
-msgid "ignore files specified via '.gitignore'"
+#: builtin/cat-file.c:644
+msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/grep.c:988
-msgid "recursively search in each submodule"
+#: builtin/cat-file.c:646
+msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/grep.c:990
-msgid "basename"
+#: builtin/cat-file.c:647
+msgid "buffer --batch output"
msgstr ""
-#: builtin/grep.c:991
-msgid "prepend parent project's basename to output"
+#: builtin/cat-file.c:649
+msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/grep.c:994
-msgid "show non-matching lines"
+#: builtin/cat-file.c:653
+msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/grep.c:996
-msgid "case insensitive matching"
+#: builtin/cat-file.c:657
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/grep.c:998
-msgid "match patterns only at word boundaries"
+#: builtin/cat-file.c:659
+msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/grep.c:1000
-msgid "process binary files as text"
+#: builtin/cat-file.c:661
+msgid "do not order --batch-all-objects output"
msgstr ""
-#: builtin/grep.c:1002
-msgid "don't match patterns in binary files"
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
-#: builtin/grep.c:1005
-msgid "process binary files with textconv filters"
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
-#: builtin/grep.c:1007
-msgid "descend at most <depth> levels"
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
msgstr ""
-#: builtin/grep.c:1011
-msgid "use extended POSIX regular expressions"
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/grep.c:1014
-msgid "use basic POSIX regular expressions (default)"
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
msgstr ""
-#: builtin/grep.c:1017
-msgid "interpret patterns as fixed strings"
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/grep.c:1020
-msgid "use Perl-compatible regular expressions"
+#: builtin/check-ignore.c:21 builtin/checkout.c:1280 builtin/gc.c:517
+#: builtin/worktree.c:496
+msgid "suppress progress reporting"
msgstr ""
-#: builtin/grep.c:1023
-msgid "show line numbers"
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
msgstr ""
-#: builtin/grep.c:1024
-msgid "don't show filenames"
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
msgstr ""
-#: builtin/grep.c:1025
-msgid "show filenames"
+#: builtin/check-ignore.c:160
+msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/grep.c:1027
-msgid "show filenames relative to top directory"
+#: builtin/check-ignore.c:163
+msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/grep.c:1029
-msgid "show only filenames instead of matching lines"
+#: builtin/check-ignore.c:165
+msgid "no path specified"
msgstr ""
-#: builtin/grep.c:1031
-msgid "synonym for --files-with-matches"
+#: builtin/check-ignore.c:169
+msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/grep.c:1034
-msgid "show only the names of files without match"
+#: builtin/check-ignore.c:171
+msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/grep.c:1036
-msgid "print NUL after filenames"
+#: builtin/check-ignore.c:174
+msgid "--non-matching is only valid with --verbose"
msgstr ""
-#: builtin/grep.c:1038
-msgid "show the number of matches instead of matching lines"
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
msgstr ""
-#: builtin/grep.c:1039
-msgid "highlight matches"
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
msgstr ""
-#: builtin/grep.c:1041
-msgid "print empty line between matches from different files"
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
msgstr ""
-#: builtin/grep.c:1043
-msgid "show filename only once above matches from same file"
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
msgstr ""
-#: builtin/grep.c:1046
-msgid "show <n> context lines before and after matches"
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/grep.c:1049
-msgid "show <n> context lines before matches"
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/grep.c:1051
-msgid "show <n> context lines after matches"
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
msgstr ""
-#: builtin/grep.c:1053
-msgid "use <n> worker threads"
+#: builtin/checkout-index.c:165
+msgid "force overwrite of existing files"
msgstr ""
-#: builtin/grep.c:1054
-msgid "shortcut for -C NUM"
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/grep.c:1057
-msgid "show a line with the function name before matches"
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
msgstr ""
-#: builtin/grep.c:1059
-msgid "show the surrounding function"
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
msgstr ""
-#: builtin/grep.c:1062
-msgid "read patterns from file"
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/grep.c:1064
-msgid "match <pattern>"
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
msgstr ""
-#: builtin/grep.c:1066
-msgid "combine patterns specified with -e"
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:669
+msgid "string"
msgstr ""
-#: builtin/grep.c:1078
-msgid "indicate hit with exit status without output"
+#: builtin/checkout-index.c:179
+msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/grep.c:1080
-msgid "show only matches from files that match all patterns"
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
msgstr ""
-#: builtin/grep.c:1082
-msgid "show parse tree for grep expression"
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/grep.c:1086
-msgid "pager"
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/grep.c:1086
-msgid "show matching files in the pager"
+#: builtin/checkout.c:147 builtin/checkout.c:181
+#, c-format
+msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/grep.c:1089
-msgid "allow calling of grep(1) (ignored by this build)"
+#: builtin/checkout.c:149 builtin/checkout.c:183
+#, c-format
+msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/grep.c:1153
-msgid "no pattern given."
+#: builtin/checkout.c:165
+#, c-format
+msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/grep.c:1189
-msgid "--no-index or --untracked cannot be used with revs"
+#: builtin/checkout.c:210
+#, c-format
+msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/grep.c:1195
+#: builtin/checkout.c:228
#, c-format
-msgid "unable to resolve revision: %s"
+msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/grep.c:1228 builtin/index-pack.c:1485
+#: builtin/checkout.c:244
#, c-format
-msgid "invalid number of threads specified (%d)"
+msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/grep.c:1251
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/checkout.c:267 builtin/checkout.c:270 builtin/checkout.c:273
+#: builtin/checkout.c:276
+#, c-format
+msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/grep.c:1274
-msgid "option not supported with --recurse-submodules."
+#: builtin/checkout.c:279 builtin/checkout.c:282
+#, c-format
+msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/grep.c:1280
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/checkout.c:285
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/grep.c:1286
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/checkout.c:354 builtin/checkout.c:361
+#, c-format
+msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/grep.c:1294
-msgid "both --cached and trees are given."
-msgstr ""
+#: builtin/checkout.c:397
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/hash-object.c:81
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
-msgstr ""
+#: builtin/checkout.c:402
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/hash-object.c:82
-msgid "git hash-object --stdin-paths"
-msgstr ""
+#: builtin/checkout.c:409
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/hash-object.c:94
-msgid "type"
+#: builtin/checkout.c:645
+msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/hash-object.c:94
-msgid "object type"
+#: builtin/checkout.c:782
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/hash-object.c:95
-msgid "write the object into the object database"
+#: builtin/checkout.c:824
+msgid "HEAD is now at"
msgstr ""
-#: builtin/hash-object.c:97
-msgid "read the object from stdin"
+#: builtin/checkout.c:828 builtin/clone.c:699
+msgid "unable to update HEAD"
msgstr ""
-#: builtin/hash-object.c:99
-msgid "store file as is without filters"
+#: builtin/checkout.c:832
+#, c-format
+msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/hash-object.c:100
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
+#: builtin/checkout.c:835
+#, c-format
+msgid "Already on '%s'\n"
msgstr ""
-#: builtin/hash-object.c:101
-msgid "process file as it were from this path"
+#: builtin/checkout.c:839
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/help.c:42
-msgid "print all available commands"
+#: builtin/checkout.c:841 builtin/checkout.c:1212
+#, c-format
+msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/help.c:43
-msgid "exclude guides"
+#: builtin/checkout.c:843
+#, c-format
+msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/help.c:44
-msgid "print list of useful guides"
+#: builtin/checkout.c:894
+#, c-format
+msgid " ... and %d more.\n"
msgstr ""
-#: builtin/help.c:45
-msgid "show man page"
-msgstr ""
+#: builtin/checkout.c:900
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/help.c:46
-msgid "show manual in web browser"
+#: builtin/checkout.c:919
+#, c-format
+msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:951
+msgid "internal error in revision walk"
msgstr ""
-#: builtin/help.c:48
-msgid "show info page"
+#: builtin/checkout.c:955
+msgid "Previous HEAD position was"
msgstr ""
-#: builtin/help.c:54
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/checkout.c:983 builtin/checkout.c:1207
+msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/help.c:66
+#: builtin/checkout.c:1104
#, c-format
-msgid "unrecognized help format '%s'"
+msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/help.c:93
-msgid "Failed to start emacsclient."
+#: builtin/checkout.c:1140
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/help.c:106
-msgid "Failed to parse emacsclient version."
+#: builtin/checkout.c:1153 builtin/worktree.c:290 builtin/worktree.c:445
+#, c-format
+msgid "invalid reference: %s"
msgstr ""
-#: builtin/help.c:114
+#: builtin/checkout.c:1182
#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
-#, c-format
-msgid "failed to exec '%s'"
+#: builtin/checkout.c:1221
+msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/help.c:207
+#: builtin/checkout.c:1224 builtin/checkout.c:1228
#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/help.c:219
+#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240
+#: builtin/checkout.c:1243
#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/help.c:336
+#: builtin/checkout.c:1248
#, c-format
-msgid "'%s': unknown man viewer."
+msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/help.c:353
-msgid "no man viewer handled the request"
+#: builtin/checkout.c:1281 builtin/checkout.c:1283 builtin/clone.c:120
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:489
+#: builtin/worktree.c:491
+msgid "branch"
msgstr ""
-#: builtin/help.c:361
-msgid "no info viewer handled the request"
+#: builtin/checkout.c:1282
+msgid "create and checkout a new branch"
msgstr ""
-#: builtin/help.c:403
-msgid "Defining attributes per path"
+#: builtin/checkout.c:1284
+msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/help.c:404
-msgid "Everyday Git With 20 Commands Or So"
+#: builtin/checkout.c:1285
+msgid "create reflog for new branch"
msgstr ""
-#: builtin/help.c:405
-msgid "A Git glossary"
+#: builtin/checkout.c:1286 builtin/worktree.c:493
+msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/help.c:406
-msgid "Specifies intentionally untracked files to ignore"
+#: builtin/checkout.c:1287
+msgid "set upstream info for new branch"
msgstr ""
-#: builtin/help.c:407
-msgid "Defining submodule properties"
+#: builtin/checkout.c:1289
+msgid "new-branch"
msgstr ""
-#: builtin/help.c:408
-msgid "Specifying revisions and ranges for Git"
+#: builtin/checkout.c:1289
+msgid "new unparented branch"
msgstr ""
-#: builtin/help.c:409
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+#: builtin/checkout.c:1291
+msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/help.c:410
-msgid "An overview of recommended workflows with Git"
+#: builtin/checkout.c:1294
+msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/help.c:422
-msgid "The common Git guides are:\n"
+#: builtin/checkout.c:1296
+msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/help.c:440
-#, c-format
-msgid "`git %s' is aliased to `%s'"
+#: builtin/checkout.c:1298
+msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/help.c:462 builtin/help.c:479
-#, c-format
-msgid "usage: %s%s"
+#: builtin/checkout.c:1300 builtin/merge.c:276
+msgid "update ignored files (default)"
msgstr ""
-#: builtin/index-pack.c:154
-#, c-format
-msgid "unable to open %s"
+#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272
+msgid "style"
msgstr ""
-#: builtin/index-pack.c:204
-#, c-format
-msgid "object type mismatch at %s"
+#: builtin/checkout.c:1303
+msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/index-pack.c:224
-#, c-format
-msgid "did not receive expected object %s"
+#: builtin/checkout.c:1306
+msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/index-pack.c:227
-#, c-format
-msgid "object %s: expected type %s, found %s"
+#: builtin/checkout.c:1308
+msgid "do not second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/index-pack.c:269
-#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/checkout.c:1310
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
-#: builtin/index-pack.c:279
-msgid "early EOF"
+#: builtin/checkout.c:1314 builtin/clone.c:87 builtin/fetch.c:141
+#: builtin/merge.c:273 builtin/pull.c:130 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
msgstr ""
-#: builtin/index-pack.c:280
-msgid "read error on input"
+#: builtin/checkout.c:1345
+msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/index-pack.c:292
-msgid "used more bytes than were available"
+#: builtin/checkout.c:1362
+msgid "--track needs a branch name"
msgstr ""
-#: builtin/index-pack.c:299
-msgid "pack too large for current definition of off_t"
+#: builtin/checkout.c:1367
+msgid "missing branch name; try -b"
msgstr ""
-#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
-msgid "pack exceeds maximum allowed size"
+#: builtin/checkout.c:1404
+msgid "invalid path specification"
msgstr ""
-#: builtin/index-pack.c:317
+#: builtin/checkout.c:1411
#, c-format
-msgid "unable to create '%s'"
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/index-pack.c:323
+#: builtin/checkout.c:1415
#, c-format
-msgid "cannot open packfile '%s'"
+msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/index-pack.c:337
-msgid "pack signature mismatch"
+#: builtin/checkout.c:1419
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
msgstr ""
-#: builtin/index-pack.c:339
+#: builtin/checkout.c:1439
#, c-format
-msgid "pack version %<PRIu32> unsupported"
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/index-pack.c:357
+#: builtin/clean.c:32
#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgid "Removing %s\n"
msgstr ""
-#: builtin/index-pack.c:479
+#: builtin/clean.c:33
#, c-format
-msgid "inflate returned %d"
+msgid "Would remove %s\n"
msgstr ""
-#: builtin/index-pack.c:528
-msgid "offset value overflow for delta base object"
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/index-pack.c:536
-msgid "delta base offset is out of bound"
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/index-pack.c:544
+#: builtin/clean.c:36
#, c-format
-msgid "unknown object type %d"
+msgid "failed to remove %s"
msgstr ""
-#: builtin/index-pack.c:575
-msgid "cannot pread pack file"
+#: builtin/clean.c:299 git-add--interactive.perl:579
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing\n"
msgstr ""
-#: builtin/index-pack.c:577
+#: builtin/clean.c:303 git-add--interactive.perl:588
#, 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] ""
+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/index-pack.c:603
-msgid "serious inflate inconsistency"
+#: builtin/clean.c:519 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/clean.c:661
#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/index-pack.c:752 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:257
+#: builtin/clean.c:698
#, c-format
-msgid "unable to read %s"
+msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/index-pack.c:814
-#, c-format
-msgid "cannot read existing object info %s"
+#: builtin/clean.c:719
+msgid "Select items to delete"
msgstr ""
-#: builtin/index-pack.c:822
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:760
#, c-format
-msgid "cannot read existing object %s"
+msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/index-pack.c:836
+#: builtin/clean.c:785 git-add--interactive.perl:1717
#, c-format
-msgid "invalid blob object %s"
+msgid "Bye.\n"
msgstr ""
-#: builtin/index-pack.c:850
-#, c-format
-msgid "invalid %s"
+#: builtin/clean.c:793
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
msgstr ""
-#: builtin/index-pack.c:853
-msgid "Error in object"
+#: builtin/clean.c:820 git-add--interactive.perl:1793
+msgid "*** Commands ***"
msgstr ""
-#: builtin/index-pack.c:855
-#, c-format
-msgid "Not all child objects of %s are reachable"
+#: builtin/clean.c:821 git-add--interactive.perl:1790
+msgid "What now"
msgstr ""
-#: builtin/index-pack.c:927 builtin/index-pack.c:958
-msgid "failed to apply delta"
+#: builtin/clean.c:829
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/clean.c:845
+msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/index-pack.c:1128
-msgid "Receiving objects"
+#: builtin/clean.c:907
+msgid "do not print names of files removed"
msgstr ""
-#: builtin/index-pack.c:1128
-msgid "Indexing objects"
+#: builtin/clean.c:909
+msgid "force"
msgstr ""
-#: builtin/index-pack.c:1160
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/clean.c:910
+msgid "interactive cleaning"
msgstr ""
-#: builtin/index-pack.c:1165
-msgid "cannot fstat packfile"
+#: builtin/clean.c:912
+msgid "remove whole directories"
msgstr ""
-#: builtin/index-pack.c:1168
-msgid "pack has junk at the end"
+#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:897 builtin/log.c:167 builtin/log.c:169
+#: builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/show-ref.c:178
+msgid "pattern"
msgstr ""
-#: builtin/index-pack.c:1179
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: builtin/clean.c:914
+msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/index-pack.c:1202
-msgid "Resolving deltas"
+#: builtin/clean.c:915
+msgid "remove ignored files, too"
msgstr ""
-#: builtin/index-pack.c:1213
-#, c-format
-msgid "unable to create thread: %s"
+#: builtin/clean.c:917
+msgid "remove only ignored files"
msgstr ""
-#: builtin/index-pack.c:1255
-msgid "confusion beyond insanity"
+#: builtin/clean.c:935
+msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/index-pack.c:1261
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/clean.c:939
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
-#: builtin/index-pack.c:1273
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
+#: builtin/clean.c:942
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
msgstr ""
-#: builtin/index-pack.c:1277
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/clone.c:44
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
-#: builtin/index-pack.c:1301
-#, c-format
-msgid "unable to deflate appended object (%d)"
+#: builtin/clone.c:89
+msgid "don't create a checkout"
msgstr ""
-#: builtin/index-pack.c:1377
-#, c-format
-msgid "local object %s is corrupt"
+#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481
+msgid "create a bare repository"
msgstr ""
-#: builtin/index-pack.c:1403
-msgid "error while closing pack file"
+#: builtin/clone.c:94
+msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/index-pack.c:1415
-#, c-format
-msgid "cannot write keep file '%s'"
+#: builtin/clone.c:96
+msgid "to clone from a local repository"
msgstr ""
-#: builtin/index-pack.c:1423
-#, c-format
-msgid "cannot close written keep file '%s'"
+#: builtin/clone.c:98
+msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/index-pack.c:1433
-msgid "cannot store pack file"
+#: builtin/clone.c:100
+msgid "setup as shared repository"
msgstr ""
-#: builtin/index-pack.c:1441
-msgid "cannot store index file"
+#: builtin/clone.c:102 builtin/clone.c:106
+msgid "pathspec"
msgstr ""
-#: builtin/index-pack.c:1479
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+#: builtin/clone.c:102 builtin/clone.c:106
+msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
-#, c-format
-msgid "no threads support, ignoring %s"
+#: builtin/clone.c:109
+msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/index-pack.c:1547
-#, c-format
-msgid "Cannot open existing pack file '%s'"
+#: builtin/clone.c:110 builtin/init-db.c:478
+msgid "template-directory"
msgstr ""
-#: builtin/index-pack.c:1549
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+#: builtin/clone.c:111 builtin/init-db.c:479
+msgid "directory from which templates will be used"
msgstr ""
-#: builtin/index-pack.c:1596
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1860
+msgid "reference repository"
+msgstr ""
-#: builtin/index-pack.c:1603
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/clone.c:117 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1862
+msgid "use --reference only while cloning"
+msgstr ""
-#: builtin/index-pack.c:1616
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3303 builtin/repack.c:329
+msgid "name"
msgstr ""
-#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
-#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
-#, c-format
-msgid "bad %s"
+#: builtin/clone.c:119
+msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/index-pack.c:1737
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/clone.c:121
+msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/index-pack.c:1739
-msgid "--stdin requires a git repository"
+#: builtin/clone.c:123
+msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/index-pack.c:1747
-msgid "--verify with no packfile name given"
+#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:218
+msgid "depth"
msgstr ""
-#: builtin/init-db.c:54
-#, c-format
-msgid "cannot stat '%s'"
+#: builtin/clone.c:125
+msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/init-db.c:60
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292
+msgid "time"
msgstr ""
-#: builtin/init-db.c:65
-#, c-format
-msgid "cannot opendir '%s'"
+#: builtin/clone.c:127
+msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/init-db.c:76
-#, c-format
-msgid "cannot readlink '%s'"
+#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1039
+msgid "revision"
msgstr ""
-#: builtin/init-db.c:78
-#, c-format
-msgid "cannot symlink '%s' '%s'"
+#: builtin/clone.c:129 builtin/fetch.c:147
+msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/init-db.c:84
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: builtin/clone.c:131
+msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/init-db.c:88
-#, c-format
-msgid "ignoring template %s"
+#: builtin/clone.c:133
+msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/init-db.c:119
-#, c-format
-msgid "templates not found %s"
+#: builtin/clone.c:135
+msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/init-db.c:134
-#, c-format
-msgid "not copying templates from '%s': %s"
+#: builtin/clone.c:136 builtin/init-db.c:487
+msgid "gitdir"
msgstr ""
-#: builtin/init-db.c:327
-#, c-format
-msgid "unable to handle file type %d"
+#: builtin/clone.c:137 builtin/init-db.c:488
+msgid "separate git dir from working tree"
msgstr ""
-#: builtin/init-db.c:330
-#, c-format
-msgid "unable to move %s to %s"
+#: builtin/clone.c:138
+msgid "key=value"
msgstr ""
-#: builtin/init-db.c:347 builtin/init-db.c:350
-#, c-format
-msgid "%s already exists"
+#: builtin/clone.c:139
+msgid "set config inside the new repository"
msgstr ""
-#: builtin/init-db.c:403
-#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
+#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231
+#: builtin/push.c:586
+msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/init-db.c:404
-#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234
+#: builtin/push.c:588
+msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/init-db.c:408
-#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
+#: builtin/clone.c:280
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
msgstr ""
-#: builtin/init-db.c:409
+#: builtin/clone.c:333
#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
+msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/init-db.c:457
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+#: builtin/clone.c:405
+#, c-format
+msgid "failed to open '%s'"
msgstr ""
-#: builtin/init-db.c:480
-msgid "permissions"
+#: builtin/clone.c:413
+#, c-format
+msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/init-db.c:481
-msgid "specify that the git repository is to be shared amongst several users"
+#: builtin/clone.c:427
+#, c-format
+msgid "failed to stat %s\n"
msgstr ""
-#: builtin/init-db.c:515 builtin/init-db.c:520
+#: builtin/clone.c:444
#, c-format
-msgid "cannot mkdir %s"
+msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/init-db.c:524
+#: builtin/clone.c:449
#, c-format
-msgid "cannot chdir to %s"
+msgid "failed to create link '%s'"
msgstr ""
-#: builtin/init-db.c:545
+#: builtin/clone.c:453
#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/init-db.c:573
+#: builtin/clone.c:479
#, c-format
-msgid "Cannot access work tree '%s'"
+msgid "done.\n"
msgstr ""
-#: builtin/interpret-trailers.c:15
+#: builtin/clone.c:493
msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
-msgstr ""
-
-#: builtin/interpret-trailers.c:26
-msgid "edit files in place"
+"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/interpret-trailers.c:27
-msgid "trim empty trailers"
+#: builtin/clone.c:570
+#, c-format
+msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/interpret-trailers.c:28
-msgid "trailer"
+#: builtin/clone.c:687
+#, c-format
+msgid "unable to update %s"
msgstr ""
-#: builtin/interpret-trailers.c:29
-msgid "trailer(s) to add"
+#: builtin/clone.c:737
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/interpret-trailers.c:42
-msgid "no input file given for in-place editing"
+#: builtin/clone.c:768
+msgid "unable to checkout working tree"
msgstr ""
-#: builtin/log.c:44
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+#: builtin/clone.c:813
+msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/log.c:45
-msgid "git show [<options>] <object>..."
+#: builtin/clone.c:876
+msgid "cannot repack to clean up"
msgstr ""
-#: builtin/log.c:89
-#, c-format
-msgid "invalid --decorate option: %s"
+#: builtin/clone.c:878
+msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/log.c:144
-msgid "suppress diff output"
+#: builtin/clone.c:918 builtin/receive-pack.c:1941
+msgid "Too many arguments."
msgstr ""
-#: builtin/log.c:145
-msgid "show source"
+#: builtin/clone.c:922
+msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/log.c:146
-msgid "Use mail map file"
+#: builtin/clone.c:935
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/log.c:147
-msgid "decorate options"
+#: builtin/clone.c:938
+msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/log.c:150
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/clone.c:951
+#, c-format
+msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/log.c:246
+#: builtin/clone.c:957 builtin/fetch.c:1608
#, c-format
-msgid "Final output: %d %s\n"
+msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/log.c:493
+#: builtin/clone.c:967
#, c-format
-msgid "git show %s: bad file"
+msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/log.c:507 builtin/log.c:601
+#: builtin/clone.c:977
#, c-format
-msgid "Could not read object %s"
+msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/log.c:625
+#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272
+#: builtin/worktree.c:296 builtin/worktree.c:326
#, c-format
-msgid "Unknown type: %d"
+msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/log.c:746
-msgid "format.headers without value"
+#: builtin/clone.c:997
+#, c-format
+msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/log.c:846
-msgid "name of output directory is too long"
+#: builtin/clone.c:1017
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/log.c:861
+#: builtin/clone.c:1019
#, c-format
-msgid "Cannot open patch file %s"
+msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/log.c:875
-msgid "Need exactly one range."
+#: builtin/clone.c:1043
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
msgstr ""
-#: builtin/log.c:885
-msgid "Not a range."
+#: builtin/clone.c:1104
+msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/log.c:991
-msgid "Cover letter needs email format"
+#: builtin/clone.c:1106
+msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/log.c:1071
-#, c-format
-msgid "insane in-reply-to: %s"
+#: builtin/clone.c:1108
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/log.c:1098
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
+#: builtin/clone.c:1110
+msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/log.c:1148
-msgid "Two output directories?"
+#: builtin/clone.c:1113
+msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/clone.c:1118
+msgid "--local is ignored"
msgstr ""
-#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
+#: builtin/clone.c:1192 builtin/clone.c:1200
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/log.c:1270
-msgid "Could not find exact merge base."
+#: builtin/clone.c:1203
+msgid "You appear to have cloned an empty repository."
msgstr ""
-#: builtin/log.c:1274
-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/column.c:10
+msgid "git column [<options>]"
msgstr ""
-#: builtin/log.c:1294
-msgid "Failed to find exact merge base"
+#: builtin/column.c:27
+msgid "lookup config vars"
msgstr ""
-#: builtin/log.c:1305
-msgid "base commit should be the ancestor of revision list"
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
msgstr ""
-#: builtin/log.c:1309
-msgid "base commit shouldn't be in revision list"
+#: builtin/column.c:30
+msgid "Maximum width"
msgstr ""
-#: builtin/log.c:1358
-msgid "cannot get patch id"
+#: builtin/column.c:31
+msgid "Padding space on left border"
msgstr ""
-#: builtin/log.c:1415
-msgid "use [PATCH n/m] even with a single patch"
+#: builtin/column.c:32
+msgid "Padding space on right border"
msgstr ""
-#: builtin/log.c:1418
-msgid "use [PATCH] even with multiple patches"
+#: builtin/column.c:33
+msgid "Padding space between columns"
msgstr ""
-#: builtin/log.c:1422
-msgid "print patches to standard out"
+#: builtin/column.c:51
+msgid "--command must be the first argument"
msgstr ""
-#: builtin/log.c:1424
-msgid "generate a cover letter"
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/log.c:1426
-msgid "use simple number sequence for output file names"
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/log.c:1427
-msgid "sfx"
+#: builtin/commit.c:51
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-#: builtin/log.c:1428
-msgid "use <sfx> instead of '.patch'"
-msgstr ""
-
-#: builtin/log.c:1430
-msgid "start numbering patches at <n> instead of 1"
-msgstr ""
-
-#: builtin/log.c:1432
-msgid "mark the series as Nth re-roll"
+#: builtin/commit.c:56
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
msgstr ""
-#: builtin/log.c:1434
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/log.c:1437
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/commit.c:66
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
msgstr ""
-#: builtin/log.c:1440
-msgid "store resulting files in <dir>"
+#: builtin/commit.c:312
+msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/log.c:1443
-msgid "don't strip/add [PATCH]"
+#: builtin/commit.c:353
+msgid "unable to create temporary index"
msgstr ""
-#: builtin/log.c:1446
-msgid "don't output binary diffs"
+#: builtin/commit.c:359
+msgid "interactive add failed"
msgstr ""
-#: builtin/log.c:1448
-msgid "output all-zero hash in From header"
+#: builtin/commit.c:373
+msgid "unable to update temporary index"
msgstr ""
-#: builtin/log.c:1450
-msgid "don't include a patch matching a commit upstream"
+#: builtin/commit.c:375
+msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/log.c:1452
-msgid "show patch format instead of default (patch + stat)"
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+msgid "unable to write new_index file"
msgstr ""
-#: builtin/log.c:1454
-msgid "Messaging"
+#: builtin/commit.c:452
+msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/log.c:1455
-msgid "header"
+#: builtin/commit.c:454
+msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/log.c:1456
-msgid "add email header"
+#: builtin/commit.c:462
+msgid "cannot read the index"
msgstr ""
-#: builtin/log.c:1457 builtin/log.c:1459
-msgid "email"
+#: builtin/commit.c:481
+msgid "unable to write temporary index file"
msgstr ""
-#: builtin/log.c:1457
-msgid "add To: header"
+#: builtin/commit.c:579
+#, c-format
+msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/log.c:1459
-msgid "add Cc: header"
+#: builtin/commit.c:581
+#, c-format
+msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/log.c:1461
-msgid "ident"
+#: builtin/commit.c:600
+msgid "malformed --author parameter"
msgstr ""
-#: builtin/log.c:1462
-msgid "set From address to <ident> (or committer ident if absent)"
+#: builtin/commit.c:652
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
msgstr ""
-#: builtin/log.c:1464
-msgid "message-id"
+#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052
+#, c-format
+msgid "could not lookup commit %s"
msgstr ""
-#: builtin/log.c:1465
-msgid "make first mail a reply to <message-id>"
+#: builtin/commit.c:701 builtin/shortlog.c:319
+#, c-format
+msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/log.c:1466 builtin/log.c:1469
-msgid "boundary"
+#: builtin/commit.c:703
+msgid "could not read log from standard input"
msgstr ""
-#: builtin/log.c:1467
-msgid "attach the patch"
+#: builtin/commit.c:707
+#, c-format
+msgid "could not read log file '%s'"
msgstr ""
-#: builtin/log.c:1470
-msgid "inline the patch"
+#: builtin/commit.c:736 builtin/commit.c:744
+msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/log.c:1474
-msgid "enable message threading, styles: shallow, deep"
+#: builtin/commit.c:741
+msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/log.c:1476
-msgid "signature"
+#: builtin/commit.c:795
+msgid "could not write commit template"
msgstr ""
-#: builtin/log.c:1477
-msgid "add a signature"
+#: builtin/commit.c:813
+#, 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"
msgstr ""
-#: builtin/log.c:1478
-msgid "base-commit"
+#: builtin/commit.c:818
+#, 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"
msgstr ""
-#: builtin/log.c:1479
-msgid "add prerequisite tree info to the patch series"
+#: builtin/commit.c:831
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/log.c:1481
-msgid "add a signature from a file"
+#: builtin/commit.c:839
+#, 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"
msgstr ""
-#: builtin/log.c:1482
-msgid "don't print the patch filenames"
+#: builtin/commit.c:856
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/log.c:1572
-msgid "-n and -k are mutually exclusive."
+#: builtin/commit.c:864
+#, c-format
+msgid "%sDate: %s"
msgstr ""
-#: builtin/log.c:1574
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+#: builtin/commit.c:871
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/log.c:1582
-msgid "--name-only does not make sense"
+#: builtin/commit.c:889
+msgid "Cannot read index"
msgstr ""
-#: builtin/log.c:1584
-msgid "--name-status does not make sense"
+#: builtin/commit.c:956
+msgid "Error building trees"
msgstr ""
-#: builtin/log.c:1586
-msgid "--check does not make sense"
+#: builtin/commit.c:970 builtin/tag.c:258
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/log.c:1616
-msgid "standard output, or directory, which one?"
+#: builtin/commit.c:1014
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/log.c:1618
+#: builtin/commit.c:1028
#, c-format
-msgid "Could not create directory '%s'"
+msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/log.c:1712
+#: builtin/commit.c:1042 builtin/commit.c:1279
#, c-format
-msgid "unable to read signature file '%s'"
+msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/log.c:1784
-msgid "Failed to create output files"
+#: builtin/commit.c:1080
+msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/log.c:1833
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+#: builtin/commit.c:1113
+msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/log.c:1887
-#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+#: builtin/commit.c:1122
+msgid "You have nothing to amend."
msgstr ""
-#: builtin/ls-files.c:461
-msgid "git ls-files [<options>] [<file>...]"
+#: builtin/commit.c:1125
+msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/ls-files.c:510
-msgid "identify the file status with tags"
+#: builtin/commit.c:1127
+msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/ls-files.c:512
-msgid "use lowercase letters for 'assume unchanged' files"
+#: builtin/commit.c:1130
+msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/ls-files.c:514
-msgid "show cached files in the output (default)"
+#: builtin/commit.c:1140
+msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/ls-files.c:516
-msgid "show deleted files in the output"
+#: builtin/commit.c:1142
+msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/ls-files.c:518
-msgid "show modified files in the output"
+#: builtin/commit.c:1150
+msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/ls-files.c:520
-msgid "show other files in the output"
+#: builtin/commit.c:1167
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/ls-files.c:522
-msgid "show ignored files in the output"
+#: builtin/commit.c:1169
+msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/ls-files.c:525
-msgid "show staged contents' object name in the output"
+#: builtin/commit.c:1183 builtin/tag.c:546
+#, c-format
+msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/ls-files.c:527
-msgid "show files on the filesystem that need to be removed"
+#: builtin/commit.c:1188
+msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/ls-files.c:529
-msgid "show 'other' directories' names only"
+#: builtin/commit.c:1314 builtin/commit.c:1498
+msgid "show status concisely"
msgstr ""
-#: builtin/ls-files.c:531
-msgid "show line endings of files"
+#: builtin/commit.c:1316 builtin/commit.c:1500
+msgid "show branch information"
msgstr ""
-#: builtin/ls-files.c:533
-msgid "don't show empty directories"
+#: builtin/commit.c:1318
+msgid "show stash information"
msgstr ""
-#: builtin/ls-files.c:536
-msgid "show unmerged files in the output"
+#: builtin/commit.c:1320 builtin/commit.c:1502
+msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/ls-files.c:538
-msgid "show resolve-undo information"
+#: builtin/commit.c:1322
+msgid "version"
msgstr ""
-#: builtin/ls-files.c:540
-msgid "skip files matching pattern"
+#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561
+#: builtin/worktree.c:640
+msgid "machine-readable output"
msgstr ""
-#: builtin/ls-files.c:543
-msgid "exclude patterns are read from <file>"
+#: builtin/commit.c:1325 builtin/commit.c:1506
+msgid "show status in long format (default)"
msgstr ""
-#: builtin/ls-files.c:546
-msgid "read additional per-directory exclude patterns in <file>"
+#: builtin/commit.c:1328 builtin/commit.c:1509
+msgid "terminate entries with NUL"
msgstr ""
-#: builtin/ls-files.c:548
-msgid "add the standard git exclusions"
+#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512
+#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1118
+#: builtin/tag.c:400
+msgid "mode"
msgstr ""
-#: builtin/ls-files.c:551
-msgid "make the output relative to the project top directory"
+#: builtin/commit.c:1331 builtin/commit.c:1512
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/ls-files.c:554
-msgid "recurse through submodules"
+#: builtin/commit.c:1335
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
msgstr ""
-#: builtin/ls-files.c:556
-msgid "if any <file> is not in the index, treat this as an error"
+#: builtin/commit.c:1337 parse-options.h:164
+msgid "when"
msgstr ""
-#: builtin/ls-files.c:557
-msgid "tree-ish"
+#: builtin/commit.c:1338
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
msgstr ""
-#: builtin/ls-files.c:558
-msgid "pretend that paths removed since <tree-ish> are still present"
+#: builtin/commit.c:1340
+msgid "list untracked files in columns"
msgstr ""
-#: builtin/ls-files.c:560
-msgid "show debugging data"
+#: builtin/commit.c:1341
+msgid "do not detect renames"
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/commit.c:1343
+msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/ls-remote.c:52
-msgid "do not print remote URL"
+#: builtin/commit.c:1363
+msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
-msgid "exec"
+#: builtin/commit.c:1468
+msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
-msgid "path of git-upload-pack on the remote host"
+#: builtin/commit.c:1469
+msgid "show diff in commit message template"
msgstr ""
-#: builtin/ls-remote.c:58
-msgid "limit to tags"
+#: builtin/commit.c:1471
+msgid "Commit message options"
msgstr ""
-#: builtin/ls-remote.c:59
-msgid "limit to heads"
+#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397
+msgid "read message from file"
msgstr ""
-#: builtin/ls-remote.c:60
-msgid "do not show peeled tags"
+#: builtin/commit.c:1473
+msgid "author"
msgstr ""
-#: builtin/ls-remote.c:62
-msgid "take url.<base>.insteadOf into account"
+#: builtin/commit.c:1473
+msgid "override author for commit"
msgstr ""
-#: builtin/ls-remote.c:64
-msgid "exit with exit code 2 if no matching refs are found"
+#: builtin/commit.c:1474 builtin/gc.c:518
+msgid "date"
msgstr ""
-#: builtin/ls-remote.c:66
-msgid "show underlying ref in addition to the object pointed by it"
+#: builtin/commit.c:1474
+msgid "override date for commit"
msgstr ""
-#: builtin/ls-tree.c:28
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409
+#: builtin/notes.c:575 builtin/tag.c:395
+msgid "message"
msgstr ""
-#: builtin/ls-tree.c:126
-msgid "only show trees"
+#: builtin/commit.c:1475
+msgid "commit message"
msgstr ""
-#: builtin/ls-tree.c:128
-msgid "recurse into subtrees"
+#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478
+#: builtin/commit.c:1479 parse-options.h:278 ref-filter.h:92
+msgid "commit"
msgstr ""
-#: builtin/ls-tree.c:130
-msgid "show trees when recursing"
+#: builtin/commit.c:1476
+msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/ls-tree.c:133
-msgid "terminate entries with NUL byte"
+#: builtin/commit.c:1477
+msgid "reuse message from specified commit"
msgstr ""
-#: builtin/ls-tree.c:134
-msgid "include object size"
+#: builtin/commit.c:1478
+msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
-msgid "list only filenames"
+#: builtin/commit.c:1479
+msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/ls-tree.c:141
-msgid "use full path names"
+#: builtin/commit.c:1480
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/ls-tree.c:143
-msgid "list entire tree; not just current directory (implies --full-name)"
+#: builtin/commit.c:1481 builtin/log.c:1533 builtin/merge.c:277
+#: builtin/pull.c:156 builtin/revert.c:107
+msgid "add Signed-off-by:"
msgstr ""
-#: builtin/merge.c:46
-msgid "git merge [<options>] [<commit>...]"
+#: builtin/commit.c:1482
+msgid "use specified template file"
msgstr ""
-#: builtin/merge.c:47
-msgid "git merge --abort"
+#: builtin/commit.c:1483
+msgid "force edit of commit"
msgstr ""
-#: builtin/merge.c:48
-msgid "git merge --continue"
+#: builtin/commit.c:1484
+msgid "default"
msgstr ""
-#: builtin/merge.c:103
-msgid "switch `m' requires a value"
+#: builtin/commit.c:1484 builtin/tag.c:401
+msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/merge.c:140
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+#: builtin/commit.c:1485
+msgid "include status in commit message template"
msgstr ""
-#: builtin/merge.c:141
-#, c-format
-msgid "Available strategies are:"
+#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186
+#: builtin/revert.c:115
+msgid "GPG sign commit"
msgstr ""
-#: builtin/merge.c:146
-#, c-format
-msgid "Available custom strategies are:"
+#: builtin/commit.c:1490
+msgid "Commit contents options"
msgstr ""
-#: builtin/merge.c:196 builtin/pull.c:127
-msgid "do not show a diffstat at the end of the merge"
+#: builtin/commit.c:1491
+msgid "commit all changed files"
msgstr ""
-#: builtin/merge.c:199 builtin/pull.c:130
-msgid "show a diffstat at the end of the merge"
+#: builtin/commit.c:1492
+msgid "add specified files to index for commit"
msgstr ""
-#: builtin/merge.c:200 builtin/pull.c:133
-msgid "(synonym to --stat)"
-msgstr ""
-
-#: builtin/merge.c:202 builtin/pull.c:136
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+#: builtin/commit.c:1493
+msgid "interactively add files"
msgstr ""
-#: builtin/merge.c:205 builtin/pull.c:139
-msgid "create a single commit instead of doing a merge"
+#: builtin/commit.c:1494
+msgid "interactively add changes"
msgstr ""
-#: builtin/merge.c:207 builtin/pull.c:142
-msgid "perform a commit if the merge succeeds (default)"
+#: builtin/commit.c:1495
+msgid "commit only specified files"
msgstr ""
-#: builtin/merge.c:209 builtin/pull.c:145
-msgid "edit message before committing"
+#: builtin/commit.c:1496
+msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/merge.c:210
-msgid "allow fast-forward (default)"
+#: builtin/commit.c:1497
+msgid "show what would be committed"
msgstr ""
-#: builtin/merge.c:212 builtin/pull.c:151
-msgid "abort if fast-forward is not possible"
+#: builtin/commit.c:1510
+msgid "amend previous commit"
msgstr ""
-#: builtin/merge.c:216 builtin/pull.c:154
-msgid "verify that the named commit has a valid GPG signature"
+#: builtin/commit.c:1511
+msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
-#: builtin/revert.c:108
-msgid "strategy"
+#: builtin/commit.c:1516
+msgid "ok to record an empty change"
msgstr ""
-#: builtin/merge.c:218 builtin/pull.c:159
-msgid "merge strategy to use"
+#: builtin/commit.c:1518
+msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:162
-msgid "option=value"
+#: builtin/commit.c:1591
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/merge.c:220 builtin/pull.c:163
-msgid "option for selected merge strategy"
+#: builtin/commit.c:1598
+msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/merge.c:222
-msgid "merge commit message (for a non-fast-forward merge)"
+#: builtin/commit.c:1617
+#, c-format
+msgid "could not read commit message: %s"
msgstr ""
-#: builtin/merge.c:226
-msgid "abort the current in-progress merge"
+#: builtin/commit.c:1628
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/merge.c:228
-msgid "continue the current in-progress merge"
+#: builtin/commit.c:1633
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/merge.c:230 builtin/pull.c:170
-msgid "allow merging unrelated histories"
+#: builtin/commit.c:1668
+msgid ""
+"repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
-#: builtin/merge.c:258
-msgid "could not run stash."
+#: builtin/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/merge.c:263
-msgid "stash failed"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/merge.c:268
-#, c-format
-msgid "not a valid object: %s"
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
msgstr ""
-#: builtin/merge.c:287 builtin/merge.c:304
-msgid "read-tree failed"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
msgstr ""
-#: builtin/merge.c:334
-msgid " (nothing to squash)"
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
+#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
+#: builtin/log.c:1553
+msgid "dir"
msgstr ""
-#: builtin/merge.c:345
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
+#: 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/merge.c:395
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
+#: builtin/commit-graph.c:135
+msgid "start walk at all refs"
msgstr ""
-#: builtin/merge.c:446
-#, c-format
-msgid "'%s' does not point to a commit"
+#: builtin/commit-graph.c:137
+msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/merge.c:536
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+#: builtin/commit-graph.c:139
+msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/merge.c:656
-msgid "Not handling anything other than two heads merge."
+#: builtin/commit-graph.c:141
+msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/merge.c:670
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+#: builtin/commit-graph.c:150
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
-#: builtin/merge.c:685
-#, c-format
-msgid "unable to write %s"
+#: builtin/config.c:11
+msgid "git config [<options>]"
msgstr ""
-#: builtin/merge.c:737
+#: builtin/config.c:103
#, c-format
-msgid "Could not read from '%s'"
+msgid "unrecognized --type argument, %s"
msgstr ""
-#: builtin/merge.c:746
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+#: builtin/config.c:115
+msgid "only one type at a time"
msgstr ""
-#: builtin/merge.c:752
-#, c-format
-msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
+#: builtin/config.c:124
+msgid "Config file location"
msgstr ""
-#: builtin/merge.c:776
-msgid "Empty commit message."
+#: builtin/config.c:125
+msgid "use global config file"
msgstr ""
-#: builtin/merge.c:796
-#, c-format
-msgid "Wonderful.\n"
+#: builtin/config.c:126
+msgid "use system config file"
msgstr ""
-#: builtin/merge.c:851
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+#: builtin/config.c:127
+msgid "use repository config file"
msgstr ""
-#: builtin/merge.c:890
-msgid "No current branch."
+#: builtin/config.c:128
+msgid "use per-worktree config file"
msgstr ""
-#: builtin/merge.c:892
-msgid "No remote for the current branch."
+#: builtin/config.c:129
+msgid "use given config file"
msgstr ""
-#: builtin/merge.c:894
-msgid "No default upstream defined for the current branch."
+#: builtin/config.c:130
+msgid "blob-id"
msgstr ""
-#: builtin/merge.c:899
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
+#: builtin/config.c:130
+msgid "read config from given blob object"
msgstr ""
-#: builtin/merge.c:946
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
+#: builtin/config.c:131
+msgid "Action"
msgstr ""
-#: builtin/merge.c:1020
-#, c-format
-msgid "could not close '%s'"
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/merge.c:1047
-#, c-format
-msgid "not something we can merge in %s: %s"
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/merge.c:1081
-msgid "not something we can merge"
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/merge.c:1146
-msgid "--abort expects no arguments"
+#: builtin/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/merge.c:1150
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/merge.c:1162
-msgid "--continue expects no arguments"
+#: builtin/config.c:137
+msgid "add a new variable: name value"
msgstr ""
-#: builtin/merge.c:1166
-msgid "There is no merge in progress (MERGE_HEAD missing)."
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/merge.c:1182
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/merge.c:1189
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/merge.c:1192
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/config.c:141
+msgid "remove a section: name"
msgstr ""
-#: builtin/merge.c:1201
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/config.c:142
+msgid "list all"
msgstr ""
-#: builtin/merge.c:1209
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/config.c:143
+msgid "open an editor"
msgstr ""
-#: builtin/merge.c:1226
-msgid "Squash commit into empty head not supported yet"
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/merge.c:1228
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/merge.c:1233
-#, c-format
-msgid "%s - not something we can merge"
+#: builtin/config.c:146
+msgid "Type"
msgstr ""
-#: builtin/merge.c:1235
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/config.c:147
+msgid "value is given this type"
msgstr ""
-#: builtin/merge.c:1269
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/merge.c:1272
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
+#: builtin/config.c:149
+msgid "value is decimal number"
msgstr ""
-#: builtin/merge.c:1275
-#, c-format
-msgid "Commit %s does not have a GPG signature."
+#: builtin/config.c:150
+msgid "value is --bool or --int"
msgstr ""
-#: builtin/merge.c:1278
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/merge.c:1340
-msgid "refusing to merge unrelated histories"
+#: builtin/config.c:152
+msgid "value is an expiry date"
msgstr ""
-#: builtin/merge.c:1349
-msgid "Already up-to-date."
+#: builtin/config.c:153
+msgid "Other"
msgstr ""
-#: builtin/merge.c:1359
-#, c-format
-msgid "Updating %s..%s\n"
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/merge.c:1400
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
+#: builtin/config.c:155
+msgid "show variable names only"
msgstr ""
-#: builtin/merge.c:1407
-#, c-format
-msgid "Nope.\n"
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
msgstr ""
-#: builtin/merge.c:1432
-msgid "Already up-to-date. Yeeah!"
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/merge.c:1438
-msgid "Not possible to fast-forward, aborting."
+#: builtin/config.c:158
+msgid "value"
msgstr ""
-#: builtin/merge.c:1461 builtin/merge.c:1540
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/merge.c:1465
+#: builtin/config.c:172
#, c-format
-msgid "Trying merge strategy %s...\n"
+msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/merge.c:1531
+#: builtin/config.c:174
#, c-format
-msgid "No merge strategy handled the merge.\n"
+msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/merge.c:1533
+#: builtin/config.c:308
#, c-format
-msgid "Merge with strategy %s failed.\n"
+msgid "invalid key pattern: %s"
msgstr ""
-#: builtin/merge.c:1542
+#: builtin/config.c:344
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/merge.c:1554
+#: builtin/config.c:401
#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+msgid "cannot parse color '%s'"
msgstr ""
-#: builtin/merge-base.c:29
-msgid "git merge-base [-a | --all] <commit> <commit>..."
+#: builtin/config.c:443
+msgid "unable to parse default color value"
msgstr ""
-#: builtin/merge-base.c:30
-msgid "git merge-base [-a | --all] --octopus <commit>..."
+#: builtin/config.c:496 builtin/config.c:742
+msgid "not in a git directory"
msgstr ""
-#: builtin/merge-base.c:31
-msgid "git merge-base --independent <commit>..."
+#: builtin/config.c:499
+msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/merge-base.c:32
-msgid "git merge-base --is-ancestor <commit> <commit>"
+#: builtin/config.c:502
+msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/merge-base.c:33
-msgid "git merge-base --fork-point <ref> [<commit>]"
+#: builtin/config.c:587
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
msgstr ""
-#: builtin/merge-base.c:217
-msgid "output all common ancestors"
+#: builtin/config.c:611
+msgid "only one config file at a time"
msgstr ""
-#: builtin/merge-base.c:219
-msgid "find ancestors for a single n-way merge"
+#: builtin/config.c:616
+msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/merge-base.c:221
-msgid "list revs not reachable from others"
+#: builtin/config.c:619
+msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/merge-base.c:223
-msgid "is the first one ancestor of the other?"
+#: builtin/config.c:638
+msgid "$HOME not set"
msgstr ""
-#: builtin/merge-base.c:225
-msgid "find where <commit> forked from reflog of <ref>"
+#: builtin/config.c:658
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
msgstr ""
-#: builtin/merge-file.c:8
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
msgstr ""
-#: builtin/merge-file.c:32
-msgid "send results to standard output"
+#: builtin/config.c:693
+msgid "only one action at a time"
msgstr ""
-#: builtin/merge-file.c:33
-msgid "use a diff3 based merge"
+#: builtin/config.c:706
+msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/merge-file.c:34
-msgid "for conflicts, use our version"
+#: builtin/config.c:712
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
msgstr ""
-#: builtin/merge-file.c:36
-msgid "for conflicts, use their version"
+#: builtin/config.c:718
+msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/merge-file.c:38
-msgid "for conflicts, use a union version"
+#: builtin/config.c:731
+#, c-format
+msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/merge-file.c:41
-msgid "for conflicts, use this marker size"
+#: builtin/config.c:734
+msgid "error processing config file(s)"
msgstr ""
-#: builtin/merge-file.c:42
-msgid "do not warn about conflicts"
+#: builtin/config.c:744
+msgid "editing stdin is not supported"
msgstr ""
-#: builtin/merge-file.c:44
-msgid "set labels for file1/orig-file/file2"
+#: builtin/config.c:746
+msgid "editing blobs is not supported"
msgstr ""
-#: builtin/merge-recursive.c:45
+#: builtin/config.c:760
#, c-format
-msgid "unknown option %s"
+msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/merge-recursive.c:51
+#: builtin/config.c:773
#, c-format
-msgid "could not parse 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-recursive.c:55
+#: builtin/config.c:847 builtin/config.c:858
#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/merge-recursive.c:63
-msgid "not handling anything other than two heads merge."
+msgid "no such section: %s"
msgstr ""
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
-#, c-format
-msgid "could not resolve ref '%s'"
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/merge-recursive.c:77
-#, c-format
-msgid "Merging %s with %s\n"
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
msgstr ""
-#: builtin/mktree.c:65
-msgid "git mktree [-z] [--missing] [--batch]"
+#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/mktree.c:152
-msgid "input is NUL terminated"
+#: builtin/describe.c:28
+msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/mktree.c:153 builtin/write-tree.c:24
-msgid "allow missing objects"
+#: builtin/describe.c:63
+msgid "head"
msgstr ""
-#: builtin/mktree.c:154
-msgid "allow creation of more than one tree"
+#: builtin/describe.c:63
+msgid "lightweight"
msgstr ""
-#: builtin/mv.c:16
-msgid "git mv [<options>] <source>... <destination>"
+#: builtin/describe.c:63
+msgid "annotated"
msgstr ""
-#: builtin/mv.c:82
+#: builtin/describe.c:273
#, c-format
-msgid "Directory %s is in index and no submodule?"
+msgid "annotated tag %s not available"
msgstr ""
-#: builtin/mv.c:84 builtin/rm.c:290
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/mv.c:102
+#: builtin/describe.c:279
#, c-format
-msgid "%.*s is in index"
+msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/mv.c:124
-msgid "force move/rename even if target exists"
+#: builtin/describe.c:323
+#, c-format
+msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/mv.c:125
-msgid "skip move/rename errors"
+#: builtin/describe.c:325
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/mv.c:167
+#: builtin/describe.c:379
#, c-format
-msgid "destination '%s' is not a directory"
+msgid "finished search at %s\n"
msgstr ""
-#: builtin/mv.c:178
+#: builtin/describe.c:405
#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/mv.c:182
-msgid "bad source"
-msgstr ""
-
-#: builtin/mv.c:185
-msgid "can not move directory into itself"
+#: builtin/describe.c:409
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
msgstr ""
-#: builtin/mv.c:188
-msgid "cannot move directory over file"
+#: builtin/describe.c:439
+#, c-format
+msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/mv.c:197
-msgid "source directory is empty"
+#: builtin/describe.c:442
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
msgstr ""
-#: builtin/mv.c:222
-msgid "not under version control"
+#: builtin/describe.c:510
+#, c-format
+msgid "describe %s\n"
msgstr ""
-#: builtin/mv.c:225
-msgid "destination exists"
+#: builtin/describe.c:513 builtin/log.c:516
+#, c-format
+msgid "Not a valid object name %s"
msgstr ""
-#: builtin/mv.c:233
+#: builtin/describe.c:521
#, c-format
-msgid "overwriting '%s'"
+msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/mv.c:236
-msgid "Cannot overwrite"
+#: builtin/describe.c:535
+msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/mv.c:239
-msgid "multiple sources for the same target"
+#: builtin/describe.c:536
+msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/mv.c:241
-msgid "destination directory does not exist"
+#: builtin/describe.c:537
+msgid "use any ref"
msgstr ""
-#: builtin/mv.c:248
-#, c-format
-msgid "%s, source=%s, destination=%s"
+#: builtin/describe.c:538
+msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/mv.c:269
-#, c-format
-msgid "Renaming %s to %s\n"
+#: builtin/describe.c:539
+msgid "always use long format"
msgstr ""
-#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
-#, c-format
-msgid "renaming '%s' failed"
+#: builtin/describe.c:540
+msgid "only follow first parent"
msgstr ""
-#: builtin/name-rev.c:289
-msgid "git name-rev [<options>] <commit>..."
+#: builtin/describe.c:543
+msgid "only output exact matches"
msgstr ""
-#: builtin/name-rev.c:290
-msgid "git name-rev [<options>] --all"
+#: builtin/describe.c:545
+msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/name-rev.c:291
-msgid "git name-rev [<options>] --stdin"
+#: builtin/describe.c:547
+msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:346
-msgid "print only names (no SHA-1)"
+#: builtin/describe.c:549
+msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:347
-msgid "only use tags to name the commits"
+#: builtin/describe.c:551 builtin/name-rev.c:424
+msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/name-rev.c:349
-msgid "only use refs matching <pattern>"
+#: builtin/describe.c:552 builtin/describe.c:555
+msgid "mark"
msgstr ""
-#: builtin/name-rev.c:351
-msgid "ignore refs matching <pattern>"
+#: builtin/describe.c:553
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/name-rev.c:353
-msgid "list all commits reachable from all refs"
+#: builtin/describe.c:556
+msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/name-rev.c:354
-msgid "read from stdin"
+#: builtin/describe.c:574
+msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/name-rev.c:355
-msgid "allow to print `undefined` names (default)"
+#: builtin/describe.c:603
+msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/name-rev.c:361
-msgid "dereference tags in the input (internal use)"
+#: builtin/describe.c:654
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/notes.c:25
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+#: builtin/describe.c:656
+msgid "--broken is incompatible with commit-ishes"
msgstr ""
-#: builtin/notes.c:26
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+#: builtin/diff.c:84
+#, c-format
+msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/notes.c:27
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+#: builtin/diff.c:235
+#, c-format
+msgid "invalid option: %s"
msgstr ""
-#: builtin/notes.c:28
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+#: builtin/diff.c:364
+msgid "Not a git repository"
msgstr ""
-#: builtin/notes.c:29
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+#: builtin/diff.c:408
+#, c-format
+msgid "invalid object '%s' given."
msgstr ""
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] show [<object>]"
+#: builtin/diff.c:417
+#, c-format
+msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/notes.c:31
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+#: builtin/diff.c:422
+#, c-format
+msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/notes.c:32
-msgid "git notes merge --commit [-v | -q]"
+#: builtin/difftool.c:31
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/notes.c:33
-msgid "git notes merge --abort [-v | -q]"
+#: builtin/difftool.c:261
+#, c-format
+msgid "failed: %d"
msgstr ""
-#: builtin/notes.c:34
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+#: builtin/difftool.c:303
+#, c-format
+msgid "could not read symlink %s"
msgstr ""
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read symlink file %s"
msgstr ""
-#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] get-ref"
+#: builtin/difftool.c:313
+#, c-format
+msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/notes.c:41
-msgid "git notes [list [<object>]]"
+#: builtin/difftool.c:414
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/notes.c:46
-msgid "git notes add [<options>] [<object>]"
+#: builtin/difftool.c:634
+#, c-format
+msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/notes.c:51
-msgid "git notes copy [<options>] <from-object> <to-object>"
+#: builtin/difftool.c:636
+msgid "working tree file has been left."
msgstr ""
-#: builtin/notes.c:52
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
+#: builtin/difftool.c:647
+#, c-format
+msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/notes.c:57
-msgid "git notes append [<options>] [<object>]"
+#: builtin/difftool.c:648
+msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/notes.c:62
-msgid "git notes edit [<object>]"
+#: builtin/difftool.c:697
+msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/notes.c:67
-msgid "git notes show [<object>]"
+#: builtin/difftool.c:699
+msgid "perform a full-directory diff"
msgstr ""
-#: builtin/notes.c:72
-msgid "git notes merge [<options>] <notes-ref>"
+#: builtin/difftool.c:701
+msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/notes.c:73
-msgid "git notes merge --commit [<options>]"
+#: builtin/difftool.c:706
+msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/notes.c:74
-msgid "git notes merge --abort [<options>]"
+#: builtin/difftool.c:707
+msgid "tool"
msgstr ""
-#: builtin/notes.c:79
-msgid "git notes remove [<object>]"
+#: builtin/difftool.c:708
+msgid "use the specified diff tool"
msgstr ""
-#: builtin/notes.c:84
-msgid "git notes prune [<options>]"
+#: builtin/difftool.c:710
+msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/notes.c:89
-msgid "git notes get-ref"
+#: builtin/difftool.c:713
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
msgstr ""
-#: builtin/notes.c:94
-msgid "Write/edit the notes for the following object:"
+#: builtin/difftool.c:716
+msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/notes.c:147
-#, c-format
-msgid "unable to start 'show' for object '%s'"
+#: builtin/difftool.c:740
+msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/notes.c:151
-msgid "could not read 'show' output"
+#: builtin/difftool.c:747
+msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
-#: builtin/notes.c:159
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/notes.c:194
-msgid "please supply the note contents using either -m or -F option"
+#: builtin/fast-export.c:1084
+msgid "show progress after <n> objects"
msgstr ""
-#: builtin/notes.c:203
-msgid "unable to write note object"
+#: builtin/fast-export.c:1086
+msgid "select handling of signed tags"
msgstr ""
-#: builtin/notes.c:205
-#, c-format
-msgid "the note contents have been left in %s"
+#: builtin/fast-export.c:1089
+msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/notes.c:233 builtin/tag.c:516
-#, c-format
-msgid "cannot read '%s'"
+#: builtin/fast-export.c:1092
+msgid "Dump marks to this file"
msgstr ""
-#: builtin/notes.c:235 builtin/tag.c:519
-#, c-format
-msgid "could not open or read '%s'"
+#: builtin/fast-export.c:1094
+msgid "Import marks from this file"
msgstr ""
-#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
-#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
-#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
-#, c-format
-msgid "failed to resolve '%s' as a valid ref."
+#: builtin/fast-export.c:1096
+msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/notes.c:257
-#, c-format
-msgid "failed to read object '%s'."
+#: builtin/fast-export.c:1098
+msgid "Output full tree for each commit"
msgstr ""
-#: builtin/notes.c:261
-#, c-format
-msgid "cannot read note data from non-blob object '%s'."
+#: builtin/fast-export.c:1100
+msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/notes.c:301
-#, c-format
-msgid "malformed input line: '%s'."
+#: builtin/fast-export.c:1101
+msgid "Skip output of blob data"
msgstr ""
-#: builtin/notes.c:316
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
+#: builtin/fast-export.c:1102 builtin/log.c:1601
+msgid "refspec"
msgstr ""
-#. TRANSLATORS: the first %s will be replaced by a
-#. git notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:345
-#, c-format
-msgid "refusing to %s notes in %s (outside of refs/notes/)"
+#: builtin/fast-export.c:1103
+msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
-#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
-#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
-msgid "too many parameters"
+#: builtin/fast-export.c:1104
+msgid "anonymize output"
msgstr ""
-#: builtin/notes.c:378 builtin/notes.c:664
-#, c-format
-msgid "no note found for object %s."
+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/notes.c:399 builtin/notes.c:562
-msgid "note contents as a string"
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
msgstr ""
-#: builtin/notes.c:402 builtin/notes.c:565
-msgid "note contents in a file"
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/notes.c:405 builtin/notes.c:568
-msgid "reuse and edit specified note object"
+#: builtin/fetch.c:29
+msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/notes.c:408 builtin/notes.c:571
-msgid "reuse specified note object"
+#: builtin/fetch.c:30
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/notes.c:411 builtin/notes.c:574
-msgid "allow storing empty note"
+#: builtin/fetch.c:31
+msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/notes.c:412 builtin/notes.c:483
-msgid "replace existing notes"
+#: builtin/fetch.c:115 builtin/pull.c:195
+msgid "fetch from all remotes"
msgstr ""
-#: builtin/notes.c:437
-#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/fetch.c:117 builtin/pull.c:198
+msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/notes.c:452 builtin/notes.c:531
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
+#: builtin/fetch.c:119 builtin/pull.c:201
+msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
-#, c-format
-msgid "Removing note for object %s\n"
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
msgstr ""
-#: builtin/notes.c:484
-msgid "read objects from stdin"
+#: builtin/fetch.c:122
+msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/notes.c:486
-msgid "load rewriting config for <command> (implies --stdin)"
+#: builtin/fetch.c:124 builtin/pull.c:205
+msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/notes.c:504
-msgid "too few parameters"
+#: builtin/fetch.c:126
+msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/notes.c:525
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/fetch.c:128
+msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/notes.c:537
-#, c-format
-msgid "missing notes on source object %s. Cannot copy."
+#: builtin/fetch.c:130 builtin/pull.c:208
+msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/notes.c:589
-#, 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/fetch.c:132
+msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/notes.c:684
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:133
+msgid "on-demand"
msgstr ""
-#: builtin/notes.c:686
-msgid "failed to delete ref NOTES_MERGE_REF"
+#: builtin/fetch.c:134
+msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/notes.c:688
-msgid "failed to remove 'git notes merge' worktree"
+#: builtin/fetch.c:138 builtin/pull.c:216
+msgid "keep downloaded pack"
msgstr ""
-#: builtin/notes.c:708
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
+#: builtin/fetch.c:140
+msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/notes.c:710
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219
+msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/notes.c:712
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+#: builtin/fetch.c:145
+msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/notes.c:725
-msgid "failed to resolve NOTES_MERGE_REF"
+#: builtin/fetch.c:151 builtin/pull.c:222
+msgid "convert to a complete repository"
msgstr ""
-#: builtin/notes.c:728
-msgid "failed to finalize notes merge"
+#: builtin/fetch.c:154
+msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/notes.c:754
-#, c-format
-msgid "unknown notes merge strategy %s"
+#: builtin/fetch.c:157
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
msgstr ""
-#: builtin/notes.c:770
-msgid "General options"
+#: builtin/fetch.c:161 builtin/pull.c:225
+msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/notes.c:772
-msgid "Merge options"
+#: builtin/fetch.c:162 builtin/pull.c:227
+msgid "refmap"
msgstr ""
-#: builtin/notes.c:774
-msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+#: builtin/fetch.c:163 builtin/pull.c:228
+msgid "specify fetch refmap"
msgstr ""
-#: builtin/notes.c:776
-msgid "Committing unmerged notes"
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585
+#: builtin/send-pack.c:172
+msgid "server-specific"
msgstr ""
-#: builtin/notes.c:778
-msgid "finalize notes merge by committing unmerged notes"
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585
+#: builtin/send-pack.c:173
+msgid "option to transmit"
msgstr ""
-#: builtin/notes.c:780
-msgid "Aborting notes merge resolution"
+#: builtin/fetch.c:170
+msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/notes.c:782
-msgid "abort notes merge"
+#: builtin/fetch.c:469
+msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/notes.c:793
-msgid "cannot mix --commit, --abort or -s/--strategy"
+#: builtin/fetch.c:608
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/notes.c:798
-msgid "must specify a notes ref to merge"
+#: builtin/fetch.c:705
+#, c-format
+msgid "object %s not found"
msgstr ""
-#: builtin/notes.c:822
-#, c-format
-msgid "unknown -s/--strategy: %s"
+#: builtin/fetch.c:709
+msgid "[up to date]"
msgstr ""
-#: builtin/notes.c:859
-#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+msgid "[rejected]"
msgstr ""
-#: builtin/notes.c:862
-#, c-format
-msgid "failed to store link to current notes ref (%s)"
+#: builtin/fetch.c:723
+msgid "can't fetch in current branch"
msgstr ""
-#: builtin/notes.c:864
-#, 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/fetch.c:733
+msgid "[tag update]"
msgstr ""
-#: builtin/notes.c:886
-#, c-format
-msgid "Object %s has no note\n"
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796
+msgid "unable to update local ref"
msgstr ""
-#: builtin/notes.c:898
-msgid "attempt to remove non-existent note is not an error"
+#: builtin/fetch.c:738
+msgid "would clobber existing tag"
msgstr ""
-#: builtin/notes.c:901
-msgid "read object names from the standard input"
+#: builtin/fetch.c:760
+msgid "[new tag]"
msgstr ""
-#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
-msgid "do not remove, show only"
+#: builtin/fetch.c:763
+msgid "[new branch]"
msgstr ""
-#: builtin/notes.c:940
-msgid "report pruned notes"
+#: builtin/fetch.c:766
+msgid "[new ref]"
msgstr ""
-#: builtin/notes.c:982
-msgid "notes-ref"
+#: builtin/fetch.c:796
+msgid "forced update"
msgstr ""
-#: builtin/notes.c:983
-msgid "use notes from <notes-ref>"
+#: builtin/fetch.c:801
+msgid "non-fast-forward"
msgstr ""
-#: builtin/notes.c:1018
+#: builtin/fetch.c:847
#, c-format
-msgid "unknown subcommand: %s"
+msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/pack-objects.c:29
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+#: builtin/fetch.c:868
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/pack-objects.c:30
-msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+#: builtin/fetch.c:959 builtin/fetch.c:1081
+#, c-format
+msgid "From %.*s\n"
msgstr ""
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/fetch.c:970
#, c-format
-msgid "deflate error (%d)"
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/pack-objects.c:770
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+#: builtin/fetch.c:1051
+#, c-format
+msgid " (%s will become dangling)"
msgstr ""
-#: builtin/pack-objects.c:783
-msgid "Writing objects"
+#: builtin/fetch.c:1052
+#, c-format
+msgid " (%s has become dangling)"
msgstr ""
-#: builtin/pack-objects.c:1063
-msgid "disabling bitmap writing, as some objects are not being packed"
+#: builtin/fetch.c:1084
+msgid "[deleted]"
msgstr ""
-#: builtin/pack-objects.c:2426
-msgid "Compressing objects"
+#: builtin/fetch.c:1085 builtin/remote.c:1036
+msgid "(none)"
msgstr ""
-#: builtin/pack-objects.c:2829
+#: builtin/fetch.c:1108
#, c-format
-msgid "unsupported index version %s"
+msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/pack-objects.c:2833
+#: builtin/fetch.c:1127
#, c-format
-msgid "bad index version '%s'"
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/pack-objects.c:2863
-msgid "do not show progress meter"
+#: builtin/fetch.c:1130
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/pack-objects.c:2865
-msgid "show progress meter"
+#: builtin/fetch.c:1434
+#, c-format
+msgid "Fetching %s\n"
msgstr ""
-#: builtin/pack-objects.c:2867
-msgid "show progress meter during object writing phase"
+#: builtin/fetch.c:1436 builtin/remote.c:100
+#, c-format
+msgid "Could not fetch %s"
msgstr ""
-#: builtin/pack-objects.c:2870
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/fetch.c:1482
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-#: builtin/pack-objects.c:2871
-msgid "version[,offset]"
+#: builtin/fetch.c:1506
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/pack-objects.c:2872
-msgid "write the pack index file in the specified idx format version"
+#: builtin/fetch.c:1543
+msgid "You need to specify a tag name."
msgstr ""
-#: builtin/pack-objects.c:2875
-msgid "maximum size of each output pack file"
+#: builtin/fetch.c:1592
+msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/pack-objects.c:2877
-msgid "ignore borrowed objects from alternate object store"
+#: builtin/fetch.c:1594
+msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/pack-objects.c:2879
-msgid "ignore packed objects"
+#: builtin/fetch.c:1599
+msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/pack-objects.c:2881
-msgid "limit pack window by objects"
+#: builtin/fetch.c:1601
+msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/pack-objects.c:2883
-msgid "limit pack window by memory in addition to object limit"
+#: builtin/fetch.c:1617
+msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/pack-objects.c:2885
-msgid "maximum length of delta chain allowed in the resulting pack"
+#: builtin/fetch.c:1619
+msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/pack-objects.c:2887
-msgid "reuse existing deltas"
+#: builtin/fetch.c:1628
+#, c-format
+msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/pack-objects.c:2889
-msgid "reuse existing objects"
+#: builtin/fetch.c:1635
+msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/pack-objects.c:2891
-msgid "use OFS_DELTA objects"
+#: builtin/fetch.c:1651
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
msgstr ""
-#: builtin/pack-objects.c:2893
-msgid "use threads when searching for best delta matches"
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/pack-objects.c:2895
-msgid "do not create an empty pack output"
+#: builtin/fmt-merge-msg.c:672
+msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/pack-objects.c:2897
-msgid "read revision arguments from standard input"
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/pack-objects.c:2899
-msgid "limit the objects to those that are not yet packed"
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
msgstr ""
-#: builtin/pack-objects.c:2902
-msgid "include objects reachable from any reference"
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
msgstr ""
-#: builtin/pack-objects.c:2905
-msgid "include objects referred by reflog entries"
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
msgstr ""
-#: builtin/pack-objects.c:2908
-msgid "include objects referred to by the index"
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
msgstr ""
-#: builtin/pack-objects.c:2911
-msgid "output pack to stdout"
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
msgstr ""
-#: builtin/pack-objects.c:2913
-msgid "include tag objects that refer to objects to be packed"
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgstr ""
-#: builtin/pack-objects.c:2915
-msgid "keep unreachable objects"
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
-#: builtin/pack-objects.c:2917
-msgid "pack loose unreachable objects"
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/pack-objects.c:2919
-msgid "unpack unreachable objects newer than <time>"
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/pack-objects.c:2922
-msgid "create thin packs"
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/pack-objects.c:2924
-msgid "create packs suitable for shallow fetches"
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/pack-objects.c:2926
-msgid "ignore packs that have companion .keep file"
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
msgstr ""
-#: builtin/pack-objects.c:2928
-msgid "pack compression level"
+#: builtin/for-each-ref.c:39 builtin/tag.c:424
+msgid "respect format colors"
msgstr ""
-#: builtin/pack-objects.c:2930
-msgid "do not hide commits by grafts"
+#: builtin/for-each-ref.c:43
+msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/pack-objects.c:2932
-msgid "use a bitmap index if available to speed up counting objects"
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are merged"
msgstr ""
-#: builtin/pack-objects.c:2934
-msgid "write a bitmap index together with the pack index"
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are not merged"
msgstr ""
-#: builtin/pack-objects.c:3061
-msgid "Counting objects"
+#: builtin/for-each-ref.c:47
+msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/pack-refs.c:6
-msgid "git pack-refs [<options>]"
+#: builtin/for-each-ref.c:48
+msgid "print only refs which don't contain the commit"
msgstr ""
-#: builtin/pack-refs.c:14
-msgid "pack everything"
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
msgstr ""
-#: builtin/pack-refs.c:15
-msgid "prune loose refs (default)"
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
msgstr ""
-#: builtin/prune-packed.c:7
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
msgstr ""
-#: builtin/prune-packed.c:40
-msgid "Removing duplicate objects"
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
msgstr ""
-#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
msgstr ""
-#: builtin/prune.c:106
-msgid "report pruned objects"
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
msgstr ""
-#: builtin/prune.c:109
-msgid "expire objects older than <time>"
+#: builtin/fsck.c:253
+#, c-format
+msgid "missing %s %s"
msgstr ""
-#: builtin/prune.c:123
-msgid "cannot prune in a precious-objects repo"
+#: builtin/fsck.c:279
+#, c-format
+msgid "unreachable %s %s"
msgstr ""
-#: builtin/pull.c:51 builtin/pull.c:53
+#: builtin/fsck.c:298
#, c-format
-msgid "Invalid value for %s: %s"
+msgid "dangling %s %s"
msgstr ""
-#: builtin/pull.c:73
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
+#: builtin/fsck.c:307
+msgid "could not create lost-found"
msgstr ""
-#: builtin/pull.c:121
-msgid "Options related to merging"
+#: builtin/fsck.c:318
+#, c-format
+msgid "could not finish '%s'"
msgstr ""
-#: builtin/pull.c:124
-msgid "incorporate changes by rebasing rather than merging"
+#: builtin/fsck.c:335
+#, c-format
+msgid "Checking %s"
msgstr ""
-#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
-msgid "allow fast-forward"
+#: builtin/fsck.c:353
+#, c-format
+msgid "Checking connectivity (%d objects)"
msgstr ""
-#: builtin/pull.c:157
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/fsck.c:372
+#, c-format
+msgid "Checking %s %s"
msgstr ""
-#: builtin/pull.c:173
-msgid "Options related to fetching"
+#: builtin/fsck.c:376
+msgid "broken links"
msgstr ""
-#: builtin/pull.c:195
-msgid "number of submodules pulled in parallel"
+#: builtin/fsck.c:385
+#, c-format
+msgid "root %s"
msgstr ""
-#: builtin/pull.c:284
+#: builtin/fsck.c:393
#, c-format
-msgid "Invalid value for pull.ff: %s"
+msgid "tagged %s %s (%s) in %s"
msgstr ""
-#: builtin/pull.c:397
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
+#: builtin/fsck.c:422
+#, c-format
+msgid "%s: object corrupt or missing"
msgstr ""
-#: builtin/pull.c:399
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
+#: builtin/fsck.c:447
+#, c-format
+msgid "%s: invalid reflog entry %s"
msgstr ""
-#: builtin/pull.c:400
-msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
+#: builtin/fsck.c:461
+#, c-format
+msgid "Checking reflog %s->%s"
msgstr ""
-#: builtin/pull.c:403
+#: builtin/fsck.c:495
#, 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."
+msgid "%s: invalid sha1 pointer %s"
msgstr ""
-#: builtin/pull.c:408 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
+#: builtin/fsck.c:502
+#, c-format
+msgid "%s: not a commit"
msgstr ""
-#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
-msgid "Please specify which branch you want to rebase against."
+#: builtin/fsck.c:557
+msgid "notice: No default references"
msgstr ""
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
-msgid "Please specify which branch you want to merge with."
+#: builtin/fsck.c:572
+#, c-format
+msgid "%s: object corrupt or missing: %s"
msgstr ""
-#: builtin/pull.c:413 builtin/pull.c:428
-msgid "See git-pull(1) for details."
+#: builtin/fsck.c:585
+#, c-format
+msgid "%s: object could not be parsed: %s"
msgstr ""
-#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
-#: git-parse-remote.sh:64
-msgid "<remote>"
+#: builtin/fsck.c:605
+#, c-format
+msgid "bad sha1 file: %s"
msgstr ""
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
-#: git-parse-remote.sh:65
-msgid "<branch>"
+#: builtin/fsck.c:620
+msgid "Checking object directory"
msgstr ""
-#: builtin/pull.c:423 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
+#: builtin/fsck.c:623
+msgid "Checking object directories"
msgstr ""
-#: builtin/pull.c:432 git-parse-remote.sh:95
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
+#: builtin/fsck.c:638
+#, c-format
+msgid "Checking %s link"
msgstr ""
-#: builtin/pull.c:437
+#: builtin/fsck.c:643 builtin/index-pack.c:833
#, c-format
-msgid ""
-"Your configuration specifies to merge with the ref '%s'\n"
-"from the remote, but no such ref was fetched."
+msgid "invalid %s"
msgstr ""
-#: builtin/pull.c:754
-msgid "ignoring --verify-signatures for rebase"
+#: builtin/fsck.c:650
+#, c-format
+msgid "%s points to something strange (%s)"
msgstr ""
-#: builtin/pull.c:801
-msgid "--[no-]autostash option is only valid with --rebase."
+#: builtin/fsck.c:656
+#, c-format
+msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/pull.c:809
-msgid "Updating an unborn branch with changes added to the index."
+#: builtin/fsck.c:660
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/pull.c:812
-msgid "pull with rebase"
+#: builtin/fsck.c:672
+msgid "Checking cache tree"
msgstr ""
-#: builtin/pull.c:813
-msgid "please commit or stash them."
+#: builtin/fsck.c:677
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
-#: builtin/pull.c:838
-#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
+#: builtin/fsck.c:688
+msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/pull.c:843
-#, 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/fsck.c:719
+msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/pull.c:858
-msgid "Cannot merge multiple branches into empty head."
+#: builtin/fsck.c:725
+msgid "show unreachable objects"
msgstr ""
-#: builtin/pull.c:862
-msgid "Cannot rebase onto multiple branches."
+#: builtin/fsck.c:726
+msgid "show dangling objects"
msgstr ""
-#: builtin/push.c:16
-msgid "git push [<options>] [<repository> [<refspec>...]]"
+#: builtin/fsck.c:727
+msgid "report tags"
msgstr ""
-#: builtin/push.c:89
-msgid "tag shorthand without <tag>"
+#: builtin/fsck.c:728
+msgid "report root nodes"
msgstr ""
-#: builtin/push.c:99
-msgid "--delete only accepts plain target ref names"
+#: builtin/fsck.c:729
+msgid "make index objects head nodes"
msgstr ""
-#: builtin/push.c:143
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+#: builtin/fsck.c:730
+msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/push.c:146
-#, c-format
+#: builtin/fsck.c:731
+msgid "also consider packs and alternate objects"
+msgstr ""
+
+#: builtin/fsck.c:732
+msgid "check only connectivity"
+msgstr ""
+
+#: builtin/fsck.c:733
+msgid "enable more strict checking"
+msgstr ""
+
+#: builtin/fsck.c:735
+msgid "write dangling objects in .git/lost-found"
+msgstr ""
+
+#: builtin/fsck.c:736 builtin/prune.c:110
+msgid "show progress"
+msgstr ""
+
+#: builtin/fsck.c:737
+msgid "show verbose names for reachable objects"
+msgstr ""
+
+#: builtin/fsck.c:797
+msgid "Checking objects"
+msgstr ""
+
+#: builtin/fsck.c:825
+#, c-format
+msgid "%s: object missing"
+msgstr ""
+
+#: builtin/fsck.c:837
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr ""
+
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
+msgstr ""
+
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr ""
+
+#: builtin/gc.c:461 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr ""
+
+#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#, c-format
+msgid "cannot read '%s'"
+msgstr ""
+
+#: builtin/gc.c:477
+#, 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"
+"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"
-" git push %s %s\n"
"%s"
msgstr ""
-#: builtin/push.c:161
+#: builtin/gc.c:519
+msgid "prune unreferenced objects"
+msgstr ""
+
+#: builtin/gc.c:521
+msgid "be more thorough (increased runtime)"
+msgstr ""
+
+#: builtin/gc.c:522
+msgid "enable auto-gc mode"
+msgstr ""
+
+#: builtin/gc.c:525
+msgid "force running gc even if there may be another gc running"
+msgstr ""
+
+#: builtin/gc.c:528
+msgid "repack all other packs except the largest pack"
+msgstr ""
+
+#: builtin/gc.c:545
#, 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"
+msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/push.c:175
+#: builtin/gc.c:556
#, c-format
-msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
-"\n"
-" git push --set-upstream %s %s\n"
+msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/push.c:183
+#: builtin/gc.c:576
#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/push.c:186
+#: builtin/gc.c:578
#, 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 "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/push.c:245
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/gc.c:579
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/push.c:252
+#: builtin/gc.c:619
+#, c-format
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."
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/push.c:258
+#: builtin/gc.c:672
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."
+"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/push.c:264
-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/grep.c:29
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/push.c:271
-msgid "Updates were rejected because the tag already exists in the remote."
+#: builtin/grep.c:225
+#, c-format
+msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/push.c:274
-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/grep.c:279
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/push.c:334
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:287 builtin/index-pack.c:1506 builtin/index-pack.c:1697
+#: builtin/pack-objects.c:2717
#, c-format
-msgid "Pushing to %s\n"
+msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/push.c:338
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
#, c-format
-msgid "failed to push some refs to '%s'"
+msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/push.c:369
+#: builtin/grep.c:646
#, c-format
-msgid "bad repository '%s'"
+msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/push.c:370
-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/grep.c:712
+#, c-format
+msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/push.c:388
-msgid "--all and --tags are incompatible"
+#: builtin/grep.c:811
+msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/push.c:389
-msgid "--all can't be combined with refspecs"
+#: builtin/grep.c:813
+msgid "find in contents not managed by git"
msgstr ""
-#: builtin/push.c:394
-msgid "--mirror and --tags are incompatible"
+#: builtin/grep.c:815
+msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/push.c:395
-msgid "--mirror can't be combined with refspecs"
+#: builtin/grep.c:817
+msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/push.c:400
-msgid "--all and --mirror are incompatible"
+#: builtin/grep.c:819
+msgid "recursively search in each submodule"
msgstr ""
-#: builtin/push.c:518
-msgid "repository"
+#: builtin/grep.c:822
+msgid "show non-matching lines"
msgstr ""
-#: builtin/push.c:519 builtin/send-pack.c:162
-msgid "push all refs"
+#: builtin/grep.c:824
+msgid "case insensitive matching"
msgstr ""
-#: builtin/push.c:520 builtin/send-pack.c:164
-msgid "mirror all refs"
+#: builtin/grep.c:826
+msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/push.c:522
-msgid "delete refs"
+#: builtin/grep.c:828
+msgid "process binary files as text"
msgstr ""
-#: builtin/push.c:523
-msgid "push tags (can't be used with --all or --mirror)"
+#: builtin/grep.c:830
+msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/push.c:526 builtin/send-pack.c:165
-msgid "force updates"
+#: builtin/grep.c:833
+msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/push.c:528 builtin/send-pack.c:179
-msgid "refname>:<expect"
+#: builtin/grep.c:835
+msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/push.c:529 builtin/send-pack.c:180
-msgid "require old value of ref to be at this value"
+#: builtin/grep.c:837
+msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/push.c:532
-msgid "control recursive pushing of submodules"
+#: builtin/grep.c:841
+msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/push.c:534 builtin/send-pack.c:173
-msgid "use thin pack"
+#: builtin/grep.c:844
+msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
-#: builtin/send-pack.c:160
-msgid "receive pack program"
+#: builtin/grep.c:847
+msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/push.c:537
-msgid "set upstream for git pull/status"
+#: builtin/grep.c:850
+msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/push.c:540
-msgid "prune locally removed refs"
+#: builtin/grep.c:853
+msgid "show line numbers"
msgstr ""
-#: builtin/push.c:542
-msgid "bypass pre-push hook"
+#: builtin/grep.c:854
+msgid "show column number of first match"
msgstr ""
-#: builtin/push.c:543
-msgid "push missing but relevant tags"
+#: builtin/grep.c:855
+msgid "don't show filenames"
msgstr ""
-#: builtin/push.c:546 builtin/send-pack.c:167
-msgid "GPG sign the push"
+#: builtin/grep.c:856
+msgid "show filenames"
msgstr ""
-#: builtin/push.c:548 builtin/send-pack.c:174
-msgid "request atomic transaction on remote side"
+#: builtin/grep.c:858
+msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/push.c:549 builtin/send-pack.c:170
-msgid "server-specific"
+#: builtin/grep.c:860
+msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/push.c:549 builtin/send-pack.c:171
-msgid "option to transmit"
+#: builtin/grep.c:862
+msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/push.c:563
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/grep.c:865
+msgid "show only the names of files without match"
msgstr ""
-#: builtin/push.c:565
-msgid "--delete doesn't make sense without any refs"
+#: builtin/grep.c:867
+msgid "print NUL after filenames"
msgstr ""
-#: builtin/push.c:584
-msgid "push options must not have new line characters"
+#: builtin/grep.c:870
+msgid "show only matching parts of a line"
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/grep.c:872
+msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/read-tree.c:130
-msgid "write resulting index to <file>"
+#: builtin/grep.c:873
+msgid "highlight matches"
msgstr ""
-#: builtin/read-tree.c:133
-msgid "only empty the index"
+#: builtin/grep.c:875
+msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/read-tree.c:135
-msgid "Merging"
+#: builtin/grep.c:877
+msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/read-tree.c:137
-msgid "perform a merge in addition to a read"
+#: builtin/grep.c:880
+msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/read-tree.c:139
-msgid "3-way merge if no file level merging required"
+#: builtin/grep.c:883
+msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/read-tree.c:141
-msgid "3-way merge in presence of adds and removes"
+#: builtin/grep.c:885
+msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/read-tree.c:143
-msgid "same as -m, but discard unmerged entries"
+#: builtin/grep.c:887
+msgid "use <n> worker threads"
msgstr ""
-#: builtin/read-tree.c:144
-msgid "<subdirectory>/"
+#: builtin/grep.c:888
+msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/read-tree.c:145
-msgid "read the tree into the index under <subdirectory>/"
+#: builtin/grep.c:891
+msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/read-tree.c:148
-msgid "update working tree with merge result"
+#: builtin/grep.c:893
+msgid "show the surrounding function"
msgstr ""
-#: builtin/read-tree.c:150
-msgid "gitignore"
+#: builtin/grep.c:896
+msgid "read patterns from file"
msgstr ""
-#: builtin/read-tree.c:151
-msgid "allow explicitly ignored files to be overwritten"
+#: builtin/grep.c:898
+msgid "match <pattern>"
msgstr ""
-#: builtin/read-tree.c:154
-msgid "don't check the working tree after merging"
+#: builtin/grep.c:900
+msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/read-tree.c:155
-msgid "don't update the index or the work tree"
+#: builtin/grep.c:912
+msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/read-tree.c:157
-msgid "skip applying sparse checkout filter"
+#: builtin/grep.c:914
+msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/read-tree.c:159
-msgid "debug unpack-trees"
+#: builtin/grep.c:916
+msgid "show parse tree for grep expression"
+msgstr ""
+
+#: builtin/grep.c:920
+msgid "pager"
msgstr ""
-#: builtin/rebase--helper.c:7
-msgid "git rebase--helper [<options>]"
+#: builtin/grep.c:920
+msgid "show matching files in the pager"
msgstr ""
-#: builtin/rebase--helper.c:19
-msgid "continue rebase"
+#: builtin/grep.c:924
+msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/rebase--helper.c:21
-msgid "abort rebase"
+#: builtin/grep.c:988
+msgid "no pattern given"
msgstr ""
-#: builtin/receive-pack.c:27
-msgid "git receive-pack <git-dir>"
+#: builtin/grep.c:1024
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr ""
+
+#: builtin/grep.c:1032
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr ""
+
+#: builtin/grep.c:1063
+msgid "invalid option combination, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1066 builtin/pack-objects.c:3400
+msgid "no threads support, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr ""
+
+#: builtin/grep.c:1092
+msgid "--open-files-in-pager only works on the worktree"
+msgstr ""
+
+#: builtin/grep.c:1115
+msgid "option not supported with --recurse-submodules"
+msgstr ""
+
+#: builtin/grep.c:1121
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr ""
+
+#: builtin/grep.c:1127
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr ""
+
+#: builtin/grep.c:1135
+msgid "both --cached and trees are given"
+msgstr ""
+
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+
+#: builtin/hash-object.c:86
+msgid "git hash-object --stdin-paths"
+msgstr ""
+
+#: builtin/hash-object.c:98
+msgid "type"
+msgstr ""
+
+#: builtin/hash-object.c:98
+msgid "object type"
+msgstr ""
+
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr ""
+
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr ""
+
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr ""
+
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
+msgstr ""
+
+#: builtin/help.c:46
+msgid "print all available commands"
+msgstr ""
+
+#: builtin/help.c:47
+msgid "exclude guides"
+msgstr ""
+
+#: builtin/help.c:48
+msgid "print list of useful guides"
+msgstr ""
+
+#: builtin/help.c:49
+msgid "print all configuration variable names"
+msgstr ""
+
+#: builtin/help.c:51
+msgid "show man page"
+msgstr ""
+
+#: builtin/help.c:52
+msgid "show manual in web browser"
+msgstr ""
+
+#: builtin/help.c:54
+msgid "show info page"
+msgstr ""
+
+#: builtin/help.c:56
+msgid "print command description"
+msgstr ""
+
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr ""
+
+#: builtin/help.c:73
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr ""
+
+#: builtin/help.c:100
+msgid "Failed to start emacsclient."
+msgstr ""
+
+#: builtin/help.c:113
+msgid "Failed to parse emacsclient version."
+msgstr ""
+
+#: builtin/help.c:121
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr ""
+
+#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#, c-format
+msgid "failed to exec '%s'"
+msgstr ""
+
+#: builtin/help.c:217
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+
+#: builtin/help.c:229
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+
+#: builtin/help.c: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:323
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr ""
+
+#: builtin/help.c:444 git.c:347
+#, 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:599
+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 builtin/repack.c:250
+#, 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:152
+#: builtin/pack-objects.c:212 builtin/pack-objects.c:306
+#, 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: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:2486
+#, 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:2725
+#, 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:55
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/log.c:56
+msgid "git show [<options>] <object>..."
+msgstr ""
+
+#: builtin/log.c:100
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr ""
+
+#: builtin/log.c:163
+msgid "suppress diff output"
+msgstr ""
+
+#: builtin/log.c:164
+msgid "show source"
+msgstr ""
+
+#: builtin/log.c:165
+msgid "Use mail map file"
+msgstr ""
+
+#: builtin/log.c:167
+msgid "only decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:169
+msgid "do not decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:170
+msgid "decorate options"
+msgstr ""
+
+#: builtin/log.c:173
+msgid "Process line range n,m in file, counting from 1"
+msgstr ""
+
+#: builtin/log.c:271
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+#: builtin/log.c:525
+#, c-format
+msgid "git show %s: bad file"
+msgstr ""
+
+#: builtin/log.c:540 builtin/log.c:634
+#, c-format
+msgid "Could not read object %s"
+msgstr ""
+
+#: builtin/log.c:659
+#, c-format
+msgid "Unknown type: %d"
+msgstr ""
+
+#: builtin/log.c:780
+msgid "format.headers without value"
+msgstr ""
+
+#: builtin/log.c:881
+msgid "name of output directory is too long"
+msgstr ""
+
+#: builtin/log.c:897
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr ""
+
+#: builtin/log.c:914
+msgid "Need exactly one range."
+msgstr ""
+
+#: builtin/log.c:924
+msgid "Not a range."
+msgstr ""
+
+#: builtin/log.c:1047
+msgid "Cover letter needs email format"
+msgstr ""
+
+#: builtin/log.c:1132
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr ""
+
+#: builtin/log.c:1159
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr ""
+
+#: builtin/log.c:1217
+msgid "Two output directories?"
+msgstr ""
+
+#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082
+#, c-format
+msgid "Unknown commit %s"
+msgstr ""
+
+#: builtin/log.c:1334 builtin/notes.c:897 builtin/tag.c:526
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/log.c:1339
+msgid "Could not find exact merge base."
+msgstr ""
+
+#: builtin/log.c:1343
+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:1363
+msgid "Failed to find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1374
+msgid "base commit should be the ancestor of revision list"
+msgstr ""
+
+#: builtin/log.c:1378
+msgid "base commit shouldn't be in revision list"
+msgstr ""
+
+#: builtin/log.c:1431
+msgid "cannot get patch id"
+msgstr ""
+
+#: builtin/log.c:1483
+msgid "failed to infer range-diff ranges"
+msgstr ""
+
+#: builtin/log.c:1528
+msgid "use [PATCH n/m] even with a single patch"
+msgstr ""
+
+#: builtin/log.c:1531
+msgid "use [PATCH] even with multiple patches"
+msgstr ""
+
+#: builtin/log.c:1535
+msgid "print patches to standard out"
+msgstr ""
+
+#: builtin/log.c:1537
+msgid "generate a cover letter"
+msgstr ""
+
+#: builtin/log.c:1539
+msgid "use simple number sequence for output file names"
+msgstr ""
+
+#: builtin/log.c:1540
+msgid "sfx"
+msgstr ""
+
+#: builtin/log.c:1541
+msgid "use <sfx> instead of '.patch'"
+msgstr ""
+
+#: builtin/log.c:1543
+msgid "start numbering patches at <n> instead of 1"
+msgstr ""
+
+#: builtin/log.c:1545
+msgid "mark the series as Nth re-roll"
+msgstr ""
+
+#: builtin/log.c:1547
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1550
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1553
+msgid "store resulting files in <dir>"
+msgstr ""
+
+#: builtin/log.c:1556
+msgid "don't strip/add [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1559
+msgid "don't output binary diffs"
+msgstr ""
+
+#: builtin/log.c:1561
+msgid "output all-zero hash in From header"
+msgstr ""
+
+#: builtin/log.c:1563
+msgid "don't include a patch matching a commit upstream"
+msgstr ""
+
+#: builtin/log.c:1565
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+
+#: builtin/log.c:1567
+msgid "Messaging"
+msgstr ""
+
+#: builtin/log.c:1568
+msgid "header"
+msgstr ""
+
+#: builtin/log.c:1569
+msgid "add email header"
+msgstr ""
+
+#: builtin/log.c:1570 builtin/log.c:1572
+msgid "email"
+msgstr ""
+
+#: builtin/log.c:1570
+msgid "add To: header"
+msgstr ""
+
+#: builtin/log.c:1572
+msgid "add Cc: header"
+msgstr ""
+
+#: builtin/log.c:1574
+msgid "ident"
+msgstr ""
+
+#: builtin/log.c:1575
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+
+#: builtin/log.c:1577
+msgid "message-id"
+msgstr ""
+
+#: builtin/log.c:1578
+msgid "make first mail a reply to <message-id>"
+msgstr ""
+
+#: builtin/log.c:1579 builtin/log.c:1582
+msgid "boundary"
+msgstr ""
+
+#: builtin/log.c:1580
+msgid "attach the patch"
+msgstr ""
+
+#: builtin/log.c:1583
+msgid "inline the patch"
+msgstr ""
+
+#: builtin/log.c:1587
+msgid "enable message threading, styles: shallow, deep"
+msgstr ""
+
+#: builtin/log.c:1589
+msgid "signature"
+msgstr ""
+
+#: builtin/log.c:1590
+msgid "add a signature"
+msgstr ""
+
+#: builtin/log.c:1591
+msgid "base-commit"
+msgstr ""
+
+#: builtin/log.c:1592
+msgid "add prerequisite tree info to the patch series"
+msgstr ""
+
+#: builtin/log.c:1594
+msgid "add a signature from a file"
+msgstr ""
+
+#: builtin/log.c:1595
+msgid "don't print the patch filenames"
+msgstr ""
+
+#: builtin/log.c:1597
+msgid "show progress while generating patches"
+msgstr ""
+
+#: builtin/log.c:1598
+msgid "rev"
+msgstr ""
+
+#: builtin/log.c:1599
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1602
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1604
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1679
+#, c-format
+msgid "invalid ident line: %s"
+msgstr ""
+
+#: builtin/log.c:1694
+msgid "-n and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1696
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1704
+msgid "--name-only does not make sense"
+msgstr ""
+
+#: builtin/log.c:1706
+msgid "--name-status does not make sense"
+msgstr ""
+
+#: builtin/log.c:1708
+msgid "--check does not make sense"
+msgstr ""
+
+#: builtin/log.c:1740
+msgid "standard output, or directory, which one?"
+msgstr ""
+
+#: builtin/log.c:1742
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr ""
+
+#: builtin/log.c:1829
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1833
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:1834
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1840
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:1844
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1852
+msgid "Range-diff:"
+msgstr ""
+
+#: builtin/log.c:1853
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1864
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:1900
+msgid "Generating patches"
+msgstr ""
+
+#: builtin/log.c:1944
+msgid "Failed to create output files"
+msgstr ""
+
+#: builtin/log.c:2003
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr ""
+
+#: builtin/log.c:2057
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
+msgstr ""
+
+#: builtin/ls-files.c:526
+msgid "identify the file status with tags"
+msgstr ""
+
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr ""
+
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr ""
+
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
+msgstr ""
+
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
+msgstr ""
+
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
+msgstr ""
+
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
+msgstr ""
+
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
+msgstr ""
+
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
+msgstr ""
+
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
+msgstr ""
+
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
+msgstr ""
+
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
+msgstr ""
+
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
+msgstr ""
+
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
+msgstr ""
+
+#: builtin/ls-files.c:573
+msgid "recurse through submodules"
+msgstr ""
+
+#: builtin/ls-files.c:575
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr ""
+
+#: builtin/ls-files.c:576
+msgid "tree-ish"
+msgstr ""
+
+#: builtin/ls-files.c:577
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+
+#: builtin/ls-files.c:579
+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:1111
+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:53
+msgid "git merge [<options>] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:54
+msgid "git merge --abort"
+msgstr ""
+
+#: builtin/merge.c:55
+msgid "git merge --continue"
+msgstr ""
+
+#: builtin/merge.c:112
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:132
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
+
+#: builtin/merge.c:178
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:179
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:184
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:235 builtin/pull.c:144
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:238 builtin/pull.c:147
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:239 builtin/pull.c:150
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:241 builtin/pull.c:153
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:244 builtin/pull.c:159
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:246 builtin/pull.c:162
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:248 builtin/pull.c:165
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:249
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:251 builtin/pull.c:171
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:255 builtin/pull.c:174
+msgid "verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/merge.c:256 builtin/notes.c:787 builtin/pull.c:178
+#: builtin/rebase.c:1124 builtin/rebase--interactive.c:188 builtin/revert.c:111
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:257 builtin/pull.c:179
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:258 builtin/pull.c:182
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:259 builtin/pull.c:183
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:261
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:268
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:270
+msgid "continue the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:272 builtin/pull.c:190
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:278
+msgid "verify commit-msg hook"
+msgstr ""
+
+#: builtin/merge.c:303
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:308
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:313
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:335 builtin/merge.c:352
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:382
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:393
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:443
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:494
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:581
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:702
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:716
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:731
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:783
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:792
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:798
+#, c-format
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:834
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:853
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:906
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:945
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:947
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:949
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:954
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1011
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr ""
+
+#: builtin/merge.c:1114
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr ""
+
+#: builtin/merge.c:1148
+msgid "not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1251
+msgid "--abort expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1255
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1267
+msgid "--continue expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1271
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1287
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1294
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1297
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1306
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1314
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1331
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1333
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1338
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1340
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1422
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1431
+msgid "Already up to date."
+msgstr ""
+
+#: builtin/merge.c:1441
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1483
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1490
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1515
+msgid "Already up to date. Yeeah!"
+msgstr ""
+
+#: builtin/merge.c:1521
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1544 builtin/merge.c:1623
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1548
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1614
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1616
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1625
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1637
+#, 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:46
+#, c-format
+msgid "unknown option %s"
+msgstr ""
+
+#: builtin/merge-recursive.c:52
+#, c-format
+msgid "could not parse object '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:56
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/merge-recursive.c:64
+msgid "not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:78
+#, 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:26
+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:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr ""
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr ""
+
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr ""
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr ""
+
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr ""
+
+#: builtin/mv.c:169
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr ""
+
+#: builtin/mv.c:180
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr ""
+
+#: builtin/mv.c:184
+msgid "bad source"
+msgstr ""
+
+#: builtin/mv.c:187
+msgid "can not move directory into itself"
+msgstr ""
+
+#: builtin/mv.c:190
+msgid "cannot move directory over file"
+msgstr ""
+
+#: builtin/mv.c:199
+msgid "source directory is empty"
+msgstr ""
+
+#: builtin/mv.c:224
+msgid "not under version control"
+msgstr ""
+
+#: builtin/mv.c:227
+msgid "destination exists"
+msgstr ""
+
+#: builtin/mv.c:235
+#, c-format
+msgid "overwriting '%s'"
+msgstr ""
+
+#: builtin/mv.c:238
+msgid "Cannot overwrite"
+msgstr ""
+
+#: builtin/mv.c:241
+msgid "multiple sources for the same target"
+msgstr ""
+
+#: builtin/mv.c:243
+msgid "destination directory does not exist"
+msgstr ""
+
+#: builtin/mv.c:250
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr ""
+
+#: builtin/mv.c:271
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr ""
+
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:513
+#, 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:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/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:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
+msgid "too many parameters"
+msgstr ""
+
+#: builtin/notes.c:389 builtin/notes.c:678
+#, c-format
+msgid "no note found for object %s."
+msgstr ""
+
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr ""
+
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr ""
+
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr ""
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr ""
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr ""
+
+#: builtin/notes.c:423 builtin/notes.c:496
+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:544
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr ""
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr ""
+
+#: builtin/notes.c:517
+msgid "too few parameters"
+msgstr ""
+
+#: builtin/notes.c:538
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:550
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr ""
+
+#: builtin/notes.c:603
+#, 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:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr ""
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr ""
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr ""
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr ""
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr ""
+
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr ""
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr ""
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr ""
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr ""
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr ""
+
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr ""
+
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr ""
+
+#: builtin/notes.c:878
+#, 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:900
+#, c-format
+msgid "Object %s has no note\n"
+msgstr ""
+
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
+msgstr ""
+
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
+msgstr ""
+
+#: builtin/notes.c:954 builtin/prune.c:108 builtin/worktree.c:165
+msgid "do not remove, show only"
+msgstr ""
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr ""
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr ""
+
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:1034
+#, 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:423
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:434
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:565
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
+
+#: builtin/pack-objects.c:776
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:789
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:793
+#, c-format
+msgid "unable to open packfile for reuse: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:797
+msgid "unable to seek in reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:808
+msgid "unable to read from reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:836
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:849
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:911 builtin/update-index.c:89
+#, c-format
+msgid "failed to stat %s"
+msgstr ""
+
+#: builtin/pack-objects.c:964
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1158
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:1586
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1595
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1864
+msgid "Counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1994
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2009
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095
+#: builtin/pack-objects.c:2105
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
+
+#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
+
+#: builtin/pack-objects.c:2119
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2445
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2577
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2664
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2670
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: builtin/pack-objects.c:2751
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2757
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2855
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022
+msgid "cannot open pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2945
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3030
+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 "use the sparse reachability algorithm"
+msgstr ""
+
+#: builtin/pack-objects.c:3298
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:3300
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:3302
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:3304
+msgid "ignore this pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3306
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:3308
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-objects.c:3310
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3312
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:3315
+msgid "handling for missing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3318
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3320
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3345
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3350
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3404
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+
+#: builtin/pack-objects.c:3406
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
+
+#: builtin/pack-objects.c:3411
+msgid "--thin cannot be used to build an indexable pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3414
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr ""
+
+#: builtin/pack-objects.c:3420
+msgid "cannot use --filter without --stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3479
+msgid "Enumerating objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3498
+#, 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:128
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+
+#: builtin/pull.c:61 builtin/pull.c:63
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr ""
+
+#: builtin/pull.c:83
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/pull.c:134
+msgid "control for recursive fetching of submodules"
+msgstr ""
+
+#: builtin/pull.c:138
+msgid "Options related to merging"
+msgstr ""
+
+#: builtin/pull.c:141
+msgid "incorporate changes by rebasing rather than merging"
+msgstr ""
+
+#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123
+msgid "allow fast-forward"
+msgstr ""
+
+#: builtin/pull.c:177
+msgid "automatically stash/stash pop before and after rebase"
+msgstr ""
+
+#: builtin/pull.c:193
+msgid "Options related to fetching"
+msgstr ""
+
+#: builtin/pull.c:203
+msgid "force overwrite of local branch"
+msgstr ""
+
+#: builtin/pull.c:211
+msgid "number of submodules pulled in parallel"
+msgstr ""
+
+#: builtin/pull.c:306
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr ""
+
+#: builtin/pull.c:422
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+
+#: builtin/pull.c:424
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+
+#: builtin/pull.c:425
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+
+#: builtin/pull.c:428
+#, 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:433 builtin/rebase.c:956 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr ""
+
+#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr ""
+
+#: builtin/pull.c:437 builtin/pull.c:452 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr ""
+
+#: builtin/pull.c:438 builtin/pull.c:453
+msgid "See git-pull(1) for details."
+msgstr ""
+
+#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455
+#: builtin/rebase.c:962 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr ""
+
+#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460
+#: git-legacy-rebase.sh:564 git-parse-remote.sh:65
+msgid "<branch>"
+msgstr ""
+
+#: builtin/pull.c:448 builtin/rebase.c:954 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr ""
+
+#: builtin/pull.c:457 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:462
+#, 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:566
+#, c-format
+msgid "unable to access commit %s"
+msgstr ""
+
+#: builtin/pull.c:844
+msgid "ignoring --verify-signatures for rebase"
+msgstr ""
+
+#: builtin/pull.c:892
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr ""
+
+#: builtin/pull.c:900
+msgid "Updating an unborn branch with changes added to the index."
+msgstr ""
+
+#: builtin/pull.c:904
+msgid "pull with rebase"
+msgstr ""
+
+#: builtin/pull.c:905
+msgid "please commit or stash them."
+msgstr ""
+
+#: builtin/pull.c:930
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+
+#: builtin/pull.c:936
+#, 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:951
+msgid "Cannot merge multiple branches into empty head."
+msgstr ""
+
+#: builtin/pull.c:955
+msgid "Cannot rebase onto multiple branches."
+msgstr ""
+
+#: builtin/pull.c:962
+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:167
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+
+#: builtin/push.c:170
+#, 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:185
+#, 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"
+msgstr ""
+
+#: builtin/push.c:199
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+" git push --set-upstream %s %s\n"
+msgstr ""
+
+#: builtin/push.c:207
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+
+#: builtin/push.c:210
+#, 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:269
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+
+#: builtin/push.c:276
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:282
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:288
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:295
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+
+#: builtin/push.c:298
+msgid ""
+"You cannot update a remote ref that points at a non-commit object,\n"
+"or update a remote ref to make it point at a non-commit object,\n"
+"without using the '--force' option.\n"
+msgstr ""
+
+#: builtin/push.c:359
+#, c-format
+msgid "Pushing to %s\n"
+msgstr ""
+
+#: builtin/push.c:364
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr ""
+
+#: builtin/push.c:398
+#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+#: builtin/push.c:399
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr ""
+
+#: builtin/push.c:554
+msgid "repository"
+msgstr ""
+
+#: builtin/push.c:555 builtin/send-pack.c:164
+msgid "push all refs"
+msgstr ""
+
+#: builtin/push.c:556 builtin/send-pack.c:166
+msgid "mirror all refs"
+msgstr ""
+
+#: builtin/push.c:558
+msgid "delete refs"
+msgstr ""
+
+#: builtin/push.c:559
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr ""
+
+#: builtin/push.c:562 builtin/send-pack.c:167
+msgid "force updates"
+msgstr ""
+
+#: builtin/push.c:564 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
+msgstr ""
+
+#: builtin/push.c:565 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
+msgstr ""
+
+#: builtin/push.c:568
+msgid "control recursive pushing of submodules"
+msgstr ""
+
+#: builtin/push.c:570 builtin/send-pack.c:175
+msgid "use thin pack"
+msgstr ""
+
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
+msgstr ""
+
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
+msgstr ""
+
+#: builtin/push.c:576
+msgid "prune locally removed refs"
+msgstr ""
+
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
+msgstr ""
+
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
+msgstr ""
+
+#: builtin/push.c:582 builtin/send-pack.c:169
+msgid "GPG sign the push"
+msgstr ""
+
+#: builtin/push.c:584 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
+msgstr ""
+
+#: builtin/push.c:602
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr ""
+
+#: builtin/push.c:604
+msgid "--delete doesn't make sense without any refs"
+msgstr ""
+
+#: builtin/push.c:607
+msgid "--all and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:609
+msgid "--all can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:613
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:615
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:618
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+#: builtin/push.c:637
+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:41
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr ""
+
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr ""
+
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr ""
+
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr ""
+
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
+msgstr ""
+
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
+msgstr ""
+
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
+msgstr ""
+
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr ""
+
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr ""
+
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr ""
+
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr ""
+
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr ""
+
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr ""
+
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr ""
+
+#: builtin/rebase.c:30
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:34
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr ""
+
+#: builtin/rebase.c:121 builtin/rebase.c:1437
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:173
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr ""
+
+#: builtin/rebase.c:188
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:213
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:289
+#, c-format
+msgid "Could not read '%s'"
+msgstr ""
+
+#: builtin/rebase.c:307
+#, c-format
+msgid "Cannot store %s"
+msgstr ""
+
+#: builtin/rebase.c:402
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: builtin/rebase.c:522
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+
+#: builtin/rebase.c:603
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+
+#: builtin/rebase.c:948
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+" git rebase '<branch>'\n"
+"\n"
+msgstr ""
+
+#: builtin/rebase.c:964
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+msgstr ""
+
+#: builtin/rebase.c:994
+msgid "exec commands cannot contain newlines"
+msgstr ""
+
+#: builtin/rebase.c:998
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1040
+msgid "rebase onto given branch instead of upstream"
+msgstr ""
+
+#: builtin/rebase.c:1042
+msgid "allow pre-rebase hook to run"
+msgstr ""
+
+#: builtin/rebase.c:1044
+msgid "be quiet. implies --no-stat"
+msgstr ""
+
+#: builtin/rebase.c:1047
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1050
+msgid "do not show diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1053
+msgid "add a Signed-off-by: line to each commit"
+msgstr ""
+
+#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061
+msgid "passed to 'git am'"
+msgstr ""
+
+#: builtin/rebase.c:1063 builtin/rebase.c:1065
+msgid "passed to 'git apply'"
+msgstr ""
+
+#: builtin/rebase.c:1067 builtin/rebase.c:1070
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
+
+#: builtin/rebase.c:1072
+msgid "continue"
+msgstr ""
+
+#: builtin/rebase.c:1075
+msgid "skip current patch and continue"
+msgstr ""
+
+#: builtin/rebase.c:1077
+msgid "abort and check out the original branch"
+msgstr ""
+
+#: builtin/rebase.c:1080
+msgid "abort but keep HEAD where it is"
+msgstr ""
+
+#: builtin/rebase.c:1081
+msgid "edit the todo list during an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:1084
+msgid "show the patch file being applied or merged"
+msgstr ""
+
+#: builtin/rebase.c:1087
+msgid "use merging strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1091
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1095
+msgid "try to recreate merges instead of ignoring them"
+msgstr ""
+
+#: builtin/rebase.c:1099
+msgid "allow rerere to update index with resolved conflict"
+msgstr ""
+
+#: builtin/rebase.c:1102
+msgid "preserve empty commits during rebase"
+msgstr ""
+
+#: builtin/rebase.c:1104
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
+
+#: builtin/rebase.c:1110
+msgid "automatically stash/stash pop before and after"
+msgstr ""
+
+#: builtin/rebase.c:1112
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
+
+#: builtin/rebase.c:1116
+msgid "allow rebasing commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:1119
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
+
+#: builtin/rebase.c:1122
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr ""
+
+#: builtin/rebase.c:1124
+msgid "use the given merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1126 builtin/revert.c:112
+msgid "option"
+msgstr ""
+
+#: builtin/rebase.c:1127
+msgid "pass the argument through to the merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1130
+msgid "rebase all reachable commits up to the root(s)"
+msgstr ""
+
+#: builtin/rebase.c:1133 builtin/rebase--interactive.c:198
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:1149
+#, c-format
+msgid "could not exec %s"
+msgstr ""
+
+#: builtin/rebase.c:1167 git-legacy-rebase.sh:220
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr ""
+
+#: builtin/rebase.c:1208 git-legacy-rebase.sh:406
+msgid "No rebase in progress?"
+msgstr ""
+
+#: builtin/rebase.c:1212 git-legacy-rebase.sh:417
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+
+#: builtin/rebase.c:1226 git-legacy-rebase.sh:424
+msgid "Cannot read HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1238 git-legacy-rebase.sh:427
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+
+#: builtin/rebase.c:1257
+msgid "could not discard worktree changes"
+msgstr ""
+
+#: builtin/rebase.c:1276
+#, c-format
+msgid "could not move back to %s"
+msgstr ""
+
+#: builtin/rebase.c:1287 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1313
+#, 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:1334
+msgid "switch `C' expects a numerical value"
+msgstr ""
+
+#: builtin/rebase.c:1375
+#, c-format
+msgid "Unknown mode: %s"
+msgstr ""
+
+#: builtin/rebase.c:1397
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1446
+msgid "cannot combine am options with either interactive or merge options"
+msgstr ""
+
+#: builtin/rebase.c:1465
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1469 git-legacy-rebase.sh:544
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+
+#: builtin/rebase.c:1475
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+
+#: builtin/rebase.c:1478
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr ""
+
+#: builtin/rebase.c:1502
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1508
+msgid "Could not create new root commit"
+msgstr ""
+
+#: builtin/rebase.c:1526
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
+
+#: builtin/rebase.c:1533
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1558
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1566 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
+#, c-format
+msgid "No such ref: %s"
+msgstr ""
+
+#: builtin/rebase.c:1578
+msgid "Could not resolve HEAD to a revision"
+msgstr ""
+
+#: builtin/rebase.c:1619 git-legacy-rebase.sh:673
+msgid "Cannot autostash"
+msgstr ""
+
+#: builtin/rebase.c:1622
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1628
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1631
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: builtin/rebase.c:1634
+msgid "could not reset --hard"
+msgstr ""
+
+#: builtin/rebase.c:1635 builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
+#: builtin/rebase.c:1651 git-legacy-rebase.sh:682
+msgid "Please commit or stash them."
+msgstr ""
+
+#: builtin/rebase.c:1678
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1691
+#, c-format
+msgid "could not switch to %s"
+msgstr ""
+
+#: builtin/rebase.c:1702 git-legacy-rebase.sh:705
+#, sh-format
+msgid "HEAD is up to date."
+msgstr ""
+
+#: builtin/rebase.c:1704
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr ""
+
+#: builtin/rebase.c:1712 git-legacy-rebase.sh:715
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr ""
+
+#: builtin/rebase.c:1714
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr ""
+
+#: builtin/rebase.c:1722 git-legacy-rebase.sh:215
+msgid "The pre-rebase hook refused to rebase."
+msgstr ""
+
+#: builtin/rebase.c:1729
+#, c-format
+msgid "Changes to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:1732
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:1757
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+
+#: builtin/rebase.c:1765
+msgid "Could not detach HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1774
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr ""
+
+#: builtin/rebase--interactive.c:25
+msgid "no HEAD?"
+msgstr ""
+
+#: builtin/rebase--interactive.c:52
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
+
+#: builtin/rebase--interactive.c:58
+msgid "could not mark as interactive"
+msgstr ""
+
+#: builtin/rebase--interactive.c:102
+#, c-format
+msgid "could not open %s"
+msgstr ""
+
+#: builtin/rebase--interactive.c:115
+msgid "could not generate todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:131
+msgid "git rebase--interactive [<options>]"
+msgstr ""
+
+#: builtin/rebase--interactive.c:150
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:152 builtin/revert.c:125
+msgid "allow commits with empty messages"
+msgstr ""
+
+#: builtin/rebase--interactive.c:153
+msgid "rebase merge commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:155
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase--interactive.c:157
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase--interactive.c:158
+msgid "sign commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:160
+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase--interactive.c:162
+msgid "skip commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:163
+msgid "edit the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:165
+msgid "show the current patch"
+msgstr ""
+
+#: builtin/rebase--interactive.c:168
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:170
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:172
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:174
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase--interactive.c:176
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:177
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:179
+msgid "restrict-revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:179
+msgid "restrict revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:180
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:181
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:183
+msgid "the upstream commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:184
+msgid "head-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:184
+msgid "head name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:189
+msgid "rebase strategy"
+msgstr ""
+
+#: builtin/rebase--interactive.c:190
+msgid "strategy-opts"
+msgstr ""
+
+#: builtin/rebase--interactive.c:191
+msgid "strategy options"
+msgstr ""
+
+#: builtin/rebase--interactive.c:192
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase--interactive.c:193
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase--interactive.c:194
+msgid "onto-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:194
+msgid "onto name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:195
+msgid "cmd"
+msgstr ""
+
+#: builtin/rebase--interactive.c:195
+msgid "the command to run"
+msgstr ""
+
+#: builtin/rebase--interactive.c:224
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase--interactive.c:230
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/receive-pack.c:33
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: 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:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr ""
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr ""
+
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr ""
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr ""
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+
+#: builtin/remote.c:16
+msgid "git remote [-v | --verbose]"
+msgstr ""
+
+#: builtin/remote.c:17
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c: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:200
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:239 builtin/repack.c:411
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:256
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:294
+msgid "pack everything in a single pack"
+msgstr ""
+
+#: builtin/repack.c: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:420
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:481
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file. But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
+msgstr ""
+
+#: builtin/repack.c:529
+#, c-format
+msgid "failed to remove '%s'"
+msgstr ""
+
+#: 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/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:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr ""
+
+#: builtin/reset.c:32
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr ""
+
+#: builtin/reset.c:34
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "mixed"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "soft"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "hard"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "merge"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "keep"
+msgstr ""
+
+#: builtin/reset.c:81
+msgid "You do not have a valid HEAD."
+msgstr ""
+
+#: builtin/reset.c:83
+msgid "Failed to find tree of HEAD."
+msgstr ""
+
+#: builtin/reset.c:89
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr ""
+
+#: builtin/reset.c:193
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr ""
+
+#: builtin/reset.c:293
+msgid "be quiet, only report errors"
+msgstr ""
+
+#: builtin/reset.c:295
+msgid "reset HEAD and index"
+msgstr ""
+
+#: builtin/reset.c:296
+msgid "reset only HEAD"
+msgstr ""
+
+#: builtin/reset.c:298 builtin/reset.c:300
+msgid "reset HEAD, index and working tree"
+msgstr ""
+
+#: builtin/reset.c:302
+msgid "reset HEAD but keep local changes"
+msgstr ""
+
+#: builtin/reset.c:308
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+
+#: builtin/reset.c:326
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr ""
+
+#: builtin/reset.c:334
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr ""
+
+#: builtin/reset.c:343
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr ""
+
+#: builtin/reset.c:352
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+
+#: builtin/reset.c:354
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr ""
+
+#: builtin/reset.c:364
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr ""
+
+#: builtin/reset.c:368
+msgid "-N can only be used with --mixed"
+msgstr ""
+
+#: builtin/reset.c:388
+msgid "Unstaged changes after reset:"
+msgstr ""
+
+#: builtin/reset.c:391
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
+msgstr ""
+
+#: builtin/reset.c:401
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr ""
+
+#: builtin/reset.c:405
+msgid "Could not write new index file."
+msgstr ""
+
+#: builtin/rev-list.c:406
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
+
+#: builtin/rev-list.c:464
+msgid "object filtering requires --objects"
+msgstr ""
+
+#: builtin/rev-list.c:467
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr ""
+
+#: builtin/rev-list.c:508
+msgid "rev-list does not support display of notes"
+msgstr ""
+
+#: builtin/rev-list.c:511
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr ""
+
+#: builtin/rev-parse.c:408
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr ""
+
+#: builtin/rev-parse.c:413
+msgid "keep the `--` passed as an arg"
+msgstr ""
+
+#: builtin/rev-parse.c:415
+msgid "stop parsing after the first non-option argument"
+msgstr ""
+
+#: builtin/rev-parse.c:418
+msgid "output in stuck long form"
+msgstr ""
+
+#: builtin/rev-parse.c:551
+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/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr ""
+
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr ""
+
+#: builtin/revert.c:101
+msgid "end revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:102
+msgid "resume revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:103
+msgid "cancel revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:104
+msgid "don't automatically commit"
+msgstr ""
+
+#: builtin/revert.c:105
+msgid "edit the commit message"
+msgstr ""
+
+#: builtin/revert.c:108
+msgid "parent-number"
+msgstr ""
+
+#: builtin/revert.c:109
+msgid "select mainline parent"
+msgstr ""
+
+#: builtin/revert.c:111
+msgid "merge strategy"
+msgstr ""
+
+#: builtin/revert.c:113
+msgid "option for merge strategy"
+msgstr ""
+
+#: builtin/revert.c:122
+msgid "append commit name"
+msgstr ""
+
+#: builtin/revert.c:124
+msgid "preserve initially empty commits"
+msgstr ""
+
+#: builtin/revert.c:126
+msgid "keep redundant, empty commits"
+msgstr ""
+
+#: builtin/revert.c:220
+msgid "revert failed"
+msgstr ""
+
+#: builtin/revert.c:233
+msgid "cherry-pick failed"
+msgstr ""
+
+#: builtin/rm.c:19
+msgid "git rm [<options>] [--] <file>..."
+msgstr ""
+
+#: builtin/rm.c:207
+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:212
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:216
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:220 builtin/rm.c:229
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:226
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:242
+msgid "do not list removed files"
+msgstr ""
+
+#: builtin/rm.c:243
+msgid "only remove from the index"
msgstr ""
-#: builtin/receive-pack.c:796
-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/rm.c:244
+msgid "override the up-to-date check"
msgstr ""
-#: builtin/receive-pack.c:816
-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/rm.c:245
+msgid "allow recursive removal"
msgstr ""
-#: builtin/receive-pack.c:1889
-msgid "quiet"
+#: builtin/rm.c:247
+msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/receive-pack.c:1903
-msgid "You must specify a directory."
+#: builtin/rm.c:289
+msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/reflog.c:423
+#: builtin/rm.c:307
#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
+msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/reflog.c:540 builtin/reflog.c:545
+#: builtin/rm.c:346
#, c-format
-msgid "'%s' is not a valid timestamp"
+msgid "git rm: unable to remove %s"
msgstr ""
-#: builtin/remote.c:12
-msgid "git remote [-v | --verbose]"
+#: 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/remote.c:13
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+#: builtin/send-pack.c:163
+msgid "remote name"
msgstr ""
-#: builtin/remote.c:14 builtin/remote.c:34
-msgid "git remote rename <old> <new>"
+#: builtin/send-pack.c:177
+msgid "use stateless RPC protocol"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:39
-msgid "git remote remove <name>"
+#: builtin/send-pack.c:178
+msgid "read refs from stdin"
msgstr ""
-#: builtin/remote.c:16 builtin/remote.c:44
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+#: builtin/send-pack.c:179
+msgid "print status from remote helper"
msgstr ""
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose] show [-n] <name>"
+#: builtin/serve.c:7
+msgid "git serve [<options>]"
msgstr ""
-#: builtin/remote.c:18
-msgid "git remote prune [-n | --dry-run] <name>"
+#: builtin/serve.c:17 builtin/upload-pack.c:23
+msgid "quit after a single request/response exchange"
msgstr ""
-#: builtin/remote.c:19
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+#: builtin/serve.c:19
+msgid "exit immediately after advertising capabilities"
msgstr ""
-#: builtin/remote.c:20
-msgid "git remote set-branches [--add] <name> <branch>..."
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/remote.c:21 builtin/remote.c:70
-msgid "git remote get-url [--push] [--all] <name>"
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
msgstr ""
-#: builtin/remote.c:22 builtin/remote.c:75
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:76
-msgid "git remote set-url --add <name> <newurl>"
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:77
-msgid "git remote set-url --delete <name> <url>"
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/remote.c:29
-msgid "git remote add [<options>] <name> <url>"
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
msgstr ""
-#: builtin/remote.c:49
-msgid "git remote set-branches <name> <branch>..."
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
-#: builtin/remote.c:50
-msgid "git remote set-branches --add <name> <branch>..."
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
msgstr ""
-#: builtin/remote.c:55
-msgid "git remote show [<options>] <name>"
+#: builtin/shortlog.c:301
+msgid "too many arguments given outside repository"
msgstr ""
-#: builtin/remote.c:60
-msgid "git remote prune [<options>] <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:65
-msgid "git remote update [<options>] [<group> | <remote>]..."
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/remote.c:94
+#: builtin/show-branch.c:395
#, c-format
-msgid "Updating %s"
-msgstr ""
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/remote.c:126
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/show-branch.c:549
+#, c-format
+msgid "no matching refs with %s"
msgstr ""
-#: builtin/remote.c:143
-#, c-format
-msgid "unknown mirror argument: %s"
+#: builtin/show-branch.c:646
+msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/remote.c:159
-msgid "fetch the remote branches"
+#: builtin/show-branch.c:648
+msgid "show remote-tracking branches"
msgstr ""
-#: builtin/remote.c:161
-msgid "import all tags and associated objects when fetching"
+#: builtin/show-branch.c:650
+msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/remote.c:164
-msgid "or do not fetch any tag at all (--no-tags)"
+#: builtin/show-branch.c:652
+msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/remote.c:166
-msgid "branch(es) to track"
+#: builtin/show-branch.c:654
+msgid "synonym to more=-1"
msgstr ""
-#: builtin/remote.c:167
-msgid "master branch"
+#: builtin/show-branch.c:655
+msgid "suppress naming strings"
msgstr ""
-#: builtin/remote.c:168
-msgid "push|fetch"
+#: builtin/show-branch.c:657
+msgid "include the current branch"
msgstr ""
-#: builtin/remote.c:169
-msgid "set up remote as a mirror to push to or fetch from"
+#: builtin/show-branch.c:659
+msgid "name commits with their object names"
msgstr ""
-#: builtin/remote.c:181
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/show-branch.c:661
+msgid "show possible merge bases"
msgstr ""
-#: builtin/remote.c:183
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/show-branch.c:663
+msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/remote.c:190 builtin/remote.c:629
-#, c-format
-msgid "remote %s already exists."
+#: builtin/show-branch.c:665
+msgid "show commits in topological order"
msgstr ""
-#: builtin/remote.c:194 builtin/remote.c:633
-#, c-format
-msgid "'%s' is not a valid remote name"
+#: builtin/show-branch.c:668
+msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/remote.c:234
-#, c-format
-msgid "Could not setup master '%s'"
+#: builtin/show-branch.c:670
+msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/remote.c:336
-#, c-format
-msgid "Could not get fetch map for refspec %s"
+#: builtin/show-branch.c:672
+msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/remote.c:437 builtin/remote.c:445
-msgid "(matching)"
+#: builtin/show-branch.c:675
+msgid "<n>[,<base>]"
msgstr ""
-#: builtin/remote.c:449
-msgid "(delete)"
+#: builtin/show-branch.c:676
+msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
-#, c-format
-msgid "No such remote: %s"
+#: builtin/show-branch.c:712
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/remote.c:639
-#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+#: builtin/show-branch.c:736
+msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/remote.c:659
-#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+#: builtin/show-branch.c:739
+msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/remote.c:695
+#: builtin/show-branch.c:742
#, c-format
-msgid "deleting '%s' failed"
-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:729
+#: builtin/show-branch.c:746
#, c-format
-msgid "creating '%s' failed"
+msgid "no such ref %s"
msgstr ""
-#: builtin/remote.c:794
-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:"
+#: builtin/show-branch.c:830
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:808
+#: builtin/show-branch.c:834
#, c-format
-msgid "Could not remove config section '%s'"
+msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/remote.c:909
+#: builtin/show-branch.c:837
#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+msgid "cannot find commit %s (%s)"
msgstr ""
-#: builtin/remote.c:912
-msgid " tracked"
+#: 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:914
-msgid " stale (use 'git remote prune' to remove)"
+#: builtin/show-ref.c:12
+msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
-#: builtin/remote.c:916
-msgid " ???"
+#: builtin/show-ref.c:161
+msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/remote.c:957
-#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+#: builtin/show-ref.c:162
+msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/remote.c:965
-#, c-format
-msgid "rebases interactively onto remote %s"
+#: builtin/show-ref.c:163
+msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/remote.c:966
-#, c-format
-msgid "rebases onto remote %s"
+#: 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:969
-#, c-format
-msgid " merges with remote %s"
+#: builtin/show-ref.c:170
+msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/remote.c:972
-#, c-format
-msgid "merges with remote %s"
+#: builtin/show-ref.c:172
+msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/remote.c:975
-#, c-format
-msgid "%-*s and with remote %s\n"
+#: builtin/show-ref.c:176
+msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/remote.c:1018
-msgid "create"
+#: builtin/show-ref.c:178
+msgid "show refs from stdin that aren't in local repository"
msgstr ""
-#: builtin/remote.c:1021
-msgid "delete"
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
msgstr ""
-#: builtin/remote.c:1025
-msgid "up to date"
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
msgstr ""
-#: builtin/remote.c:1028
-msgid "fast-forwardable"
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
msgstr ""
-#: builtin/remote.c:1031
-msgid "local out of date"
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/remote.c:1038
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
-msgid " %-*s forces to %-*s (%s)"
+msgid "Expecting a full ref name, got %s"
msgstr ""
-#: builtin/remote.c:1041
-#, c-format
-msgid " %-*s pushes to %-*s (%s)"
+#: builtin/submodule--helper.c:62
+msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/remote.c:1045
+#: builtin/submodule--helper.c:100
#, c-format
-msgid " %-*s forces to %s"
+msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/remote.c:1048
-#, c-format
-msgid " %-*s pushes to %s"
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/remote.c:1116
-msgid "do not query remotes"
+#: builtin/submodule--helper.c:413
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/remote.c:1143
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
+#: builtin/submodule--helper.c:650
#, c-format
-msgid "* remote %s"
+msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/remote.c:1144
+#: builtin/submodule--helper.c:522
#, c-format
-msgid " Fetch URL: %s"
+msgid "Entering '%s'\n"
msgstr ""
-#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
-msgid "(no URL)"
+#: builtin/submodule--helper.c:525
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
msgstr ""
-#. TRANSLATORS: the colon ':' should align with
-#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1156 builtin/remote.c:1158
+#: builtin/submodule--helper.c:546
#, c-format
-msgid " Push URL: %s"
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
msgstr ""
-#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
-#, c-format
-msgid " HEAD branch: %s"
+#: builtin/submodule--helper.c:562
+msgid "Suppress output of entering each submodule command"
msgstr ""
-#: builtin/remote.c:1160
-msgid "(not queried)"
+#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+msgid "Recurse into nested submodules"
msgstr ""
-#: builtin/remote.c:1162
-msgid "(unknown)"
+#: builtin/submodule--helper.c:569
+msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
msgstr ""
-#: builtin/remote.c:1166
+#: builtin/submodule--helper.c:596
#, c-format
msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
msgstr ""
-#: builtin/remote.c:1178
+#: builtin/submodule--helper.c:664
#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Failed to register url for submodule path '%s'"
+msgstr ""
-#: builtin/remote.c:1181 builtin/remote.c:1207
-msgid " (status not queried)"
+#: builtin/submodule--helper.c:668
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/remote.c:1190
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/submodule--helper.c:678
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:685
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:707
+msgid "Suppress output for initializing a submodule"
+msgstr ""
-#: builtin/remote.c:1198
-msgid " Local refs will be mirrored by 'git push'"
+#: builtin/submodule--helper.c:712
+msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/remote.c:1204
+#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
#, 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:1225
-msgid "set refs/remotes/<name>/HEAD according to remote"
+msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/remote.c:1227
-msgid "delete refs/remotes/<name>/HEAD"
+#: builtin/submodule--helper.c:823
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/remote.c:1242
-msgid "Cannot determine remote HEAD"
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#, c-format
+msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/remote.c:1244
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+msgid "Suppress submodule status output"
msgstr ""
-#: builtin/remote.c:1254
-#, c-format
-msgid "Could not delete %s"
+#: builtin/submodule--helper.c:875
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
msgstr ""
-#: builtin/remote.c:1262
-#, c-format
-msgid "Not a valid ref: %s"
+#: builtin/submodule--helper.c:876
+msgid "recurse into nested submodules"
msgstr ""
-#: builtin/remote.c:1264
-#, c-format
-msgid "Could not setup %s"
+#: builtin/submodule--helper.c:881
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/remote.c:1282
-#, c-format
-msgid " %s will become dangling!"
+#: builtin/submodule--helper.c:905
+msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/remote.c:1283
+#: builtin/submodule--helper.c:969
#, c-format
-msgid " %s has become dangling!"
+msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/remote.c:1293
+#: builtin/submodule--helper.c:975
#, c-format
-msgid "Pruning %s"
+msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/remote.c:1294
+#: builtin/submodule--helper.c:989
#, c-format
-msgid "URL: %s"
+msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/remote.c:1310
+#: builtin/submodule--helper.c:1000
#, c-format
-msgid " * [would prune] %s"
+msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/remote.c:1313
-#, c-format
-msgid " * [pruned] %s"
+#: builtin/submodule--helper.c:1047
+msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/remote.c:1358
-msgid "prune remotes after fetching"
+#: builtin/submodule--helper.c:1054
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
+#: builtin/submodule--helper.c:1108
#, c-format
-msgid "No such remote '%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:1437
-msgid "add branch"
+#: builtin/submodule--helper.c:1120
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
msgstr ""
-#: builtin/remote.c:1444
-msgid "no remote specified"
+#: builtin/submodule--helper.c:1128
+#, c-format
+msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/remote.c:1461
-msgid "query push URLs rather than fetch URLs"
+#: builtin/submodule--helper.c:1130
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/remote.c:1463
-msgid "return all URLs"
+#: builtin/submodule--helper.c:1141
+#, c-format
+msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/remote.c:1491
+#: builtin/submodule--helper.c:1157
#, c-format
-msgid "no URLs configured for remote '%s'"
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/remote.c:1517
-msgid "manipulate push URLs"
+#: builtin/submodule--helper.c:1186
+msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/remote.c:1519
-msgid "add URL"
+#: builtin/submodule--helper.c:1187
+msgid "Unregister all submodules"
msgstr ""
-#: builtin/remote.c:1521
-msgid "delete URLs"
+#: builtin/submodule--helper.c:1192
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/remote.c:1528
-msgid "--add --delete doesn't make sense"
+#: builtin/submodule--helper.c:1206
+msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/remote.c:1569
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
#, c-format
-msgid "Invalid old URL pattern: %s"
+msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/remote.c:1577
+#: builtin/submodule--helper.c:1340
#, c-format
-msgid "No such URL found: %s"
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/remote.c:1579
-msgid "Will not delete all non-push URLs"
+#: builtin/submodule--helper.c:1347
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/remote.c:1593
-msgid "be verbose; must be placed before a subcommand"
+#: builtin/submodule--helper.c:1370
+msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/remote.c:1624
-#, c-format
-msgid "Unknown subcommand: %s"
+#: builtin/submodule--helper.c:1373
+msgid "name of the new submodule"
msgstr ""
-#: builtin/repack.c:17
-msgid "git repack [<options>]"
+#: builtin/submodule--helper.c:1376
+msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/repack.c:22
-msgid ""
-"Incremental repacks are incompatible with bitmap indexes. Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+#: builtin/submodule--helper.c:1384
+msgid "depth for shallow clones"
msgstr ""
-#: builtin/repack.c:166
-msgid "pack everything in a single pack"
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872
+msgid "force cloning progress"
msgstr ""
-#: builtin/repack.c:168
-msgid "same as -a, and turn unreachable objects loose"
+#: builtin/submodule--helper.c:1392
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/repack.c:171
-msgid "remove redundant packs, and run git-prune-packed"
+#: builtin/submodule--helper.c:1423
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/repack.c:173
-msgid "pass --no-reuse-delta to git-pack-objects"
+#: builtin/submodule--helper.c:1437
+#, c-format
+msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/repack.c:175
-msgid "pass --no-reuse-object to git-pack-objects"
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/repack.c:177
-msgid "do not run git-update-server-info"
+#: builtin/submodule--helper.c:1477
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/repack.c:180
-msgid "pass --local to git-pack-objects"
+#: builtin/submodule--helper.c:1570
+#, c-format
+msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/repack.c:182
-msgid "write bitmap index"
+#: builtin/submodule--helper.c:1574
+msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/repack.c:183
-msgid "approxidate"
+#: builtin/submodule--helper.c:1604
+#, c-format
+msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/repack.c:184
-msgid "with -A, do not loosen objects older than this"
+#: builtin/submodule--helper.c:1633
+#, c-format
+msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/repack.c:186
-msgid "with -a, repack unreachable objects"
+#: builtin/submodule--helper.c:1777
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/repack.c:188
-msgid "size of the window used for delta compression"
+#: builtin/submodule--helper.c:1788
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/repack.c:189 builtin/repack.c:193
-msgid "bytes"
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+msgid "path into the working tree"
msgstr ""
-#: builtin/repack.c:190
-msgid "same as the above, but limit memory size instead of entries count"
+#: builtin/submodule--helper.c:1854
+msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/repack.c:192
-msgid "limits the maximum delta depth"
+#: builtin/submodule--helper.c:1858
+msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/repack.c:194
-msgid "maximum size of each packfile"
+#: builtin/submodule--helper.c:1864
+msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/repack.c:196
-msgid "repack objects in packs marked with .keep"
+#: builtin/submodule--helper.c:1867
+msgid "parallel jobs"
msgstr ""
-#: builtin/repack.c:206
-msgid "cannot delete packs in a precious-objects repo"
+#: builtin/submodule--helper.c:1869
+msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/repack.c:210
-msgid "--keep-unreachable and -A are incompatible"
+#: builtin/submodule--helper.c:1870
+msgid "don't print cloning progress"
msgstr ""
-#: builtin/repack.c:400 builtin/worktree.c:115
-#, c-format
-msgid "failed to remove '%s'"
+#: builtin/submodule--helper.c:1877
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/replace.c:19
-msgid "git replace [-f] <object> <replacement>"
+#: builtin/submodule--helper.c:1890
+msgid "bad value for update parameter"
msgstr ""
-#: builtin/replace.c:20
-msgid "git replace [-f] --edit <object>"
+#: builtin/submodule--helper.c:1938
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
msgstr ""
-#: builtin/replace.c:21
-msgid "git replace [-f] --graft <commit> [<parent>...]"
+#: builtin/submodule--helper.c:2061
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/replace.c:22
-msgid "git replace -d <object>..."
+#: builtin/submodule--helper.c:2094
+msgid "recurse into submodules"
msgstr ""
-#: builtin/replace.c:23
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr ""
-#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395
-#, c-format
-msgid "Not a valid object name: '%s'"
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/replace.c:359
-#, c-format
-msgid "bad mergetag in commit '%s'"
+#: builtin/submodule--helper.c:2161
+msgid "git submodule--helper config name [value]"
msgstr ""
-#: builtin/replace.c:361
-#, c-format
-msgid "malformed mergetag in commit '%s'"
+#: builtin/submodule--helper.c:2162
+msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/replace.c:372
-#, c-format
-msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
+#: builtin/submodule--helper.c:2179 git-submodule.sh:169
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/replace.c:405
+#: builtin/submodule--helper.c:2229 git.c:413 git.c:658
#, c-format
-msgid "the original commit '%s' has a gpg signature."
-msgstr ""
-
-#: builtin/replace.c:406
-msgid "the signature will be removed in the replacement commit!"
+msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/replace.c:412
+#: builtin/submodule--helper.c:2235
#, c-format
-msgid "could not write replacement commit for: '%s'"
+msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
-#: builtin/replace.c:436
-msgid "list replace refs"
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
-#: builtin/replace.c:437
-msgid "delete replace refs"
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
-#: builtin/replace.c:438
-msgid "edit existing object"
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/replace.c:439
-msgid "change a commit's parents"
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
msgstr ""
-#: builtin/replace.c:440
-msgid "replace the ref if it exists"
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
msgstr ""
-#: builtin/replace.c:441
-msgid "do not pretty-print contents for --edit"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
msgstr ""
-#: builtin/replace.c:442
-msgid "use this format"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
msgstr ""
-#: builtin/rerere.c:12
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
msgstr ""
-#: builtin/rerere.c:58
-msgid "register clean resolutions in index"
+#: builtin/tag.c:26
+msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/reset.c:26
+#: builtin/tag.c:27
msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-#: builtin/reset.c:27
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+#: builtin/tag.c:29
+msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/reset.c:28
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+#: builtin/tag.c:87
+#, c-format
+msgid "tag '%s' not found."
msgstr ""
-#: builtin/reset.c:34
-msgid "mixed"
+#: builtin/tag.c:103
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/reset.c:34
-msgid "soft"
+#: 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/reset.c:34
-msgid "hard"
+#: 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/reset.c:34
-msgid "merge"
+#: builtin/tag.c:191
+msgid "unable to sign the tag"
msgstr ""
-#: builtin/reset.c:34
-msgid "keep"
+#: builtin/tag.c:193
+msgid "unable to write tag file"
msgstr ""
-#: builtin/reset.c:74
-msgid "You do not have a valid HEAD."
+#: builtin/tag.c:218
+msgid "bad object type."
msgstr ""
-#: builtin/reset.c:76
-msgid "Failed to find tree of HEAD."
+#: builtin/tag.c:267
+msgid "no tag message?"
msgstr ""
-#: builtin/reset.c:82
+#: builtin/tag.c:274
#, c-format
-msgid "Failed to find tree of %s."
+msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/reset.c:100
-#, c-format
-msgid "HEAD is now at %s"
+#: builtin/tag.c:385
+msgid "list tag names"
msgstr ""
-#: builtin/reset.c:183
-#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
+#: builtin/tag.c:387
+msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/reset.c:276
-msgid "be quiet, only report errors"
+#: builtin/tag.c:389
+msgid "delete tags"
msgstr ""
-#: builtin/reset.c:278
-msgid "reset HEAD and index"
+#: builtin/tag.c:390
+msgid "verify tags"
msgstr ""
-#: builtin/reset.c:279
-msgid "reset only HEAD"
+#: builtin/tag.c:392
+msgid "Tag creation options"
msgstr ""
-#: builtin/reset.c:281 builtin/reset.c:283
-msgid "reset HEAD, index and working tree"
+#: builtin/tag.c:394
+msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/reset.c:285
-msgid "reset HEAD but keep local changes"
+#: builtin/tag.c:396
+msgid "tag message"
msgstr ""
-#: builtin/reset.c:288
-msgid "record only the fact that removed paths will be added later"
+#: builtin/tag.c:398
+msgid "force edit of tag message"
msgstr ""
-#: builtin/reset.c:305
-#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
+#: builtin/tag.c:399
+msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/reset.c:313
-#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
+#: builtin/tag.c:403
+msgid "use another key to sign the tag"
msgstr ""
-#: builtin/reset.c:322
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: builtin/tag.c:404
+msgid "replace the tag if exists"
msgstr ""
-#: builtin/reset.c:331
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: builtin/tag.c:405 builtin/update-ref.c:369
+msgid "create a reflog"
msgstr ""
-#: builtin/reset.c:333
-#, c-format
-msgid "Cannot do %s reset with paths."
+#: builtin/tag.c:407
+msgid "Tag listing options"
+msgstr ""
+
+#: builtin/tag.c:408
+msgid "show tag list in columns"
msgstr ""
-#: builtin/reset.c:343
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
+#: builtin/tag.c:409 builtin/tag.c:411
+msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/reset.c:347
-msgid "-N can only be used with --mixed"
+#: builtin/tag.c:410 builtin/tag.c:412
+msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/reset.c:364
-msgid "Unstaged changes after reset:"
+#: builtin/tag.c:413
+msgid "print only tags that are merged"
msgstr ""
-#: builtin/reset.c:370
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: builtin/tag.c:414
+msgid "print only tags that are not merged"
msgstr ""
-#: builtin/reset.c:374
-msgid "Could not write new index file."
+#: builtin/tag.c:419
+msgid "print only tags of the object"
msgstr ""
-#: builtin/rev-list.c:354
-msgid "rev-list does not support display of notes"
+#: builtin/tag.c:463
+msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/rev-parse.c:393
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+#: builtin/tag.c:485
+msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/rev-parse.c:398
-msgid "keep the `--` passed as an arg"
+#: builtin/tag.c:487
+msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/rev-parse.c:400
-msgid "stop parsing after the first non-option argument"
+#: builtin/tag.c:489
+msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/rev-parse.c:403
-msgid "output in stuck long form"
+#: builtin/tag.c:491
+msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/rev-parse.c:534
-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/tag.c:493
+msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/revert.c:22
-msgid "git revert [<options>] <commit-ish>..."
+#: builtin/tag.c:504
+msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/revert.c:23
-msgid "git revert <subcommand>"
+#: builtin/tag.c:523
+msgid "too many params"
msgstr ""
-#: builtin/revert.c:28
-msgid "git cherry-pick [<options>] <commit-ish>..."
+#: builtin/tag.c:529
+#, c-format
+msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/revert.c:29
-msgid "git cherry-pick <subcommand>"
+#: builtin/tag.c:534
+#, c-format
+msgid "tag '%s' already exists"
msgstr ""
-#: builtin/revert.c:89
+#: builtin/tag.c:565
#, c-format
-msgid "%s: %s cannot be used with %s"
+msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/revert.c:98
-msgid "end revert or cherry-pick sequence"
+#: builtin/unpack-objects.c:500
+msgid "Unpacking objects"
msgstr ""
-#: builtin/revert.c:99
-msgid "resume revert or cherry-pick sequence"
+#: builtin/update-index.c:83
+#, c-format
+msgid "failed to create directory %s"
msgstr ""
-#: builtin/revert.c:100
-msgid "cancel revert or cherry-pick sequence"
+#: builtin/update-index.c:99
+#, c-format
+msgid "failed to create file %s"
msgstr ""
-#: builtin/revert.c:101
-msgid "don't automatically commit"
+#: builtin/update-index.c:107
+#, c-format
+msgid "failed to delete file %s"
msgstr ""
-#: builtin/revert.c:102
-msgid "edit the commit message"
+#: builtin/update-index.c:114 builtin/update-index.c:220
+#, c-format
+msgid "failed to delete directory %s"
msgstr ""
-#: builtin/revert.c:105
-msgid "parent-number"
+#: builtin/update-index.c:139
+#, c-format
+msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/revert.c:106
-msgid "select mainline parent"
+#: builtin/update-index.c:153
+msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/revert.c:108
-msgid "merge strategy"
+#: builtin/update-index.c:166
+msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/revert.c:109
-msgid "option"
+#: builtin/update-index.c:179
+msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/revert.c:110
-msgid "option for merge strategy"
+#: builtin/update-index.c:190
+msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/revert.c:119
-msgid "append commit name"
+#: builtin/update-index.c:201
+msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/revert.c:121
-msgid "preserve initially empty commits"
+#: builtin/update-index.c:214
+msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/revert.c:122
-msgid "allow commits with empty messages"
+#: builtin/update-index.c:221
+msgid " OK"
msgstr ""
-#: builtin/revert.c:123
-msgid "keep redundant, empty commits"
+#: builtin/update-index.c:589
+msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/revert.c:211
-msgid "revert failed"
+#: builtin/update-index.c:962
+msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/revert.c:224
-msgid "cherry-pick failed"
+#: builtin/update-index.c:965
+msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/rm.c:17
-msgid "git rm [<options>] [--] <file>..."
+#: builtin/update-index.c:968
+msgid "do not ignore new files"
msgstr ""
-#: builtin/rm.c:205
-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:210
-msgid ""
-"\n"
-"(use -f to force removal)"
+#: builtin/update-index.c:970
+msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/rm.c:214
-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:972
+msgid "notice files missing from worktree"
+msgstr ""
-#: builtin/rm.c:218 builtin/rm.c:227
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/update-index.c:974
+msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/rm.c:224
-msgid "the following file has local modifications:"
-msgid_plural "the following files have local modifications:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/update-index.c:977
+msgid "refresh stat information"
+msgstr ""
-#: builtin/rm.c:242
-msgid "do not list removed files"
+#: builtin/update-index.c:981
+msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/rm.c:243
-msgid "only remove from the index"
+#: builtin/update-index.c:985
+msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/rm.c:244
-msgid "override the up-to-date check"
+#: builtin/update-index.c:986
+msgid "add the specified entry to the index"
msgstr ""
-#: builtin/rm.c:245
-msgid "allow recursive removal"
+#: builtin/update-index.c:995
+msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/rm.c:247
-msgid "exit with a zero status even if nothing matched"
+#: builtin/update-index.c:998
+msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/rm.c:308
-#, c-format
-msgid "not removing '%s' recursively without -r"
+#: builtin/update-index.c:1001
+msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/rm.c:347
-#, c-format
-msgid "git rm: unable to remove %s"
+#: builtin/update-index.c:1004
+msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/rm.c:370
-#, c-format
-msgid "could not remove '%s'"
+#: builtin/update-index.c:1007
+msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/send-pack.c:18
-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:1009
+msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/send-pack.c:161
-msgid "remote name"
+#: builtin/update-index.c:1011
+msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/send-pack.c:175
-msgid "use stateless RPC protocol"
+#: builtin/update-index.c:1013
+msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/send-pack.c:176
-msgid "read refs from stdin"
+#: builtin/update-index.c:1017
+msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/send-pack.c:177
-msgid "print status from remote helper"
+#: builtin/update-index.c:1021
+msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/shortlog.c:13
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+#: builtin/update-index.c:1025
+msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/shortlog.c:248
-msgid "Group by committer rather than author"
+#: builtin/update-index.c:1029
+msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/shortlog.c:250
-msgid "sort output according to the number of commits per author"
+#: builtin/update-index.c:1032
+msgid "report actions to standard output"
msgstr ""
-#: builtin/shortlog.c:252
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/update-index.c:1034
+msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/shortlog.c:254
-msgid "Show the email address of each author"
+#: builtin/update-index.c:1038
+msgid "write index in this format"
msgstr ""
-#: builtin/shortlog.c:255
-msgid "w[,i1[,i2]]"
+#: builtin/update-index.c:1040
+msgid "enable or disable split index"
msgstr ""
-#: builtin/shortlog.c:256
-msgid "Linewrap output"
+#: builtin/update-index.c:1042
+msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/show-branch.c:10
-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>)...]"
+#: builtin/update-index.c:1044
+msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/show-branch.c:14
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+#: builtin/update-index.c:1046
+msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/show-branch.c:374
-#, 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:1048
+msgid "write out the index even if is not flagged as changed"
+msgstr ""
-#: builtin/show-branch.c:536
-#, c-format
-msgid "no matching refs with %s"
+#: builtin/update-index.c:1050
+msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/show-branch.c:632
-msgid "show remote-tracking and local branches"
+#: builtin/update-index.c:1052
+msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/show-branch.c:634
-msgid "show remote-tracking branches"
+#: builtin/update-index.c:1055
+msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/show-branch.c:636
-msgid "color '*!+-' corresponding to the branch"
+#: builtin/update-index.c:1156
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
msgstr ""
-#: builtin/show-branch.c:638
-msgid "show <n> more commits after the common ancestor"
+#: builtin/update-index.c:1165
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
msgstr ""
-#: builtin/show-branch.c:640
-msgid "synonym to more=-1"
+#: builtin/update-index.c:1176
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
msgstr ""
-#: builtin/show-branch.c:641
-msgid "suppress naming strings"
+#: builtin/update-index.c:1180
+msgid "Untracked cache disabled"
msgstr ""
-#: builtin/show-branch.c:643
-msgid "include the current branch"
+#: builtin/update-index.c:1188
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
msgstr ""
-#: builtin/show-branch.c:645
-msgid "name commits with their object names"
+#: builtin/update-index.c:1192
+#, c-format
+msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/show-branch.c:647
-msgid "show possible merge bases"
+#: builtin/update-index.c:1200
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/show-branch.c:649
-msgid "show refs unreachable from any other ref"
+#: builtin/update-index.c:1204
+msgid "fsmonitor enabled"
msgstr ""
-#: builtin/show-branch.c:651
-msgid "show commits in topological order"
+#: builtin/update-index.c:1207
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/show-branch.c:654
-msgid "show only commits not on the first branch"
+#: builtin/update-index.c:1211
+msgid "fsmonitor disabled"
msgstr ""
-#: builtin/show-branch.c:656
-msgid "show merges reachable from only one tip"
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
-#: builtin/show-branch.c:658
-msgid "topologically sort, maintaining date order where possible"
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-#: builtin/show-branch.c:661
-msgid "<n>[,<base>]"
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/show-branch.c:662
-msgid "show <n> most recent ref-log entries starting at base"
+#: builtin/update-ref.c:364
+msgid "delete the reference"
msgstr ""
-#: builtin/show-branch.c:696
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+#: builtin/update-ref.c:366
+msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/show-branch.c:720
-msgid "no branches given, and HEAD is not valid"
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/show-branch.c:723
-msgid "--reflog option needs one branch name"
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
msgstr ""
-#: builtin/show-branch.c:726
-#, 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/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr ""
-#: builtin/show-branch.c:730
-#, c-format
-msgid "no such ref %s"
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
msgstr ""
-#: builtin/show-branch.c:814
-#, c-format
-msgid "cannot handle more than %d rev."
-msgid_plural "cannot handle more than %d revs."
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr ""
-#: builtin/show-branch.c:818
-#, c-format
-msgid "'%s' is not a valid ref."
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
msgstr ""
-#: builtin/show-branch.c:821
-#, c-format
-msgid "cannot find commit %s (%s)"
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
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/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>]"
+#: builtin/verify-commit.c:20
+msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/show-ref.c:159
-msgid "only show tags (can be combined with heads)"
+#: builtin/verify-commit.c:76
+msgid "print commit contents"
msgstr ""
-#: builtin/show-ref.c:160
-msgid "only show heads (can be combined with tags)"
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+msgid "print raw gpg status output"
msgstr ""
-#: builtin/show-ref.c:161
-msgid "stricter reference checking, requires exact ref path"
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr ""
-#: builtin/show-ref.c:164 builtin/show-ref.c:166
-msgid "show the HEAD reference, even if it would be filtered out"
+#: builtin/verify-pack.c:65
+msgid "verbose"
msgstr ""
-#: builtin/show-ref.c:168
-msgid "dereference tags into object IDs"
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
msgstr ""
-#: builtin/show-ref.c:170
-msgid "only show SHA1 hash using <n> digits"
+#: builtin/verify-tag.c:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr ""
-#: builtin/show-ref.c:174
-msgid "do not print results to stdout (useful with --verify)"
+#: builtin/verify-tag.c:37
+msgid "print tag contents"
msgstr ""
-#: builtin/show-ref.c:176
-msgid "show refs from stdin that aren't in local repository"
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/stripspace.c:17
-msgid "git stripspace [-s | --strip-comments]"
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/stripspace.c:18
-msgid "git stripspace [-c | --comment-lines]"
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/stripspace.c:35
-msgid "skip and remove all lines starting with comment character"
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/stripspace.c:38
-msgid "prepend comment character and space to each line"
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
-#, c-format
-msgid "No such ref: %s"
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
-#, c-format
-msgid "Expecting a full ref name, got %s"
+#: builtin/worktree.c:24
+msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/submodule--helper.c:71
+#: builtin/worktree.c:61 builtin/worktree.c:888
#, c-format
-msgid "cannot strip one component off url '%s'"
+msgid "failed to delete '%s'"
msgstr ""
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
-msgid "alternative anchor for relative paths"
+#: builtin/worktree.c:80
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/submodule--helper.c:310
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+#: builtin/worktree.c:86
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/submodule--helper.c:395
+#: builtin/worktree.c:110
#, c-format
msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
msgstr ""
-#: builtin/submodule--helper.c:406
+#: builtin/worktree.c:118
#, c-format
-msgid "Failed to register url for submodule path '%s'"
+msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/submodule--helper.c:410
+#: builtin/worktree.c:127
#, c-format
-msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr ""
+
+#: builtin/worktree.c:166
+msgid "report pruned working trees"
+msgstr ""
+
+#: builtin/worktree.c:168
+msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/submodule--helper.c:420
+#: builtin/worktree.c:235
#, c-format
-msgid "warning: command update mode suggested for submodule '%s'\n"
+msgid "'%s' already exists"
msgstr ""
-#: builtin/submodule--helper.c:427
+#: builtin/worktree.c:252
#, c-format
-msgid "Failed to register update mode for submodule path '%s'"
+msgid "unable to re-add worktree '%s'"
msgstr ""
-#: builtin/submodule--helper.c:443
-msgid "Suppress output for initializing a submodule"
+#: builtin/worktree.c:257
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/submodule--helper.c:448
-msgid "git submodule--helper init [<path>]"
+#: builtin/worktree.c:259
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
+#: builtin/worktree.c:310
+#, c-format
+msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/submodule--helper.c:482
+#: builtin/worktree.c:429 builtin/worktree.c:435
#, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/worktree.c:431
#, c-format
-msgid "submodule '%s' cannot add alternate: %s"
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/submodule--helper.c:604
+#: builtin/worktree.c:440
#, c-format
-msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/submodule--helper.c:611
+#: builtin/worktree.c:446
#, c-format
-msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/submodule--helper.c:633
-msgid "where the new submodule will be cloned to"
+#: builtin/worktree.c:487
+msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/submodule--helper.c:636
-msgid "name of the new submodule"
+#: builtin/worktree.c:490
+msgid "create a new branch"
msgstr ""
-#: builtin/submodule--helper.c:639
-msgid "url where to clone the submodule from"
+#: builtin/worktree.c:492
+msgid "create or reset a branch"
msgstr ""
-#: builtin/submodule--helper.c:645
-msgid "depth for shallow clones"
+#: builtin/worktree.c:494
+msgid "populate the new working tree"
msgstr ""
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
-msgid "force cloning progress"
+#: builtin/worktree.c:495
+msgid "keep the new working tree locked"
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:498
+msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/submodule--helper.c:684
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
+#: builtin/worktree.c:501
+msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/submodule--helper.c:699
-#, c-format
-msgid "could not get submodule directory for '%s'"
+#: builtin/worktree.c:509
+msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/submodule--helper.c:764
-#, c-format
-msgid "Submodule path '%s' not initialized"
+#: builtin/worktree.c:570
+msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/submodule--helper.c:768
-msgid "Maybe you want to use 'update --init'?"
+#: builtin/worktree.c:670
+msgid "reason for locking"
msgstr ""
-#: builtin/submodule--helper.c:793
+#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789
+#: builtin/worktree.c:916
#, c-format
-msgid "Skipping unmerged submodule %s"
+msgid "'%s' is not a working tree"
+msgstr ""
+
+#: builtin/worktree.c:684 builtin/worktree.c:717
+msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/submodule--helper.c:814
+#: builtin/worktree.c:689
#, c-format
-msgid "Skipping submodule '%s'"
+msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/submodule--helper.c:942
+#: builtin/worktree.c:691
#, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
+msgid "'%s' is already locked"
msgstr ""
-#: builtin/submodule--helper.c:953
+#: builtin/worktree.c:719
#, c-format
-msgid "Failed to clone '%s' a second time, aborting"
+msgid "'%s' is not locked"
msgstr ""
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
-msgid "path into the working tree"
+#: builtin/worktree.c:760
+msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/submodule--helper.c:977
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/worktree.c:768
+msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/submodule--helper.c:981
-msgid "rebase, merge, checkout or none"
+#: builtin/worktree.c:791 builtin/worktree.c:918
+#, c-format
+msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/submodule--helper.c:985
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/worktree.c:796
+#, c-format
+msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/submodule--helper.c:988
-msgid "parallel jobs"
+#: builtin/worktree.c:802
+#, c-format
+msgid "target '%s' already exists"
msgstr ""
-#: builtin/submodule--helper.c:990
-msgid "whether the initial clone should follow the shallow recommendation"
+#: builtin/worktree.c:810
+#, c-format
+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:991
-msgid "don't print cloning progress"
+#: builtin/worktree.c:812
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/submodule--helper.c:998
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/worktree.c:815
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/submodule--helper.c:1008
-msgid "bad value for update parameter"
+#: builtin/worktree.c:820
+#, c-format
+msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1079
+#: builtin/worktree.c:868
#, c-format
-msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
+msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1163
-msgid "recurse into submodules"
+#: builtin/worktree.c:872
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/submodule--helper.c:1169
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/worktree.c:877
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/submodule--helper.c:1226
-msgid "submodule--helper subcommand must be called with a subcommand"
+#: builtin/worktree.c:900
+msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/submodule--helper.c:1233
+#: builtin/worktree.c:923
#, c-format
-msgid "%s doesn't support --super-prefix"
+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:1239
-#, c-format
-msgid "'%s' is not a valid submodule--helper subcommand"
+#: builtin/worktree.c:925
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/symbolic-ref.c:7
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
+#: builtin/worktree.c:928
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref -d [-q] <name>"
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: builtin/symbolic-ref.c:40
-msgid "suppress error message for non-symbolic (detached) refs"
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
msgstr ""
-#: builtin/symbolic-ref.c:41
-msgid "delete symbolic ref"
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
msgstr ""
-#: builtin/symbolic-ref.c:42
-msgid "shorten ref output"
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
-msgid "reason"
+#: credential-cache--daemon.c:223
+#, 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"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
-msgid "reason of the update"
+#: credential-cache--daemon.c:272
+msgid "print debugging messages to stderr"
msgstr ""
-#: builtin/tag.c:23
-msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
msgstr ""
-#: builtin/tag.c:24
-msgid "git tag -d <tagname>..."
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
msgstr ""
-#: builtin/tag.c:25
+#: git.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>...]"
+"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/tag.c:27
-msgid "git tag -v [--format=<format>] <tagname>..."
+#: 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/tag.c:83
+#: git.c:174
#, c-format
-msgid "tag '%s' not found."
+msgid "no directory given for --git-dir\n"
msgstr ""
-#: builtin/tag.c:99
+#: git.c:188
#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
+msgid "no namespace given for --namespace\n"
msgstr ""
-#: builtin/tag.c:128
+#: git.c:202
#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be ignored.\n"
+msgid "no directory given for --work-tree\n"
msgstr ""
-#: builtin/tag.c:132
+#: git.c:216
#, 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 "no prefix given for --super-prefix\n"
msgstr ""
-#: builtin/tag.c:210
-msgid "unable to sign the tag"
-msgstr ""
-
-#: builtin/tag.c:212
-msgid "unable to write tag file"
-msgstr ""
-
-#: builtin/tag.c:236
-msgid "bad object type."
+#: git.c:238
+#, c-format
+msgid "-c expects a configuration string\n"
msgstr ""
-#: builtin/tag.c:282
-msgid "no tag message?"
+#: git.c:276
+#, c-format
+msgid "no directory given for -C\n"
msgstr ""
-#: builtin/tag.c:289
+#: git.c:301
#, c-format
-msgid "The tag message has been left in %s\n"
+msgid "unknown option: %s\n"
msgstr ""
-#: builtin/tag.c:312
-msgid "tag: tagging "
+#: git.c:342
+#, c-format
+msgid "while expanding alias '%s': '%s'"
msgstr ""
-#: builtin/tag.c:320
-msgid "object of unknown type"
+#: git.c:351
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
msgstr ""
-#: builtin/tag.c:327
-msgid "commit object"
+#: git.c:359
+#, c-format
+msgid "empty alias for %s"
msgstr ""
-#: builtin/tag.c:335
-msgid "tree object"
+#: git.c:362
+#, c-format
+msgid "recursive alias: %s"
msgstr ""
-#: builtin/tag.c:338
-msgid "blob object"
+#: git.c:437
+msgid "write failure on standard output"
msgstr ""
-#: builtin/tag.c:341
-msgid "other tag object"
+#: git.c:439
+msgid "unknown write failure on standard output"
msgstr ""
-#: builtin/tag.c:397
-msgid "list tag names"
+#: git.c:441
+msgid "close failed on standard output"
msgstr ""
-#: builtin/tag.c:399
-msgid "print <n> lines of each tag message"
+#: git.c:720
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: builtin/tag.c:401
-msgid "delete tags"
+#: git.c:770
+#, c-format
+msgid "cannot handle %s as a builtin"
msgstr ""
-#: builtin/tag.c:402
-msgid "verify tags"
+#: git.c:783
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
msgstr ""
-#: builtin/tag.c:404
-msgid "Tag creation options"
+#: git.c:803
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: builtin/tag.c:406
-msgid "annotated tag, needs a message"
+#: git.c:815
+#, c-format
+msgid "failed to run command '%s': %s\n"
msgstr ""
-#: builtin/tag.c:408
-msgid "tag message"
+#: http.c:378
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: builtin/tag.c:410
-msgid "annotated and GPG-signed tag"
+#: http.c:399
+msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: builtin/tag.c:414
-msgid "use another key to sign the tag"
+#: http.c:408
+msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: builtin/tag.c:415
-msgid "replace the tag if exists"
+#: http.c:876
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: builtin/tag.c:416 builtin/update-ref.c:368
-msgid "create a reflog"
+#: http.c:949
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr ""
-#: builtin/tag.c:418
-msgid "Tag listing options"
+#: http.c:1085
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-
-#: builtin/tag.c:419
-msgid "show tag list in columns"
+
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: builtin/tag.c:420 builtin/tag.c:422
-msgid "print only tags that contain the commit"
+#: http.c:1096
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: builtin/tag.c:421 builtin/tag.c:423
-msgid "print only tags that don't contain the commit"
+#: http.c:1959
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
msgstr ""
-#: builtin/tag.c:424
-msgid "print only tags that are merged"
+#: remote-curl.c:455
+#, c-format
+msgid "redirecting to %s"
msgstr ""
-#: builtin/tag.c:425
-msgid "print only tags that are not merged"
+#: parse-options.h:154
+msgid "expiry-date"
msgstr ""
-#: builtin/tag.c:430
-msgid "print only tags of the object"
+#: parse-options.h:169
+msgid "no-op (backward compatibility)"
msgstr ""
-#: builtin/tag.c:469
-msgid "--column and -n are incompatible"
+#: parse-options.h:259
+msgid "be more verbose"
msgstr ""
-#: builtin/tag.c:491
-msgid "-n option is only allowed in list mode"
+#: parse-options.h:261
+msgid "be more quiet"
msgstr ""
-#: builtin/tag.c:493
-msgid "--contains option is only allowed in list mode"
+#: parse-options.h:267
+msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: builtin/tag.c:495
-msgid "--no-contains option is only allowed in list mode"
+#: command-list.h:50
+msgid "Add file contents to the index"
msgstr ""
-#: builtin/tag.c:497
-msgid "--points-at option is only allowed in list mode"
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
msgstr ""
-#: builtin/tag.c:499
-msgid "--merged and --no-merged options are only allowed in list mode"
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
msgstr ""
-#: builtin/tag.c:510
-msgid "only one -F or -m option is allowed."
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
msgstr ""
-#: builtin/tag.c:529
-msgid "too many params"
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
msgstr ""
-#: builtin/tag.c:535
-#, c-format
-msgid "'%s' is not a valid tag name."
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
msgstr ""
-#: builtin/tag.c:540
-#, c-format
-msgid "tag '%s' already exists"
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
msgstr ""
-#: builtin/tag.c:570
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
msgstr ""
-#: builtin/unpack-objects.c:493
-msgid "Unpacking objects"
+#: command-list.h:58
+msgid "List, create, or delete branches"
msgstr ""
-#: builtin/update-index.c:79
-#, c-format
-msgid "failed to create directory %s"
+#: command-list.h:59
+msgid "Move objects and refs by archive"
msgstr ""
-#: builtin/update-index.c:85
-#, c-format
-msgid "failed to stat %s"
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
msgstr ""
-#: builtin/update-index.c:95
-#, c-format
-msgid "failed to create file %s"
+#: command-list.h:61
+msgid "Display gitattributes information"
msgstr ""
-#: builtin/update-index.c:103
-#, c-format
-msgid "failed to delete file %s"
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
msgstr ""
-#: builtin/update-index.c:110 builtin/update-index.c:216
-#, c-format
-msgid "failed to delete directory %s"
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
msgstr ""
-#: builtin/update-index.c:135
-#, c-format
-msgid "Testing mtime in '%s' "
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
msgstr ""
-#: builtin/update-index.c:149
-msgid "directory stat info does not change after adding a new file"
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
msgstr ""
-#: builtin/update-index.c:162
-msgid "directory stat info does not change after adding a new directory"
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
msgstr ""
-#: builtin/update-index.c:175
-msgid "directory stat info changes after updating a file"
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
msgstr ""
-#: builtin/update-index.c:186
-msgid "directory stat info changes after adding a file inside subdirectory"
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
msgstr ""
-#: builtin/update-index.c:197
-msgid "directory stat info does not change after deleting a file"
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
msgstr ""
-#: builtin/update-index.c:210
-msgid "directory stat info does not change after deleting a directory"
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
msgstr ""
-#: builtin/update-index.c:217
-msgid " OK"
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
msgstr ""
-#: builtin/update-index.c:568
-msgid "git update-index [<options>] [--] [<file>...]"
+#: command-list.h:72
+msgid "Display data in columns"
msgstr ""
-#: builtin/update-index.c:923
-msgid "continue refresh even when index needs update"
+#: command-list.h:73
+msgid "Record changes to the repository"
msgstr ""
-#: builtin/update-index.c:926
-msgid "refresh: ignore submodules"
+#: command-list.h:74
+msgid "Write and verify Git commit-graph files"
msgstr ""
-#: builtin/update-index.c:929
-msgid "do not ignore new files"
+#: command-list.h:75
+msgid "Create a new commit object"
msgstr ""
-#: builtin/update-index.c:931
-msgid "let files replace directories and vice-versa"
+#: command-list.h:76
+msgid "Get and set repository or global options"
msgstr ""
-#: builtin/update-index.c:933
-msgid "notice files missing from worktree"
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
-#: builtin/update-index.c:935
-msgid "refresh even if index contains unmerged entries"
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
msgstr ""
-#: builtin/update-index.c:938
-msgid "refresh stat information"
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
msgstr ""
-#: builtin/update-index.c:942
-msgid "like --refresh, but ignore assume-unchanged setting"
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
msgstr ""
-#: builtin/update-index.c:946
-msgid "<mode>,<object>,<path>"
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
msgstr ""
-#: builtin/update-index.c:947
-msgid "add the specified entry to the index"
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
msgstr ""
-#: builtin/update-index.c:956
-msgid "mark files as \"not changing\""
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
msgstr ""
-#: builtin/update-index.c:959
-msgid "clear assumed-unchanged bit"
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
msgstr ""
-#: builtin/update-index.c:962
-msgid "mark files as \"index-only\""
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
msgstr ""
-#: builtin/update-index.c:965
-msgid "clear skip-worktree bit"
+#: command-list.h:86
+msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
-#: builtin/update-index.c:968
-msgid "add to index only; do not add content to object database"
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
msgstr ""
-#: builtin/update-index.c:970
-msgid "remove named paths even if present in worktree"
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
msgstr ""
-#: builtin/update-index.c:972
-msgid "with --stdin: input lines are terminated by null bytes"
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
-#: builtin/update-index.c:974
-msgid "read list of paths to be updated from standard input"
+#: command-list.h:90
+msgid "Show changes using common diff tools"
msgstr ""
-#: builtin/update-index.c:978
-msgid "add entries from standard input to the index"
+#: command-list.h:91
+msgid "Git data exporter"
msgstr ""
-#: builtin/update-index.c:982
-msgid "repopulate stages #2 and #3 for the listed paths"
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
msgstr ""
-#: builtin/update-index.c:986
-msgid "only update entries that differ from HEAD"
+#: command-list.h:93
+msgid "Download objects and refs from another repository"
msgstr ""
-#: builtin/update-index.c:990
-msgid "ignore files missing from worktree"
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
msgstr ""
-#: builtin/update-index.c:993
-msgid "report actions to standard output"
+#: command-list.h:95
+msgid "Rewrite branches"
msgstr ""
-#: builtin/update-index.c:995
-msgid "(for porcelains) forget saved unresolved conflicts"
+#: command-list.h:96
+msgid "Produce a merge commit message"
msgstr ""
-#: builtin/update-index.c:999
-msgid "write index in this format"
+#: command-list.h:97
+msgid "Output information on each ref"
msgstr ""
-#: builtin/update-index.c:1001
-msgid "enable or disable split index"
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
msgstr ""
-#: builtin/update-index.c:1003
-msgid "enable/disable untracked cache"
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
-#: builtin/update-index.c:1005
-msgid "test if the filesystem supports untracked cache"
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
msgstr ""
-#: builtin/update-index.c:1007
-msgid "enable untracked cache without testing the filesystem"
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
-#: builtin/update-index.c:1107
-msgid ""
-"core.splitIndex is set to false; remove or change it, if you really want to "
-"enable split index"
+#: command-list.h:102
+msgid "Print lines matching a pattern"
msgstr ""
-#: builtin/update-index.c:1116
-msgid ""
-"core.splitIndex is set to true; remove or change it, if you really want to "
-"disable split index"
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
msgstr ""
-#: builtin/update-index.c:1127
-msgid ""
-"core.untrackedCache is set to true; remove or change it, if you really want "
-"to disable the untracked cache"
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
-#: builtin/update-index.c:1131
-msgid "Untracked cache disabled"
+#: command-list.h:105
+msgid "Display help information about Git"
msgstr ""
-#: builtin/update-index.c:1139
-msgid ""
-"core.untrackedCache is set to false; remove or change it, if you really want "
-"to enable the untracked cache"
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
msgstr ""
-#: builtin/update-index.c:1143
-#, c-format
-msgid "Untracked cache enabled for '%s'"
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
msgstr ""
-#: builtin/update-ref.c:9
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
msgstr ""
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>] --stdin [-z]"
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
msgstr ""
-#: builtin/update-ref.c:363
-msgid "delete the reference"
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
-#: builtin/update-ref.c:365
-msgid "update <refname> not the one it points to"
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
msgstr ""
-#: builtin/update-ref.c:366
-msgid "stdin has NUL-terminated arguments"
+#: command-list.h:113
+msgid "add or parse structured information in commit messages"
msgstr ""
-#: builtin/update-ref.c:367
-msgid "read updates from stdin"
+#: command-list.h:114
+msgid "The Git repository browser"
msgstr ""
-#: builtin/update-server-info.c:6
-msgid "git update-server-info [--force]"
+#: command-list.h:115
+msgid "Show commit logs"
msgstr ""
-#: builtin/update-server-info.c:14
-msgid "update the info files from scratch"
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
msgstr ""
-#: builtin/verify-commit.c:17
-msgid "git verify-commit [-v | --verbose] <commit>..."
+#: command-list.h:117
+msgid "List references in a remote repository"
msgstr ""
-#: builtin/verify-commit.c:72
-msgid "print commit contents"
+#: command-list.h:118
+msgid "List the contents of a tree object"
msgstr ""
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
-msgid "print raw gpg status output"
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
-#: builtin/verify-pack.c:54
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
msgstr ""
-#: builtin/verify-pack.c:64
-msgid "verbose"
+#: command-list.h:121
+msgid "Join two or more development histories together"
msgstr ""
-#: builtin/verify-pack.c:66
-msgid "show statistics only"
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
-#: builtin/verify-tag.c:18
-msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+#: command-list.h:123
+msgid "Run a three-way file merge"
msgstr ""
-#: builtin/verify-tag.c:36
-msgid "print tag contents"
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
msgstr ""
-#: builtin/worktree.c:15
-msgid "git worktree add [<options>] <path> [<branch>]"
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
-#: builtin/worktree.c:16
-msgid "git worktree list [<options>]"
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
-#: builtin/worktree.c:17
-msgid "git worktree lock [<options>] <path>"
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
msgstr ""
-#: builtin/worktree.c:18
-msgid "git worktree prune [<options>]"
+#: command-list.h:128
+msgid "Write and verify multi-pack-indexes"
msgstr ""
-#: builtin/worktree.c:19
-msgid "git worktree unlock <path>"
+#: command-list.h:129
+msgid "Creates a tag object"
msgstr ""
-#: builtin/worktree.c:42
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
-#: builtin/worktree.c:48
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
+#: command-list.h:131
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
-#: builtin/worktree.c:53
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
msgstr ""
-#: builtin/worktree.c:64
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
+#: command-list.h:133
+msgid "Add or inspect object notes"
msgstr ""
-#: builtin/worktree.c:80
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
msgstr ""
-#: builtin/worktree.c:128
-msgid "report pruned working trees"
+#: command-list.h:135
+msgid "Create a packed archive of objects"
msgstr ""
-#: builtin/worktree.c:130
-msgid "expire working trees older than <time>"
+#: command-list.h:136
+msgid "Find redundant pack files"
msgstr ""
-#: builtin/worktree.c:204
-#, c-format
-msgid "'%s' already exists"
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
-#: builtin/worktree.c:236
-#, c-format
-msgid "could not create directory of '%s'"
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
msgstr ""
-#: builtin/worktree.c:272
-#, c-format
-msgid "Preparing %s (identifier %s)"
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
msgstr ""
-#: builtin/worktree.c:324
-msgid "checkout <branch> even if already checked out in other worktree"
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
msgstr ""
-#: builtin/worktree.c:326
-msgid "create a new branch"
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
msgstr ""
-#: builtin/worktree.c:328
-msgid "create or reset a branch"
+#: command-list.h:142
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
-#: builtin/worktree.c:330
-msgid "populate the new working tree"
+#: command-list.h:143
+msgid "Update remote refs along with associated objects"
msgstr ""
-#: builtin/worktree.c:338
-msgid "-b, -B, and --detach are mutually exclusive"
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
-#: builtin/worktree.c:473
-msgid "reason for locking"
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
-#: builtin/worktree.c:485 builtin/worktree.c:518
-#, c-format
-msgid "'%s' is not a working tree"
+#: command-list.h:146
+msgid "Reads tree information into the index"
msgstr ""
-#: builtin/worktree.c:487 builtin/worktree.c:520
-msgid "The main working tree cannot be locked or unlocked"
+#: command-list.h:147
+msgid "Reapply commits on top of another base tip"
msgstr ""
-#: builtin/worktree.c:492
-#, c-format
-msgid "'%s' is already locked, reason: %s"
+#: command-list.h:148
+msgid "Receive what is pushed into the repository"
msgstr ""
-#: builtin/worktree.c:494
-#, c-format
-msgid "'%s' is already locked"
+#: command-list.h:149
+msgid "Manage reflog information"
msgstr ""
-#: builtin/worktree.c:522
-#, c-format
-msgid "'%s' is not locked"
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
msgstr ""
-#: builtin/write-tree.c:13
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
msgstr ""
-#: builtin/write-tree.c:26
-msgid "<prefix>/"
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
msgstr ""
-#: builtin/write-tree.c:27
-msgid "write tree object for a subdirectory <prefix>"
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
msgstr ""
-#: builtin/write-tree.c:30
-msgid "only useful for debugging"
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
-#: upload-pack.c:22
-msgid "git upload-pack [<options>] <dir>"
+#: command-list.h:155
+msgid "Reset current HEAD to the specified state"
msgstr ""
-#: upload-pack.c:1040
-msgid "quit after a single request/response exchange"
+#: command-list.h:156
+msgid "Revert some existing commits"
msgstr ""
-#: upload-pack.c:1042
-msgid "exit immediately after initial ref advertisement"
+#: command-list.h:157
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
-#: upload-pack.c:1044
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+#: command-list.h:158
+msgid "Pick out and massage parameters"
msgstr ""
-#: upload-pack.c:1046
-msgid "interrupt transfer after <n> seconds of inactivity"
+#: command-list.h:159
+msgid "Remove files from the working tree and from the index"
msgstr ""
-#: credential-cache--daemon.c:223
-#, 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:160
+msgid "Send a collection of patches as emails"
msgstr ""
-#: credential-cache--daemon.c:271
-msgid "print debugging messages to stderr"
+#: command-list.h:161
+msgid "Push objects over Git protocol to another repository"
msgstr ""
-#: git.c:14
-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:162
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
-#: http.c:355
-msgid "Delegation control is not supported with cURL < 7.22.0"
+#: command-list.h:163
+msgid "Summarize 'git log' output"
msgstr ""
-#: http.c:364
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: command-list.h:164
+msgid "Show various types of objects"
msgstr ""
-#: http.c:1755
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-" asked for: %s\n"
-" redirect: %s"
+#: command-list.h:165
+msgid "Show branches and their commits"
msgstr ""
-#: remote-curl.c:323
-#, c-format
-msgid "redirecting to %s"
+#: command-list.h:166
+msgid "Show packed archive index"
msgstr ""
-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
+#: command-list.h:167
+msgid "List references in a local repository"
msgstr ""
-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
+#: command-list.h:168
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
+#: command-list.h:169
+msgid "Common Git shell script setup code"
msgstr ""
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
+#: command-list.h:170
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
+#: command-list.h:171
+msgid "Add file contents to the staging area"
msgstr ""
-#: common-cmds.h:17
-msgid "Add file contents to the index"
+#: command-list.h:172
+msgid "Show the working tree status"
msgstr ""
-#: common-cmds.h:18
-msgid "Use binary search to find the commit that introduced a bug"
+#: command-list.h:173
+msgid "Remove unnecessary whitespace"
msgstr ""
-#: common-cmds.h:19
-msgid "List, create, or delete branches"
+#: command-list.h:174
+msgid "Initialize, update or inspect submodules"
msgstr ""
-#: common-cmds.h:20
-msgid "Switch branches or restore working tree files"
+#: command-list.h:175
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
-#: common-cmds.h:21
-msgid "Clone a repository into a new directory"
+#: command-list.h:176
+msgid "Read, modify and delete symbolic refs"
msgstr ""
-#: common-cmds.h:22
-msgid "Record changes to the repository"
+#: command-list.h:177
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: common-cmds.h:23
-msgid "Show changes between commits, commit and working tree, etc"
+#: command-list.h:178
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
-#: common-cmds.h:24
-msgid "Download objects and refs from another repository"
+#: command-list.h:179
+msgid "Unpack objects from a packed archive"
msgstr ""
-#: common-cmds.h:25
-msgid "Print lines matching a pattern"
+#: command-list.h:180
+msgid "Register file contents in the working tree to the index"
msgstr ""
-#: common-cmds.h:26
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: command-list.h:181
+msgid "Update the object name stored in a ref safely"
msgstr ""
-#: common-cmds.h:27
-msgid "Show commit logs"
+#: command-list.h:182
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-#: common-cmds.h:28
-msgid "Join two or more development histories together"
+#: command-list.h:183
+msgid "Send archive back to git-archive"
msgstr ""
-#: common-cmds.h:29
-msgid "Move or rename a file, a directory, or a symlink"
+#: command-list.h:184
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
-#: common-cmds.h:30
-msgid "Fetch from and integrate with another repository or a local branch"
+#: command-list.h:185
+msgid "Show a Git logical variable"
msgstr ""
-#: common-cmds.h:31
-msgid "Update remote refs along with associated objects"
+#: command-list.h:186
+msgid "Check the GPG signature of commits"
msgstr ""
-#: common-cmds.h:32
-msgid "Reapply commits on top of another base tip"
+#: command-list.h:187
+msgid "Validate packed Git archive files"
msgstr ""
-#: common-cmds.h:33
-msgid "Reset current HEAD to the specified state"
+#: command-list.h:188
+msgid "Check the GPG signature of tags"
msgstr ""
-#: common-cmds.h:34
-msgid "Remove files from the working tree and from the index"
+#: command-list.h:189
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
-#: common-cmds.h:35
-msgid "Show various types of objects"
+#: command-list.h:190
+msgid "Show logs with difference each commit introduces"
msgstr ""
-#: common-cmds.h:36
-msgid "Show the working tree status"
+#: command-list.h:191
+msgid "Manage multiple working trees"
msgstr ""
-#: common-cmds.h:37
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: command-list.h:192
+msgid "Create a tree object from the current index"
msgstr ""
-#: parse-options.h:145
-msgid "expiry-date"
+#: command-list.h:193
+msgid "Defining attributes per path"
msgstr ""
-#: parse-options.h:160
-msgid "no-op (backward compatibility)"
+#: command-list.h:194
+msgid "Git command-line interface and conventions"
msgstr ""
-#: parse-options.h:238
-msgid "be more verbose"
+#: command-list.h:195
+msgid "A Git core tutorial for developers"
msgstr ""
-#: parse-options.h:240
-msgid "be more quiet"
+#: command-list.h:196
+msgid "Git for CVS users"
msgstr ""
-#: parse-options.h:246
-msgid "use <n> digits to display SHA-1s"
+#: command-list.h:197
+msgid "Tweaking diff output"
msgstr ""
-#: rerere.h:40
-msgid "update the index with reused conflict resolution if possible"
+#: command-list.h:198
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
+#: command-list.h:199
+msgid "A Git Glossary"
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:60
-msgid "Do you want me to do it for you [Y/n]? "
+#: command-list.h:200
+msgid "Hooks used by Git"
msgstr ""
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
+#: command-list.h:201
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
+#: command-list.h:202
+msgid "Defining submodule properties"
msgstr ""
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
+#: command-list.h:203
+msgid "Git namespaces"
msgstr ""
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+#: command-list.h:204
+msgid "Git Repository Layout"
msgstr ""
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
+#: command-list.h:205
+msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
+#: command-list.h:206
+msgid "A tutorial introduction to Git: part two"
msgstr ""
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
+#: command-list.h:207
+msgid "A tutorial introduction to Git"
msgstr ""
-#: git-bisect.sh:262
-#, sh-format
-msgid "Bad rev input: $arg"
+#: command-list.h:208
+msgid "An overview of recommended workflows with Git"
msgstr ""
-#: git-bisect.sh:281
-#, sh-format
-msgid "Bad rev input: $bisected_head"
+#: list-objects-filter-options.h:63
+msgid "args"
msgstr ""
-#: git-bisect.sh:290
-#, sh-format
-msgid "Bad rev input: $rev"
+#: list-objects-filter-options.h:64
+msgid "object filtering"
msgstr ""
-#: git-bisect.sh:299
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
msgstr ""
-#: git-bisect.sh:322
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
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
-msgid "Are you sure [Y/n]? "
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: git-bisect.sh:340
+#: git-bisect.sh:101
#, 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.)"
+msgid "Bad rev input: $arg"
msgstr ""
-#: git-bisect.sh:343
+#: git-bisect.sh:121
#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-
-#: git-bisect.sh:414 git-bisect.sh:546
-msgid "We are not bisecting."
+msgid "Bad rev input: $bisected_head"
msgstr ""
-#: git-bisect.sh:421
+#: git-bisect.sh:130
#, sh-format
-msgid "'$invalid' is not a valid commit"
+msgid "Bad rev input: $rev"
msgstr ""
-#: git-bisect.sh:430
+#: git-bisect.sh:139
#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
+msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-bisect.sh:458
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr ""
-#: git-bisect.sh:459
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:480
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:492
+#: git-bisect.sh:241
+msgid "bisect run failed: no command provided."
+msgstr ""
+
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:499
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:525
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:531
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:538
+#: git-bisect.sh:292
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
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-
-#: git-bisect.sh:636
-msgid "no terms defined"
-msgstr ""
-
-#: git-bisect.sh:653
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
msgstr ""
#: git-merge-octopus.sh:46
#: 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:57
-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:157 git-rebase.sh:396
+#: git-legacy-rebase.sh:445
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:171
+#: git-legacy-rebase.sh:471
#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase.sh:211
-msgid "The pre-rebase hook refused to rebase."
-msgstr ""
-
-#: git-rebase.sh:216
-msgid "It looks like git-am is in progress. Cannot rebase."
+msgid ""
+"It seems that there is already a $state_dir_base directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t$cmd_live_rebase\n"
+"If that is not the case, please\n"
+"\t$cmd_clear_stale_rebase\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there."
msgstr ""
-#: git-rebase.sh:357
-msgid "No rebase in progress?"
+#: git-legacy-rebase.sh:523
+msgid ""
+"fatal: cannot combine am options with either interactive or merge options"
msgstr ""
-#: git-rebase.sh:368
-msgid "The --edit-todo action can only be used during interactive rebase."
+#: git-legacy-rebase.sh:530
+msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
msgstr ""
-#: git-rebase.sh:375
-msgid "Cannot read HEAD"
+#: git-legacy-rebase.sh:541
+msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: git-rebase.sh:378
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
+#: git-legacy-rebase.sh:550
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
msgstr ""
-#: git-rebase.sh:418
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
+#: git-legacy-rebase.sh:552
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
msgstr ""
-#: git-rebase.sh:469
+#: git-legacy-rebase.sh:578
#, sh-format
-msgid "invalid upstream $upstream_name"
+msgid "invalid upstream '$upstream_name'"
msgstr ""
-#: git-rebase.sh:493
+#: git-legacy-rebase.sh:602
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:505
+#: git-legacy-rebase.sh:614
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:528
+#: git-legacy-rebase.sh:640
#, sh-format
-msgid "fatal: no such branch: $branch_name"
-msgstr ""
-
-#: git-rebase.sh:561
-msgid "Cannot autostash"
+msgid "fatal: no such branch/commit '$branch_name'"
msgstr ""
-#: git-rebase.sh:566
+#: git-legacy-rebase.sh:678
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:570
-msgid "Please commit or stash them."
-msgstr ""
-
-#: git-rebase.sh:590
+#: git-legacy-rebase.sh:707
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:594
+#: git-legacy-rebase.sh:717
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:605
+#: git-legacy-rebase.sh:731
#, sh-format
-msgid "Changes from $mb to $onto:"
+msgid "Changes to $onto:"
msgstr ""
-#: git-rebase.sh:614
-msgid "First, rewinding head to replay your work on top of it..."
+#: git-legacy-rebase.sh:733
+#, sh-format
+msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:624
+#: git-legacy-rebase.sh:743
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
-#: git-stash.sh:53
+#: git-legacy-rebase.sh:757
+msgid "First, rewinding head to replay your work on top of it..."
+msgstr ""
+
+#: git-stash.sh:75
msgid "git stash clear with parameters is unimplemented"
msgstr ""
-#: git-stash.sh:94
+#: git-stash.sh:125
msgid "You do not have the initial commit yet"
msgstr ""
-#: git-stash.sh:109
+#: git-stash.sh:140
msgid "Cannot save the current index state"
msgstr ""
-#: git-stash.sh:124
+#: git-stash.sh:155
msgid "Cannot save the untracked files"
msgstr ""
-#: git-stash.sh:144 git-stash.sh:157
+#: git-stash.sh:175 git-stash.sh:188
msgid "Cannot save the current worktree state"
msgstr ""
-#: git-stash.sh:161
+#: git-stash.sh:192
msgid "No changes selected"
msgstr ""
-#: git-stash.sh:164
+#: git-stash.sh:195
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:177
+#: git-stash.sh:208
msgid "Cannot record working tree state"
msgstr ""
-#: git-stash.sh:209
+#: git-stash.sh:246
#, 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:265
+#: git-stash.sh:298
#, 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:278
+#: git-stash.sh:312
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: git-stash.sh:286
+#: git-stash.sh:320
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:291
+#: git-stash.sh:325
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:295
+#: git-stash.sh:329
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:296
+#: git-stash.sh:330
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:323
+#: git-stash.sh:359
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:471
+#: git-stash.sh:507
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:484
-msgid "No stash found."
+#: git-stash.sh:520
+msgid "No stash entries found."
msgstr ""
-#: git-stash.sh:491
+#: git-stash.sh:527
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:506
+#: git-stash.sh:542
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:534
+#: git-stash.sh:570
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:545
+#: git-stash.sh:581
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:553
+#: git-stash.sh:589
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:557
+#: git-stash.sh:593
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:565
+#: git-stash.sh:601
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:567
+#: git-stash.sh:603
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:576
-msgid "Could not restore untracked files from stash"
+#: git-stash.sh:612
+msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:601
+#: git-stash.sh:637
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:616
+#: git-stash.sh:652
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:630
-msgid "The stash is kept in case you need it again."
+#: git-stash.sh:666
+msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: git-stash.sh:639
+#: git-stash.sh:675
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:640
+#: git-stash.sh:676
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:648
+#: git-stash.sh:684
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:727
+#: git-stash.sh:763
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:218
+#: 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:236
+#: git-submodule.sh:259
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:238
+#: git-submodule.sh:261
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:246
+#: git-submodule.sh:269
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:248
+#: 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:254
+#: git-submodule.sh:277
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:266
+#: git-submodule.sh:289
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:271
+#: git-submodule.sh:294
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:280
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:341
-#, sh-format
-msgid "Entering '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:361
-#, sh-format
-msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr ""
-
-#: git-submodule.sh:432
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr ""
-
-#: git-submodule.sh:437
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-
-#: git-submodule.sh:457
-#, 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:465
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-
-#: git-submodule.sh:468
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:472
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:481
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:637
+#: git-submodule.sh:563
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:647
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:652
+#: git-submodule.sh:578
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:670
+#: git-submodule.sh:596
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:676
+#: 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:683
+#: git-submodule.sh:609
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:684
+#: git-submodule.sh:610
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:688
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:689
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:694
+#: git-submodule.sh:620
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:695
+#: git-submodule.sh:621
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:700
+#: git-submodule.sh:626
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:701
+#: git-submodule.sh:627
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:732
+#: git-submodule.sh:658
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:840
+#: git-submodule.sh:754
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:892
+#: git-submodule.sh:806
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:912
+#: git-submodule.sh:826
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:915
+#: git-submodule.sh:829
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:918
+#: git-submodule.sh:832
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1064
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:1136
-#, 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
msgstr ""
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:238
+#: git-add--interactive.perl:196
#, perl-format
msgid "%12s %12s %s"
msgstr ""
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
msgid "staged"
msgstr ""
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
msgid "unstaged"
msgstr ""
-#: git-add--interactive.perl:288 git-add--interactive.perl:313
+#: git-add--interactive.perl:253 git-add--interactive.perl:278
msgid "binary"
msgstr ""
-#: git-add--interactive.perl:297 git-add--interactive.perl:351
+#: git-add--interactive.perl:262 git-add--interactive.perl:316
msgid "nothing"
msgstr ""
-#: git-add--interactive.perl:333 git-add--interactive.perl:348
+#: git-add--interactive.perl:298 git-add--interactive.perl:313
msgid "unchanged"
msgstr ""
-#: git-add--interactive.perl:644
+#: 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:647
+#: 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:650
+#: 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:653
+#: 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:662
+#: git-add--interactive.perl:627
msgid "Update"
msgstr ""
-#: git-add--interactive.perl:674
+#: git-add--interactive.perl:639
msgid "Revert"
msgstr ""
-#: git-add--interactive.perl:697
+#: git-add--interactive.perl:662
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
-#: git-add--interactive.perl:708
+#: git-add--interactive.perl:673
msgid "Add untracked"
msgstr ""
-#: git-add--interactive.perl:714
+#: git-add--interactive.perl:679
msgid "No untracked files.\n"
msgstr ""
-#: git-add--interactive.perl:1030
+#: 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:1033
+#: 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:1036
+#: 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:1039 git-add--interactive.perl:1048
+#: 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:1042 git-add--interactive.perl:1045
+#: 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:1058
+#: git-add--interactive.perl:1085
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1086
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: git-add--interactive.perl:1065
+#: 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:1073
+#: 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:1087
+#: 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:1178
+#: git-add--interactive.perl:1213
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: git-add--interactive.perl:1187
+#: 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:1193
+#: 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:1199
+#: 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:1205
+#: 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:1211
+#: 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:1217
+#: 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:1223
+#: 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:1232
+#: 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:1263
+#: git-add--interactive.perl:1304
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1305
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: git-add--interactive.perl:1267
+#: git-add--interactive.perl:1308
msgid "Nothing was applied.\n"
msgstr ""
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1319
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1328
msgid "Only binary files changed.\n"
msgstr ""
-#: git-add--interactive.perl:1289
+#: git-add--interactive.perl:1330
msgid "No changes.\n"
msgstr ""
-#: git-add--interactive.perl:1297
+#: git-add--interactive.perl:1338
msgid "Patch update"
msgstr ""
-#: git-add--interactive.perl:1349
+#: 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:1350
+#: 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:1351
+#: 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:1354
+#: 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:1355
+#: 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:1356
+#: 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:1359
+#: 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:1360
+#: 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:1361
+#: 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:1364
+#: 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:1365
+#: 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:1366
+#: 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:1369
+#: 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:1370
+#: 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:1371
+#: 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:1374
+#: 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:1375
+#: 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:1376
+#: 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:1379
+#: 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:1380
+#: 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:1381
+#: 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:1484
+#: git-add--interactive.perl:1529
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: git-add--interactive.perl:1486
+#: git-add--interactive.perl:1531
msgid "go to which hunk? "
msgstr ""
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1540
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1500
+#: 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:1526
+#: 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:1539
+#: git-add--interactive.perl:1588
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1549
+#: git-add--interactive.perl:1598
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
+#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
+#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1597
+#: 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:1649
+#: 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:1668
+#: 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:1685 git-add--interactive.perl:1690
-#: git-add--interactive.perl:1693 git-add--interactive.perl:1700
-#: git-add--interactive.perl:1704 git-add--interactive.perl:1710
+#: 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:1706
+#: git-add--interactive.perl:1763
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:121
+#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
-#: git-send-email.perl:128 git-send-email.perl:134
+#: 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:202 git-send-email.perl:208
+#: git-send-email.perl:219 git-send-email.perl:225
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:282
+#: 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:287
+#: git-send-email.perl:307
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:305
+#: git-send-email.perl:326
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:368 git-send-email.perl:623
+#: 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:437
+#: 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:466
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:498
+#: git-send-email.perl:525
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:500
+#: git-send-email.perl:527
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:502
+#: git-send-email.perl:529
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:507
+#: git-send-email.perl:534
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:589
+#: 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:610
+#: git-send-email.perl:637
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:634
+#: git-send-email.perl:661
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:645
+#: git-send-email.perl:672
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:658
+#: git-send-email.perl:685
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:668
+#: git-send-email.perl:695
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:678
+#: 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:701
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr ""
-
-#: git-send-email.perl:704
+#: git-send-email.perl:730
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:739
-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:748
+#: 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:780
+#: git-send-email.perl:825
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:809
+#: 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:814
+#: git-send-email.perl:885
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:822
+#: git-send-email.perl:893
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:841
+#: git-send-email.perl:912
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:859
+#: git-send-email.perl:930
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:871
+#: 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:921 git-send-email.perl:929
+#: 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:933
+#: git-send-email.perl:1012
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1234
+#: git-send-email.perl:1329
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1309
+#: 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:1324
-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:1327
+#: git-send-email.perl:1430
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1353
+#: git-send-email.perl:1458
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1397
+#: git-send-email.perl:1505
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1403
+#: git-send-email.perl:1510 git-send-email.perl:1514
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr ""
+
+#: git-send-email.perl:1523
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1421
+#: git-send-email.perl:1541
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1424
+#: git-send-email.perl:1544
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1424
+#: git-send-email.perl:1544
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1426
+#: git-send-email.perl:1546
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1426
+#: git-send-email.perl:1546
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1438
+#: git-send-email.perl:1558
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1441
+#: git-send-email.perl:1561
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1454
+#: git-send-email.perl:1579
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1501 git-send-email.perl:1521
+#: 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:1507
+#: git-send-email.perl:1632
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1555
+#: git-send-email.perl:1685
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1578
+#: git-send-email.perl:1720
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1676
+#: git-send-email.perl:1831
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1683
+#: git-send-email.perl:1838
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1687
+#: git-send-email.perl:1842
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1714
+#: git-send-email.perl:1872
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1722
+#: git-send-email.perl:1880
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#: 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:1744
+#: git-send-email.perl:1924
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1760
+#: 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:1764
+#: git-send-email.perl:1945
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""