зеркало из https://github.com/microsoft/git.git
13661 строка
272 KiB
Plaintext
13661 строка
272 KiB
Plaintext
# SOME DESCRIPTIVE TITLE.
|
|
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
|
# This file is distributed under the same license as the PACKAGE package.
|
|
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
|
#
|
|
#, fuzzy
|
|
msgid ""
|
|
msgstr ""
|
|
"Project-Id-Version: PACKAGE VERSION\n"
|
|
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
|
"POT-Creation-Date: 2016-11-25 22:50+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"
|
|
"Language: \n"
|
|
"MIME-Version: 1.0\n"
|
|
"Content-Type: text/plain; charset=CHARSET\n"
|
|
"Content-Transfer-Encoding: 8bit\n"
|
|
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
|
|
|
|
#: advice.c:55
|
|
#, c-format
|
|
msgid "hint: %.*s\n"
|
|
msgstr ""
|
|
|
|
#: advice.c:83
|
|
msgid "Cherry-picking is not possible because you have unmerged files."
|
|
msgstr ""
|
|
|
|
#: advice.c:85
|
|
msgid "Committing is not possible because you have unmerged files."
|
|
msgstr ""
|
|
|
|
#: advice.c:87
|
|
msgid "Merging is not possible because you have unmerged files."
|
|
msgstr ""
|
|
|
|
#: advice.c:89
|
|
msgid "Pulling is not possible because you have unmerged files."
|
|
msgstr ""
|
|
|
|
#: advice.c:91
|
|
msgid "Reverting is not possible because you have unmerged files."
|
|
msgstr ""
|
|
|
|
#: advice.c:93
|
|
#, c-format
|
|
msgid "It is not possible to %s because you have unmerged files."
|
|
msgstr ""
|
|
|
|
#: advice.c:101
|
|
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
|
|
msgid "Exiting because of an unresolved conflict."
|
|
msgstr ""
|
|
|
|
#: advice.c:114 builtin/merge.c:1181
|
|
msgid "You have not concluded your merge (MERGE_HEAD exists)."
|
|
msgstr ""
|
|
|
|
#: advice.c:116
|
|
msgid "Please, commit your changes before merging."
|
|
msgstr ""
|
|
|
|
#: advice.c:117
|
|
msgid "Exiting because of unfinished merge."
|
|
msgstr ""
|
|
|
|
#: advice.c:123
|
|
#, c-format
|
|
msgid ""
|
|
"Note: checking out '%s'.\n"
|
|
"\n"
|
|
"You are in 'detached HEAD' state. You can look around, make experimental\n"
|
|
"changes and commit them, and you can discard any commits you make in this\n"
|
|
"state without impacting any branches by performing another checkout.\n"
|
|
"\n"
|
|
"If you want to create a new branch to retain commits you create, you may\n"
|
|
"do so (now or later) by using -b with the checkout command again. Example:\n"
|
|
"\n"
|
|
" git checkout -b <new-branch-name>\n"
|
|
"\n"
|
|
msgstr ""
|
|
|
|
#: apply.c:57
|
|
#, c-format
|
|
msgid "unrecognized whitespace option '%s'"
|
|
msgstr ""
|
|
|
|
#: apply.c:73
|
|
#, c-format
|
|
msgid "unrecognized whitespace ignore option '%s'"
|
|
msgstr ""
|
|
|
|
#: apply.c:125
|
|
msgid "--reject and --3way cannot be used together."
|
|
msgstr ""
|
|
|
|
#: apply.c:127
|
|
msgid "--cached and --3way cannot be used together."
|
|
msgstr ""
|
|
|
|
#: apply.c:130
|
|
msgid "--3way outside a repository"
|
|
msgstr ""
|
|
|
|
#: apply.c:141
|
|
msgid "--index outside a repository"
|
|
msgstr ""
|
|
|
|
#: apply.c:144
|
|
msgid "--cached outside a repository"
|
|
msgstr ""
|
|
|
|
#: apply.c:845
|
|
#, c-format
|
|
msgid "Cannot prepare timestamp regexp %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:854
|
|
#, c-format
|
|
msgid "regexec returned %d for input: %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:938
|
|
#, c-format
|
|
msgid "unable to find filename in patch at line %d"
|
|
msgstr ""
|
|
|
|
#: apply.c:977
|
|
#, c-format
|
|
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
|
|
msgstr ""
|
|
|
|
#: apply.c:983
|
|
#, c-format
|
|
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
|
|
msgstr ""
|
|
|
|
#: apply.c:984
|
|
#, c-format
|
|
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
|
|
msgstr ""
|
|
|
|
#: apply.c:990
|
|
#, c-format
|
|
msgid "git apply: bad git-diff - expected /dev/null on line %d"
|
|
msgstr ""
|
|
|
|
#: apply.c:1488
|
|
#, c-format
|
|
msgid "recount: unexpected line: %.*s"
|
|
msgstr ""
|
|
|
|
#: apply.c:1557
|
|
#, c-format
|
|
msgid "patch fragment without header at line %d: %.*s"
|
|
msgstr ""
|
|
|
|
#: apply.c:1577
|
|
#, c-format
|
|
msgid ""
|
|
"git diff header lacks filename information when removing %d leading pathname "
|
|
"component (line %d)"
|
|
msgid_plural ""
|
|
"git diff header lacks filename information when removing %d leading pathname "
|
|
"components (line %d)"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: apply.c:1589
|
|
#, c-format
|
|
msgid "git diff header lacks filename information (line %d)"
|
|
msgstr ""
|
|
|
|
#: apply.c:1759
|
|
msgid "new file depends on old contents"
|
|
msgstr ""
|
|
|
|
#: apply.c:1761
|
|
msgid "deleted file still has contents"
|
|
msgstr ""
|
|
|
|
#: apply.c:1795
|
|
#, c-format
|
|
msgid "corrupt patch at line %d"
|
|
msgstr ""
|
|
|
|
#: apply.c:1832
|
|
#, c-format
|
|
msgid "new file %s depends on old contents"
|
|
msgstr ""
|
|
|
|
#: apply.c:1834
|
|
#, c-format
|
|
msgid "deleted file %s still has contents"
|
|
msgstr ""
|
|
|
|
#: apply.c:1837
|
|
#, c-format
|
|
msgid "** warning: file %s becomes empty but is not deleted"
|
|
msgstr ""
|
|
|
|
#: apply.c:1984
|
|
#, c-format
|
|
msgid "corrupt binary patch at line %d: %.*s"
|
|
msgstr ""
|
|
|
|
#: apply.c:2021
|
|
#, c-format
|
|
msgid "unrecognized binary patch at line %d"
|
|
msgstr ""
|
|
|
|
#: apply.c:2182
|
|
#, c-format
|
|
msgid "patch with only garbage at line %d"
|
|
msgstr ""
|
|
|
|
#: apply.c:2274
|
|
#, c-format
|
|
msgid "unable to read symlink %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:2278
|
|
#, c-format
|
|
msgid "unable to open or read %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:2931
|
|
#, c-format
|
|
msgid "invalid start of line: '%c'"
|
|
msgstr ""
|
|
|
|
#: apply.c:3050
|
|
#, 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:3062
|
|
#, c-format
|
|
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
|
|
msgstr ""
|
|
|
|
#: apply.c:3068
|
|
#, c-format
|
|
msgid ""
|
|
"while searching for:\n"
|
|
"%.*s"
|
|
msgstr ""
|
|
|
|
#: apply.c:3090
|
|
#, c-format
|
|
msgid "missing binary patch data for '%s'"
|
|
msgstr ""
|
|
|
|
#: apply.c:3098
|
|
#, c-format
|
|
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
|
|
msgstr ""
|
|
|
|
#: apply.c:3144
|
|
#, c-format
|
|
msgid "cannot apply binary patch to '%s' without full index line"
|
|
msgstr ""
|
|
|
|
#: apply.c:3154
|
|
#, c-format
|
|
msgid ""
|
|
"the patch applies to '%s' (%s), which does not match the current contents."
|
|
msgstr ""
|
|
|
|
#: apply.c:3162
|
|
#, c-format
|
|
msgid "the patch applies to an empty '%s' but it is not empty"
|
|
msgstr ""
|
|
|
|
#: apply.c:3180
|
|
#, c-format
|
|
msgid "the necessary postimage %s for '%s' cannot be read"
|
|
msgstr ""
|
|
|
|
#: apply.c:3193
|
|
#, c-format
|
|
msgid "binary patch does not apply to '%s'"
|
|
msgstr ""
|
|
|
|
#: apply.c:3199
|
|
#, c-format
|
|
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
|
|
msgstr ""
|
|
|
|
#: apply.c:3220
|
|
#, c-format
|
|
msgid "patch failed: %s:%ld"
|
|
msgstr ""
|
|
|
|
#: apply.c:3342
|
|
#, c-format
|
|
msgid "cannot checkout %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
|
|
#, c-format
|
|
msgid "failed to read %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:3398
|
|
#, c-format
|
|
msgid "reading from '%s' beyond a symbolic link"
|
|
msgstr ""
|
|
|
|
#: apply.c:3427 apply.c:3667
|
|
#, c-format
|
|
msgid "path %s has been renamed/deleted"
|
|
msgstr ""
|
|
|
|
#: apply.c:3510 apply.c:3681
|
|
#, c-format
|
|
msgid "%s: does not exist in index"
|
|
msgstr ""
|
|
|
|
#: apply.c:3519 apply.c:3689
|
|
#, c-format
|
|
msgid "%s: does not match index"
|
|
msgstr ""
|
|
|
|
#: apply.c:3554
|
|
msgid "repository lacks the necessary blob to fall back on 3-way merge."
|
|
msgstr ""
|
|
|
|
#: apply.c:3557
|
|
#, c-format
|
|
msgid "Falling back to three-way merge...\n"
|
|
msgstr ""
|
|
|
|
#: apply.c:3573 apply.c:3577
|
|
#, c-format
|
|
msgid "cannot read the current contents of '%s'"
|
|
msgstr ""
|
|
|
|
#: apply.c:3589
|
|
#, c-format
|
|
msgid "Failed to fall back on three-way merge...\n"
|
|
msgstr ""
|
|
|
|
#: apply.c:3603
|
|
#, c-format
|
|
msgid "Applied patch to '%s' with conflicts.\n"
|
|
msgstr ""
|
|
|
|
#: apply.c:3608
|
|
#, c-format
|
|
msgid "Applied patch to '%s' cleanly.\n"
|
|
msgstr ""
|
|
|
|
#: apply.c:3634
|
|
msgid "removal patch leaves file contents"
|
|
msgstr ""
|
|
|
|
#: apply.c:3706
|
|
#, c-format
|
|
msgid "%s: wrong type"
|
|
msgstr ""
|
|
|
|
#: apply.c:3708
|
|
#, c-format
|
|
msgid "%s has type %o, expected %o"
|
|
msgstr ""
|
|
|
|
#: apply.c:3859 apply.c:3861
|
|
#, c-format
|
|
msgid "invalid path '%s'"
|
|
msgstr ""
|
|
|
|
#: apply.c:3917
|
|
#, c-format
|
|
msgid "%s: already exists in index"
|
|
msgstr ""
|
|
|
|
#: apply.c:3920
|
|
#, c-format
|
|
msgid "%s: already exists in working directory"
|
|
msgstr ""
|
|
|
|
#: apply.c:3940
|
|
#, c-format
|
|
msgid "new mode (%o) of %s does not match old mode (%o)"
|
|
msgstr ""
|
|
|
|
#: apply.c:3945
|
|
#, c-format
|
|
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:3965
|
|
#, c-format
|
|
msgid "affected file '%s' is beyond a symbolic link"
|
|
msgstr ""
|
|
|
|
#: apply.c:3969
|
|
#, c-format
|
|
msgid "%s: patch does not apply"
|
|
msgstr ""
|
|
|
|
#: apply.c:3984
|
|
#, c-format
|
|
msgid "Checking patch %s..."
|
|
msgstr ""
|
|
|
|
#: apply.c:4075
|
|
#, c-format
|
|
msgid "sha1 information is lacking or useless for submodule %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:4082
|
|
#, c-format
|
|
msgid "mode change for %s, which is not in current HEAD"
|
|
msgstr ""
|
|
|
|
#: apply.c:4085
|
|
#, c-format
|
|
msgid "sha1 information is lacking or useless (%s)."
|
|
msgstr ""
|
|
|
|
#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
|
|
#, c-format
|
|
msgid "make_cache_entry failed for path '%s'"
|
|
msgstr ""
|
|
|
|
#: apply.c:4094
|
|
#, c-format
|
|
msgid "could not add %s to temporary index"
|
|
msgstr ""
|
|
|
|
#: apply.c:4104
|
|
#, c-format
|
|
msgid "could not write temporary index to %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:4242
|
|
#, c-format
|
|
msgid "unable to remove %s from index"
|
|
msgstr ""
|
|
|
|
#: apply.c:4277
|
|
#, c-format
|
|
msgid "corrupt patch for submodule %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:4283
|
|
#, c-format
|
|
msgid "unable to stat newly created file '%s'"
|
|
msgstr ""
|
|
|
|
#: apply.c:4291
|
|
#, c-format
|
|
msgid "unable to create backing store for newly created file %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:4297 apply.c:4441
|
|
#, c-format
|
|
msgid "unable to add cache entry for %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:4338
|
|
#, c-format
|
|
msgid "failed to write to '%s'"
|
|
msgstr ""
|
|
|
|
#: apply.c:4342
|
|
#, c-format
|
|
msgid "closing file '%s'"
|
|
msgstr ""
|
|
|
|
#: apply.c:4412
|
|
#, c-format
|
|
msgid "unable to write file '%s' mode %o"
|
|
msgstr ""
|
|
|
|
#: apply.c:4510
|
|
#, c-format
|
|
msgid "Applied patch %s cleanly."
|
|
msgstr ""
|
|
|
|
#: apply.c:4518
|
|
msgid "internal error"
|
|
msgstr ""
|
|
|
|
#: apply.c:4521
|
|
#, c-format
|
|
msgid "Applying patch %%s with %d reject..."
|
|
msgid_plural "Applying patch %%s with %d rejects..."
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: apply.c:4532
|
|
#, c-format
|
|
msgid "truncating .rej filename to %.*s.rej"
|
|
msgstr ""
|
|
|
|
#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
|
|
#, c-format
|
|
msgid "cannot open %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:4554
|
|
#, c-format
|
|
msgid "Hunk #%d applied cleanly."
|
|
msgstr ""
|
|
|
|
#: apply.c:4558
|
|
#, c-format
|
|
msgid "Rejected hunk #%d."
|
|
msgstr ""
|
|
|
|
#: apply.c:4668
|
|
#, c-format
|
|
msgid "Skipped patch '%s'."
|
|
msgstr ""
|
|
|
|
#: apply.c:4676
|
|
msgid "unrecognized input"
|
|
msgstr ""
|
|
|
|
#: apply.c:4695
|
|
msgid "unable to read index file"
|
|
msgstr ""
|
|
|
|
#: apply.c:4833
|
|
#, c-format
|
|
msgid "can't open patch '%s': %s"
|
|
msgstr ""
|
|
|
|
#: apply.c:4858
|
|
#, c-format
|
|
msgid "squelched %d whitespace error"
|
|
msgid_plural "squelched %d whitespace errors"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: apply.c:4864 apply.c:4879
|
|
#, c-format
|
|
msgid "%d line adds whitespace errors."
|
|
msgid_plural "%d lines add whitespace errors."
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: apply.c:4872
|
|
#, 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:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
|
|
msgid "Unable to write new index file"
|
|
msgstr ""
|
|
|
|
#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
|
|
#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
|
|
#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
|
|
#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
|
|
#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
|
|
msgid "path"
|
|
msgstr ""
|
|
|
|
#: apply.c:4920
|
|
msgid "don't apply changes matching the given path"
|
|
msgstr ""
|
|
|
|
#: apply.c:4923
|
|
msgid "apply changes matching the given path"
|
|
msgstr ""
|
|
|
|
#: apply.c:4925 builtin/am.c:2286
|
|
msgid "num"
|
|
msgstr ""
|
|
|
|
#: apply.c:4926
|
|
msgid "remove <num> leading slashes from traditional diff paths"
|
|
msgstr ""
|
|
|
|
#: apply.c:4929
|
|
msgid "ignore additions made by the patch"
|
|
msgstr ""
|
|
|
|
#: apply.c:4931
|
|
msgid "instead of applying the patch, output diffstat for the input"
|
|
msgstr ""
|
|
|
|
#: apply.c:4935
|
|
msgid "show number of added and deleted lines in decimal notation"
|
|
msgstr ""
|
|
|
|
#: apply.c:4937
|
|
msgid "instead of applying the patch, output a summary for the input"
|
|
msgstr ""
|
|
|
|
#: apply.c:4939
|
|
msgid "instead of applying the patch, see if the patch is applicable"
|
|
msgstr ""
|
|
|
|
#: apply.c:4941
|
|
msgid "make sure the patch is applicable to the current index"
|
|
msgstr ""
|
|
|
|
#: apply.c:4943
|
|
msgid "apply a patch without touching the working tree"
|
|
msgstr ""
|
|
|
|
#: apply.c:4945
|
|
msgid "accept a patch that touches outside the working area"
|
|
msgstr ""
|
|
|
|
#: apply.c:4947
|
|
msgid "also apply the patch (use with --stat/--summary/--check)"
|
|
msgstr ""
|
|
|
|
#: apply.c:4949
|
|
msgid "attempt three-way merge if a patch does not apply"
|
|
msgstr ""
|
|
|
|
#: apply.c:4951
|
|
msgid "build a temporary index based on embedded index information"
|
|
msgstr ""
|
|
|
|
#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
|
|
msgid "paths are separated with NUL character"
|
|
msgstr ""
|
|
|
|
#: apply.c:4956
|
|
msgid "ensure at least <n> lines of context match"
|
|
msgstr ""
|
|
|
|
#: apply.c:4957 builtin/am.c:2265
|
|
msgid "action"
|
|
msgstr ""
|
|
|
|
#: apply.c:4958
|
|
msgid "detect new or modified lines that have whitespace errors"
|
|
msgstr ""
|
|
|
|
#: apply.c:4961 apply.c:4964
|
|
msgid "ignore changes in whitespace when finding context"
|
|
msgstr ""
|
|
|
|
#: apply.c:4967
|
|
msgid "apply the patch in reverse"
|
|
msgstr ""
|
|
|
|
#: apply.c:4969
|
|
msgid "don't expect at least one line of context"
|
|
msgstr ""
|
|
|
|
#: apply.c:4971
|
|
msgid "leave the rejected hunks in corresponding *.rej files"
|
|
msgstr ""
|
|
|
|
#: apply.c:4973
|
|
msgid "allow overlapping hunks"
|
|
msgstr ""
|
|
|
|
#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
|
|
#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
|
|
#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
|
|
msgid "be verbose"
|
|
msgstr ""
|
|
|
|
#: apply.c:4976
|
|
msgid "tolerate incorrectly detected missing new-line at the end of file"
|
|
msgstr ""
|
|
|
|
#: apply.c:4979
|
|
msgid "do not trust the line counts in the hunk headers"
|
|
msgstr ""
|
|
|
|
#: apply.c:4981 builtin/am.c:2274
|
|
msgid "root"
|
|
msgstr ""
|
|
|
|
#: apply.c:4982
|
|
msgid "prepend <root> to all filenames"
|
|
msgstr ""
|
|
|
|
#: archive.c:12
|
|
msgid "git archive [<options>] <tree-ish> [<path>...]"
|
|
msgstr ""
|
|
|
|
#: archive.c:13
|
|
msgid "git archive --list"
|
|
msgstr ""
|
|
|
|
#: archive.c:14
|
|
msgid ""
|
|
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
|
|
msgstr ""
|
|
|
|
#: archive.c:15
|
|
msgid "git archive --remote <repo> [--exec <cmd>] --list"
|
|
msgstr ""
|
|
|
|
#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
|
|
#, c-format
|
|
msgid "pathspec '%s' did not match any files"
|
|
msgstr ""
|
|
|
|
#: archive.c:429
|
|
msgid "fmt"
|
|
msgstr ""
|
|
|
|
#: archive.c:429
|
|
msgid "archive format"
|
|
msgstr ""
|
|
|
|
#: archive.c:430 builtin/log.c:1429
|
|
msgid "prefix"
|
|
msgstr ""
|
|
|
|
#: archive.c:431
|
|
msgid "prepend prefix to each pathname in the archive"
|
|
msgstr ""
|
|
|
|
#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59
|
|
#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723
|
|
#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
|
|
#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
|
|
#: parse-options.h:153
|
|
msgid "file"
|
|
msgstr ""
|
|
|
|
#: archive.c:433 builtin/archive.c:89
|
|
msgid "write the archive to this file"
|
|
msgstr ""
|
|
|
|
#: archive.c:435
|
|
msgid "read .gitattributes in working directory"
|
|
msgstr ""
|
|
|
|
#: archive.c:436
|
|
msgid "report archived files on stderr"
|
|
msgstr ""
|
|
|
|
#: archive.c:437
|
|
msgid "store only"
|
|
msgstr ""
|
|
|
|
#: archive.c:438
|
|
msgid "compress faster"
|
|
msgstr ""
|
|
|
|
#: archive.c:446
|
|
msgid "compress better"
|
|
msgstr ""
|
|
|
|
#: archive.c:449
|
|
msgid "list supported archive formats"
|
|
msgstr ""
|
|
|
|
#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
|
|
#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
|
|
msgid "repo"
|
|
msgstr ""
|
|
|
|
#: archive.c:452 builtin/archive.c:91
|
|
msgid "retrieve the archive from remote repository <repo>"
|
|
msgstr ""
|
|
|
|
#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
|
|
msgid "command"
|
|
msgstr ""
|
|
|
|
#: archive.c:454 builtin/archive.c:93
|
|
msgid "path to the remote git-upload-archive command"
|
|
msgstr ""
|
|
|
|
#: archive.c:461
|
|
msgid "Unexpected option --remote"
|
|
msgstr ""
|
|
|
|
#: archive.c:463
|
|
msgid "Option --exec can only be used together with --remote"
|
|
msgstr ""
|
|
|
|
#: archive.c:465
|
|
msgid "Unexpected option --output"
|
|
msgstr ""
|
|
|
|
#: archive.c:487
|
|
#, c-format
|
|
msgid "Unknown archive format '%s'"
|
|
msgstr ""
|
|
|
|
#: archive.c:494
|
|
#, c-format
|
|
msgid "Argument not supported for format '%s': -%d"
|
|
msgstr ""
|
|
|
|
#: attr.c:263
|
|
msgid ""
|
|
"Negative patterns are ignored in git attributes\n"
|
|
"Use '\\!' for literal leading exclamation."
|
|
msgstr ""
|
|
|
|
#: bisect.c:441
|
|
#, c-format
|
|
msgid "Could not open file '%s'"
|
|
msgstr ""
|
|
|
|
#: bisect.c:446
|
|
#, c-format
|
|
msgid "Badly quoted content in file '%s': %s"
|
|
msgstr ""
|
|
|
|
#: bisect.c:655
|
|
#, c-format
|
|
msgid "We cannot bisect more!\n"
|
|
msgstr ""
|
|
|
|
#: bisect.c:708
|
|
#, c-format
|
|
msgid "Not a valid commit name %s"
|
|
msgstr ""
|
|
|
|
#: bisect.c:732
|
|
#, c-format
|
|
msgid ""
|
|
"The merge base %s is bad.\n"
|
|
"This means the bug has been fixed between %s and [%s].\n"
|
|
msgstr ""
|
|
|
|
#: bisect.c:737
|
|
#, c-format
|
|
msgid ""
|
|
"The merge base %s is new.\n"
|
|
"The property has changed between %s and [%s].\n"
|
|
msgstr ""
|
|
|
|
#: bisect.c:742
|
|
#, c-format
|
|
msgid ""
|
|
"The merge base %s is %s.\n"
|
|
"This means the first '%s' commit is between %s and [%s].\n"
|
|
msgstr ""
|
|
|
|
#: bisect.c:750
|
|
#, c-format
|
|
msgid ""
|
|
"Some %s revs are not ancestor of the %s rev.\n"
|
|
"git bisect cannot work properly in this case.\n"
|
|
"Maybe you mistook %s and %s revs?\n"
|
|
msgstr ""
|
|
|
|
#: bisect.c:763
|
|
#, c-format
|
|
msgid ""
|
|
"the merge base between %s and [%s] must be skipped.\n"
|
|
"So we cannot be sure the first %s commit is between %s and %s.\n"
|
|
"We continue anyway."
|
|
msgstr ""
|
|
|
|
#: bisect.c:798
|
|
#, c-format
|
|
msgid "Bisecting: a merge base must be tested\n"
|
|
msgstr ""
|
|
|
|
#: bisect.c:849
|
|
#, c-format
|
|
msgid "a %s revision is needed"
|
|
msgstr ""
|
|
|
|
#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
|
|
#, c-format
|
|
msgid "could not create file '%s'"
|
|
msgstr ""
|
|
|
|
#: bisect.c:917
|
|
#, c-format
|
|
msgid "could not read file '%s'"
|
|
msgstr ""
|
|
|
|
#: bisect.c:947
|
|
msgid "reading bisect refs failed"
|
|
msgstr ""
|
|
|
|
#: bisect.c:967
|
|
#, c-format
|
|
msgid "%s was both %s and %s\n"
|
|
msgstr ""
|
|
|
|
#: bisect.c:975
|
|
#, c-format
|
|
msgid ""
|
|
"No testable commit found.\n"
|
|
"Maybe you started with bad path parameters?\n"
|
|
msgstr ""
|
|
|
|
#: bisect.c:994
|
|
#, 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:998
|
|
#, 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
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"After fixing the error cause you may try to fix up\n"
|
|
"the remote tracking information by invoking\n"
|
|
"\"git branch --set-upstream-to=%s%s%s\"."
|
|
msgstr ""
|
|
|
|
#: branch.c:67
|
|
#, c-format
|
|
msgid "Not setting branch %s as its own upstream."
|
|
msgstr ""
|
|
|
|
#: branch.c:93
|
|
#, c-format
|
|
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
|
|
msgstr ""
|
|
|
|
#: branch.c:94
|
|
#, c-format
|
|
msgid "Branch %s set up to track remote branch %s from %s."
|
|
msgstr ""
|
|
|
|
#: branch.c:98
|
|
#, c-format
|
|
msgid "Branch %s set up to track local branch %s by rebasing."
|
|
msgstr ""
|
|
|
|
#: branch.c:99
|
|
#, c-format
|
|
msgid "Branch %s set up to track local branch %s."
|
|
msgstr ""
|
|
|
|
#: branch.c:104
|
|
#, c-format
|
|
msgid "Branch %s set up to track remote ref %s by rebasing."
|
|
msgstr ""
|
|
|
|
#: branch.c:105
|
|
#, c-format
|
|
msgid "Branch %s set up to track remote ref %s."
|
|
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."
|
|
msgstr ""
|
|
|
|
#: branch.c:119
|
|
msgid "Unable to write upstream branch configuration"
|
|
msgstr ""
|
|
|
|
#: branch.c:156
|
|
#, c-format
|
|
msgid "Not tracking: ambiguous information for ref %s"
|
|
msgstr ""
|
|
|
|
#: branch.c:185
|
|
#, c-format
|
|
msgid "'%s' is not a valid branch name."
|
|
msgstr ""
|
|
|
|
#: branch.c:190
|
|
#, c-format
|
|
msgid "A branch named '%s' already exists."
|
|
msgstr ""
|
|
|
|
#: branch.c:198
|
|
msgid "Cannot force update the current branch."
|
|
msgstr ""
|
|
|
|
#: branch.c:218
|
|
#, c-format
|
|
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
|
|
msgstr ""
|
|
|
|
#: branch.c:220
|
|
#, c-format
|
|
msgid "the requested upstream branch '%s' does not exist"
|
|
msgstr ""
|
|
|
|
#: branch.c:222
|
|
msgid ""
|
|
"\n"
|
|
"If you are planning on basing your work on an upstream\n"
|
|
"branch that already exists at the remote, you may need to\n"
|
|
"run \"git fetch\" to retrieve it.\n"
|
|
"\n"
|
|
"If you are planning to push out a new local branch that\n"
|
|
"will track its remote counterpart, you may want to use\n"
|
|
"\"git push -u\" to set the upstream config as you push."
|
|
msgstr ""
|
|
|
|
#: branch.c:265
|
|
#, c-format
|
|
msgid "Not a valid object name: '%s'."
|
|
msgstr ""
|
|
|
|
#: branch.c:285
|
|
#, c-format
|
|
msgid "Ambiguous object name: '%s'."
|
|
msgstr ""
|
|
|
|
#: branch.c:290
|
|
#, c-format
|
|
msgid "Not a valid branch point: '%s'."
|
|
msgstr ""
|
|
|
|
#: branch.c:344
|
|
#, c-format
|
|
msgid "'%s' is already checked out at '%s'"
|
|
msgstr ""
|
|
|
|
#: branch.c:363
|
|
#, c-format
|
|
msgid "HEAD of working tree %s is not updated"
|
|
msgstr ""
|
|
|
|
#: bundle.c:34
|
|
#, c-format
|
|
msgid "'%s' does not look like a v2 bundle file"
|
|
msgstr ""
|
|
|
|
#: bundle.c:61
|
|
#, c-format
|
|
msgid "unrecognized header: %s%s (%d)"
|
|
msgstr ""
|
|
|
|
#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
|
|
#, c-format
|
|
msgid "could not open '%s'"
|
|
msgstr ""
|
|
|
|
#: bundle.c:139
|
|
msgid "Repository lacks these prerequisite commits:"
|
|
msgstr ""
|
|
|
|
#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
|
|
#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
|
|
#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
|
|
#: builtin/merge.c:356 builtin/shortlog.c:170
|
|
msgid "revision walk setup failed"
|
|
msgstr ""
|
|
|
|
#: bundle.c:185
|
|
#, c-format
|
|
msgid "The bundle contains this ref:"
|
|
msgid_plural "The bundle contains these %d refs:"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: bundle.c:192
|
|
msgid "The bundle records a complete history."
|
|
msgstr ""
|
|
|
|
#: bundle.c:194
|
|
#, c-format
|
|
msgid "The bundle requires this ref:"
|
|
msgid_plural "The bundle requires these %d refs:"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: bundle.c:253
|
|
msgid "Could not spawn pack-objects"
|
|
msgstr ""
|
|
|
|
#: bundle.c:264
|
|
msgid "pack-objects died"
|
|
msgstr ""
|
|
|
|
#: bundle.c:304
|
|
msgid "rev-list died"
|
|
msgstr ""
|
|
|
|
#: bundle.c:353
|
|
#, c-format
|
|
msgid "ref '%s' is excluded by the rev-list options"
|
|
msgstr ""
|
|
|
|
#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
|
|
#, c-format
|
|
msgid "unrecognized argument: %s"
|
|
msgstr ""
|
|
|
|
#: bundle.c:451
|
|
msgid "Refusing to create empty bundle."
|
|
msgstr ""
|
|
|
|
#: bundle.c:463
|
|
#, c-format
|
|
msgid "cannot create '%s'"
|
|
msgstr ""
|
|
|
|
#: bundle.c:491
|
|
msgid "index-pack died"
|
|
msgstr ""
|
|
|
|
#: color.c:290
|
|
#, c-format
|
|
msgid "invalid color value: %.*s"
|
|
msgstr ""
|
|
|
|
#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
|
|
#: builtin/am.c:2127
|
|
#, c-format
|
|
msgid "could not parse %s"
|
|
msgstr ""
|
|
|
|
#: commit.c:42
|
|
#, c-format
|
|
msgid "%s %s is not a commit!"
|
|
msgstr ""
|
|
|
|
#: commit.c:1514
|
|
msgid ""
|
|
"Warning: commit message did not conform to UTF-8.\n"
|
|
"You may want to amend it after fixing the message, or set the config\n"
|
|
"variable i18n.commitencoding to the encoding your project uses.\n"
|
|
msgstr ""
|
|
|
|
#: compat/obstack.c:406 compat/obstack.c:408
|
|
msgid "memory exhausted"
|
|
msgstr ""
|
|
|
|
#: config.c:516
|
|
#, c-format
|
|
msgid "bad config line %d in blob %s"
|
|
msgstr ""
|
|
|
|
#: config.c:520
|
|
#, c-format
|
|
msgid "bad config line %d in file %s"
|
|
msgstr ""
|
|
|
|
#: config.c:524
|
|
#, c-format
|
|
msgid "bad config line %d in standard input"
|
|
msgstr ""
|
|
|
|
#: config.c:528
|
|
#, c-format
|
|
msgid "bad config line %d in submodule-blob %s"
|
|
msgstr ""
|
|
|
|
#: config.c:532
|
|
#, c-format
|
|
msgid "bad config line %d in command line %s"
|
|
msgstr ""
|
|
|
|
#: config.c:536
|
|
#, c-format
|
|
msgid "bad config line %d in %s"
|
|
msgstr ""
|
|
|
|
#: config.c:655
|
|
msgid "out of range"
|
|
msgstr ""
|
|
|
|
#: config.c:655
|
|
msgid "invalid unit"
|
|
msgstr ""
|
|
|
|
#: config.c:661
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s': %s"
|
|
msgstr ""
|
|
|
|
#: config.c:666
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
|
|
msgstr ""
|
|
|
|
#: config.c:669
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
|
|
msgstr ""
|
|
|
|
#: config.c:672
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
|
|
msgstr ""
|
|
|
|
#: config.c:675
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
|
|
msgstr ""
|
|
|
|
#: config.c:678
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
|
|
msgstr ""
|
|
|
|
#: config.c:681
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in %s: %s"
|
|
msgstr ""
|
|
|
|
#: config.c:768
|
|
#, c-format
|
|
msgid "failed to expand user dir in: '%s'"
|
|
msgstr ""
|
|
|
|
#: config.c:852 config.c:863
|
|
#, c-format
|
|
msgid "bad zlib compression level %d"
|
|
msgstr ""
|
|
|
|
#: config.c:978
|
|
#, c-format
|
|
msgid "invalid mode for object creation: %s"
|
|
msgstr ""
|
|
|
|
#: config.c:1312
|
|
msgid "unable to parse command-line config"
|
|
msgstr ""
|
|
|
|
#: config.c:1362
|
|
msgid "unknown error occurred while reading the configuration files"
|
|
msgstr ""
|
|
|
|
#: config.c:1716
|
|
#, c-format
|
|
msgid "unable to parse '%s' from command-line config"
|
|
msgstr ""
|
|
|
|
#: config.c:1718
|
|
#, c-format
|
|
msgid "bad config variable '%s' in file '%s' at line %d"
|
|
msgstr ""
|
|
|
|
#: config.c:1777
|
|
#, c-format
|
|
msgid "%s has multiple values"
|
|
msgstr ""
|
|
|
|
#: config.c:2311
|
|
#, c-format
|
|
msgid "could not set '%s' to '%s'"
|
|
msgstr ""
|
|
|
|
#: config.c:2313
|
|
#, c-format
|
|
msgid "could not unset '%s'"
|
|
msgstr ""
|
|
|
|
#: connect.c:49
|
|
msgid "The remote end hung up upon initial contact"
|
|
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."
|
|
msgstr ""
|
|
|
|
#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
|
|
msgid "Checking connectivity"
|
|
msgstr ""
|
|
|
|
#: connected.c:75
|
|
msgid "Could not run 'git rev-list'"
|
|
msgstr ""
|
|
|
|
#: connected.c:95
|
|
msgid "failed write to rev-list"
|
|
msgstr ""
|
|
|
|
#: connected.c:102
|
|
msgid "failed to close rev-list's stdin"
|
|
msgstr ""
|
|
|
|
#: convert.c:201
|
|
#, c-format
|
|
msgid ""
|
|
"CRLF will be replaced by LF in %s.\n"
|
|
"The file will have its original line endings in your working directory."
|
|
msgstr ""
|
|
|
|
#: convert.c:205
|
|
#, c-format
|
|
msgid "CRLF would be replaced by LF in %s."
|
|
msgstr ""
|
|
|
|
#: convert.c:211
|
|
#, c-format
|
|
msgid ""
|
|
"LF will be replaced by CRLF in %s.\n"
|
|
"The file will have its original line endings in your working directory."
|
|
msgstr ""
|
|
|
|
#: convert.c:215
|
|
#, c-format
|
|
msgid "LF would be replaced by CRLF in %s"
|
|
msgstr ""
|
|
|
|
#: date.c:97
|
|
msgid "in the future"
|
|
msgstr ""
|
|
|
|
#: date.c:103
|
|
#, c-format
|
|
msgid "%lu second ago"
|
|
msgid_plural "%lu seconds ago"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: date.c:110
|
|
#, c-format
|
|
msgid "%lu minute ago"
|
|
msgid_plural "%lu minutes ago"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: date.c:117
|
|
#, c-format
|
|
msgid "%lu hour ago"
|
|
msgid_plural "%lu hours ago"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: date.c:124
|
|
#, c-format
|
|
msgid "%lu day ago"
|
|
msgid_plural "%lu days ago"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: date.c:130
|
|
#, c-format
|
|
msgid "%lu week ago"
|
|
msgid_plural "%lu weeks ago"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: 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] ""
|
|
|
|
#. TRANSLATORS: "%s" is "<n> years"
|
|
#: date.c:151
|
|
#, c-format
|
|
msgid "%s, %lu month ago"
|
|
msgid_plural "%s, %lu months ago"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: date.c:156 date.c:161
|
|
#, c-format
|
|
msgid "%lu year ago"
|
|
msgid_plural "%lu years ago"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: diffcore-order.c:24
|
|
#, c-format
|
|
msgid "failed to read orderfile '%s'"
|
|
msgstr ""
|
|
|
|
#: diffcore-rename.c:536
|
|
msgid "Performing inexact rename detection"
|
|
msgstr ""
|
|
|
|
#: diff.c:62
|
|
#, c-format
|
|
msgid "option '%s' requires a value"
|
|
msgstr ""
|
|
|
|
#: diff.c:124
|
|
#, c-format
|
|
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
|
|
msgstr ""
|
|
|
|
#: diff.c:129
|
|
#, c-format
|
|
msgid " Unknown dirstat parameter '%s'\n"
|
|
msgstr ""
|
|
|
|
#: diff.c:283
|
|
#, c-format
|
|
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
|
|
msgstr ""
|
|
|
|
#: diff.c:346
|
|
#, c-format
|
|
msgid ""
|
|
"Found errors in 'diff.dirstat' config variable:\n"
|
|
"%s"
|
|
msgstr ""
|
|
|
|
#: diff.c:3087
|
|
#, c-format
|
|
msgid "external diff died, stopping at %s"
|
|
msgstr ""
|
|
|
|
#: diff.c:3412
|
|
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
|
|
msgstr ""
|
|
|
|
#: diff.c:3502
|
|
msgid "--follow requires exactly one pathspec"
|
|
msgstr ""
|
|
|
|
#: diff.c:3665
|
|
#, c-format
|
|
msgid ""
|
|
"Failed to parse --dirstat/-X option parameter:\n"
|
|
"%s"
|
|
msgstr ""
|
|
|
|
#: diff.c:3679
|
|
#, c-format
|
|
msgid "Failed to parse --submodule option parameter: '%s'"
|
|
msgstr ""
|
|
|
|
#: diff.c:4700
|
|
msgid "inexact rename detection was skipped due to too many files."
|
|
msgstr ""
|
|
|
|
#: diff.c:4703
|
|
msgid "only found copies from modified paths due to too many files."
|
|
msgstr ""
|
|
|
|
#: diff.c:4706
|
|
#, c-format
|
|
msgid ""
|
|
"you may want to set your %s variable to at least %d and retry the command."
|
|
msgstr ""
|
|
|
|
#: dir.c:1866
|
|
msgid "failed to get kernel name and information"
|
|
msgstr ""
|
|
|
|
#: dir.c:1985
|
|
msgid "Untracked cache is disabled on this system or location."
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:213
|
|
msgid "git fetch-pack: expected shallow list"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:225
|
|
msgid "git fetch-pack: expected ACK/NAK, got EOF"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:243
|
|
#, c-format
|
|
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:295
|
|
msgid "--stateless-rpc requires multi_ack_detailed"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:381
|
|
#, c-format
|
|
msgid "invalid shallow line: %s"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:387
|
|
#, c-format
|
|
msgid "invalid unshallow line: %s"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:389
|
|
#, c-format
|
|
msgid "object not found: %s"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:392
|
|
#, c-format
|
|
msgid "error in object: %s"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:394
|
|
#, c-format
|
|
msgid "no shallow found: %s"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:397
|
|
#, c-format
|
|
msgid "expected shallow/unshallow, got %s"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:436
|
|
#, c-format
|
|
msgid "got %s %d %s"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:450
|
|
#, c-format
|
|
msgid "invalid commit %s"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:483
|
|
msgid "giving up"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:493 progress.c:235
|
|
msgid "done"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:505
|
|
#, c-format
|
|
msgid "got %s (%d) %s"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:551
|
|
#, c-format
|
|
msgid "Marking %s as complete"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:697
|
|
#, c-format
|
|
msgid "already have %s (%s)"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:735
|
|
msgid "fetch-pack: unable to fork off sideband demultiplexer"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:743
|
|
msgid "protocol error: bad pack header"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:799
|
|
#, c-format
|
|
msgid "fetch-pack: unable to fork off %s"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:815
|
|
#, c-format
|
|
msgid "%s failed"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:817
|
|
msgid "error in sideband demultiplexer"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:844
|
|
msgid "Server does not support shallow clients"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:848
|
|
msgid "Server supports multi_ack_detailed"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:851
|
|
msgid "Server supports no-done"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:857
|
|
msgid "Server supports multi_ack"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:861
|
|
msgid "Server supports side-band-64k"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:865
|
|
msgid "Server supports side-band"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:869
|
|
msgid "Server supports allow-tip-sha1-in-want"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:873
|
|
msgid "Server supports allow-reachable-sha1-in-want"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:883
|
|
msgid "Server supports ofs-delta"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:890
|
|
#, c-format
|
|
msgid "Server version is %.*s"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:896
|
|
msgid "Server does not support --shallow-since"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:900
|
|
msgid "Server does not support --shallow-exclude"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:902
|
|
msgid "Server does not support --deepen"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:913
|
|
msgid "no common commits"
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:925
|
|
msgid "git fetch-pack: fetch failed."
|
|
msgstr ""
|
|
|
|
#: fetch-pack.c:1087
|
|
msgid "no matching remote head"
|
|
msgstr ""
|
|
|
|
#: gpg-interface.c:185
|
|
msgid "gpg failed to sign the data"
|
|
msgstr ""
|
|
|
|
#: gpg-interface.c:215
|
|
msgid "could not create temporary file"
|
|
msgstr ""
|
|
|
|
#: gpg-interface.c:217
|
|
#, c-format
|
|
msgid "failed writing detached signature to '%s'"
|
|
msgstr ""
|
|
|
|
#: grep.c:1782
|
|
#, c-format
|
|
msgid "'%s': unable to read %s"
|
|
msgstr ""
|
|
|
|
#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
|
|
#, c-format
|
|
msgid "failed to stat '%s'"
|
|
msgstr ""
|
|
|
|
#: grep.c:1810
|
|
#, c-format
|
|
msgid "'%s': short read"
|
|
msgstr ""
|
|
|
|
#: help.c:203
|
|
#, c-format
|
|
msgid "available git commands in '%s'"
|
|
msgstr ""
|
|
|
|
#: help.c:210
|
|
msgid "git commands available from elsewhere on your $PATH"
|
|
msgstr ""
|
|
|
|
#: help.c:241
|
|
msgid "These are common Git commands used in various situations:"
|
|
msgstr ""
|
|
|
|
#: help.c:306
|
|
#, c-format
|
|
msgid ""
|
|
"'%s' appears to be a git command, but we were not\n"
|
|
"able to execute it. Maybe git-%s is broken?"
|
|
msgstr ""
|
|
|
|
#: help.c:361
|
|
msgid "Uh oh. Your system reports no Git commands at all."
|
|
msgstr ""
|
|
|
|
#: help.c:383
|
|
#, c-format
|
|
msgid ""
|
|
"WARNING: You called a Git command named '%s', which does not exist.\n"
|
|
"Continuing under the assumption that you meant '%s'"
|
|
msgstr ""
|
|
|
|
#: help.c:388
|
|
#, c-format
|
|
msgid "in %0.1f seconds automatically..."
|
|
msgstr ""
|
|
|
|
#: help.c:395
|
|
#, c-format
|
|
msgid "git: '%s' is not a git command. See 'git --help'."
|
|
msgstr ""
|
|
|
|
#: help.c:399 help.c:465
|
|
msgid ""
|
|
"\n"
|
|
"Did you mean this?"
|
|
msgid_plural ""
|
|
"\n"
|
|
"Did you mean one of these?"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: help.c:461
|
|
#, c-format
|
|
msgid "%s: %s - %s"
|
|
msgstr ""
|
|
|
|
#: ident.c:334
|
|
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 ""
|
|
|
|
#: lockfile.c:152
|
|
#, 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."
|
|
msgstr ""
|
|
|
|
#: lockfile.c:160
|
|
#, c-format
|
|
msgid "Unable to create '%s.lock': %s"
|
|
msgstr ""
|
|
|
|
#: merge.c:41
|
|
msgid "failed to read the cache"
|
|
msgstr ""
|
|
|
|
#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
|
|
#: builtin/checkout.c:588 builtin/clone.c:731
|
|
msgid "unable to write new index file"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:209
|
|
msgid "(bad commit)\n"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:231
|
|
#, c-format
|
|
msgid "addinfo_cache failed for path '%s'"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:301
|
|
msgid "error building trees"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:720
|
|
#, c-format
|
|
msgid "failed to create path '%s'%s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:731
|
|
#, c-format
|
|
msgid "Removing %s to make room for subdirectory\n"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:745 merge-recursive.c:764
|
|
msgid ": perhaps a D/F conflict?"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:754
|
|
#, c-format
|
|
msgid "refusing to lose untracked file at '%s'"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:796 builtin/cat-file.c:34
|
|
#, c-format
|
|
msgid "cannot read object %s '%s'"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:798
|
|
#, c-format
|
|
msgid "blob expected for %s '%s'"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:822
|
|
#, c-format
|
|
msgid "failed to open '%s': %s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:833
|
|
#, c-format
|
|
msgid "failed to symlink '%s': %s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:838
|
|
#, c-format
|
|
msgid "do not know what to do with %06o %s '%s'"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:978
|
|
msgid "Failed to execute internal merge"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:982
|
|
#, c-format
|
|
msgid "Unable to add %s to database"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1081 merge-recursive.c:1095
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
|
"in tree."
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1087 merge-recursive.c:1100
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
|
"in tree at %s."
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1143
|
|
msgid "rename"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1143
|
|
msgid "renamed"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1200
|
|
#, c-format
|
|
msgid "%s is a directory in %s adding as %s instead"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1225
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
|
|
"\"->\"%s\" in \"%s\"%s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1230
|
|
msgid " (left unresolved)"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1292
|
|
#, c-format
|
|
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1325
|
|
#, c-format
|
|
msgid "Renaming %s to %s and %s to %s instead"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1531
|
|
#, c-format
|
|
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1546
|
|
#, c-format
|
|
msgid "Adding merged %s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1553 merge-recursive.c:1766
|
|
#, c-format
|
|
msgid "Adding as %s instead"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1610
|
|
#, c-format
|
|
msgid "cannot read object %s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1613
|
|
#, c-format
|
|
msgid "object %s is not a blob"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1666
|
|
msgid "modify"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1666
|
|
msgid "modified"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1676
|
|
msgid "content"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1683
|
|
msgid "add/add"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1718
|
|
#, c-format
|
|
msgid "Skipped %s (merged same as existing)"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1732
|
|
#, c-format
|
|
msgid "Auto-merging %s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1736 git-submodule.sh:924
|
|
msgid "submodule"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1737
|
|
#, c-format
|
|
msgid "CONFLICT (%s): Merge conflict in %s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1831
|
|
#, c-format
|
|
msgid "Removing %s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1857
|
|
msgid "file/directory"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1863
|
|
msgid "directory/file"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1868
|
|
#, c-format
|
|
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1877
|
|
#, c-format
|
|
msgid "Adding %s"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1914
|
|
msgid "Already up-to-date!"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:1923
|
|
#, c-format
|
|
msgid "merging of trees %s and %s failed"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:2006
|
|
msgid "Merging:"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:2019
|
|
#, c-format
|
|
msgid "found %u common ancestor:"
|
|
msgid_plural "found %u common ancestors:"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: merge-recursive.c:2058
|
|
msgid "merge returned no commit"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:2121
|
|
#, c-format
|
|
msgid "Could not parse object '%s'"
|
|
msgstr ""
|
|
|
|
#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
|
|
msgid "Unable to write index."
|
|
msgstr ""
|
|
|
|
#: notes-merge.c:273
|
|
#, 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."
|
|
msgstr ""
|
|
|
|
#: notes-merge.c:280
|
|
#, c-format
|
|
msgid "You have not concluded your notes merge (%s exists)."
|
|
msgstr ""
|
|
|
|
#: notes-utils.c:41
|
|
msgid "Cannot commit uninitialized/unreferenced notes tree"
|
|
msgstr ""
|
|
|
|
#: notes-utils.c:100
|
|
#, c-format
|
|
msgid "Bad notes.rewriteMode value: '%s'"
|
|
msgstr ""
|
|
|
|
#: notes-utils.c:110
|
|
#, c-format
|
|
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: The first %s is the name of the
|
|
#. environment variable, the second %s is its value
|
|
#: notes-utils.c:137
|
|
#, c-format
|
|
msgid "Bad %s value: '%s'"
|
|
msgstr ""
|
|
|
|
#: object.c:242
|
|
#, c-format
|
|
msgid "unable to parse object: %s"
|
|
msgstr ""
|
|
|
|
#: parse-options.c:572
|
|
msgid "..."
|
|
msgstr ""
|
|
|
|
#: parse-options.c:590
|
|
#, c-format
|
|
msgid "usage: %s"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: the colon here should align with the
|
|
#. one in "usage: %s" translation
|
|
#: parse-options.c:594
|
|
#, c-format
|
|
msgid " or: %s"
|
|
msgstr ""
|
|
|
|
#: parse-options.c:597
|
|
#, c-format
|
|
msgid " %s"
|
|
msgstr ""
|
|
|
|
#: parse-options.c:631
|
|
msgid "-NUM"
|
|
msgstr ""
|
|
|
|
#: parse-options-cb.c:108
|
|
#, c-format
|
|
msgid "malformed object name '%s'"
|
|
msgstr ""
|
|
|
|
#: path.c:826
|
|
#, c-format
|
|
msgid "Could not make %s writable by group"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:133
|
|
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:143
|
|
msgid ""
|
|
"global 'literal' pathspec setting is incompatible with all other global "
|
|
"pathspec settings"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:177
|
|
msgid "invalid parameter for pathspec magic 'prefix'"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:183
|
|
#, c-format
|
|
msgid "Invalid pathspec magic '%.*s' in '%s'"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:187
|
|
#, c-format
|
|
msgid "Missing ')' at the end of pathspec magic in '%s'"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:205
|
|
#, c-format
|
|
msgid "Unimplemented pathspec magic '%c' in '%s'"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:230
|
|
#, c-format
|
|
msgid "%s: 'literal' and 'glob' are incompatible"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:241
|
|
#, c-format
|
|
msgid "%s: '%s' is outside repository"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:291
|
|
#, c-format
|
|
msgid "Pathspec '%s' is in submodule '%.*s'"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:353
|
|
#, c-format
|
|
msgid "%s: pathspec magic not supported by this command: %s"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:408
|
|
msgid ""
|
|
"empty strings as pathspecs will be made invalid in upcoming releases. please "
|
|
"use . instead if you meant to match all paths"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:440
|
|
#, c-format
|
|
msgid "pathspec '%s' is beyond a symbolic link"
|
|
msgstr ""
|
|
|
|
#: pathspec.c:449
|
|
msgid ""
|
|
"There is nothing to exclude from by :(exclude) patterns.\n"
|
|
"Perhaps you forgot to add either ':/' or '.' ?"
|
|
msgstr ""
|
|
|
|
#: pretty.c:971
|
|
msgid "unable to parse --pretty format"
|
|
msgstr ""
|
|
|
|
#: read-cache.c:1315
|
|
#, c-format
|
|
msgid ""
|
|
"index.version set, but the value is invalid.\n"
|
|
"Using version %i"
|
|
msgstr ""
|
|
|
|
#: read-cache.c:1325
|
|
#, c-format
|
|
msgid ""
|
|
"GIT_INDEX_VERSION set, but the value is invalid.\n"
|
|
"Using version %i"
|
|
msgstr ""
|
|
|
|
#: refs.c:576 builtin/merge.c:840
|
|
#, c-format
|
|
msgid "Could not open '%s' for writing"
|
|
msgstr ""
|
|
|
|
#: refs/files-backend.c:2481
|
|
#, c-format
|
|
msgid "could not delete reference %s: %s"
|
|
msgstr ""
|
|
|
|
#: refs/files-backend.c:2484
|
|
#, c-format
|
|
msgid "could not delete references: %s"
|
|
msgstr ""
|
|
|
|
#: refs/files-backend.c:2493
|
|
#, c-format
|
|
msgid "could not remove reference %s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:55
|
|
#, c-format
|
|
msgid "expected format: %%(color:<color>)"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:57
|
|
#, c-format
|
|
msgid "unrecognized color: %%(color:%s)"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:71
|
|
#, c-format
|
|
msgid "unrecognized format: %%(%s)"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:77
|
|
#, c-format
|
|
msgid "%%(body) does not take arguments"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:84
|
|
#, c-format
|
|
msgid "%%(subject) does not take arguments"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:101
|
|
#, c-format
|
|
msgid "positive value expected contents:lines=%s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:103
|
|
#, c-format
|
|
msgid "unrecognized %%(contents) argument: %s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:113
|
|
#, c-format
|
|
msgid "unrecognized %%(objectname) argument: %s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:135
|
|
#, c-format
|
|
msgid "expected format: %%(align:<width>,<position>)"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:147
|
|
#, c-format
|
|
msgid "unrecognized position:%s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:151
|
|
#, c-format
|
|
msgid "unrecognized width:%s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:157
|
|
#, c-format
|
|
msgid "unrecognized %%(align) argument: %s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:161
|
|
#, c-format
|
|
msgid "positive width expected with the %%(align) atom"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:244
|
|
#, c-format
|
|
msgid "malformed field name: %.*s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:270
|
|
#, c-format
|
|
msgid "unknown field name: %.*s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:372
|
|
#, c-format
|
|
msgid "format: %%(end) atom used without corresponding atom"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:424
|
|
#, c-format
|
|
msgid "malformed format string %s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:878
|
|
msgid ":strip= requires a positive integer argument"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:883
|
|
#, c-format
|
|
msgid "ref '%s' does not have %ld components to :strip"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:1046
|
|
#, c-format
|
|
msgid "unknown %.*s format %s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:1066 ref-filter.c:1097
|
|
#, c-format
|
|
msgid "missing object %s for %s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:1069 ref-filter.c:1100
|
|
#, c-format
|
|
msgid "parse_object_buffer failed on %s for %s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:1311
|
|
#, c-format
|
|
msgid "malformed object at '%s'"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:1373
|
|
#, c-format
|
|
msgid "ignoring ref with broken name %s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:1378
|
|
#, c-format
|
|
msgid "ignoring broken ref %s"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:1633
|
|
#, c-format
|
|
msgid "format: %%(end) atom missing"
|
|
msgstr ""
|
|
|
|
#: ref-filter.c:1687
|
|
#, c-format
|
|
msgid "malformed object name %s"
|
|
msgstr ""
|
|
|
|
#: remote.c:746
|
|
#, c-format
|
|
msgid "Cannot fetch both %s and %s to %s"
|
|
msgstr ""
|
|
|
|
#: remote.c:750
|
|
#, c-format
|
|
msgid "%s usually tracks %s, not %s"
|
|
msgstr ""
|
|
|
|
#: remote.c:754
|
|
#, c-format
|
|
msgid "%s tracks both %s and %s"
|
|
msgstr ""
|
|
|
|
#: remote.c:762
|
|
msgid "Internal error"
|
|
msgstr ""
|
|
|
|
#: remote.c:1677 remote.c:1720
|
|
msgid "HEAD does not point to a branch"
|
|
msgstr ""
|
|
|
|
#: remote.c:1686
|
|
#, c-format
|
|
msgid "no such branch: '%s'"
|
|
msgstr ""
|
|
|
|
#: remote.c:1689
|
|
#, c-format
|
|
msgid "no upstream configured for branch '%s'"
|
|
msgstr ""
|
|
|
|
#: remote.c:1695
|
|
#, c-format
|
|
msgid "upstream branch '%s' not stored as a remote-tracking branch"
|
|
msgstr ""
|
|
|
|
#: remote.c:1710
|
|
#, c-format
|
|
msgid "push destination '%s' on remote '%s' has no local tracking branch"
|
|
msgstr ""
|
|
|
|
#: remote.c:1725
|
|
#, c-format
|
|
msgid "branch '%s' has no remote for pushing"
|
|
msgstr ""
|
|
|
|
#: remote.c:1736
|
|
#, c-format
|
|
msgid "push refspecs for '%s' do not include '%s'"
|
|
msgstr ""
|
|
|
|
#: remote.c:1749
|
|
msgid "push has no destination (push.default is 'nothing')"
|
|
msgstr ""
|
|
|
|
#: remote.c:1771
|
|
msgid "cannot resolve 'simple' push to a single destination"
|
|
msgstr ""
|
|
|
|
#: remote.c:2073
|
|
#, c-format
|
|
msgid "Your branch is based on '%s', but the upstream is gone.\n"
|
|
msgstr ""
|
|
|
|
#: remote.c:2077
|
|
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
|
|
msgstr ""
|
|
|
|
#: remote.c:2080
|
|
#, c-format
|
|
msgid "Your branch is up-to-date with '%s'.\n"
|
|
msgstr ""
|
|
|
|
#: remote.c:2084
|
|
#, 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:2090
|
|
msgid " (use \"git push\" to publish your local commits)\n"
|
|
msgstr ""
|
|
|
|
#: remote.c:2093
|
|
#, 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:2101
|
|
msgid " (use \"git pull\" to update your local branch)\n"
|
|
msgstr ""
|
|
|
|
#: remote.c:2104
|
|
#, 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:2114
|
|
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
|
msgstr ""
|
|
|
|
#: revision.c:2158
|
|
msgid "your current branch appears to be broken"
|
|
msgstr ""
|
|
|
|
#: revision.c:2161
|
|
#, c-format
|
|
msgid "your current branch '%s' does not have any commits yet"
|
|
msgstr ""
|
|
|
|
#: revision.c:2355
|
|
msgid "--first-parent is incompatible with --bisect"
|
|
msgstr ""
|
|
|
|
#: run-command.c:106
|
|
msgid "open /dev/null failed"
|
|
msgstr ""
|
|
|
|
#: run-command.c:108
|
|
#, c-format
|
|
msgid "dup2(%d,%d) failed"
|
|
msgstr ""
|
|
|
|
#: send-pack.c:297
|
|
msgid "failed to sign the push certificate"
|
|
msgstr ""
|
|
|
|
#: send-pack.c:410
|
|
msgid "the receiving end does not support --signed push"
|
|
msgstr ""
|
|
|
|
#: send-pack.c:412
|
|
msgid ""
|
|
"not sending a push certificate since the receiving end does not support --"
|
|
"signed push"
|
|
msgstr ""
|
|
|
|
#: send-pack.c:424
|
|
msgid "the receiving end does not support --atomic push"
|
|
msgstr ""
|
|
|
|
#: send-pack.c:429
|
|
msgid "the receiving end does not support push options"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:171
|
|
msgid "revert"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:171
|
|
msgid "cherry-pick"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:228
|
|
msgid ""
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
"with 'git add <paths>' or 'git rm <paths>'"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:231
|
|
msgid ""
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
"with 'git add <paths>' or 'git rm <paths>'\n"
|
|
"and commit the result with 'git commit'"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:244 sequencer.c:1209
|
|
#, c-format
|
|
msgid "could not lock '%s'"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
|
|
#, c-format
|
|
msgid "could not write to '%s'"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:251
|
|
#, c-format
|
|
msgid "could not write eol to '%s'"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
|
|
#, c-format
|
|
msgid "failed to finalize '%s'."
|
|
msgstr ""
|
|
|
|
#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
|
|
#, c-format
|
|
msgid "could not read '%s'"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:305
|
|
#, c-format
|
|
msgid "your local changes would be overwritten by %s."
|
|
msgstr ""
|
|
|
|
#: sequencer.c:309
|
|
msgid "commit your changes or stash them to proceed."
|
|
msgstr ""
|
|
|
|
#: sequencer.c:324
|
|
#, c-format
|
|
msgid "%s: fast-forward"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
|
|
#: sequencer.c:399
|
|
#, c-format
|
|
msgid "%s: Unable to write new index file"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:418
|
|
msgid "could not resolve HEAD commit\n"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:438
|
|
msgid "unable to update cache tree\n"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:483
|
|
#, 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"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:567
|
|
#, c-format
|
|
msgid "could not parse commit %s\n"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:572
|
|
#, c-format
|
|
msgid "could not parse parent commit %s\n"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:656
|
|
msgid "your index file is unmerged."
|
|
msgstr ""
|
|
|
|
#: sequencer.c:675
|
|
#, c-format
|
|
msgid "commit %s is a merge but no -m option was given."
|
|
msgstr ""
|
|
|
|
#: sequencer.c:683
|
|
#, c-format
|
|
msgid "commit %s does not have parent %d"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:687
|
|
#, c-format
|
|
msgid "mainline was specified but commit %s is not a merge."
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: The first %s will be a "todo" command like
|
|
#. "revert" or "pick", the second %s a SHA1.
|
|
#: sequencer.c:700
|
|
#, c-format
|
|
msgid "%s: cannot parse parent commit %s"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:705
|
|
#, c-format
|
|
msgid "cannot get commit message for %s"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:797
|
|
#, c-format
|
|
msgid "could not revert %s... %s"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:798
|
|
#, c-format
|
|
msgid "could not apply %s... %s"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:833
|
|
msgid "empty commit set passed"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:843
|
|
#, c-format
|
|
msgid "git %s: failed to read the index"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:850
|
|
#, c-format
|
|
msgid "git %s: failed to refresh the index"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:944
|
|
#, c-format
|
|
msgid "invalid line %d: %.*s"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:950
|
|
msgid "no commits parsed."
|
|
msgstr ""
|
|
|
|
#: sequencer.c:966
|
|
#, c-format
|
|
msgid "could not read '%s'."
|
|
msgstr ""
|
|
|
|
#: sequencer.c:972
|
|
#, c-format
|
|
msgid "unusable instruction sheet: '%s'"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:983
|
|
msgid "cannot cherry-pick during a revert."
|
|
msgstr ""
|
|
|
|
#: sequencer.c:985
|
|
msgid "cannot revert during a cherry-pick."
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1028
|
|
#, c-format
|
|
msgid "invalid key: %s"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1031
|
|
#, c-format
|
|
msgid "invalid value for %s: %s"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1063
|
|
#, c-format
|
|
msgid "malformed options sheet: '%s'"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1101
|
|
msgid "a cherry-pick or revert is already in progress"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1102
|
|
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1106
|
|
#, c-format
|
|
msgid "could not create sequencer directory '%s'"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1120
|
|
msgid "could not lock HEAD"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1151 sequencer.c:1289
|
|
msgid "no cherry-pick or revert in progress"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1153
|
|
msgid "cannot resolve HEAD"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1155 sequencer.c:1189
|
|
msgid "cannot abort from a branch yet to be born"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1175 builtin/grep.c:578
|
|
#, c-format
|
|
msgid "cannot open '%s'"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1177
|
|
#, c-format
|
|
msgid "cannot read '%s': %s"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1178
|
|
msgid "unexpected end of file"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1184
|
|
#, c-format
|
|
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1354
|
|
#, c-format
|
|
msgid "%s: can't cherry-pick a %s"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1358
|
|
#, c-format
|
|
msgid "%s: bad revision"
|
|
msgstr ""
|
|
|
|
#: sequencer.c:1391
|
|
msgid "can't revert as initial commit"
|
|
msgstr ""
|
|
|
|
#: setup.c:160
|
|
#, 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 ""
|
|
|
|
#: setup.c:173
|
|
#, 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 ""
|
|
|
|
#: setup.c:223
|
|
#, c-format
|
|
msgid ""
|
|
"ambiguous argument '%s': both revision and filename\n"
|
|
"Use '--' to separate paths from revisions, like this:\n"
|
|
"'git <command> [<revision>...] -- [<file>...]'"
|
|
msgstr ""
|
|
|
|
#: setup.c:468
|
|
#, c-format
|
|
msgid "Expected git repo version <= %d, found %d"
|
|
msgstr ""
|
|
|
|
#: setup.c:476
|
|
msgid "unknown repository extensions found:"
|
|
msgstr ""
|
|
|
|
#: setup.c:762
|
|
#, c-format
|
|
msgid "Not a git repository (or any of the parent directories): %s"
|
|
msgstr ""
|
|
|
|
#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
|
|
msgid "Cannot come back to cwd"
|
|
msgstr ""
|
|
|
|
#: setup.c:845
|
|
msgid "Unable to read current working directory"
|
|
msgstr ""
|
|
|
|
#: setup.c:920
|
|
#, c-format
|
|
msgid ""
|
|
"Not a git repository (or any parent up to mount point %s)\n"
|
|
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
|
|
msgstr ""
|
|
|
|
#: setup.c:927
|
|
#, c-format
|
|
msgid "Cannot change to '%s/..'"
|
|
msgstr ""
|
|
|
|
#: setup.c:989
|
|
#, c-format
|
|
msgid ""
|
|
"Problem with core.sharedRepository filemode value (0%.3o).\n"
|
|
"The owner of files must always have read and write permissions."
|
|
msgstr ""
|
|
|
|
#: sha1_file.c:473
|
|
#, c-format
|
|
msgid "path '%s' does not exist"
|
|
msgstr ""
|
|
|
|
#: sha1_file.c:499
|
|
#, c-format
|
|
msgid "reference repository '%s' as a linked checkout is not supported yet."
|
|
msgstr ""
|
|
|
|
#: sha1_file.c:505
|
|
#, c-format
|
|
msgid "reference repository '%s' is not a local repository."
|
|
msgstr ""
|
|
|
|
#: sha1_file.c:511
|
|
#, c-format
|
|
msgid "reference repository '%s' is shallow"
|
|
msgstr ""
|
|
|
|
#: sha1_file.c:519
|
|
#, c-format
|
|
msgid "reference repository '%s' is grafted"
|
|
msgstr ""
|
|
|
|
#: sha1_file.c:1159
|
|
msgid "offset before end of packfile (broken .idx?)"
|
|
msgstr ""
|
|
|
|
#: sha1_file.c:2592
|
|
#, c-format
|
|
msgid "offset before start of pack index for %s (corrupt index?)"
|
|
msgstr ""
|
|
|
|
#: sha1_file.c:2596
|
|
#, c-format
|
|
msgid "offset beyond end of pack index for %s (truncated index?)"
|
|
msgstr ""
|
|
|
|
#: sha1_name.c:407
|
|
#, c-format
|
|
msgid "short SHA1 %s is ambiguous"
|
|
msgstr ""
|
|
|
|
#: sha1_name.c:418
|
|
msgid "The candidates are:"
|
|
msgstr ""
|
|
|
|
#: sha1_name.c:578
|
|
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:64 submodule.c:98
|
|
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
|
|
msgstr ""
|
|
|
|
#: submodule.c:68 submodule.c:102
|
|
#, c-format
|
|
msgid "Could not find section in .gitmodules where path=%s"
|
|
msgstr ""
|
|
|
|
#: submodule.c:76
|
|
#, c-format
|
|
msgid "Could not update .gitmodules entry %s"
|
|
msgstr ""
|
|
|
|
#: submodule.c:109
|
|
#, c-format
|
|
msgid "Could not remove .gitmodules entry for %s"
|
|
msgstr ""
|
|
|
|
#: submodule.c:120
|
|
msgid "staging updated .gitmodules failed"
|
|
msgstr ""
|
|
|
|
#: submodule.c:158
|
|
msgid "negative values not allowed for submodule.fetchJobs"
|
|
msgstr ""
|
|
|
|
#: submodule-config.c:358
|
|
#, c-format
|
|
msgid "invalid value for %s"
|
|
msgstr ""
|
|
|
|
#: trailer.c:238
|
|
#, c-format
|
|
msgid "running trailer command '%s' failed"
|
|
msgstr ""
|
|
|
|
#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
|
|
#: trailer.c:541
|
|
#, c-format
|
|
msgid "unknown value '%s' for key '%s'"
|
|
msgstr ""
|
|
|
|
#: trailer.c:523 trailer.c:528 builtin/remote.c:289
|
|
#, c-format
|
|
msgid "more than one %s"
|
|
msgstr ""
|
|
|
|
#: trailer.c:672
|
|
#, c-format
|
|
msgid "empty trailer token in trailer '%.*s'"
|
|
msgstr ""
|
|
|
|
#: trailer.c:695
|
|
#, c-format
|
|
msgid "could not read input file '%s'"
|
|
msgstr ""
|
|
|
|
#: trailer.c:698
|
|
msgid "could not read from stdin"
|
|
msgstr ""
|
|
|
|
#: trailer.c:929 builtin/am.c:44
|
|
#, c-format
|
|
msgid "could not stat %s"
|
|
msgstr ""
|
|
|
|
#: trailer.c:931
|
|
#, c-format
|
|
msgid "file %s is not a regular file"
|
|
msgstr ""
|
|
|
|
#: trailer.c:933
|
|
#, c-format
|
|
msgid "file %s is not writable by user"
|
|
msgstr ""
|
|
|
|
#: trailer.c:945
|
|
msgid "could not open temporary file"
|
|
msgstr ""
|
|
|
|
#: trailer.c:983
|
|
#, c-format
|
|
msgid "could not rename temporary file to %s"
|
|
msgstr ""
|
|
|
|
#: transport.c:62
|
|
#, c-format
|
|
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
|
|
msgstr ""
|
|
|
|
#: transport.c:151
|
|
#, c-format
|
|
msgid "transport: invalid depth option '%s'"
|
|
msgstr ""
|
|
|
|
#: transport.c:817
|
|
#, c-format
|
|
msgid ""
|
|
"The following submodule paths contain changes that can\n"
|
|
"not be found on any remote:\n"
|
|
msgstr ""
|
|
|
|
#: transport.c:821
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"Please try\n"
|
|
"\n"
|
|
"\tgit push --recurse-submodules=on-demand\n"
|
|
"\n"
|
|
"or cd to the path and use\n"
|
|
"\n"
|
|
"\tgit push\n"
|
|
"\n"
|
|
"to push them to a remote.\n"
|
|
"\n"
|
|
msgstr ""
|
|
|
|
#: transport.c:829
|
|
msgid "Aborting."
|
|
msgstr ""
|
|
|
|
#: transport-helper.c:1075
|
|
#, c-format
|
|
msgid "Could not read ref %s"
|
|
msgstr ""
|
|
|
|
#: tree-walk.c:31
|
|
msgid "too-short tree object"
|
|
msgstr ""
|
|
|
|
#: tree-walk.c:37
|
|
msgid "malformed mode in tree entry"
|
|
msgstr ""
|
|
|
|
#: tree-walk.c:41
|
|
msgid "empty filename in tree entry"
|
|
msgstr ""
|
|
|
|
#: tree-walk.c:113
|
|
msgid "too-short tree file"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:64
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by checkout:\n"
|
|
"%%sPlease commit your changes or stash them before you switch branches."
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:66
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by checkout:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:69
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
"%%sPlease commit your changes or stash them before you merge."
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:71
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:74
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by %s:\n"
|
|
"%%sPlease commit your changes or stash them before you %s."
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:76
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by %s:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:81
|
|
#, c-format
|
|
msgid ""
|
|
"Updating the following directories would lose untracked files in it:\n"
|
|
"%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:85
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by checkout:\n"
|
|
"%%sPlease move or remove them before you switch branches."
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:87
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by checkout:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:90
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by merge:\n"
|
|
"%%sPlease move or remove them before you merge."
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:92
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by merge:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:95
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by %s:\n"
|
|
"%%sPlease move or remove them before you %s."
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:97
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by %s:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:102
|
|
#, 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 ""
|
|
|
|
#: unpack-trees.c:104
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be overwritten by "
|
|
"checkout:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:107
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be overwritten by merge:\n"
|
|
"%%sPlease move or remove them before you merge."
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:109
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be overwritten by merge:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:112
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be overwritten by %s:\n"
|
|
"%%sPlease move or remove them before you %s."
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:114
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be overwritten by %s:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:121
|
|
#, c-format
|
|
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:124
|
|
#, c-format
|
|
msgid ""
|
|
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
|
|
"%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:126
|
|
#, c-format
|
|
msgid ""
|
|
"The following working tree files would be overwritten by sparse checkout "
|
|
"update:\n"
|
|
"%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:128
|
|
#, c-format
|
|
msgid ""
|
|
"The following working tree files would be removed by sparse checkout "
|
|
"update:\n"
|
|
"%s"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:205
|
|
#, c-format
|
|
msgid "Aborting\n"
|
|
msgstr ""
|
|
|
|
#: unpack-trees.c:237
|
|
msgid "Checking out files"
|
|
msgstr ""
|
|
|
|
#: urlmatch.c:120
|
|
msgid "invalid URL scheme name or missing '://' suffix"
|
|
msgstr ""
|
|
|
|
#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
|
|
#, c-format
|
|
msgid "invalid %XX escape sequence"
|
|
msgstr ""
|
|
|
|
#: urlmatch.c:172
|
|
msgid "missing host and scheme is not 'file:'"
|
|
msgstr ""
|
|
|
|
#: urlmatch.c:189
|
|
msgid "a 'file:' URL may not have a port number"
|
|
msgstr ""
|
|
|
|
#: urlmatch.c:199
|
|
msgid "invalid characters in host name"
|
|
msgstr ""
|
|
|
|
#: urlmatch.c:244 urlmatch.c:255
|
|
msgid "invalid port number"
|
|
msgstr ""
|
|
|
|
#: urlmatch.c:322
|
|
msgid "invalid '..' path segment"
|
|
msgstr ""
|
|
|
|
#: worktree.c:282
|
|
#, c-format
|
|
msgid "failed to read '%s'"
|
|
msgstr ""
|
|
|
|
#: wrapper.c:222 wrapper.c:392
|
|
#, c-format
|
|
msgid "could not open '%s' for reading and writing"
|
|
msgstr ""
|
|
|
|
#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
|
|
#, c-format
|
|
msgid "could not open '%s' for writing"
|
|
msgstr ""
|
|
|
|
#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
|
|
#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
|
|
#: builtin/pull.c:341
|
|
#, c-format
|
|
msgid "could not open '%s' for reading"
|
|
msgstr ""
|
|
|
|
#: wrapper.c:605 wrapper.c:626
|
|
#, c-format
|
|
msgid "unable to access '%s'"
|
|
msgstr ""
|
|
|
|
#: wrapper.c:634
|
|
msgid "unable to get current working directory"
|
|
msgstr ""
|
|
|
|
#: wrapper.c:658
|
|
#, c-format
|
|
msgid "could not write to %s"
|
|
msgstr ""
|
|
|
|
#: wrapper.c:660
|
|
#, c-format
|
|
msgid "could not close %s"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:151
|
|
msgid "Unmerged paths:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:178 wt-status.c:205
|
|
#, c-format
|
|
msgid " (use \"git reset %s <file>...\" to unstage)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:180 wt-status.c:207
|
|
msgid " (use \"git rm --cached <file>...\" to unstage)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:184
|
|
msgid " (use \"git add <file>...\" to mark resolution)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:186 wt-status.c:190
|
|
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:188
|
|
msgid " (use \"git rm <file>...\" to mark resolution)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:199 wt-status.c:945
|
|
msgid "Changes to be committed:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:217 wt-status.c:954
|
|
msgid "Changes not staged for commit:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:221
|
|
msgid " (use \"git add <file>...\" to update what will be committed)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:223
|
|
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:224
|
|
msgid ""
|
|
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:226
|
|
msgid " (commit or discard the untracked or modified content in submodules)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:238
|
|
#, c-format
|
|
msgid " (use \"git %s <file>...\" to include in what will be committed)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:253
|
|
msgid "both deleted:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:255
|
|
msgid "added by us:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:257
|
|
msgid "deleted by them:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:259
|
|
msgid "added by them:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:261
|
|
msgid "deleted by us:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:263
|
|
msgid "both added:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:265
|
|
msgid "both modified:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:275
|
|
msgid "new file:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:277
|
|
msgid "copied:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:279
|
|
msgid "deleted:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:281
|
|
msgid "modified:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:283
|
|
msgid "renamed:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:285
|
|
msgid "typechange:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:287
|
|
msgid "unknown:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:289
|
|
msgid "unmerged:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:371
|
|
msgid "new commits, "
|
|
msgstr ""
|
|
|
|
#: wt-status.c:373
|
|
msgid "modified content, "
|
|
msgstr ""
|
|
|
|
#: wt-status.c:375
|
|
msgid "untracked content, "
|
|
msgstr ""
|
|
|
|
#: wt-status.c:818
|
|
msgid "Submodules changed but not updated:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:820
|
|
msgid "Submodule changes to be committed:"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:901
|
|
msgid ""
|
|
"Do not touch the line above.\n"
|
|
"Everything below will be removed."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1013
|
|
msgid "You have unmerged paths."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1016
|
|
msgid " (fix conflicts and run \"git commit\")"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1018
|
|
msgid " (use \"git merge --abort\" to abort the merge)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1023
|
|
msgid "All conflicts fixed but you are still merging."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1026
|
|
msgid " (use \"git commit\" to conclude merge)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1036
|
|
msgid "You are in the middle of an am session."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1039
|
|
msgid "The current patch is empty."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1043
|
|
msgid " (fix conflicts and then run \"git am --continue\")"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1045
|
|
msgid " (use \"git am --skip\" to skip this patch)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1047
|
|
msgid " (use \"git am --abort\" to restore the original branch)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1172
|
|
msgid "No commands done."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1175
|
|
#, c-format
|
|
msgid "Last command done (%d command done):"
|
|
msgid_plural "Last commands done (%d commands done):"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: wt-status.c:1186
|
|
#, c-format
|
|
msgid " (see more in file %s)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1191
|
|
msgid "No commands remaining."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1194
|
|
#, 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:1202
|
|
msgid " (use \"git rebase --edit-todo\" to view and edit)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1215
|
|
#, c-format
|
|
msgid "You are currently rebasing branch '%s' on '%s'."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1220
|
|
msgid "You are currently rebasing."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1234
|
|
msgid " (fix conflicts and then run \"git rebase --continue\")"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1236
|
|
msgid " (use \"git rebase --skip\" to skip this patch)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1238
|
|
msgid " (use \"git rebase --abort\" to check out the original branch)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1244
|
|
msgid " (all conflicts fixed: run \"git rebase --continue\")"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1248
|
|
#, c-format
|
|
msgid ""
|
|
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1253
|
|
msgid "You are currently splitting a commit during a rebase."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1256
|
|
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1260
|
|
#, c-format
|
|
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1265
|
|
msgid "You are currently editing a commit during a rebase."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1268
|
|
msgid " (use \"git commit --amend\" to amend the current commit)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1270
|
|
msgid ""
|
|
" (use \"git rebase --continue\" once you are satisfied with your changes)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1280
|
|
#, c-format
|
|
msgid "You are currently cherry-picking commit %s."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1285
|
|
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1288
|
|
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1290
|
|
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1299
|
|
#, c-format
|
|
msgid "You are currently reverting commit %s."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1304
|
|
msgid " (fix conflicts and run \"git revert --continue\")"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1307
|
|
msgid " (all conflicts fixed: run \"git revert --continue\")"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1309
|
|
msgid " (use \"git revert --abort\" to cancel the revert operation)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1320
|
|
#, c-format
|
|
msgid "You are currently bisecting, started from branch '%s'."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1324
|
|
msgid "You are currently bisecting."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1327
|
|
msgid " (use \"git bisect reset\" to get back to the original branch)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1524
|
|
msgid "On branch "
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1530
|
|
msgid "interactive rebase in progress; onto "
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1532
|
|
msgid "rebase in progress; onto "
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1537
|
|
msgid "HEAD detached at "
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1539
|
|
msgid "HEAD detached from "
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1542
|
|
msgid "Not currently on any branch."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1560
|
|
msgid "Initial commit"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1574
|
|
msgid "Untracked files"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1576
|
|
msgid "Ignored files"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1580
|
|
#, c-format
|
|
msgid ""
|
|
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
|
|
"may speed it up, but you have to be careful not to forget to add\n"
|
|
"new files yourself (see 'git help status')."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1586
|
|
#, c-format
|
|
msgid "Untracked files not listed%s"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1588
|
|
msgid " (use -u option to show untracked files)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1594
|
|
msgid "No changes"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1599
|
|
#, c-format
|
|
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1602
|
|
#, c-format
|
|
msgid "no changes added to commit\n"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1605
|
|
#, c-format
|
|
msgid ""
|
|
"nothing added to commit but untracked files present (use \"git add\" to "
|
|
"track)\n"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1608
|
|
#, c-format
|
|
msgid "nothing added to commit but untracked files present\n"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1611
|
|
#, c-format
|
|
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1614 wt-status.c:1619
|
|
#, c-format
|
|
msgid "nothing to commit\n"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1617
|
|
#, c-format
|
|
msgid "nothing to commit (use -u to show untracked files)\n"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1621
|
|
#, c-format
|
|
msgid "nothing to commit, working tree clean\n"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1728
|
|
msgid "Initial commit on "
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1732
|
|
msgid "HEAD (no branch)"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1761
|
|
msgid "gone"
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1763 wt-status.c:1771
|
|
msgid "behind "
|
|
msgstr ""
|
|
|
|
#: wt-status.c:1766 wt-status.c:1769
|
|
msgid "ahead "
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: the action is e.g. "pull with rebase"
|
|
#: wt-status.c:2270
|
|
#, c-format
|
|
msgid "cannot %s: You have unstaged changes."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:2276
|
|
msgid "additionally, your index contains uncommitted changes."
|
|
msgstr ""
|
|
|
|
#: wt-status.c:2278
|
|
#, c-format
|
|
msgid "cannot %s: Your index contains uncommitted changes."
|
|
msgstr ""
|
|
|
|
#: compat/precompose_utf8.c:57 builtin/clone.c:414
|
|
#, c-format
|
|
msgid "failed to unlink '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:22
|
|
msgid "git add [<options>] [--] <pathspec>..."
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:80
|
|
#, c-format
|
|
msgid "unexpected diff status %c"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:85 builtin/commit.c:291
|
|
msgid "updating files failed"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:95
|
|
#, c-format
|
|
msgid "remove '%s'\n"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:149
|
|
msgid "Unstaged changes after refreshing the index:"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:209 builtin/rev-parse.c:840
|
|
msgid "Could not read the index"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:220
|
|
#, c-format
|
|
msgid "Could not open '%s' for writing."
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:224
|
|
msgid "Could not write patch"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:227
|
|
msgid "editing patch failed"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:230
|
|
#, c-format
|
|
msgid "Could not stat '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:232
|
|
msgid "Empty patch. Aborted."
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:237
|
|
#, c-format
|
|
msgid "Could not apply '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:247
|
|
msgid "The following paths are ignored by one of your .gitignore files:\n"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
|
|
#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
|
|
#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
|
|
msgid "dry run"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:269
|
|
msgid "interactive picking"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
|
|
msgid "select hunks interactively"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:271
|
|
msgid "edit current diff and apply"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:272
|
|
msgid "allow adding otherwise ignored files"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:273
|
|
msgid "update tracked files"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:274
|
|
msgid "record only the fact that the path will be added later"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:275
|
|
msgid "add changes from all tracked and untracked files"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:278
|
|
msgid "ignore paths removed in the working tree (same as --no-all)"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:280
|
|
msgid "don't add, only refresh the index"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:281
|
|
msgid "just skip files which cannot be added because of errors"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:282
|
|
msgid "check if - even missing - files are ignored in dry run"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:283 builtin/update-index.c:947
|
|
msgid "(+/-)x"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:283 builtin/update-index.c:948
|
|
msgid "override the executable bit of the listed files"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:305
|
|
#, c-format
|
|
msgid "Use -f if you really want to add them.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:312
|
|
msgid "adding files failed"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:348
|
|
msgid "-A and -u are mutually incompatible"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:355
|
|
msgid "Option --ignore-missing can only be used together with --dry-run"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:359
|
|
#, c-format
|
|
msgid "--chmod param '%s' must be either -x or +x"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:374
|
|
#, c-format
|
|
msgid "Nothing specified, nothing added.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:375
|
|
#, c-format
|
|
msgid "Maybe you wanted to say 'git add .'?\n"
|
|
msgstr ""
|
|
|
|
#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
|
|
#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
|
|
#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
|
|
#: builtin/submodule--helper.c:244
|
|
msgid "index file corrupt"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:414
|
|
msgid "could not parse author script"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:491
|
|
#, c-format
|
|
msgid "'%s' was deleted by the applypatch-msg hook"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:532
|
|
#, c-format
|
|
msgid "Malformed input line: '%s'."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:569
|
|
#, c-format
|
|
msgid "Failed to copy notes from '%s' to '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:595
|
|
msgid "fseek failed"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:775
|
|
#, c-format
|
|
msgid "could not parse patch '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:840
|
|
msgid "Only one StGIT patch series can be applied at once"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:887
|
|
msgid "invalid timestamp"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:890 builtin/am.c:898
|
|
msgid "invalid Date line"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:895
|
|
msgid "invalid timezone offset"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:984
|
|
msgid "Patch format detection failed."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:989 builtin/clone.c:379
|
|
#, c-format
|
|
msgid "failed to create directory '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:993
|
|
msgid "Failed to split patches."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1125 builtin/commit.c:376
|
|
msgid "unable to write index file"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1176
|
|
#, c-format
|
|
msgid "When you have resolved this problem, run \"%s --continue\"."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1177
|
|
#, c-format
|
|
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1178
|
|
#, c-format
|
|
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1316
|
|
msgid "Patch is empty. Was it split wrong?"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1390 builtin/log.c:1550
|
|
#, c-format
|
|
msgid "invalid ident line: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1417
|
|
#, c-format
|
|
msgid "unable to parse commit %s"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1610
|
|
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1612
|
|
msgid "Using index info to reconstruct a base tree..."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1631
|
|
msgid ""
|
|
"Did you hand edit your patch?\n"
|
|
"It does not apply to blobs recorded in its index."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1637
|
|
msgid "Falling back to patching base and 3-way merge..."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1662
|
|
msgid "Failed to merge in the changes."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1686 builtin/merge.c:628
|
|
msgid "git write-tree failed to write a tree"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1693
|
|
msgid "applying to an empty history"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
|
|
#: builtin/merge.c:823
|
|
msgid "failed to write commit object"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1739 builtin/am.c:1743
|
|
#, c-format
|
|
msgid "cannot resume: %s does not exist."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1759
|
|
msgid "cannot be interactive without stdin connected to a terminal."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1764
|
|
msgid "Commit Body is:"
|
|
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: "
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1824
|
|
#, c-format
|
|
msgid "Dirty index: cannot apply patches (dirty: %s)"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1861 builtin/am.c:1933
|
|
#, c-format
|
|
msgid "Applying: %.*s"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1877
|
|
msgid "No changes -- Patch already applied."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1885
|
|
#, c-format
|
|
msgid "Patch failed at %s %.*s"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1891
|
|
#, c-format
|
|
msgid "The copy of the patch that failed is found in: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1936
|
|
msgid ""
|
|
"No changes - did you forget to use 'git add'?\n"
|
|
"If there is nothing left to stage, chances are that something else\n"
|
|
"already introduced the same changes; you might want to skip this patch."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:1943
|
|
msgid ""
|
|
"You still have unmerged paths in your index.\n"
|
|
"Did you forget to use 'git add'?"
|
|
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'."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2103
|
|
msgid "failed to clean index"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2137
|
|
msgid ""
|
|
"You seem to have moved HEAD since the last 'am' failure.\n"
|
|
"Not rewinding to ORIG_HEAD"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2200
|
|
#, c-format
|
|
msgid "Invalid value for --patch-format: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2233
|
|
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2234
|
|
msgid "git am [<options>] (--continue | --skip | --abort)"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2240
|
|
msgid "run interactively"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2242
|
|
msgid "historical option -- no-op"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2244
|
|
msgid "allow fall back on 3way merging if needed"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
|
|
#: builtin/repack.c:172
|
|
msgid "be quiet"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2247
|
|
msgid "add a Signed-off-by line to the commit message"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2250
|
|
msgid "recode into utf8 (default)"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2252
|
|
msgid "pass -k flag to git-mailinfo"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2254
|
|
msgid "pass -b flag to git-mailinfo"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2256
|
|
msgid "pass -m flag to git-mailinfo"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2258
|
|
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2261
|
|
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2264
|
|
msgid "strip everything before a scissors line"
|
|
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"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
|
|
#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
|
|
#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
|
|
#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
|
|
#: parse-options.h:132 parse-options.h:134 parse-options.h:245
|
|
msgid "n"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
|
|
#: builtin/tag.c:372
|
|
msgid "format"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2290
|
|
msgid "format the patch(es) are in"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2296
|
|
msgid "override error message when patch failure occurs"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2298
|
|
msgid "continue applying patches after resolving a conflict"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2301
|
|
msgid "synonyms for --continue"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2304
|
|
msgid "skip the current patch"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2307
|
|
msgid "restore the original branch and abort the patching operation."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2311
|
|
msgid "lie about committer date"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2313
|
|
msgid "use current timestamp for author date"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
|
|
#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
|
|
msgid "key-id"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2316
|
|
msgid "GPG-sign commits"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2319
|
|
msgid "(internal use for git-rebase)"
|
|
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."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2341
|
|
msgid "failed to read the index"
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2356
|
|
#, c-format
|
|
msgid "previous rebase directory %s still exists but mbox given."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2380
|
|
#, c-format
|
|
msgid ""
|
|
"Stray %s directory found.\n"
|
|
"Use \"git am --abort\" to remove it."
|
|
msgstr ""
|
|
|
|
#: builtin/am.c:2386
|
|
msgid "Resolve operation not in progress, we are not resuming."
|
|
msgstr ""
|
|
|
|
#: builtin/apply.c:8
|
|
msgid "git apply [<options>] [<patch>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/archive.c:17
|
|
#, c-format
|
|
msgid "could not create archive file '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/archive.c:20
|
|
msgid "could not redirect output"
|
|
msgstr ""
|
|
|
|
#: builtin/archive.c:37
|
|
msgid "git archive: Remote with no URL"
|
|
msgstr ""
|
|
|
|
#: builtin/archive.c:58
|
|
msgid "git archive: expected ACK/NAK, got EOF"
|
|
msgstr ""
|
|
|
|
#: builtin/archive.c:61
|
|
#, c-format
|
|
msgid "git archive: NACK %s"
|
|
msgstr ""
|
|
|
|
#: builtin/archive.c:63
|
|
#, c-format
|
|
msgid "remote error: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/archive.c:64
|
|
msgid "git archive: protocol error"
|
|
msgstr ""
|
|
|
|
#: builtin/archive.c:68
|
|
msgid "git archive: expected a flush"
|
|
msgstr ""
|
|
|
|
#: builtin/bisect--helper.c:7
|
|
msgid "git bisect--helper --next-all [--no-checkout]"
|
|
msgstr ""
|
|
|
|
#: builtin/bisect--helper.c:17
|
|
msgid "perform 'git bisect next'"
|
|
msgstr ""
|
|
|
|
#: builtin/bisect--helper.c:19
|
|
msgid "update BISECT_HEAD instead of checking out the current commit"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:33
|
|
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:38
|
|
msgid "<rev-opts> are documented in git-rev-list(1)"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:1781
|
|
msgid "Blaming lines"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2577
|
|
msgid "Show blame entries as we find them, incrementally"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2578
|
|
msgid "Show blank SHA-1 for boundary commits (Default: off)"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2579
|
|
msgid "Do not treat root commits as boundaries (Default: off)"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2580
|
|
msgid "Show work cost statistics"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2581
|
|
msgid "Force progress reporting"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2582
|
|
msgid "Show output score for blame entries"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2583
|
|
msgid "Show original filename (Default: auto)"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2584
|
|
msgid "Show original linenumber (Default: off)"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2585
|
|
msgid "Show in a format designed for machine consumption"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2586
|
|
msgid "Show porcelain format with per-line commit information"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2587
|
|
msgid "Use the same output mode as git-annotate (Default: off)"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2588
|
|
msgid "Show raw timestamp (Default: off)"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2589
|
|
msgid "Show long commit SHA1 (Default: off)"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2590
|
|
msgid "Suppress author name and timestamp (Default: off)"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2591
|
|
msgid "Show author email instead of name (Default: off)"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2592
|
|
msgid "Ignore whitespace differences"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2599
|
|
msgid "Use an experimental indent-based heuristic to improve diffs"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2600
|
|
msgid "Use an experimental blank-line-based heuristic to improve diffs"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2602
|
|
msgid "Spend extra cycles to find better match"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2603
|
|
msgid "Use revisions from <file> instead of calling git-rev-list"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2604
|
|
msgid "Use <file>'s contents as the final image"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2605 builtin/blame.c:2606
|
|
msgid "score"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2605
|
|
msgid "Find line copies within and across files"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2606
|
|
msgid "Find line movements within and across files"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2607
|
|
msgid "n,m"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2607
|
|
msgid "Process only line range n,m, counting from 1"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2654
|
|
msgid "--progress can't be used with --incremental or porcelain formats"
|
|
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:2700
|
|
msgid "4 years, 11 months ago"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2780
|
|
msgid "--contents and --reverse do not blend well."
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2800
|
|
msgid "cannot use --contents with final commit object name"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2805
|
|
msgid "--reverse and --first-parent together require specified latest commit"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2832
|
|
msgid ""
|
|
"--reverse --first-parent together require range along first-parent chain"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2843
|
|
#, c-format
|
|
msgid "no such path %s in %s"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2854
|
|
#, c-format
|
|
msgid "cannot read blob %s for path %s"
|
|
msgstr ""
|
|
|
|
#: builtin/blame.c:2873
|
|
#, c-format
|
|
msgid "file %s has only %lu line"
|
|
msgid_plural "file %s has only %lu lines"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/branch.c:26
|
|
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:27
|
|
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:28
|
|
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:29
|
|
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:30
|
|
msgid "git branch [<options>] [-r | -a] [--points-at]"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:143
|
|
#, c-format
|
|
msgid ""
|
|
"deleting branch '%s' that has been merged to\n"
|
|
" '%s', but not yet merged to HEAD."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:147
|
|
#, c-format
|
|
msgid ""
|
|
"not deleting branch '%s' that is not yet merged to\n"
|
|
" '%s', even though it is merged to HEAD."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:161
|
|
#, c-format
|
|
msgid "Couldn't look up commit object for '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:165
|
|
#, c-format
|
|
msgid ""
|
|
"The branch '%s' is not fully merged.\n"
|
|
"If you are sure you want to delete it, run 'git branch -D %s'."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:178
|
|
msgid "Update of config-file failed"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:206
|
|
msgid "cannot use -a with -d"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:212
|
|
msgid "Couldn't look up commit object for HEAD"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:226
|
|
#, c-format
|
|
msgid "Cannot delete branch '%s' checked out at '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:241
|
|
#, c-format
|
|
msgid "remote-tracking branch '%s' not found."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:242
|
|
#, c-format
|
|
msgid "branch '%s' not found."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:257
|
|
#, c-format
|
|
msgid "Error deleting remote-tracking branch '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:258
|
|
#, c-format
|
|
msgid "Error deleting branch '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:265
|
|
#, c-format
|
|
msgid "Deleted remote-tracking branch %s (was %s).\n"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:266
|
|
#, c-format
|
|
msgid "Deleted branch %s (was %s).\n"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:312
|
|
#, c-format
|
|
msgid "[%s: gone]"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:317
|
|
#, c-format
|
|
msgid "[%s]"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:322
|
|
#, c-format
|
|
msgid "[%s: behind %d]"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:324
|
|
#, c-format
|
|
msgid "[behind %d]"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:328
|
|
#, c-format
|
|
msgid "[%s: ahead %d]"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:330
|
|
#, c-format
|
|
msgid "[ahead %d]"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:333
|
|
#, c-format
|
|
msgid "[%s: ahead %d, behind %d]"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:336
|
|
#, c-format
|
|
msgid "[ahead %d, behind %d]"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:349
|
|
msgid " **** invalid ref ****"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:375
|
|
#, c-format
|
|
msgid "(no branch, rebasing %s)"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:378
|
|
#, c-format
|
|
msgid "(no branch, bisect started on %s)"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: make sure this matches
|
|
#. "HEAD detached at " in wt-status.c
|
|
#: builtin/branch.c:384
|
|
#, c-format
|
|
msgid "(HEAD detached at %s)"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: make sure this matches
|
|
#. "HEAD detached from " in wt-status.c
|
|
#: builtin/branch.c:389
|
|
#, c-format
|
|
msgid "(HEAD detached from %s)"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:393
|
|
msgid "(no branch)"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:544
|
|
#, c-format
|
|
msgid "Branch %s is being rebased at %s"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:548
|
|
#, c-format
|
|
msgid "Branch %s is being bisected at %s"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:563
|
|
msgid "cannot rename the current branch while not on any."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:573
|
|
#, c-format
|
|
msgid "Invalid branch name: '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:590
|
|
msgid "Branch rename failed"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:594
|
|
#, c-format
|
|
msgid "Renamed a misnamed branch '%s' away"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:597
|
|
#, c-format
|
|
msgid "Branch renamed to %s, but HEAD is not updated!"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:604
|
|
msgid "Branch is renamed, but update of config-file failed"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:620
|
|
#, c-format
|
|
msgid ""
|
|
"Please edit the description for the branch\n"
|
|
" %s\n"
|
|
"Lines starting with '%c' will be stripped.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:651
|
|
msgid "Generic options"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:653
|
|
msgid "show hash and subject, give twice for upstream branch"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:654
|
|
msgid "suppress informational messages"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:655
|
|
msgid "set up tracking mode (see git-pull(1))"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:657
|
|
msgid "change upstream info"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:659
|
|
msgid "upstream"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:659
|
|
msgid "change the upstream info"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:660
|
|
msgid "Unset the upstream info"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:661
|
|
msgid "use colored output"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:662
|
|
msgid "act on remote-tracking branches"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:664 builtin/branch.c:665
|
|
msgid "print only branches that contain the commit"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:668
|
|
msgid "Specific git-branch actions:"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:669
|
|
msgid "list both remote-tracking and local branches"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:671
|
|
msgid "delete fully merged branch"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:672
|
|
msgid "delete branch (even if not merged)"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:673
|
|
msgid "move/rename a branch and its reflog"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:674
|
|
msgid "move/rename a branch, even if target exists"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:675
|
|
msgid "list branch names"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:676
|
|
msgid "create the branch's reflog"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:678
|
|
msgid "edit the description for the branch"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:679
|
|
msgid "force creation, move/rename, deletion"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:680
|
|
msgid "print only branches that are merged"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:681
|
|
msgid "print only branches that are not merged"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:682
|
|
msgid "list branches in columns"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
|
|
msgid "key"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
|
|
msgid "field name to sort on"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:686 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:369
|
|
msgid "object"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:687
|
|
msgid "print only branches of the object"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:705
|
|
msgid "Failed to resolve HEAD as a valid ref."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:709 builtin/clone.c:706
|
|
msgid "HEAD not found below refs/heads!"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:729
|
|
msgid "--column and --verbose are incompatible"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:740 builtin/branch.c:782
|
|
msgid "branch name required"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:758
|
|
msgid "Cannot give description to detached HEAD"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:763
|
|
msgid "cannot edit description of more than one branch"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:770
|
|
#, c-format
|
|
msgid "No commit on branch '%s' yet."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:773
|
|
#, c-format
|
|
msgid "No branch named '%s'."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:788
|
|
msgid "too many branches for a rename operation"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:793
|
|
msgid "too many branches to set new upstream"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:797
|
|
#, c-format
|
|
msgid ""
|
|
"could not set upstream of HEAD to %s when it does not point to any branch."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
|
|
#, c-format
|
|
msgid "no such branch '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:804
|
|
#, c-format
|
|
msgid "branch '%s' does not exist"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:816
|
|
msgid "too many branches to unset upstream"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:820
|
|
msgid "could not unset upstream of HEAD when it does not point to any branch."
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:826
|
|
#, c-format
|
|
msgid "Branch '%s' has no upstream information"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:840
|
|
msgid "it does not make sense to create 'HEAD' manually"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:846
|
|
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:849
|
|
#, c-format
|
|
msgid ""
|
|
"The --set-upstream flag is deprecated and will be removed. Consider using --"
|
|
"track or --set-upstream-to\n"
|
|
msgstr ""
|
|
|
|
#: builtin/branch.c:866
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"If you wanted to make '%s' track '%s', do this:\n"
|
|
"\n"
|
|
msgstr ""
|
|
|
|
#: builtin/bundle.c:51
|
|
#, c-format
|
|
msgid "%s is okay\n"
|
|
msgstr ""
|
|
|
|
#: builtin/bundle.c:64
|
|
msgid "Need a repository to create a bundle."
|
|
msgstr ""
|
|
|
|
#: builtin/bundle.c:68
|
|
msgid "Need a repository to unbundle."
|
|
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>"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:514
|
|
msgid ""
|
|
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
|
|
"filters]"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:551
|
|
msgid "<type> can be one of: blob, tree, commit, tag"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:552
|
|
msgid "show object type"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:553
|
|
msgid "show object size"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:555
|
|
msgid "exit with zero when there's no error"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:556
|
|
msgid "pretty-print object's content"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:558
|
|
msgid "for blob objects, run textconv on object's content"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:560
|
|
msgid "for blob objects, run filters on object's content"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:561 git-submodule.sh:923
|
|
msgid "blob"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:562
|
|
msgid "use a specific path for --textconv/--filters"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:564
|
|
msgid "allow -s and -t to work with broken/corrupt objects"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:565
|
|
msgid "buffer --batch output"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:567
|
|
msgid "show info and content of objects fed from the standard input"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:570
|
|
msgid "show info about objects fed from the standard input"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:573
|
|
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
|
|
msgstr ""
|
|
|
|
#: builtin/cat-file.c:575
|
|
msgid "show all objects with --batch or --batch-check"
|
|
msgstr ""
|
|
|
|
#: builtin/check-attr.c:11
|
|
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
|
|
msgstr ""
|
|
|
|
#: builtin/check-attr.c:12
|
|
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/check-attr.c:19
|
|
msgid "report all attributes set on file"
|
|
msgstr ""
|
|
|
|
#: builtin/check-attr.c:20
|
|
msgid "use .gitattributes only from the index"
|
|
msgstr ""
|
|
|
|
#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
|
|
msgid "read file names from stdin"
|
|
msgstr ""
|
|
|
|
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
|
|
msgid "terminate input and output records by a NUL character"
|
|
msgstr ""
|
|
|
|
#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
|
|
msgid "suppress progress reporting"
|
|
msgstr ""
|
|
|
|
#: builtin/check-ignore.c:26
|
|
msgid "show non-matching input paths"
|
|
msgstr ""
|
|
|
|
#: builtin/check-ignore.c:28
|
|
msgid "ignore index when checking"
|
|
msgstr ""
|
|
|
|
#: builtin/check-ignore.c:154
|
|
msgid "cannot specify pathnames with --stdin"
|
|
msgstr ""
|
|
|
|
#: builtin/check-ignore.c:157
|
|
msgid "-z only makes sense with --stdin"
|
|
msgstr ""
|
|
|
|
#: builtin/check-ignore.c:159
|
|
msgid "no path specified"
|
|
msgstr ""
|
|
|
|
#: builtin/check-ignore.c:163
|
|
msgid "--quiet is only valid with a single pathname"
|
|
msgstr ""
|
|
|
|
#: builtin/check-ignore.c:165
|
|
msgid "cannot have both --quiet and --verbose"
|
|
msgstr ""
|
|
|
|
#: builtin/check-ignore.c:168
|
|
msgid "--non-matching is only valid with --verbose"
|
|
msgstr ""
|
|
|
|
#: builtin/check-mailmap.c:8
|
|
msgid "git check-mailmap [<options>] <contact>..."
|
|
msgstr ""
|
|
|
|
#: builtin/check-mailmap.c:13
|
|
msgid "also read contacts from stdin"
|
|
msgstr ""
|
|
|
|
#: builtin/check-mailmap.c:24
|
|
#, c-format
|
|
msgid "unable to parse contact: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/check-mailmap.c:47
|
|
msgid "no contacts specified"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:127
|
|
msgid "git checkout-index [<options>] [--] [<file>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:144
|
|
msgid "stage should be between 1 and 3 or all"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:160
|
|
msgid "check out all files in the index"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:161
|
|
msgid "force overwrite of existing files"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:163
|
|
msgid "no warning for existing files and files not in index"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:165
|
|
msgid "don't checkout new files"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:167
|
|
msgid "update stat information in the index file"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:171
|
|
msgid "read list of paths from the standard input"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:173
|
|
msgid "write the content to temporary files"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:174 builtin/column.c:30
|
|
#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
|
|
#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
|
|
#: builtin/worktree.c:469
|
|
msgid "string"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:175
|
|
msgid "when creating files, prepend <string>"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout-index.c:177
|
|
msgid "copy out the files from named stage"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:25
|
|
msgid "git checkout [<options>] <branch>"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:26
|
|
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:134 builtin/checkout.c:167
|
|
#, c-format
|
|
msgid "path '%s' does not have our version"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:136 builtin/checkout.c:169
|
|
#, c-format
|
|
msgid "path '%s' does not have their version"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:152
|
|
#, c-format
|
|
msgid "path '%s' does not have all necessary versions"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:196
|
|
#, c-format
|
|
msgid "path '%s' does not have necessary versions"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:213
|
|
#, c-format
|
|
msgid "path '%s': cannot merge"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:230
|
|
#, c-format
|
|
msgid "Unable to add merge result for '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
|
|
#: builtin/checkout.c:259
|
|
#, c-format
|
|
msgid "'%s' cannot be used with updating paths"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:262 builtin/checkout.c:265
|
|
#, c-format
|
|
msgid "'%s' cannot be used with %s"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:268
|
|
#, c-format
|
|
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:339 builtin/checkout.c:346
|
|
#, c-format
|
|
msgid "path '%s' is unmerged"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:494
|
|
msgid "you need to resolve your current index first"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:624
|
|
#, c-format
|
|
msgid "Can not do reflog for '%s': %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:663
|
|
msgid "HEAD is now at"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:667 builtin/clone.c:660
|
|
msgid "unable to update HEAD"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:671
|
|
#, c-format
|
|
msgid "Reset branch '%s'\n"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:674
|
|
#, c-format
|
|
msgid "Already on '%s'\n"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:678
|
|
#, c-format
|
|
msgid "Switched to and reset branch '%s'\n"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:680 builtin/checkout.c:1069
|
|
#, c-format
|
|
msgid "Switched to a new branch '%s'\n"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:682
|
|
#, c-format
|
|
msgid "Switched to branch '%s'\n"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:733
|
|
#, c-format
|
|
msgid " ... and %d more.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:739
|
|
#, c-format
|
|
msgid ""
|
|
"Warning: you are leaving %d commit behind, not connected to\n"
|
|
"any of your branches:\n"
|
|
"\n"
|
|
"%s\n"
|
|
msgid_plural ""
|
|
"Warning: you are leaving %d commits behind, not connected to\n"
|
|
"any of your branches:\n"
|
|
"\n"
|
|
"%s\n"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/checkout.c:758
|
|
#, 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:794
|
|
msgid "internal error in revision walk"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:798
|
|
msgid "Previous HEAD position was"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:825 builtin/checkout.c:1064
|
|
msgid "You are on a branch yet to be born"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:970
|
|
#, c-format
|
|
msgid "only one reference expected, %d given."
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1010 builtin/worktree.c:214
|
|
#, c-format
|
|
msgid "invalid reference: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1039
|
|
#, c-format
|
|
msgid "reference is not a tree: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1078
|
|
msgid "paths cannot be used with switching branches"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1081 builtin/checkout.c:1085
|
|
#, c-format
|
|
msgid "'%s' cannot be used with switching branches"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
|
|
#: builtin/checkout.c:1100
|
|
#, c-format
|
|
msgid "'%s' cannot be used with '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1105
|
|
#, c-format
|
|
msgid "Cannot switch branch to a non-commit '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
|
|
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
|
|
#: builtin/worktree.c:326
|
|
msgid "branch"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1139
|
|
msgid "create and checkout a new branch"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1141
|
|
msgid "create/reset and checkout a branch"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1142
|
|
msgid "create reflog for new branch"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1143 builtin/worktree.c:328
|
|
msgid "detach HEAD at named commit"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1144
|
|
msgid "set upstream info for new branch"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1146
|
|
msgid "new-branch"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1146
|
|
msgid "new unparented branch"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1147
|
|
msgid "checkout our version for unmerged files"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1149
|
|
msgid "checkout their version for unmerged files"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1151
|
|
msgid "force checkout (throw away local modifications)"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1152
|
|
msgid "perform a 3-way merge with the new branch"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1153 builtin/merge.c:231
|
|
msgid "update ignored files (default)"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
|
|
msgid "style"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1155
|
|
msgid "conflict style (merge or diff3)"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1158
|
|
msgid "do not limit pathspecs to sparse entries only"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1160
|
|
msgid "second guess 'git checkout <no-such-branch>'"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1162
|
|
msgid "do not check if another worktree is holding the given ref"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
|
|
#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
|
|
#: builtin/send-pack.c:168
|
|
msgid "force progress reporting"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1194
|
|
msgid "-b, -B and --orphan are mutually exclusive"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1211
|
|
msgid "--track needs a branch name"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1216
|
|
msgid "Missing branch name; try -b"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1252
|
|
msgid "invalid path specification"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1259
|
|
#, 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?"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1264
|
|
#, c-format
|
|
msgid "git checkout: --detach does not take a path argument '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/checkout.c:1268
|
|
msgid ""
|
|
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
|
"checking out of the index."
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:25
|
|
msgid ""
|
|
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:29
|
|
#, c-format
|
|
msgid "Removing %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:30
|
|
#, c-format
|
|
msgid "Would remove %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:31
|
|
#, c-format
|
|
msgid "Skipping repository %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:32
|
|
#, c-format
|
|
msgid "Would skip repository %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:33
|
|
#, c-format
|
|
msgid "failed to remove %s"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:291
|
|
msgid ""
|
|
"Prompt help:\n"
|
|
"1 - select a numbered item\n"
|
|
"foo - select item based on unique prefix\n"
|
|
" - (empty) select nothing"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:295
|
|
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"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:511
|
|
#, c-format
|
|
msgid "Huh (%s)?"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:653
|
|
#, c-format
|
|
msgid "Input ignore patterns>> "
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:690
|
|
#, c-format
|
|
msgid "WARNING: Cannot find items matched by: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:711
|
|
msgid "Select items to delete"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Make sure to keep [y/N] as is
|
|
#: builtin/clean.c:752
|
|
#, c-format
|
|
msgid "Remove %s [y/N]? "
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:777
|
|
msgid "Bye."
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:785
|
|
msgid ""
|
|
"clean - start cleaning\n"
|
|
"filter by pattern - exclude items from deletion\n"
|
|
"select by numbers - select items to be deleted by numbers\n"
|
|
"ask each - confirm each deletion (like \"rm -i\")\n"
|
|
"quit - stop cleaning\n"
|
|
"help - this screen\n"
|
|
"? - help for prompt selection"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:812
|
|
msgid "*** Commands ***"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:813
|
|
msgid "What now"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:821
|
|
msgid "Would remove the following item:"
|
|
msgid_plural "Would remove the following items:"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/clean.c:838
|
|
msgid "No more files to clean, exiting."
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:869
|
|
msgid "do not print names of files removed"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:871
|
|
msgid "force"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:872
|
|
msgid "interactive cleaning"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:874
|
|
msgid "remove whole directories"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
|
|
#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
|
|
msgid "pattern"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:876
|
|
msgid "add <pattern> to ignore rules"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:877
|
|
msgid "remove ignored files, too"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:879
|
|
msgid "remove only ignored files"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:897
|
|
msgid "-x and -X cannot be used together"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:901
|
|
msgid ""
|
|
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
|
|
"clean"
|
|
msgstr ""
|
|
|
|
#: builtin/clean.c:904
|
|
msgid ""
|
|
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
|
|
"refusing to clean"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:37
|
|
msgid "git clone [<options>] [--] <repo> [<dir>]"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:65
|
|
msgid "don't create a checkout"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
|
|
msgid "create a bare repository"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:70
|
|
msgid "create a mirror repository (implies bare)"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:72
|
|
msgid "to clone from a local repository"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:74
|
|
msgid "don't use local hardlinks, always copy"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:76
|
|
msgid "setup as shared repository"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:78 builtin/clone.c:80
|
|
msgid "initialize submodules in the clone"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:82
|
|
msgid "number of submodules cloned in parallel"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:83 builtin/init-db.c:475
|
|
msgid "template-directory"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:84 builtin/init-db.c:476
|
|
msgid "directory from which templates will be used"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
|
|
#: builtin/submodule--helper.c:954
|
|
msgid "reference repository"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:90
|
|
msgid "use --reference only while cloning"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
|
|
msgid "name"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:92
|
|
msgid "use <name> instead of 'origin' to track upstream"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:94
|
|
msgid "checkout <branch> instead of the remote's HEAD"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:96
|
|
msgid "path to git-upload-pack on the remote"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
|
|
#: builtin/pull.c:202
|
|
msgid "depth"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:98
|
|
msgid "create a shallow clone of that depth"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
|
|
#: parse-options.h:142
|
|
msgid "time"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:100
|
|
msgid "create a shallow clone since a specific time"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:101 builtin/fetch.c:124
|
|
msgid "revision"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:102 builtin/fetch.c:125
|
|
msgid "deepen history of shallow clone by excluding rev"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:104
|
|
msgid "clone only one branch, HEAD or --branch"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:106
|
|
msgid "any cloned submodules will be shallow"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:107 builtin/init-db.c:484
|
|
msgid "gitdir"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:108 builtin/init-db.c:485
|
|
msgid "separate git dir from working tree"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:109
|
|
msgid "key=value"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:110
|
|
msgid "set config inside the new repository"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
|
|
msgid "use IPv4 addresses only"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
|
|
msgid "use IPv6 addresses only"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:250
|
|
msgid ""
|
|
"No directory name could be guessed.\n"
|
|
"Please specify a directory on the command line"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:303
|
|
#, c-format
|
|
msgid "info: Could not add alternate for '%s': %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:375
|
|
#, c-format
|
|
msgid "failed to open '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:383
|
|
#, c-format
|
|
msgid "%s exists and is not a directory"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:397
|
|
#, c-format
|
|
msgid "failed to stat %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:419
|
|
#, c-format
|
|
msgid "failed to create link '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:423
|
|
#, c-format
|
|
msgid "failed to copy file to '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:448
|
|
#, c-format
|
|
msgid "done.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:460
|
|
msgid ""
|
|
"Clone succeeded, but checkout failed.\n"
|
|
"You can inspect what was checked out with 'git status'\n"
|
|
"and retry the checkout with 'git checkout -f HEAD'\n"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:537
|
|
#, c-format
|
|
msgid "Could not find remote branch %s to clone."
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:632
|
|
msgid "remote did not send all necessary objects"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:648
|
|
#, c-format
|
|
msgid "unable to update %s"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:697
|
|
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:728
|
|
msgid "unable to checkout working tree"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:768
|
|
msgid "unable to write parameters to config file"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:831
|
|
msgid "cannot repack to clean up"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:833
|
|
msgid "cannot unlink temporary alternates file"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:866 builtin/receive-pack.c:1895
|
|
msgid "Too many arguments."
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:870
|
|
msgid "You must specify a repository to clone."
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:883
|
|
#, c-format
|
|
msgid "--bare and --origin %s options are incompatible."
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:886
|
|
msgid "--bare and --separate-git-dir are incompatible."
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:899
|
|
#, c-format
|
|
msgid "repository '%s' does not exist"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:905 builtin/fetch.c:1338
|
|
#, c-format
|
|
msgid "depth %s is not a positive number"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:915
|
|
#, c-format
|
|
msgid "destination path '%s' already exists and is not an empty directory."
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:925
|
|
#, c-format
|
|
msgid "working tree '%s' already exists."
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
|
|
#: builtin/worktree.c:222 builtin/worktree.c:249
|
|
#, c-format
|
|
msgid "could not create leading directories of '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:943
|
|
#, c-format
|
|
msgid "could not create work tree dir '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:955
|
|
#, c-format
|
|
msgid "Cloning into bare repository '%s'...\n"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:957
|
|
#, c-format
|
|
msgid "Cloning into '%s'...\n"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:963
|
|
msgid ""
|
|
"clone --recursive is not compatible with both --reference and --reference-if-"
|
|
"able"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:1019
|
|
msgid "--depth is ignored in local clones; use file:// instead."
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:1021
|
|
msgid "--shallow-since is ignored in local clones; use file:// instead."
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:1023
|
|
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:1026
|
|
msgid "source repository is shallow, ignoring --local"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:1031
|
|
msgid "--local is ignored"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:1035
|
|
#, c-format
|
|
msgid "Don't know how to clone %s"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:1090 builtin/clone.c:1098
|
|
#, c-format
|
|
msgid "Remote branch %s not found in upstream %s"
|
|
msgstr ""
|
|
|
|
#: builtin/clone.c:1101
|
|
msgid "You appear to have cloned an empty repository."
|
|
msgstr ""
|
|
|
|
#: builtin/column.c:9
|
|
msgid "git column [<options>]"
|
|
msgstr ""
|
|
|
|
#: builtin/column.c:26
|
|
msgid "lookup config vars"
|
|
msgstr ""
|
|
|
|
#: builtin/column.c:27 builtin/column.c:28
|
|
msgid "layout to use"
|
|
msgstr ""
|
|
|
|
#: builtin/column.c:29
|
|
msgid "Maximum width"
|
|
msgstr ""
|
|
|
|
#: builtin/column.c:30
|
|
msgid "Padding space on left border"
|
|
msgstr ""
|
|
|
|
#: builtin/column.c:31
|
|
msgid "Padding space on right border"
|
|
msgstr ""
|
|
|
|
#: builtin/column.c:32
|
|
msgid "Padding space between columns"
|
|
msgstr ""
|
|
|
|
#: builtin/column.c:51
|
|
msgid "--command must be the first argument"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:38
|
|
msgid "git commit [<options>] [--] <pathspec>..."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:43
|
|
msgid "git status [<options>] [--] <pathspec>..."
|
|
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"
|
|
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"
|
|
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"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:85
|
|
msgid "Otherwise, please use 'git reset'\n"
|
|
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"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:318
|
|
msgid "failed to unpack HEAD tree object"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:359
|
|
msgid "unable to create temporary index"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:365
|
|
msgid "interactive add failed"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:378
|
|
msgid "unable to update temporary index"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:380
|
|
msgid "Failed to update main cache tree"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
|
|
msgid "unable to write new_index file"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:458
|
|
msgid "cannot do a partial commit during a merge."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:460
|
|
msgid "cannot do a partial commit during a cherry-pick."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:469
|
|
msgid "cannot read the index"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:488
|
|
msgid "unable to write temporary index file"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:582
|
|
#, c-format
|
|
msgid "commit '%s' lacks author header"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:584
|
|
#, c-format
|
|
msgid "commit '%s' has malformed author line"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:603
|
|
msgid "malformed --author parameter"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:611
|
|
#, c-format
|
|
msgid "invalid date format: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:655
|
|
msgid ""
|
|
"unable to select a comment character that is not used\n"
|
|
"in the current commit message"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
|
|
#, c-format
|
|
msgid "could not lookup commit %s"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:704 builtin/shortlog.c:286
|
|
#, c-format
|
|
msgid "(reading log message from standard input)\n"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:706
|
|
msgid "could not read log from standard input"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:710
|
|
#, c-format
|
|
msgid "could not read log file '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:737 builtin/commit.c:745
|
|
msgid "could not read SQUASH_MSG"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:742
|
|
msgid "could not read MERGE_MSG"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:796
|
|
msgid "could not write commit template"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:814
|
|
#, 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/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"
|
|
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"
|
|
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"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:859
|
|
#, c-format
|
|
msgid "%sAuthor: %.*s <%.*s>"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:867
|
|
#, c-format
|
|
msgid "%sDate: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:874
|
|
#, c-format
|
|
msgid "%sCommitter: %.*s <%.*s>"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:892
|
|
msgid "Cannot read index"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:954
|
|
msgid "Error building trees"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:969 builtin/tag.c:266
|
|
#, c-format
|
|
msgid "Please supply the message using either -m or -F option.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1071
|
|
#, c-format
|
|
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1086 builtin/commit.c:1327
|
|
#, c-format
|
|
msgid "Invalid untracked files mode '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1124
|
|
msgid "--long and -z are incompatible"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1154
|
|
msgid "Using both --reset-author and --author does not make sense"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1163
|
|
msgid "You have nothing to amend."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1166
|
|
msgid "You are in the middle of a merge -- cannot amend."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1168
|
|
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1171
|
|
msgid "Options --squash and --fixup cannot be used together"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1181
|
|
msgid "Only one of -c/-C/-F/--fixup can be used."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1183
|
|
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1191
|
|
msgid "--reset-author can be used only with -C, -c or --amend."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1208
|
|
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1210
|
|
msgid "No paths with --include/--only does not make sense."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1212
|
|
msgid "Clever... amending the last one with dirty index."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1214
|
|
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1226 builtin/tag.c:474
|
|
#, c-format
|
|
msgid "Invalid cleanup mode %s"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1231
|
|
msgid "Paths with -a does not make sense."
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1341 builtin/commit.c:1617
|
|
msgid "show status concisely"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1343 builtin/commit.c:1619
|
|
msgid "show branch information"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1345
|
|
msgid "version"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
|
|
#: builtin/worktree.c:440
|
|
msgid "machine-readable output"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1348 builtin/commit.c:1623
|
|
msgid "show status in long format (default)"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1351 builtin/commit.c:1626
|
|
msgid "terminate entries with NUL"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
|
|
#: builtin/fast-export.c:984 builtin/tag.c:353
|
|
msgid "mode"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1354 builtin/commit.c:1629
|
|
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1357
|
|
msgid "show ignored files"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1358 parse-options.h:155
|
|
msgid "when"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1359
|
|
msgid ""
|
|
"ignore changes to submodules, optional when: all, dirty, untracked. "
|
|
"(Default: all)"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1361
|
|
msgid "list untracked files in columns"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1437
|
|
msgid "couldn't look up newly created commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1439
|
|
msgid "could not parse newly created commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1484
|
|
msgid "detached HEAD"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1487
|
|
msgid " (root-commit)"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1587
|
|
msgid "suppress summary after successful commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1588
|
|
msgid "show diff in commit message template"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1590
|
|
msgid "Commit message options"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1591 builtin/tag.c:351
|
|
msgid "read message from file"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1592
|
|
msgid "author"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1592
|
|
msgid "override author for commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1593 builtin/gc.c:326
|
|
msgid "date"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1593
|
|
msgid "override date for commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
|
|
#: builtin/notes.c:561 builtin/tag.c:349
|
|
msgid "message"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1594
|
|
msgid "commit message"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
|
|
#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
|
|
msgid "commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1595
|
|
msgid "reuse and edit message from specified commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1596
|
|
msgid "reuse message from specified commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1597
|
|
msgid "use autosquash formatted message to fixup specified commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1598
|
|
msgid "use autosquash formatted message to squash specified commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1599
|
|
msgid "the commit is authored by me now (used with -C/-c/--amend)"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
|
|
msgid "add Signed-off-by:"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1601
|
|
msgid "use specified template file"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1602
|
|
msgid "force edit of commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1603
|
|
msgid "default"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1603 builtin/tag.c:354
|
|
msgid "how to strip spaces and #comments from message"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1604
|
|
msgid "include status in commit message template"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
|
|
#: builtin/revert.c:93
|
|
msgid "GPG sign commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1609
|
|
msgid "Commit contents options"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1610
|
|
msgid "commit all changed files"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1611
|
|
msgid "add specified files to index for commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1612
|
|
msgid "interactively add files"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1613
|
|
msgid "interactively add changes"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1614
|
|
msgid "commit only specified files"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1615
|
|
msgid "bypass pre-commit and commit-msg hooks"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1616
|
|
msgid "show what would be committed"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1627
|
|
msgid "amend previous commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1628
|
|
msgid "bypass post-rewrite hook"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1633
|
|
msgid "ok to record an empty change"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1635
|
|
msgid "ok to record a change with an empty message"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1664
|
|
msgid "could not parse HEAD commit"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1712
|
|
#, c-format
|
|
msgid "Corrupt MERGE_HEAD file (%s)"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1719
|
|
msgid "could not read MERGE_MODE"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1738
|
|
#, c-format
|
|
msgid "could not read commit message: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1749
|
|
#, c-format
|
|
msgid "Aborting commit; you did not edit the message.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1754
|
|
#, c-format
|
|
msgid "Aborting commit due to empty commit message.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/commit.c:1802
|
|
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/config.c:9
|
|
msgid "git config [<options>]"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:55
|
|
msgid "Config file location"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:56
|
|
msgid "use global config file"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:57
|
|
msgid "use system config file"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:58
|
|
msgid "use repository config file"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:59
|
|
msgid "use given config file"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:60
|
|
msgid "blob-id"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:60
|
|
msgid "read config from given blob object"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:61
|
|
msgid "Action"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:62
|
|
msgid "get value: name [value-regex]"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:63
|
|
msgid "get all values: key [value-regex]"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:64
|
|
msgid "get values for regexp: name-regex [value-regex]"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:65
|
|
msgid "get value specific for the URL: section[.var] URL"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:66
|
|
msgid "replace all matching variables: name value [value_regex]"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:67
|
|
msgid "add a new variable: name value"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:68
|
|
msgid "remove a variable: name [value-regex]"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:69
|
|
msgid "remove all matches: name [value-regex]"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:70
|
|
msgid "rename section: old-name new-name"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:71
|
|
msgid "remove a section: name"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:72
|
|
msgid "list all"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:73
|
|
msgid "open an editor"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:74
|
|
msgid "find the color configured: slot [default]"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:75
|
|
msgid "find the color setting: slot [stdout-is-tty]"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:76
|
|
msgid "Type"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:77
|
|
msgid "value is \"true\" or \"false\""
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:78
|
|
msgid "value is decimal number"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:79
|
|
msgid "value is --bool or --int"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:80
|
|
msgid "value is a path (file or directory name)"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:81
|
|
msgid "Other"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:82
|
|
msgid "terminate values with NUL byte"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:83
|
|
msgid "show variable names only"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:84
|
|
msgid "respect include directives on lookup"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:85
|
|
msgid "show origin of config (file, standard input, blob, command line)"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:327
|
|
msgid "unable to parse default color value"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:471
|
|
#, c-format
|
|
msgid ""
|
|
"# This is Git's per-user configuration file.\n"
|
|
"[user]\n"
|
|
"# Please adapt and uncomment the following lines:\n"
|
|
"#\tname = %s\n"
|
|
"#\temail = %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:613
|
|
#, c-format
|
|
msgid "cannot create configuration file %s"
|
|
msgstr ""
|
|
|
|
#: builtin/config.c:625
|
|
#, 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]"
|
|
msgstr ""
|
|
|
|
#: builtin/count-objects.c:96
|
|
msgid "print sizes in human readable format"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:17
|
|
msgid "git describe [<options>] [<commit-ish>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:18
|
|
msgid "git describe [<options>] --dirty"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:217
|
|
#, c-format
|
|
msgid "annotated tag %s not available"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:221
|
|
#, c-format
|
|
msgid "annotated tag %s has no embedded name"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:223
|
|
#, c-format
|
|
msgid "tag '%s' is really '%s' here"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:250 builtin/log.c:480
|
|
#, c-format
|
|
msgid "Not a valid object name %s"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:253
|
|
#, c-format
|
|
msgid "%s is not a valid '%s' object"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:270
|
|
#, c-format
|
|
msgid "no tag exactly matches '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:272
|
|
#, c-format
|
|
msgid "searching to describe %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:319
|
|
#, c-format
|
|
msgid "finished search at %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:346
|
|
#, c-format
|
|
msgid ""
|
|
"No annotated tags can describe '%s'.\n"
|
|
"However, there were unannotated tags: try --tags."
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:350
|
|
#, c-format
|
|
msgid ""
|
|
"No tags can describe '%s'.\n"
|
|
"Try --always, or create some tags."
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:371
|
|
#, c-format
|
|
msgid "traversed %lu commits\n"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:374
|
|
#, c-format
|
|
msgid ""
|
|
"more than %i tags found; listed %i most recent\n"
|
|
"gave up search at %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:396
|
|
msgid "find the tag that comes after the commit"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:397
|
|
msgid "debug search strategy on stderr"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:398
|
|
msgid "use any ref"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:399
|
|
msgid "use any tag, even unannotated"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:400
|
|
msgid "always use long format"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:401
|
|
msgid "only follow first parent"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:404
|
|
msgid "only output exact matches"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:406
|
|
msgid "consider <n> most recent tags (default: 10)"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:408
|
|
msgid "only consider tags matching <pattern>"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:410 builtin/name-rev.c:320
|
|
msgid "show abbreviated commit object as fallback"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:411
|
|
msgid "mark"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:412
|
|
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:430
|
|
msgid "--long is incompatible with --abbrev=0"
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:456
|
|
msgid "No names found, cannot describe anything."
|
|
msgstr ""
|
|
|
|
#: builtin/describe.c:476
|
|
msgid "--dirty is incompatible with commit-ishes"
|
|
msgstr ""
|
|
|
|
#: builtin/diff.c:86
|
|
#, c-format
|
|
msgid "'%s': not a regular file or symlink"
|
|
msgstr ""
|
|
|
|
#: builtin/diff.c:237
|
|
#, c-format
|
|
msgid "invalid option: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/diff.c:361
|
|
msgid "Not a git repository"
|
|
msgstr ""
|
|
|
|
#: builtin/diff.c:404
|
|
#, c-format
|
|
msgid "invalid object '%s' given."
|
|
msgstr ""
|
|
|
|
#: builtin/diff.c:413
|
|
#, c-format
|
|
msgid "more than two blobs given: '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/diff.c:420
|
|
#, c-format
|
|
msgid "unhandled object '%s' given."
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:25
|
|
msgid "git fast-export [rev-list-opts]"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:980
|
|
msgid "show progress after <n> objects"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:982
|
|
msgid "select handling of signed tags"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:985
|
|
msgid "select handling of tags that tag filtered objects"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:988
|
|
msgid "Dump marks to this file"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:990
|
|
msgid "Import marks from this file"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:992
|
|
msgid "Fake a tagger when tags lack one"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:994
|
|
msgid "Output full tree for each commit"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:996
|
|
msgid "Use the done feature to terminate the stream"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:997
|
|
msgid "Skip output of blob data"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:998
|
|
msgid "refspec"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:999
|
|
msgid "Apply refspec to exported refs"
|
|
msgstr ""
|
|
|
|
#: builtin/fast-export.c:1000
|
|
msgid "anonymize output"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:21
|
|
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:22
|
|
msgid "git fetch [<options>] <group>"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:23
|
|
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:24
|
|
msgid "git fetch --all [<options>]"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:95 builtin/pull.c:175
|
|
msgid "fetch from all remotes"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:97 builtin/pull.c:178
|
|
msgid "append to .git/FETCH_HEAD instead of overwriting"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:99 builtin/pull.c:181
|
|
msgid "path to upload pack on remote end"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:100 builtin/pull.c:183
|
|
msgid "force overwrite of local branch"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:102
|
|
msgid "fetch from multiple remotes"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:104 builtin/pull.c:185
|
|
msgid "fetch all tags and associated objects"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:106
|
|
msgid "do not fetch all tags (--no-tags)"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:108
|
|
msgid "number of submodules fetched in parallel"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:110 builtin/pull.c:188
|
|
msgid "prune remote-tracking branches no longer on remote"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:111 builtin/pull.c:191
|
|
msgid "on-demand"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:112 builtin/pull.c:192
|
|
msgid "control recursive fetching of submodules"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:116 builtin/pull.c:200
|
|
msgid "keep downloaded pack"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:118
|
|
msgid "allow updating of HEAD ref"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
|
|
msgid "deepen history of shallow clone"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:123
|
|
msgid "deepen history of shallow repository based on time"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:129 builtin/pull.c:206
|
|
msgid "convert to a complete repository"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:131 builtin/log.c:1433
|
|
msgid "dir"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:132
|
|
msgid "prepend this to submodule path output"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:135
|
|
msgid "default mode for recursion"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:137 builtin/pull.c:209
|
|
msgid "accept refs that update .git/shallow"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:138 builtin/pull.c:211
|
|
msgid "refmap"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:139 builtin/pull.c:212
|
|
msgid "specify fetch refmap"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:398
|
|
msgid "Couldn't find remote ref HEAD"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:514
|
|
#, c-format
|
|
msgid "configuration fetch.output contains invalid value %s"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:607
|
|
#, c-format
|
|
msgid "object %s not found"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:611
|
|
msgid "[up to date]"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:624 builtin/fetch.c:704
|
|
msgid "[rejected]"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:625
|
|
msgid "can't fetch in current branch"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:634
|
|
msgid "[tag update]"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
|
|
#: builtin/fetch.c:699
|
|
msgid "unable to update local ref"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:654
|
|
msgid "[new tag]"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:657
|
|
msgid "[new branch]"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:660
|
|
msgid "[new ref]"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:699
|
|
msgid "forced update"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:704
|
|
msgid "non-fast-forward"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:749
|
|
#, c-format
|
|
msgid "%s did not send all necessary objects\n"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:769
|
|
#, c-format
|
|
msgid "reject %s because shallow roots are not allowed to be updated"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:856 builtin/fetch.c:952
|
|
#, c-format
|
|
msgid "From %.*s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:867
|
|
#, c-format
|
|
msgid ""
|
|
"some local refs could not be updated; try running\n"
|
|
" 'git remote prune %s' to remove any old, conflicting branches"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:922
|
|
#, c-format
|
|
msgid " (%s will become dangling)"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:923
|
|
#, c-format
|
|
msgid " (%s has become dangling)"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:955
|
|
msgid "[deleted]"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:956 builtin/remote.c:1020
|
|
msgid "(none)"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:979
|
|
#, c-format
|
|
msgid "Refusing to fetch into current branch %s of non-bare repository"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:998
|
|
#, c-format
|
|
msgid "Option \"%s\" value \"%s\" is not valid for %s"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1001
|
|
#, c-format
|
|
msgid "Option \"%s\" is ignored for %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1077
|
|
#, c-format
|
|
msgid "Don't know how to fetch from %s"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1237
|
|
#, c-format
|
|
msgid "Fetching %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1239 builtin/remote.c:96
|
|
#, c-format
|
|
msgid "Could not fetch %s"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1257
|
|
msgid ""
|
|
"No remote repository specified. Please, specify either a URL or a\n"
|
|
"remote name from which new revisions should be fetched."
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1280
|
|
msgid "You need to specify a tag name."
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1322
|
|
msgid "Negative depth in --deepen is not supported"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1324
|
|
msgid "--deepen and --depth are mutually exclusive"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1329
|
|
msgid "--depth and --unshallow cannot be used together"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1331
|
|
msgid "--unshallow on a complete repository does not make sense"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1353
|
|
msgid "fetch --all does not take a repository argument"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1355
|
|
msgid "fetch --all does not make sense with refspecs"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1366
|
|
#, c-format
|
|
msgid "No such remote or remote group: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/fetch.c:1374
|
|
msgid "Fetching a group and specifying refspecs does not make sense"
|
|
msgstr ""
|
|
|
|
#: builtin/fmt-merge-msg.c:14
|
|
msgid ""
|
|
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
|
|
msgstr ""
|
|
|
|
#: builtin/fmt-merge-msg.c:663
|
|
msgid "populate log with at most <n> entries from shortlog"
|
|
msgstr ""
|
|
|
|
#: builtin/fmt-merge-msg.c:666
|
|
msgid "alias for --log (deprecated)"
|
|
msgstr ""
|
|
|
|
#: builtin/fmt-merge-msg.c:669
|
|
msgid "text"
|
|
msgstr ""
|
|
|
|
#: builtin/fmt-merge-msg.c:670
|
|
msgid "use <text> as start of message"
|
|
msgstr ""
|
|
|
|
#: builtin/fmt-merge-msg.c:671
|
|
msgid "file to read from"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:9
|
|
msgid "git for-each-ref [<options>] [<pattern>]"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:10
|
|
msgid "git for-each-ref [--points-at <object>]"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:11
|
|
msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:12
|
|
msgid "git for-each-ref [--contains [<object>]]"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:27
|
|
msgid "quote placeholders suitably for shells"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:29
|
|
msgid "quote placeholders suitably for perl"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:31
|
|
msgid "quote placeholders suitably for python"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:33
|
|
msgid "quote placeholders suitably for Tcl"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:36
|
|
msgid "show only <n> matched refs"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:37 builtin/tag.c:372
|
|
msgid "format to use for the output"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:41
|
|
msgid "print only refs which points at the given object"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:43
|
|
msgid "print only refs that are merged"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:44
|
|
msgid "print only refs that are not merged"
|
|
msgstr ""
|
|
|
|
#: builtin/for-each-ref.c:45
|
|
msgid "print only refs which contain the commit"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:519
|
|
msgid "Checking object directories"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:588
|
|
msgid "git fsck [<options>] [<object>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:594
|
|
msgid "show unreachable objects"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:595
|
|
msgid "show dangling objects"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:596
|
|
msgid "report tags"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:597
|
|
msgid "report root nodes"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:598
|
|
msgid "make index objects head nodes"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:599
|
|
msgid "make reflogs head nodes (default)"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:600
|
|
msgid "also consider packs and alternate objects"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:601
|
|
msgid "check only connectivity"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:602
|
|
msgid "enable more strict checking"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:604
|
|
msgid "write dangling objects in .git/lost-found"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:605 builtin/prune.c:107
|
|
msgid "show progress"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:606
|
|
msgid "show verbose names for reachable objects"
|
|
msgstr ""
|
|
|
|
#: builtin/fsck.c:665
|
|
msgid "Checking objects"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:25
|
|
msgid "git gc [<options>]"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:72
|
|
#, c-format
|
|
msgid "Invalid %s: '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:139
|
|
#, c-format
|
|
msgid "insanely long object directory %.*s"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:290
|
|
#, c-format
|
|
msgid ""
|
|
"The last gc run reported the following. Please correct the root cause\n"
|
|
"and remove %s.\n"
|
|
"Automatic cleanup will not be performed until the file is removed.\n"
|
|
"\n"
|
|
"%s"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:327
|
|
msgid "prune unreferenced objects"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:329
|
|
msgid "be more thorough (increased runtime)"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:330
|
|
msgid "enable auto-gc mode"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:331
|
|
msgid "force running gc even if there may be another gc running"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:373
|
|
#, c-format
|
|
msgid "Auto packing the repository in background for optimum performance.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:375
|
|
#, c-format
|
|
msgid "Auto packing the repository for optimum performance.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:376
|
|
#, c-format
|
|
msgid "See \"git help gc\" for manual housekeeping.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:397
|
|
#, c-format
|
|
msgid ""
|
|
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
|
|
msgstr ""
|
|
|
|
#: builtin/gc.c:441
|
|
msgid ""
|
|
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:23
|
|
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:219
|
|
#, c-format
|
|
msgid "grep: failed to create thread: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:277
|
|
#, c-format
|
|
msgid "invalid number of threads specified (%d) for %s"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:453 builtin/grep.c:488
|
|
#, c-format
|
|
msgid "unable to read tree (%s)"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:503
|
|
#, c-format
|
|
msgid "unable to grep from object of type %s"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:561
|
|
#, c-format
|
|
msgid "switch `%c' expects a numerical value"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:647
|
|
msgid "search in index instead of in the work tree"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:649
|
|
msgid "find in contents not managed by git"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:651
|
|
msgid "search in both tracked and untracked files"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:653
|
|
msgid "ignore files specified via '.gitignore'"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:656
|
|
msgid "show non-matching lines"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:658
|
|
msgid "case insensitive matching"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:660
|
|
msgid "match patterns only at word boundaries"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:662
|
|
msgid "process binary files as text"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:664
|
|
msgid "don't match patterns in binary files"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:667
|
|
msgid "process binary files with textconv filters"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:669
|
|
msgid "descend at most <depth> levels"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:673
|
|
msgid "use extended POSIX regular expressions"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:676
|
|
msgid "use basic POSIX regular expressions (default)"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:679
|
|
msgid "interpret patterns as fixed strings"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:682
|
|
msgid "use Perl-compatible regular expressions"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:685
|
|
msgid "show line numbers"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:686
|
|
msgid "don't show filenames"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:687
|
|
msgid "show filenames"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:689
|
|
msgid "show filenames relative to top directory"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:691
|
|
msgid "show only filenames instead of matching lines"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:693
|
|
msgid "synonym for --files-with-matches"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:696
|
|
msgid "show only the names of files without match"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:698
|
|
msgid "print NUL after filenames"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:700
|
|
msgid "show the number of matches instead of matching lines"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:701
|
|
msgid "highlight matches"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:703
|
|
msgid "print empty line between matches from different files"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:705
|
|
msgid "show filename only once above matches from same file"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:708
|
|
msgid "show <n> context lines before and after matches"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:711
|
|
msgid "show <n> context lines before matches"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:713
|
|
msgid "show <n> context lines after matches"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:715
|
|
msgid "use <n> worker threads"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:716
|
|
msgid "shortcut for -C NUM"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:719
|
|
msgid "show a line with the function name before matches"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:721
|
|
msgid "show the surrounding function"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:724
|
|
msgid "read patterns from file"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:726
|
|
msgid "match <pattern>"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:728
|
|
msgid "combine patterns specified with -e"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:740
|
|
msgid "indicate hit with exit status without output"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:742
|
|
msgid "show only matches from files that match all patterns"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:744
|
|
msgid "show parse tree for grep expression"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:748
|
|
msgid "pager"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:748
|
|
msgid "show matching files in the pager"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:751
|
|
msgid "allow calling of grep(1) (ignored by this build)"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:814
|
|
msgid "no pattern given."
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:846 builtin/index-pack.c:1480
|
|
#, c-format
|
|
msgid "invalid number of threads specified (%d)"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:876
|
|
msgid "--open-files-in-pager only works on the worktree"
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:902
|
|
msgid "--cached or --untracked cannot be used with --no-index."
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:907
|
|
msgid "--no-index or --untracked cannot be used with revs."
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:910
|
|
msgid "--[no-]exclude-standard cannot be used for tracked contents."
|
|
msgstr ""
|
|
|
|
#: builtin/grep.c:918
|
|
msgid "both --cached and trees are given."
|
|
msgstr ""
|
|
|
|
#: builtin/hash-object.c:81
|
|
msgid ""
|
|
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
|
|
"[--] <file>..."
|
|
msgstr ""
|
|
|
|
#: builtin/hash-object.c:82
|
|
msgid "git hash-object --stdin-paths"
|
|
msgstr ""
|
|
|
|
#: builtin/hash-object.c:94
|
|
msgid "type"
|
|
msgstr ""
|
|
|
|
#: builtin/hash-object.c:94
|
|
msgid "object type"
|
|
msgstr ""
|
|
|
|
#: builtin/hash-object.c:95
|
|
msgid "write the object into the object database"
|
|
msgstr ""
|
|
|
|
#: builtin/hash-object.c:97
|
|
msgid "read the object from stdin"
|
|
msgstr ""
|
|
|
|
#: builtin/hash-object.c:99
|
|
msgid "store file as is without filters"
|
|
msgstr ""
|
|
|
|
#: builtin/hash-object.c:100
|
|
msgid ""
|
|
"just hash any random garbage to create corrupt objects for debugging Git"
|
|
msgstr ""
|
|
|
|
#: builtin/hash-object.c:101
|
|
msgid "process file as it were from this path"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:42
|
|
msgid "print all available commands"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:43
|
|
msgid "exclude guides"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:44
|
|
msgid "print list of useful guides"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:45
|
|
msgid "show man page"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:46
|
|
msgid "show manual in web browser"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:48
|
|
msgid "show info page"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:54
|
|
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:66
|
|
#, c-format
|
|
msgid "unrecognized help format '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:93
|
|
msgid "Failed to start emacsclient."
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:106
|
|
msgid "Failed to parse emacsclient version."
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:114
|
|
#, c-format
|
|
msgid "emacsclient version '%d' too old (< 22)."
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
|
|
#, c-format
|
|
msgid "failed to exec '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:207
|
|
#, c-format
|
|
msgid ""
|
|
"'%s': path for unsupported man viewer.\n"
|
|
"Please consider using 'man.<tool>.cmd' instead."
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:219
|
|
#, c-format
|
|
msgid ""
|
|
"'%s': cmd for supported man viewer.\n"
|
|
"Please consider using 'man.<tool>.path' instead."
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:336
|
|
#, c-format
|
|
msgid "'%s': unknown man viewer."
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:353
|
|
msgid "no man viewer handled the request"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:361
|
|
msgid "no info viewer handled the request"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:403
|
|
msgid "Defining attributes per path"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:404
|
|
msgid "Everyday Git With 20 Commands Or So"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:405
|
|
msgid "A Git glossary"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:406
|
|
msgid "Specifies intentionally untracked files to ignore"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:407
|
|
msgid "Defining submodule properties"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:408
|
|
msgid "Specifying revisions and ranges for Git"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:409
|
|
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:410
|
|
msgid "An overview of recommended workflows with Git"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:422
|
|
msgid "The common Git guides are:\n"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:440
|
|
#, c-format
|
|
msgid "`git %s' is aliased to `%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/help.c:462 builtin/help.c:479
|
|
#, c-format
|
|
msgid "usage: %s%s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:154
|
|
#, c-format
|
|
msgid "unable to open %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:204
|
|
#, c-format
|
|
msgid "object type mismatch at %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:224
|
|
#, c-format
|
|
msgid "did not receive expected object %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:227
|
|
#, c-format
|
|
msgid "object %s: expected type %s, found %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:269
|
|
#, c-format
|
|
msgid "cannot fill %d byte"
|
|
msgid_plural "cannot fill %d bytes"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/index-pack.c:279
|
|
msgid "early EOF"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:280
|
|
msgid "read error on input"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:292
|
|
msgid "used more bytes than were available"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:299
|
|
msgid "pack too large for current definition of off_t"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
|
|
msgid "pack exceeds maximum allowed size"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:317
|
|
#, c-format
|
|
msgid "unable to create '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:322
|
|
#, c-format
|
|
msgid "cannot open packfile '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:336
|
|
msgid "pack signature mismatch"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:338
|
|
#, c-format
|
|
msgid "pack version %<PRIu32> unsupported"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:356
|
|
#, c-format
|
|
msgid "pack has bad object at offset %<PRIuMAX>: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:478
|
|
#, c-format
|
|
msgid "inflate returned %d"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:527
|
|
msgid "offset value overflow for delta base object"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:535
|
|
msgid "delta base offset is out of bound"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:543
|
|
#, c-format
|
|
msgid "unknown object type %d"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:574
|
|
msgid "cannot pread pack file"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:576
|
|
#, 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:602
|
|
msgid "serious inflate inconsistency"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
|
|
#: builtin/index-pack.c:811 builtin/index-pack.c:820
|
|
#, c-format
|
|
msgid "SHA1 COLLISION FOUND WITH %s !"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:751 builtin/pack-objects.c:166
|
|
#: builtin/pack-objects.c:258
|
|
#, c-format
|
|
msgid "unable to read %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:817
|
|
#, c-format
|
|
msgid "cannot read existing object %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:831
|
|
#, c-format
|
|
msgid "invalid blob object %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:845
|
|
#, c-format
|
|
msgid "invalid %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:848
|
|
msgid "Error in object"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:850
|
|
#, c-format
|
|
msgid "Not all child objects of %s are reachable"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:922 builtin/index-pack.c:953
|
|
msgid "failed to apply delta"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1123
|
|
msgid "Receiving objects"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1123
|
|
msgid "Indexing objects"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1155
|
|
msgid "pack is corrupted (SHA1 mismatch)"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1160
|
|
msgid "cannot fstat packfile"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1163
|
|
msgid "pack has junk at the end"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1174
|
|
msgid "confusion beyond insanity in parse_pack_objects()"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1197
|
|
msgid "Resolving deltas"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1208
|
|
#, c-format
|
|
msgid "unable to create thread: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1250
|
|
msgid "confusion beyond insanity"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1256
|
|
#, c-format
|
|
msgid "completed with %d local object"
|
|
msgid_plural "completed with %d local objects"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/index-pack.c:1268
|
|
#, c-format
|
|
msgid "Unexpected tail checksum for %s (disk corruption?)"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1272
|
|
#, c-format
|
|
msgid "pack has %d unresolved delta"
|
|
msgid_plural "pack has %d unresolved deltas"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/index-pack.c:1296
|
|
#, c-format
|
|
msgid "unable to deflate appended object (%d)"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1372
|
|
#, c-format
|
|
msgid "local object %s is corrupt"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1396
|
|
msgid "error while closing pack file"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1409
|
|
#, c-format
|
|
msgid "cannot write keep file '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1417
|
|
#, c-format
|
|
msgid "cannot close written keep file '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1430
|
|
msgid "cannot store pack file"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1441
|
|
msgid "cannot store index file"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1474
|
|
#, c-format
|
|
msgid "bad pack.indexversion=%<PRIu32>"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
|
|
#, c-format
|
|
msgid "no threads support, ignoring %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1542
|
|
#, c-format
|
|
msgid "Cannot open existing pack file '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1544
|
|
#, c-format
|
|
msgid "Cannot open existing pack idx file for '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1591
|
|
#, c-format
|
|
msgid "non delta: %d object"
|
|
msgid_plural "non delta: %d objects"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/index-pack.c:1598
|
|
#, c-format
|
|
msgid "chain length = %d: %lu object"
|
|
msgid_plural "chain length = %d: %lu objects"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/index-pack.c:1611
|
|
#, c-format
|
|
msgid "packfile name '%s' does not end with '.pack'"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
|
|
#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
|
|
#, c-format
|
|
msgid "bad %s"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1732
|
|
msgid "--fix-thin cannot be used without --stdin"
|
|
msgstr ""
|
|
|
|
#: builtin/index-pack.c:1740
|
|
msgid "--verify with no packfile name given"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:54
|
|
#, c-format
|
|
msgid "cannot stat '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:60
|
|
#, c-format
|
|
msgid "cannot stat template '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:65
|
|
#, c-format
|
|
msgid "cannot opendir '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:76
|
|
#, c-format
|
|
msgid "cannot readlink '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:78
|
|
#, c-format
|
|
msgid "cannot symlink '%s' '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:84
|
|
#, c-format
|
|
msgid "cannot copy '%s' to '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:88
|
|
#, c-format
|
|
msgid "ignoring template %s"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:119
|
|
#, c-format
|
|
msgid "templates not found %s"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:134
|
|
#, c-format
|
|
msgid "not copying templates from '%s': %s"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:327
|
|
#, c-format
|
|
msgid "unable to handle file type %d"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:330
|
|
#, c-format
|
|
msgid "unable to move %s to %s"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:347 builtin/init-db.c:350
|
|
#, c-format
|
|
msgid "%s already exists"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:403
|
|
#, c-format
|
|
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:404
|
|
#, c-format
|
|
msgid "Reinitialized existing Git repository in %s%s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:408
|
|
#, c-format
|
|
msgid "Initialized empty shared Git repository in %s%s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:409
|
|
#, c-format
|
|
msgid "Initialized empty Git repository in %s%s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:457
|
|
msgid ""
|
|
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
|
|
"shared[=<permissions>]] [<directory>]"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:480
|
|
msgid "permissions"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:481
|
|
msgid "specify that the git repository is to be shared amongst several users"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:515 builtin/init-db.c:520
|
|
#, c-format
|
|
msgid "cannot mkdir %s"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:524
|
|
#, c-format
|
|
msgid "cannot chdir to %s"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:545
|
|
#, c-format
|
|
msgid ""
|
|
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
|
|
"dir=<directory>)"
|
|
msgstr ""
|
|
|
|
#: builtin/init-db.c:573
|
|
#, 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:26
|
|
msgid "edit files in place"
|
|
msgstr ""
|
|
|
|
#: builtin/interpret-trailers.c:27
|
|
msgid "trim empty trailers"
|
|
msgstr ""
|
|
|
|
#: builtin/interpret-trailers.c:28
|
|
msgid "trailer"
|
|
msgstr ""
|
|
|
|
#: builtin/interpret-trailers.c:29
|
|
msgid "trailer(s) to add"
|
|
msgstr ""
|
|
|
|
#: builtin/interpret-trailers.c:42
|
|
msgid "no input file given for in-place editing"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:44
|
|
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:45
|
|
msgid "git show [<options>] <object>..."
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:84
|
|
#, c-format
|
|
msgid "invalid --decorate option: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:139
|
|
msgid "suppress diff output"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:140
|
|
msgid "show source"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:141
|
|
msgid "Use mail map file"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:142
|
|
msgid "decorate options"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:145
|
|
msgid "Process line range n,m in file, counting from 1"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:241
|
|
#, c-format
|
|
msgid "Final output: %d %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:486
|
|
#, c-format
|
|
msgid "git show %s: bad file"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:500 builtin/log.c:594
|
|
#, c-format
|
|
msgid "Could not read object %s"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:618
|
|
#, c-format
|
|
msgid "Unknown type: %d"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:739
|
|
msgid "format.headers without value"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:839
|
|
msgid "name of output directory is too long"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:854
|
|
#, c-format
|
|
msgid "Cannot open patch file %s"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:868
|
|
msgid "Need exactly one range."
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:878
|
|
msgid "Not a range."
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:984
|
|
msgid "Cover letter needs email format"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1063
|
|
#, c-format
|
|
msgid "insane in-reply-to: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1091
|
|
msgid "git format-patch [<options>] [<since> | <revision-range>]"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1141
|
|
msgid "Two output directories?"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
|
|
#, c-format
|
|
msgid "Unknown commit %s"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
|
|
#, c-format
|
|
msgid "Failed to resolve '%s' as a valid ref."
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1263
|
|
msgid "Could not find exact merge base."
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1267
|
|
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:1287
|
|
msgid "Failed to find exact merge base"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1298
|
|
msgid "base commit should be the ancestor of revision list"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1302
|
|
msgid "base commit shouldn't be in revision list"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1351
|
|
msgid "cannot get patch id"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1408
|
|
msgid "use [PATCH n/m] even with a single patch"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1411
|
|
msgid "use [PATCH] even with multiple patches"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1415
|
|
msgid "print patches to standard out"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1417
|
|
msgid "generate a cover letter"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1419
|
|
msgid "use simple number sequence for output file names"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1420
|
|
msgid "sfx"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1421
|
|
msgid "use <sfx> instead of '.patch'"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1423
|
|
msgid "start numbering patches at <n> instead of 1"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1425
|
|
msgid "mark the series as Nth re-roll"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1427
|
|
msgid "Use [RFC PATCH] instead of [PATCH]"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1430
|
|
msgid "Use [<prefix>] instead of [PATCH]"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1433
|
|
msgid "store resulting files in <dir>"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1436
|
|
msgid "don't strip/add [PATCH]"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1439
|
|
msgid "don't output binary diffs"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1441
|
|
msgid "output all-zero hash in From header"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1443
|
|
msgid "don't include a patch matching a commit upstream"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1445
|
|
msgid "show patch format instead of default (patch + stat)"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1447
|
|
msgid "Messaging"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1448
|
|
msgid "header"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1449
|
|
msgid "add email header"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1450 builtin/log.c:1452
|
|
msgid "email"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1450
|
|
msgid "add To: header"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1452
|
|
msgid "add Cc: header"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1454
|
|
msgid "ident"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1455
|
|
msgid "set From address to <ident> (or committer ident if absent)"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1457
|
|
msgid "message-id"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1458
|
|
msgid "make first mail a reply to <message-id>"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1459 builtin/log.c:1462
|
|
msgid "boundary"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1460
|
|
msgid "attach the patch"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1463
|
|
msgid "inline the patch"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1467
|
|
msgid "enable message threading, styles: shallow, deep"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1469
|
|
msgid "signature"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1470
|
|
msgid "add a signature"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1471
|
|
msgid "base-commit"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1472
|
|
msgid "add prerequisite tree info to the patch series"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1474
|
|
msgid "add a signature from a file"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1475
|
|
msgid "don't print the patch filenames"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1565
|
|
msgid "-n and -k are mutually exclusive."
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1567
|
|
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1575
|
|
msgid "--name-only does not make sense"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1577
|
|
msgid "--name-status does not make sense"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1579
|
|
msgid "--check does not make sense"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1609
|
|
msgid "standard output, or directory, which one?"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1611
|
|
#, c-format
|
|
msgid "Could not create directory '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1705
|
|
#, c-format
|
|
msgid "unable to read signature file '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1777
|
|
msgid "Failed to create output files"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1826
|
|
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
|
|
msgstr ""
|
|
|
|
#: builtin/log.c:1880
|
|
#, c-format
|
|
msgid ""
|
|
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:458
|
|
msgid "git ls-files [<options>] [<file>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:507
|
|
msgid "identify the file status with tags"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:509
|
|
msgid "use lowercase letters for 'assume unchanged' files"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:511
|
|
msgid "show cached files in the output (default)"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:513
|
|
msgid "show deleted files in the output"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:515
|
|
msgid "show modified files in the output"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:517
|
|
msgid "show other files in the output"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:519
|
|
msgid "show ignored files in the output"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:522
|
|
msgid "show staged contents' object name in the output"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:524
|
|
msgid "show files on the filesystem that need to be removed"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:526
|
|
msgid "show 'other' directories' names only"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:528
|
|
msgid "show line endings of files"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:530
|
|
msgid "don't show empty directories"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:533
|
|
msgid "show unmerged files in the output"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:535
|
|
msgid "show resolve-undo information"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:537
|
|
msgid "skip files matching pattern"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:540
|
|
msgid "exclude patterns are read from <file>"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:543
|
|
msgid "read additional per-directory exclude patterns in <file>"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:545
|
|
msgid "add the standard git exclusions"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:548
|
|
msgid "make the output relative to the project top directory"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:551
|
|
msgid "recurse through submodules"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:553
|
|
msgid "if any <file> is not in the index, treat this as an error"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:554
|
|
msgid "tree-ish"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:555
|
|
msgid "pretend that paths removed since <tree-ish> are still present"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-files.c:557
|
|
msgid "show debugging data"
|
|
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>...]]"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-remote.c:50
|
|
msgid "do not print remote URL"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
|
|
msgid "exec"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
|
|
msgid "path of git-upload-pack on the remote host"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-remote.c:56
|
|
msgid "limit to tags"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-remote.c:57
|
|
msgid "limit to heads"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-remote.c:58
|
|
msgid "do not show peeled tags"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-remote.c:60
|
|
msgid "take url.<base>.insteadOf into account"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-remote.c:62
|
|
msgid "exit with exit code 2 if no matching refs are found"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-remote.c:64
|
|
msgid "show underlying ref in addition to the object pointed by it"
|
|
msgstr ""
|
|
|
|
#: builtin/ls-tree.c:28
|
|
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/merge.c:46
|
|
msgid "git merge [<options>] [<commit>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:47
|
|
msgid "git merge [<options>] <msg> HEAD <commit>"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:48
|
|
msgid "git merge --abort"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:102
|
|
msgid "switch `m' requires a value"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:139
|
|
#, c-format
|
|
msgid "Could not find merge strategy '%s'.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:140
|
|
#, c-format
|
|
msgid "Available strategies are:"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:145
|
|
#, c-format
|
|
msgid "Available custom strategies are:"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:195 builtin/pull.c:127
|
|
msgid "do not show a diffstat at the end of the merge"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:198 builtin/pull.c:130
|
|
msgid "show a diffstat at the end of the merge"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:199 builtin/pull.c:133
|
|
msgid "(synonym to --stat)"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:201 builtin/pull.c:136
|
|
msgid "add (at most <n>) entries from shortlog to merge commit message"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:204 builtin/pull.c:139
|
|
msgid "create a single commit instead of doing a merge"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:206 builtin/pull.c:142
|
|
msgid "perform a commit if the merge succeeds (default)"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:208 builtin/pull.c:145
|
|
msgid "edit message before committing"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:209
|
|
msgid "allow fast-forward (default)"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:211 builtin/pull.c:151
|
|
msgid "abort if fast-forward is not possible"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:215 builtin/pull.c:154
|
|
msgid "verify that the named commit has a valid GPG signature"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
|
|
#: builtin/revert.c:89
|
|
msgid "strategy"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:217 builtin/pull.c:159
|
|
msgid "merge strategy to use"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:218 builtin/pull.c:162
|
|
msgid "option=value"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:219 builtin/pull.c:163
|
|
msgid "option for selected merge strategy"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:221
|
|
msgid "merge commit message (for a non-fast-forward merge)"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:225
|
|
msgid "abort the current in-progress merge"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:227 builtin/pull.c:170
|
|
msgid "allow merging unrelated histories"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:255
|
|
msgid "could not run stash."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:260
|
|
msgid "stash failed"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:265
|
|
#, c-format
|
|
msgid "not a valid object: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:284 builtin/merge.c:301
|
|
msgid "read-tree failed"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:331
|
|
msgid " (nothing to squash)"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:342
|
|
#, c-format
|
|
msgid "Squash commit -- not updating HEAD\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:392
|
|
#, c-format
|
|
msgid "No merge message -- not updating HEAD\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:443
|
|
#, c-format
|
|
msgid "'%s' does not point to a commit"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:533
|
|
#, c-format
|
|
msgid "Bad branch.%s.mergeoptions string: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:652
|
|
msgid "Not handling anything other than two heads merge."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:666
|
|
#, c-format
|
|
msgid "Unknown option for merge-recursive: -X%s"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:681
|
|
#, c-format
|
|
msgid "unable to write %s"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:733
|
|
#, c-format
|
|
msgid "Could not read from '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:742
|
|
#, c-format
|
|
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:748
|
|
#, 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:772
|
|
msgid "Empty commit message."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:792
|
|
#, c-format
|
|
msgid "Wonderful.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:847
|
|
#, c-format
|
|
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:863
|
|
#, c-format
|
|
msgid "'%s' is not a commit"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:904
|
|
msgid "No current branch."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:906
|
|
msgid "No remote for the current branch."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:908
|
|
msgid "No default upstream defined for the current branch."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:913
|
|
#, c-format
|
|
msgid "No remote-tracking branch for %s from %s"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:960
|
|
#, c-format
|
|
msgid "Bad value '%s' in environment '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1034
|
|
#, c-format
|
|
msgid "could not close '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1061
|
|
#, c-format
|
|
msgid "not something we can merge in %s: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1095
|
|
msgid "not something we can merge"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1162
|
|
msgid "There is no merge to abort (MERGE_HEAD missing)."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1178
|
|
msgid ""
|
|
"You have not concluded your merge (MERGE_HEAD exists).\n"
|
|
"Please, commit your changes before you merge."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1185
|
|
msgid ""
|
|
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
|
|
"Please, commit your changes before you merge."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1188
|
|
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1197
|
|
msgid "You cannot combine --squash with --no-ff."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1205
|
|
msgid "No commit specified and merge.defaultToUpstream not set."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1222
|
|
msgid "Squash commit into empty head not supported yet"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1224
|
|
msgid "Non-fast-forward commit does not make sense into an empty head"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1229
|
|
#, c-format
|
|
msgid "%s - not something we can merge"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1231
|
|
msgid "Can merge only exactly one commit into empty head"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1287
|
|
#, c-format
|
|
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1290
|
|
#, c-format
|
|
msgid "Commit %s has a bad GPG signature allegedly by %s."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1293
|
|
#, c-format
|
|
msgid "Commit %s does not have a GPG signature."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1296
|
|
#, c-format
|
|
msgid "Commit %s has a good GPG signature by %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1358
|
|
msgid "refusing to merge unrelated histories"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1367
|
|
msgid "Already up-to-date."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1377
|
|
#, c-format
|
|
msgid "Updating %s..%s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1418
|
|
#, c-format
|
|
msgid "Trying really trivial in-index merge...\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1425
|
|
#, c-format
|
|
msgid "Nope.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1450
|
|
msgid "Already up-to-date. Yeeah!"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1456
|
|
msgid "Not possible to fast-forward, aborting."
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1479 builtin/merge.c:1558
|
|
#, c-format
|
|
msgid "Rewinding the tree to pristine...\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1483
|
|
#, c-format
|
|
msgid "Trying merge strategy %s...\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1549
|
|
#, c-format
|
|
msgid "No merge strategy handled the merge.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1551
|
|
#, c-format
|
|
msgid "Merge with strategy %s failed.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1560
|
|
#, c-format
|
|
msgid "Using the %s to prepare resolving by hand.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge.c:1572
|
|
#, c-format
|
|
msgid "Automatic merge went well; stopped before committing as requested\n"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-base.c:29
|
|
msgid "git merge-base [-a | --all] <commit> <commit>..."
|
|
msgstr ""
|
|
|
|
#: builtin/merge-base.c:30
|
|
msgid "git merge-base [-a | --all] --octopus <commit>..."
|
|
msgstr ""
|
|
|
|
#: builtin/merge-base.c:31
|
|
msgid "git merge-base --independent <commit>..."
|
|
msgstr ""
|
|
|
|
#: builtin/merge-base.c:32
|
|
msgid "git merge-base --is-ancestor <commit> <commit>"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-base.c:33
|
|
msgid "git merge-base --fork-point <ref> [<commit>]"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-base.c:217
|
|
msgid "output all common ancestors"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-base.c:219
|
|
msgid "find ancestors for a single n-way merge"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-base.c:221
|
|
msgid "list revs not reachable from others"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-base.c:223
|
|
msgid "is the first one ancestor of the other?"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-base.c:225
|
|
msgid "find where <commit> forked from reflog of <ref>"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-file.c:8
|
|
msgid ""
|
|
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
|
|
"<orig-file> <file2>"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-file.c:33
|
|
msgid "send results to standard output"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-file.c:34
|
|
msgid "use a diff3 based merge"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-file.c:35
|
|
msgid "for conflicts, use our version"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-file.c:37
|
|
msgid "for conflicts, use their version"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-file.c:39
|
|
msgid "for conflicts, use a union version"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-file.c:42
|
|
msgid "for conflicts, use this marker size"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-file.c:43
|
|
msgid "do not warn about conflicts"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-file.c:45
|
|
msgid "set labels for file1/orig-file/file2"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-recursive.c:45
|
|
#, c-format
|
|
msgid "unknown option %s"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-recursive.c:51
|
|
#, c-format
|
|
msgid "could not parse object '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-recursive.c:55
|
|
#, c-format
|
|
msgid "cannot handle more than %d base. Ignoring %s."
|
|
msgid_plural "cannot handle more than %d bases. Ignoring %s."
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/merge-recursive.c:63
|
|
msgid "not handling anything other than two heads merge."
|
|
msgstr ""
|
|
|
|
#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
|
|
#, c-format
|
|
msgid "could not resolve ref '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/merge-recursive.c:77
|
|
#, c-format
|
|
msgid "Merging %s with %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/mktree.c:65
|
|
msgid "git mktree [-z] [--missing] [--batch]"
|
|
msgstr ""
|
|
|
|
#: builtin/mktree.c:152
|
|
msgid "input is NUL terminated"
|
|
msgstr ""
|
|
|
|
#: builtin/mktree.c:153 builtin/write-tree.c:24
|
|
msgid "allow missing objects"
|
|
msgstr ""
|
|
|
|
#: builtin/mktree.c:154
|
|
msgid "allow creation of more than one tree"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:15
|
|
msgid "git mv [<options>] <source>... <destination>"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:70
|
|
#, c-format
|
|
msgid "Directory %s is in index and no submodule?"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:72 builtin/rm.c:317
|
|
msgid "Please stage your changes to .gitmodules or stash them to proceed"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:90
|
|
#, c-format
|
|
msgid "%.*s is in index"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:112
|
|
msgid "force move/rename even if target exists"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:113
|
|
msgid "skip move/rename errors"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:155
|
|
#, c-format
|
|
msgid "destination '%s' is not a directory"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:166
|
|
#, c-format
|
|
msgid "Checking rename of '%s' to '%s'\n"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:170
|
|
msgid "bad source"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:173
|
|
msgid "can not move directory into itself"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:176
|
|
msgid "cannot move directory over file"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:185
|
|
msgid "source directory is empty"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:210
|
|
msgid "not under version control"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:213
|
|
msgid "destination exists"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:221
|
|
#, c-format
|
|
msgid "overwriting '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:224
|
|
msgid "Cannot overwrite"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:227
|
|
msgid "multiple sources for the same target"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:229
|
|
msgid "destination directory does not exist"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:236
|
|
#, c-format
|
|
msgid "%s, source=%s, destination=%s"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:257
|
|
#, c-format
|
|
msgid "Renaming %s to %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
|
|
#, c-format
|
|
msgid "renaming '%s' failed"
|
|
msgstr ""
|
|
|
|
#: builtin/name-rev.c:257
|
|
msgid "git name-rev [<options>] <commit>..."
|
|
msgstr ""
|
|
|
|
#: builtin/name-rev.c:258
|
|
msgid "git name-rev [<options>] --all"
|
|
msgstr ""
|
|
|
|
#: builtin/name-rev.c:259
|
|
msgid "git name-rev [<options>] --stdin"
|
|
msgstr ""
|
|
|
|
#: builtin/name-rev.c:311
|
|
msgid "print only names (no SHA-1)"
|
|
msgstr ""
|
|
|
|
#: builtin/name-rev.c:312
|
|
msgid "only use tags to name the commits"
|
|
msgstr ""
|
|
|
|
#: builtin/name-rev.c:314
|
|
msgid "only use refs matching <pattern>"
|
|
msgstr ""
|
|
|
|
#: builtin/name-rev.c:316
|
|
msgid "list all commits reachable from all refs"
|
|
msgstr ""
|
|
|
|
#: builtin/name-rev.c:317
|
|
msgid "read from stdin"
|
|
msgstr ""
|
|
|
|
#: builtin/name-rev.c:318
|
|
msgid "allow to print `undefined` names (default)"
|
|
msgstr ""
|
|
|
|
#: builtin/name-rev.c:324
|
|
msgid "dereference tags in the input (internal use)"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:25
|
|
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:26
|
|
msgid ""
|
|
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
|
"| (-c | -C) <object>] [<object>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:27
|
|
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:28
|
|
msgid ""
|
|
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
|
"(-c | -C) <object>] [<object>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:29
|
|
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:30
|
|
msgid "git notes [--ref <notes-ref>] show [<object>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:31
|
|
msgid ""
|
|
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:32
|
|
msgid "git notes merge --commit [-v | -q]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:33
|
|
msgid "git notes merge --abort [-v | -q]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:34
|
|
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:35
|
|
msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:36
|
|
msgid "git notes [--ref <notes-ref>] get-ref"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:41
|
|
msgid "git notes [list [<object>]]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:46
|
|
msgid "git notes add [<options>] [<object>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:51
|
|
msgid "git notes copy [<options>] <from-object> <to-object>"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:52
|
|
msgid "git notes copy --stdin [<from-object> <to-object>]..."
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:57
|
|
msgid "git notes append [<options>] [<object>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:62
|
|
msgid "git notes edit [<object>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:67
|
|
msgid "git notes show [<object>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:72
|
|
msgid "git notes merge [<options>] <notes-ref>"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:73
|
|
msgid "git notes merge --commit [<options>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:74
|
|
msgid "git notes merge --abort [<options>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:79
|
|
msgid "git notes remove [<object>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:84
|
|
msgid "git notes prune [<options>]"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:89
|
|
msgid "git notes get-ref"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:94
|
|
msgid "Write/edit the notes for the following object:"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:147
|
|
#, c-format
|
|
msgid "unable to start 'show' for object '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:151
|
|
msgid "could not read 'show' output"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:159
|
|
#, c-format
|
|
msgid "failed to finish 'show' for object '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:194
|
|
msgid "please supply the note contents using either -m or -F option"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:203
|
|
msgid "unable to write note object"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:205
|
|
#, c-format
|
|
msgid "the note contents have been left in %s"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:233 builtin/tag.c:439
|
|
#, c-format
|
|
msgid "cannot read '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:235 builtin/tag.c:442
|
|
#, c-format
|
|
msgid "could not open or read '%s'"
|
|
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:659
|
|
#, c-format
|
|
msgid "failed to resolve '%s' as a valid ref."
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:257
|
|
#, c-format
|
|
msgid "failed to read object '%s'."
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:261
|
|
#, c-format
|
|
msgid "cannot read note data from non-blob object '%s'."
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:301
|
|
#, c-format
|
|
msgid "malformed input line: '%s'."
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:316
|
|
#, 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:345
|
|
#, c-format
|
|
msgid "refusing to %s notes in %s (outside of refs/notes/)"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
|
|
#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
|
|
#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
|
|
msgid "too many parameters"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:378 builtin/notes.c:665
|
|
#, c-format
|
|
msgid "no note found for object %s."
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:399 builtin/notes.c:562
|
|
msgid "note contents as a string"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:402 builtin/notes.c:565
|
|
msgid "note contents in a file"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:405 builtin/notes.c:568
|
|
msgid "reuse and edit specified note object"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:408 builtin/notes.c:571
|
|
msgid "reuse specified note object"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:411 builtin/notes.c:574
|
|
msgid "allow storing empty note"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:412 builtin/notes.c:483
|
|
msgid "replace existing notes"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:437
|
|
#, c-format
|
|
msgid ""
|
|
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
"existing notes"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:452 builtin/notes.c:531
|
|
#, c-format
|
|
msgid "Overwriting existing notes for object %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
|
|
#, c-format
|
|
msgid "Removing note for object %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:484
|
|
msgid "read objects from stdin"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:486
|
|
msgid "load rewriting config for <command> (implies --stdin)"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:504
|
|
msgid "too few parameters"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:525
|
|
#, c-format
|
|
msgid ""
|
|
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
"existing notes"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:537
|
|
#, c-format
|
|
msgid "missing notes on source object %s. Cannot copy."
|
|
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"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:685
|
|
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:687
|
|
msgid "failed to delete ref NOTES_MERGE_REF"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:689
|
|
msgid "failed to remove 'git notes merge' worktree"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:709
|
|
msgid "failed to read ref NOTES_MERGE_PARTIAL"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:711
|
|
msgid "could not find commit from NOTES_MERGE_PARTIAL."
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:713
|
|
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:726
|
|
msgid "failed to resolve NOTES_MERGE_REF"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:729
|
|
msgid "failed to finalize notes merge"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:755
|
|
#, c-format
|
|
msgid "unknown notes merge strategy %s"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:771
|
|
msgid "General options"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:773
|
|
msgid "Merge options"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:775
|
|
msgid ""
|
|
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
|
|
"cat_sort_uniq)"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:777
|
|
msgid "Committing unmerged notes"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:779
|
|
msgid "finalize notes merge by committing unmerged notes"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:781
|
|
msgid "Aborting notes merge resolution"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:783
|
|
msgid "abort notes merge"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:794
|
|
msgid "cannot mix --commit, --abort or -s/--strategy"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:799
|
|
msgid "must specify a notes ref to merge"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:823
|
|
#, c-format
|
|
msgid "unknown -s/--strategy: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:860
|
|
#, c-format
|
|
msgid "a notes merge into %s is already in-progress at %s"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:863
|
|
#, c-format
|
|
msgid "failed to store link to current notes ref (%s)"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:865
|
|
#, 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:887
|
|
#, c-format
|
|
msgid "Object %s has no note\n"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:899
|
|
msgid "attempt to remove non-existent note is not an error"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:902
|
|
msgid "read object names from the standard input"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
|
|
msgid "do not remove, show only"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:941
|
|
msgid "report pruned notes"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:983
|
|
msgid "notes-ref"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:984
|
|
msgid "use notes from <notes-ref>"
|
|
msgstr ""
|
|
|
|
#: builtin/notes.c:1019
|
|
#, c-format
|
|
msgid "unknown subcommand: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:29
|
|
msgid ""
|
|
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:30
|
|
msgid ""
|
|
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
|
|
#, c-format
|
|
msgid "deflate error (%d)"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:768
|
|
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:781
|
|
msgid "Writing objects"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:1070
|
|
msgid "disabling bitmap writing, as some objects are not being packed"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2346
|
|
msgid "Compressing objects"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2759
|
|
#, c-format
|
|
msgid "unsupported index version %s"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2763
|
|
#, c-format
|
|
msgid "bad index version '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2793
|
|
msgid "do not show progress meter"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2795
|
|
msgid "show progress meter"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2797
|
|
msgid "show progress meter during object writing phase"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2800
|
|
msgid "similar to --all-progress when progress meter is shown"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2801
|
|
msgid "version[,offset]"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2802
|
|
msgid "write the pack index file in the specified idx format version"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2805
|
|
msgid "maximum size of each output pack file"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2807
|
|
msgid "ignore borrowed objects from alternate object store"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2809
|
|
msgid "ignore packed objects"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2811
|
|
msgid "limit pack window by objects"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2813
|
|
msgid "limit pack window by memory in addition to object limit"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2815
|
|
msgid "maximum length of delta chain allowed in the resulting pack"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2817
|
|
msgid "reuse existing deltas"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2819
|
|
msgid "reuse existing objects"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2821
|
|
msgid "use OFS_DELTA objects"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2823
|
|
msgid "use threads when searching for best delta matches"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2825
|
|
msgid "do not create an empty pack output"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2827
|
|
msgid "read revision arguments from standard input"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2829
|
|
msgid "limit the objects to those that are not yet packed"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2832
|
|
msgid "include objects reachable from any reference"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2835
|
|
msgid "include objects referred by reflog entries"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2838
|
|
msgid "include objects referred to by the index"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2841
|
|
msgid "output pack to stdout"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2843
|
|
msgid "include tag objects that refer to objects to be packed"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2845
|
|
msgid "keep unreachable objects"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2847
|
|
msgid "pack loose unreachable objects"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2849
|
|
msgid "unpack unreachable objects newer than <time>"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2852
|
|
msgid "create thin packs"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2854
|
|
msgid "create packs suitable for shallow fetches"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2856
|
|
msgid "ignore packs that have companion .keep file"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2858
|
|
msgid "pack compression level"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2860
|
|
msgid "do not hide commits by grafts"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2862
|
|
msgid "use a bitmap index if available to speed up counting objects"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2864
|
|
msgid "write a bitmap index together with the pack index"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-objects.c:2993
|
|
msgid "Counting objects"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-refs.c:6
|
|
msgid "git pack-refs [<options>]"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-refs.c:14
|
|
msgid "pack everything"
|
|
msgstr ""
|
|
|
|
#: builtin/pack-refs.c:15
|
|
msgid "prune loose refs (default)"
|
|
msgstr ""
|
|
|
|
#: builtin/prune-packed.c:7
|
|
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|
msgstr ""
|
|
|
|
#: builtin/prune-packed.c:40
|
|
msgid "Removing duplicate objects"
|
|
msgstr ""
|
|
|
|
#: builtin/prune.c:11
|
|
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/prune.c:106 builtin/worktree.c:128
|
|
msgid "report pruned objects"
|
|
msgstr ""
|
|
|
|
#: builtin/prune.c:109 builtin/worktree.c:130
|
|
msgid "expire objects older than <time>"
|
|
msgstr ""
|
|
|
|
#: builtin/prune.c:123
|
|
msgid "cannot prune in a precious-objects repo"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:51 builtin/pull.c:53
|
|
#, c-format
|
|
msgid "Invalid value for %s: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:73
|
|
msgid "git pull [<options>] [<repository> [<refspec>...]]"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:121
|
|
msgid "Options related to merging"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:124
|
|
msgid "incorporate changes by rebasing rather than merging"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:148 builtin/revert.c:101
|
|
msgid "allow fast-forward"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:157
|
|
msgid "automatically stash/stash pop before and after rebase"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:173
|
|
msgid "Options related to fetching"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:195
|
|
msgid "number of submodules pulled in parallel"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:284
|
|
#, c-format
|
|
msgid "Invalid value for pull.ff: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:397
|
|
msgid ""
|
|
"There is no candidate for rebasing against among the refs that you just "
|
|
"fetched."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:399
|
|
msgid ""
|
|
"There are no candidates for merging among the refs that you just fetched."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:400
|
|
msgid ""
|
|
"Generally this means that you provided a wildcard refspec which had no\n"
|
|
"matches on the remote end."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:403
|
|
#, 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:408 git-parse-remote.sh:73
|
|
msgid "You are not currently on a branch."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
|
|
msgid "Please specify which branch you want to rebase against."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
|
|
msgid "Please specify which branch you want to merge with."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:413 builtin/pull.c:428
|
|
msgid "See git-pull(1) for details."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
|
|
#: git-parse-remote.sh:64
|
|
msgid "<remote>"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
|
|
#: git-parse-remote.sh:65
|
|
msgid "<branch>"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:423 git-parse-remote.sh:75
|
|
msgid "There is no tracking information for the current branch."
|
|
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:"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:437
|
|
#, 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:754
|
|
msgid "ignoring --verify-signatures for rebase"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:801
|
|
msgid "--[no-]autostash option is only valid with --rebase."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:809
|
|
msgid "Updating an unborn branch with changes added to the index."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:812
|
|
msgid "pull with rebase"
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:813
|
|
msgid "please commit or stash them."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:838
|
|
#, c-format
|
|
msgid ""
|
|
"fetch updated the current branch head.\n"
|
|
"fast-forwarding your working tree from\n"
|
|
"commit %s."
|
|
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."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:858
|
|
msgid "Cannot merge multiple branches into empty head."
|
|
msgstr ""
|
|
|
|
#: builtin/pull.c:862
|
|
msgid "Cannot rebase onto multiple branches."
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:16
|
|
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:89
|
|
msgid "tag shorthand without <tag>"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:99
|
|
msgid "--delete only accepts plain target ref names"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:143
|
|
msgid ""
|
|
"\n"
|
|
"To choose either option permanently, see push.default in 'git help config'."
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:146
|
|
#, c-format
|
|
msgid ""
|
|
"The upstream branch of your current branch does not match\n"
|
|
"the name of your current branch. To push to the upstream branch\n"
|
|
"on the remote, use\n"
|
|
"\n"
|
|
" git push %s HEAD:%s\n"
|
|
"\n"
|
|
"To push to the branch of the same name on the remote, use\n"
|
|
"\n"
|
|
" git push %s %s\n"
|
|
"%s"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:161
|
|
#, 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:175
|
|
#, 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:183
|
|
#, c-format
|
|
msgid "The current branch %s has multiple upstream branches, refusing to push."
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:186
|
|
#, 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:242
|
|
msgid ""
|
|
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:249
|
|
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:255
|
|
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:261
|
|
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:268
|
|
msgid "Updates were rejected because the tag already exists in the remote."
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:271
|
|
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:331
|
|
#, c-format
|
|
msgid "Pushing to %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:335
|
|
#, c-format
|
|
msgid "failed to push some refs to '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:366
|
|
#, c-format
|
|
msgid "bad repository '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:367
|
|
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:385
|
|
msgid "--all and --tags are incompatible"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:386
|
|
msgid "--all can't be combined with refspecs"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:391
|
|
msgid "--mirror and --tags are incompatible"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:392
|
|
msgid "--mirror can't be combined with refspecs"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:397
|
|
msgid "--all and --mirror are incompatible"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:515
|
|
msgid "repository"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:516 builtin/send-pack.c:161
|
|
msgid "push all refs"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:517 builtin/send-pack.c:163
|
|
msgid "mirror all refs"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:519
|
|
msgid "delete refs"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:520
|
|
msgid "push tags (can't be used with --all or --mirror)"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:523 builtin/send-pack.c:164
|
|
msgid "force updates"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:525 builtin/send-pack.c:175
|
|
msgid "refname>:<expect"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:526 builtin/send-pack.c:176
|
|
msgid "require old value of ref to be at this value"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:529
|
|
msgid "control recursive pushing of submodules"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:531 builtin/send-pack.c:169
|
|
msgid "use thin pack"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
|
|
#: builtin/send-pack.c:159
|
|
msgid "receive pack program"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:534
|
|
msgid "set upstream for git pull/status"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:537
|
|
msgid "prune locally removed refs"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:539
|
|
msgid "bypass pre-push hook"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:540
|
|
msgid "push missing but relevant tags"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:543 builtin/send-pack.c:166
|
|
msgid "GPG sign the push"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:545 builtin/send-pack.c:170
|
|
msgid "request atomic transaction on remote side"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:546
|
|
msgid "server-specific"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:546
|
|
msgid "option to transmit"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:560
|
|
msgid "--delete is incompatible with --all, --mirror and --tags"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:562
|
|
msgid "--delete doesn't make sense without any refs"
|
|
msgstr ""
|
|
|
|
#: builtin/push.c:579
|
|
msgid "push options must not have new line characters"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:37
|
|
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:110
|
|
msgid "write resulting index to <file>"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:113
|
|
msgid "only empty the index"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:115
|
|
msgid "Merging"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:117
|
|
msgid "perform a merge in addition to a read"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:119
|
|
msgid "3-way merge if no file level merging required"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:121
|
|
msgid "3-way merge in presence of adds and removes"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:123
|
|
msgid "same as -m, but discard unmerged entries"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:124
|
|
msgid "<subdirectory>/"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:125
|
|
msgid "read the tree into the index under <subdirectory>/"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:128
|
|
msgid "update working tree with merge result"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:130
|
|
msgid "gitignore"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:131
|
|
msgid "allow explicitly ignored files to be overwritten"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:134
|
|
msgid "don't check the working tree after merging"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:135
|
|
msgid "don't update the index or the work tree"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:137
|
|
msgid "skip applying sparse checkout filter"
|
|
msgstr ""
|
|
|
|
#: builtin/read-tree.c:139
|
|
msgid "debug unpack-trees"
|
|
msgstr ""
|
|
|
|
#: builtin/receive-pack.c:26
|
|
msgid "git receive-pack <git-dir>"
|
|
msgstr ""
|
|
|
|
#: builtin/receive-pack.c:793
|
|
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 'receive.denyCurrentBranch' configuration variable to\n"
|
|
"'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:813
|
|
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:1883
|
|
msgid "quiet"
|
|
msgstr ""
|
|
|
|
#: builtin/receive-pack.c:1897
|
|
msgid "You must specify a directory."
|
|
msgstr ""
|
|
|
|
#: builtin/reflog.c:423
|
|
#, c-format
|
|
msgid "'%s' for '%s' is not a valid timestamp"
|
|
msgstr ""
|
|
|
|
#: builtin/reflog.c:540 builtin/reflog.c:545
|
|
#, c-format
|
|
msgid "'%s' is not a valid timestamp"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:12
|
|
msgid "git remote [-v | --verbose]"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:13
|
|
msgid ""
|
|
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
|
|
"mirror=<fetch|push>] <name> <url>"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:14 builtin/remote.c:34
|
|
msgid "git remote rename <old> <new>"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:15 builtin/remote.c:39
|
|
msgid "git remote remove <name>"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:16 builtin/remote.c:44
|
|
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:17
|
|
msgid "git remote [-v | --verbose] show [-n] <name>"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:18
|
|
msgid "git remote prune [-n | --dry-run] <name>"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:19
|
|
msgid ""
|
|
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:20
|
|
msgid "git remote set-branches [--add] <name> <branch>..."
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:21 builtin/remote.c:70
|
|
msgid "git remote get-url [--push] [--all] <name>"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:22 builtin/remote.c:75
|
|
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:23 builtin/remote.c:76
|
|
msgid "git remote set-url --add <name> <newurl>"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:24 builtin/remote.c:77
|
|
msgid "git remote set-url --delete <name> <url>"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:29
|
|
msgid "git remote add [<options>] <name> <url>"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:49
|
|
msgid "git remote set-branches <name> <branch>..."
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:50
|
|
msgid "git remote set-branches --add <name> <branch>..."
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:55
|
|
msgid "git remote show [<options>] <name>"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:60
|
|
msgid "git remote prune [<options>] <name>"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:65
|
|
msgid "git remote update [<options>] [<group> | <remote>]..."
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:94
|
|
#, c-format
|
|
msgid "Updating %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:126
|
|
msgid ""
|
|
"--mirror is dangerous and deprecated; please\n"
|
|
"\t use --mirror=fetch or --mirror=push instead"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:143
|
|
#, c-format
|
|
msgid "unknown mirror argument: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:159
|
|
msgid "fetch the remote branches"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:161
|
|
msgid "import all tags and associated objects when fetching"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:164
|
|
msgid "or do not fetch any tag at all (--no-tags)"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:166
|
|
msgid "branch(es) to track"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:167
|
|
msgid "master branch"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:168
|
|
msgid "push|fetch"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:169
|
|
msgid "set up remote as a mirror to push to or fetch from"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:181
|
|
msgid "specifying a master branch makes no sense with --mirror"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:183
|
|
msgid "specifying branches to track makes sense only with fetch mirrors"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:190 builtin/remote.c:629
|
|
#, c-format
|
|
msgid "remote %s already exists."
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:194 builtin/remote.c:633
|
|
#, c-format
|
|
msgid "'%s' is not a valid remote name"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:234
|
|
#, c-format
|
|
msgid "Could not setup master '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:336
|
|
#, c-format
|
|
msgid "Could not get fetch map for refspec %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:437 builtin/remote.c:445
|
|
msgid "(matching)"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:449
|
|
msgid "(delete)"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
|
|
#, c-format
|
|
msgid "No such remote: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:639
|
|
#, c-format
|
|
msgid "Could not rename config section '%s' to '%s'"
|
|
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."
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:695
|
|
#, c-format
|
|
msgid "deleting '%s' failed"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:729
|
|
#, c-format
|
|
msgid "creating '%s' failed"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:792
|
|
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:806
|
|
#, c-format
|
|
msgid "Could not remove config section '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:907
|
|
#, c-format
|
|
msgid " new (next fetch will store in remotes/%s)"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:910
|
|
msgid " tracked"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:912
|
|
msgid " stale (use 'git remote prune' to remove)"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:914
|
|
msgid " ???"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:955
|
|
#, c-format
|
|
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:963
|
|
#, c-format
|
|
msgid "rebases interactively onto remote %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:964
|
|
#, c-format
|
|
msgid "rebases onto remote %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:967
|
|
#, c-format
|
|
msgid " merges with remote %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:970
|
|
#, c-format
|
|
msgid "merges with remote %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:973
|
|
#, c-format
|
|
msgid "%-*s and with remote %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1016
|
|
msgid "create"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1019
|
|
msgid "delete"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1023
|
|
msgid "up to date"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1026
|
|
msgid "fast-forwardable"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1029
|
|
msgid "local out of date"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1036
|
|
#, c-format
|
|
msgid " %-*s forces to %-*s (%s)"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1039
|
|
#, c-format
|
|
msgid " %-*s pushes to %-*s (%s)"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1043
|
|
#, c-format
|
|
msgid " %-*s forces to %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1046
|
|
#, c-format
|
|
msgid " %-*s pushes to %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1114
|
|
msgid "do not query remotes"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1141
|
|
#, c-format
|
|
msgid "* remote %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1142
|
|
#, c-format
|
|
msgid " Fetch URL: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
|
|
msgid "(no URL)"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: the colon ':' should align with
|
|
#. the one in " Fetch URL: %s" translation
|
|
#: builtin/remote.c:1154 builtin/remote.c:1156
|
|
#, c-format
|
|
msgid " Push URL: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
|
|
#, c-format
|
|
msgid " HEAD branch: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1158
|
|
msgid "(not queried)"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1160
|
|
msgid "(unknown)"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1164
|
|
#, c-format
|
|
msgid ""
|
|
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1176
|
|
#, c-format
|
|
msgid " Remote branch:%s"
|
|
msgid_plural " Remote branches:%s"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/remote.c:1179 builtin/remote.c:1205
|
|
msgid " (status not queried)"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1188
|
|
msgid " Local branch configured for 'git pull':"
|
|
msgid_plural " Local branches configured for 'git pull':"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/remote.c:1196
|
|
msgid " Local refs will be mirrored by 'git push'"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1202
|
|
#, 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:1223
|
|
msgid "set refs/remotes/<name>/HEAD according to remote"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1225
|
|
msgid "delete refs/remotes/<name>/HEAD"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1240
|
|
msgid "Cannot determine remote HEAD"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1242
|
|
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1252
|
|
#, c-format
|
|
msgid "Could not delete %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1260
|
|
#, c-format
|
|
msgid "Not a valid ref: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1262
|
|
#, c-format
|
|
msgid "Could not setup %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1280
|
|
#, c-format
|
|
msgid " %s will become dangling!"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1281
|
|
#, c-format
|
|
msgid " %s has become dangling!"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1291
|
|
#, c-format
|
|
msgid "Pruning %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1292
|
|
#, c-format
|
|
msgid "URL: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1308
|
|
#, c-format
|
|
msgid " * [would prune] %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1311
|
|
#, c-format
|
|
msgid " * [pruned] %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1356
|
|
msgid "prune remotes after fetching"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
|
|
#, c-format
|
|
msgid "No such remote '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1435
|
|
msgid "add branch"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1442
|
|
msgid "no remote specified"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1459
|
|
msgid "query push URLs rather than fetch URLs"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1461
|
|
msgid "return all URLs"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1489
|
|
#, c-format
|
|
msgid "no URLs configured for remote '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1515
|
|
msgid "manipulate push URLs"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1517
|
|
msgid "add URL"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1519
|
|
msgid "delete URLs"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1526
|
|
msgid "--add --delete doesn't make sense"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1567
|
|
#, c-format
|
|
msgid "Invalid old URL pattern: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1575
|
|
#, c-format
|
|
msgid "No such URL found: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1577
|
|
msgid "Will not delete all non-push URLs"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1591
|
|
msgid "be verbose; must be placed before a subcommand"
|
|
msgstr ""
|
|
|
|
#: builtin/remote.c:1622
|
|
#, c-format
|
|
msgid "Unknown subcommand: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:17
|
|
msgid "git repack [<options>]"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:160
|
|
msgid "pack everything in a single pack"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:162
|
|
msgid "same as -a, and turn unreachable objects loose"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:165
|
|
msgid "remove redundant packs, and run git-prune-packed"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:167
|
|
msgid "pass --no-reuse-delta to git-pack-objects"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:169
|
|
msgid "pass --no-reuse-object to git-pack-objects"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:171
|
|
msgid "do not run git-update-server-info"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:174
|
|
msgid "pass --local to git-pack-objects"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:176
|
|
msgid "write bitmap index"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:177
|
|
msgid "approxidate"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:178
|
|
msgid "with -A, do not loosen objects older than this"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:180
|
|
msgid "with -a, repack unreachable objects"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:182
|
|
msgid "size of the window used for delta compression"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:183 builtin/repack.c:187
|
|
msgid "bytes"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:184
|
|
msgid "same as the above, but limit memory size instead of entries count"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:186
|
|
msgid "limits the maximum delta depth"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:188
|
|
msgid "maximum size of each packfile"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:190
|
|
msgid "repack objects in packs marked with .keep"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:200
|
|
msgid "cannot delete packs in a precious-objects repo"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:204
|
|
msgid "--keep-unreachable and -A are incompatible"
|
|
msgstr ""
|
|
|
|
#: builtin/repack.c:391 builtin/worktree.c:115
|
|
#, c-format
|
|
msgid "failed to remove '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:19
|
|
msgid "git replace [-f] <object> <replacement>"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:20
|
|
msgid "git replace [-f] --edit <object>"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:21
|
|
msgid "git replace [-f] --graft <commit> [<parent>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:22
|
|
msgid "git replace -d <object>..."
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:23
|
|
msgid "git replace [--format=<format>] [-l [<pattern>]]"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
|
|
#, c-format
|
|
msgid "Not a valid object name: '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:355
|
|
#, c-format
|
|
msgid "bad mergetag in commit '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:357
|
|
#, c-format
|
|
msgid "malformed mergetag in commit '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:368
|
|
#, c-format
|
|
msgid ""
|
|
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
|
|
"instead of --graft"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:401
|
|
#, c-format
|
|
msgid "the original commit '%s' has a gpg signature."
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:402
|
|
msgid "the signature will be removed in the replacement commit!"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:408
|
|
#, c-format
|
|
msgid "could not write replacement commit for: '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:432
|
|
msgid "list replace refs"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:433
|
|
msgid "delete replace refs"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:434
|
|
msgid "edit existing object"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:435
|
|
msgid "change a commit's parents"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:436
|
|
msgid "replace the ref if it exists"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:437
|
|
msgid "do not pretty-print contents for --edit"
|
|
msgstr ""
|
|
|
|
#: builtin/replace.c:438
|
|
msgid "use this format"
|
|
msgstr ""
|
|
|
|
#: builtin/rerere.c:12
|
|
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
|
|
msgstr ""
|
|
|
|
#: builtin/rerere.c:58
|
|
msgid "register clean resolutions in index"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:26
|
|
msgid ""
|
|
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:27
|
|
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:28
|
|
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:34
|
|
msgid "mixed"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:34
|
|
msgid "soft"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:34
|
|
msgid "hard"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:34
|
|
msgid "merge"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:34
|
|
msgid "keep"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:74
|
|
msgid "You do not have a valid HEAD."
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:76
|
|
msgid "Failed to find tree of HEAD."
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:82
|
|
#, c-format
|
|
msgid "Failed to find tree of %s."
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:100
|
|
#, c-format
|
|
msgid "HEAD is now at %s"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:183
|
|
#, c-format
|
|
msgid "Cannot do a %s reset in the middle of a merge."
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:276
|
|
msgid "be quiet, only report errors"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:278
|
|
msgid "reset HEAD and index"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:279
|
|
msgid "reset only HEAD"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:281 builtin/reset.c:283
|
|
msgid "reset HEAD, index and working tree"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:285
|
|
msgid "reset HEAD but keep local changes"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:288
|
|
msgid "record only the fact that removed paths will be added later"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:305
|
|
#, c-format
|
|
msgid "Failed to resolve '%s' as a valid revision."
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:313
|
|
#, c-format
|
|
msgid "Failed to resolve '%s' as a valid tree."
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:322
|
|
msgid "--patch is incompatible with --{hard,mixed,soft}"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:331
|
|
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:333
|
|
#, c-format
|
|
msgid "Cannot do %s reset with paths."
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:343
|
|
#, c-format
|
|
msgid "%s reset is not allowed in a bare repository"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:347
|
|
msgid "-N can only be used with --mixed"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:364
|
|
msgid "Unstaged changes after reset:"
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:370
|
|
#, c-format
|
|
msgid "Could not reset index file to revision '%s'."
|
|
msgstr ""
|
|
|
|
#: builtin/reset.c:374
|
|
msgid "Could not write new index file."
|
|
msgstr ""
|
|
|
|
#: builtin/rev-list.c:354
|
|
msgid "rev-list does not support display of notes"
|
|
msgstr ""
|
|
|
|
#: builtin/rev-parse.c:386
|
|
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/rev-parse.c:391
|
|
msgid "keep the `--` passed as an arg"
|
|
msgstr ""
|
|
|
|
#: builtin/rev-parse.c:393
|
|
msgid "stop parsing after the first non-option argument"
|
|
msgstr ""
|
|
|
|
#: builtin/rev-parse.c:396
|
|
msgid "output in stuck long form"
|
|
msgstr ""
|
|
|
|
#: builtin/rev-parse.c:527
|
|
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:22
|
|
msgid "git revert [<options>] <commit-ish>..."
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:23
|
|
msgid "git revert <subcommand>"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:28
|
|
msgid "git cherry-pick [<options>] <commit-ish>..."
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:29
|
|
msgid "git cherry-pick <subcommand>"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:71
|
|
#, c-format
|
|
msgid "%s: %s cannot be used with %s"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:80
|
|
msgid "end revert or cherry-pick sequence"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:81
|
|
msgid "resume revert or cherry-pick sequence"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:82
|
|
msgid "cancel revert or cherry-pick sequence"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:83
|
|
msgid "don't automatically commit"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:84
|
|
msgid "edit the commit message"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:87
|
|
msgid "parent number"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:89
|
|
msgid "merge strategy"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:90
|
|
msgid "option"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:91
|
|
msgid "option for merge strategy"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:100
|
|
msgid "append commit name"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:102
|
|
msgid "preserve initially empty commits"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:103
|
|
msgid "allow commits with empty messages"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:104
|
|
msgid "keep redundant, empty commits"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:192
|
|
msgid "revert failed"
|
|
msgstr ""
|
|
|
|
#: builtin/revert.c:205
|
|
msgid "cherry-pick failed"
|
|
msgstr ""
|
|
|
|
#: builtin/rm.c:17
|
|
msgid "git rm [<options>] [--] <file>..."
|
|
msgstr ""
|
|
|
|
#: builtin/rm.c:65
|
|
msgid ""
|
|
"the following submodule (or one of its nested submodules)\n"
|
|
"uses a .git directory:"
|
|
msgid_plural ""
|
|
"the following submodules (or one of their nested submodules)\n"
|
|
"use a .git directory:"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/rm.c:71
|
|
msgid ""
|
|
"\n"
|
|
"(use 'rm -rf' if you really want to remove it including all of its history)"
|
|
msgstr ""
|
|
|
|
#: builtin/rm.c:230
|
|
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:235
|
|
msgid ""
|
|
"\n"
|
|
"(use -f to force removal)"
|
|
msgstr ""
|
|
|
|
#: builtin/rm.c:239
|
|
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:243 builtin/rm.c:254
|
|
msgid ""
|
|
"\n"
|
|
"(use --cached to keep the file, or -f to force removal)"
|
|
msgstr ""
|
|
|
|
#: builtin/rm.c:251
|
|
msgid "the following file has local modifications:"
|
|
msgid_plural "the following files have local modifications:"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/rm.c:269
|
|
msgid "do not list removed files"
|
|
msgstr ""
|
|
|
|
#: builtin/rm.c:270
|
|
msgid "only remove from the index"
|
|
msgstr ""
|
|
|
|
#: builtin/rm.c:271
|
|
msgid "override the up-to-date check"
|
|
msgstr ""
|
|
|
|
#: builtin/rm.c:272
|
|
msgid "allow recursive removal"
|
|
msgstr ""
|
|
|
|
#: builtin/rm.c:274
|
|
msgid "exit with a zero status even if nothing matched"
|
|
msgstr ""
|
|
|
|
#: builtin/rm.c:335
|
|
#, c-format
|
|
msgid "not removing '%s' recursively without -r"
|
|
msgstr ""
|
|
|
|
#: builtin/rm.c:374
|
|
#, c-format
|
|
msgid "git rm: unable to remove %s"
|
|
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."
|
|
msgstr ""
|
|
|
|
#: builtin/send-pack.c:160
|
|
msgid "remote name"
|
|
msgstr ""
|
|
|
|
#: builtin/send-pack.c:171
|
|
msgid "use stateless RPC protocol"
|
|
msgstr ""
|
|
|
|
#: builtin/send-pack.c:172
|
|
msgid "read refs from stdin"
|
|
msgstr ""
|
|
|
|
#: builtin/send-pack.c:173
|
|
msgid "print status from remote helper"
|
|
msgstr ""
|
|
|
|
#: builtin/shortlog.c:13
|
|
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
|
|
msgstr ""
|
|
|
|
#: builtin/shortlog.c:242
|
|
msgid "sort output according to the number of commits per author"
|
|
msgstr ""
|
|
|
|
#: builtin/shortlog.c:244
|
|
msgid "Suppress commit descriptions, only provides commit count"
|
|
msgstr ""
|
|
|
|
#: builtin/shortlog.c:246
|
|
msgid "Show the email address of each author"
|
|
msgstr ""
|
|
|
|
#: builtin/shortlog.c:247
|
|
msgid "w[,i1[,i2]]"
|
|
msgstr ""
|
|
|
|
#: builtin/shortlog.c:248
|
|
msgid "Linewrap output"
|
|
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>)...]"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:14
|
|
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:375
|
|
#, c-format
|
|
msgid "ignoring %s; cannot handle more than %d ref"
|
|
msgid_plural "ignoring %s; cannot handle more than %d refs"
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/show-branch.c:541
|
|
#, c-format
|
|
msgid "no matching refs with %s"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:639
|
|
msgid "show remote-tracking and local branches"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:641
|
|
msgid "show remote-tracking branches"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:643
|
|
msgid "color '*!+-' corresponding to the branch"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:645
|
|
msgid "show <n> more commits after the common ancestor"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:647
|
|
msgid "synonym to more=-1"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:648
|
|
msgid "suppress naming strings"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:650
|
|
msgid "include the current branch"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:652
|
|
msgid "name commits with their object names"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:654
|
|
msgid "show possible merge bases"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:656
|
|
msgid "show refs unreachable from any other ref"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:658
|
|
msgid "show commits in topological order"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:661
|
|
msgid "show only commits not on the first branch"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:663
|
|
msgid "show merges reachable from only one tip"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:665
|
|
msgid "topologically sort, maintaining date order where possible"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:668
|
|
msgid "<n>[,<base>]"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:669
|
|
msgid "show <n> most recent ref-log entries starting at base"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:703
|
|
msgid ""
|
|
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:727
|
|
msgid "no branches given, and HEAD is not valid"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:730
|
|
msgid "--reflog option needs one branch name"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:733
|
|
#, c-format
|
|
msgid "only %d entry can be shown at one time."
|
|
msgid_plural "only %d entries can be shown at one time."
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/show-branch.c:737
|
|
#, c-format
|
|
msgid "no such ref %s"
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:829
|
|
#, c-format
|
|
msgid "cannot handle more than %d rev."
|
|
msgid_plural "cannot handle more than %d revs."
|
|
msgstr[0] ""
|
|
msgstr[1] ""
|
|
|
|
#: builtin/show-branch.c:833
|
|
#, c-format
|
|
msgid "'%s' is not a valid ref."
|
|
msgstr ""
|
|
|
|
#: builtin/show-branch.c:836
|
|
#, c-format
|
|
msgid "cannot find commit %s (%s)"
|
|
msgstr ""
|
|
|
|
#: builtin/show-ref.c:10
|
|
msgid ""
|
|
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
|
|
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/show-ref.c:11
|
|
msgid "git show-ref --exclude-existing[=<pattern>]"
|
|
msgstr ""
|
|
|
|
#: builtin/show-ref.c:165
|
|
msgid "only show tags (can be combined with heads)"
|
|
msgstr ""
|
|
|
|
#: builtin/show-ref.c:166
|
|
msgid "only show heads (can be combined with tags)"
|
|
msgstr ""
|
|
|
|
#: builtin/show-ref.c:167
|
|
msgid "stricter reference checking, requires exact ref path"
|
|
msgstr ""
|
|
|
|
#: builtin/show-ref.c:170 builtin/show-ref.c:172
|
|
msgid "show the HEAD reference, even if it would be filtered out"
|
|
msgstr ""
|
|
|
|
#: builtin/show-ref.c:174
|
|
msgid "dereference tags into object IDs"
|
|
msgstr ""
|
|
|
|
#: builtin/show-ref.c:176
|
|
msgid "only show SHA1 hash using <n> digits"
|
|
msgstr ""
|
|
|
|
#: builtin/show-ref.c:180
|
|
msgid "do not print results to stdout (useful with --verify)"
|
|
msgstr ""
|
|
|
|
#: builtin/show-ref.c:182
|
|
msgid "show refs from stdin that aren't in local repository"
|
|
msgstr ""
|
|
|
|
#: builtin/stripspace.c:17
|
|
msgid "git stripspace [-s | --strip-comments]"
|
|
msgstr ""
|
|
|
|
#: builtin/stripspace.c:18
|
|
msgid "git stripspace [-c | --comment-lines]"
|
|
msgstr ""
|
|
|
|
#: builtin/stripspace.c:35
|
|
msgid "skip and remove all lines starting with comment character"
|
|
msgstr ""
|
|
|
|
#: builtin/stripspace.c:38
|
|
msgid "prepend comment character and space to each line"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
|
|
#, c-format
|
|
msgid "No such ref: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
|
|
#, c-format
|
|
msgid "Expecting a full ref name, got %s"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:71
|
|
#, c-format
|
|
msgid "cannot strip one component off url '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
|
|
#: builtin/submodule--helper.c:590
|
|
msgid "alternative anchor for relative paths"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:287
|
|
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
|
|
#, c-format
|
|
msgid "No url found for submodule path '%s' in .gitmodules"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:369
|
|
#, c-format
|
|
msgid "Failed to register url for submodule path '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:373
|
|
#, c-format
|
|
msgid "Submodule '%s' (%s) registered for path '%s'\n"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:383
|
|
#, c-format
|
|
msgid "warning: command update mode suggested for submodule '%s'\n"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:390
|
|
#, c-format
|
|
msgid "Failed to register update mode for submodule path '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:409
|
|
msgid "Suppress output for initializing a submodule"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:414
|
|
msgid "git submodule--helper init [<path>]"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:435
|
|
msgid "git submodule--helper name <path>"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:441
|
|
#, c-format
|
|
msgid "no submodule mapping found in .gitmodules for path '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
|
|
#, c-format
|
|
msgid "submodule '%s' cannot add alternate: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:563
|
|
#, c-format
|
|
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:570
|
|
#, c-format
|
|
msgid "Value '%s' for submodule.alternateLocation is not recognized"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:593
|
|
msgid "where the new submodule will be cloned to"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:596
|
|
msgid "name of the new submodule"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:599
|
|
msgid "url where to clone the submodule from"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:605
|
|
msgid "depth for shallow clones"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
|
|
msgid "force cloning progress"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:613
|
|
msgid ""
|
|
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
|
|
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
|
|
#, c-format
|
|
msgid "could not create directory '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:644
|
|
#, c-format
|
|
msgid "clone of '%s' into submodule path '%s' failed"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:660
|
|
#, c-format
|
|
msgid "cannot open file '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:665
|
|
#, c-format
|
|
msgid "could not close file %s"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:672
|
|
#, c-format
|
|
msgid "could not get submodule directory for '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:726
|
|
#, c-format
|
|
msgid "Submodule path '%s' not initialized"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:730
|
|
msgid "Maybe you want to use 'update --init'?"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:756
|
|
#, c-format
|
|
msgid "Skipping unmerged submodule %s"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:777
|
|
#, c-format
|
|
msgid "Skipping submodule '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:913
|
|
#, c-format
|
|
msgid "Failed to clone '%s'. Retry scheduled"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:924
|
|
#, c-format
|
|
msgid "Failed to clone '%s' a second time, aborting"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:945
|
|
msgid "path into the working tree"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:948
|
|
msgid "path into the working tree, across nested submodule boundaries"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:952
|
|
msgid "rebase, merge, checkout or none"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:956
|
|
msgid "Create a shallow clone truncated to the specified number of revisions"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:959
|
|
msgid "parallel jobs"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:961
|
|
msgid "whether the initial clone should follow the shallow recommendation"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:962
|
|
msgid "don't print cloning progress"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:969
|
|
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:979
|
|
msgid "bad value for update parameter"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:1050
|
|
#, c-format
|
|
msgid ""
|
|
"Submodule (%s) branch configured to inherit branch from superproject, but "
|
|
"the superproject is not on any branch"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:1100
|
|
msgid "submodule--helper subcommand must be called with a subcommand"
|
|
msgstr ""
|
|
|
|
#: builtin/submodule--helper.c:1107
|
|
#, c-format
|
|
msgid "'%s' is not a valid submodule--helper subcommand"
|
|
msgstr ""
|
|
|
|
#: builtin/symbolic-ref.c:7
|
|
msgid "git symbolic-ref [<options>] <name> [<ref>]"
|
|
msgstr ""
|
|
|
|
#: builtin/symbolic-ref.c:8
|
|
msgid "git symbolic-ref -d [-q] <name>"
|
|
msgstr ""
|
|
|
|
#: builtin/symbolic-ref.c:40
|
|
msgid "suppress error message for non-symbolic (detached) refs"
|
|
msgstr ""
|
|
|
|
#: builtin/symbolic-ref.c:41
|
|
msgid "delete symbolic ref"
|
|
msgstr ""
|
|
|
|
#: builtin/symbolic-ref.c:42
|
|
msgid "shorten ref output"
|
|
msgstr ""
|
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
|
|
msgid "reason"
|
|
msgstr ""
|
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
|
|
msgid "reason of the update"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:23
|
|
msgid ""
|
|
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
|
|
"[<head>]"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:24
|
|
msgid "git tag -d <tagname>..."
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:25
|
|
msgid ""
|
|
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
|
|
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:27
|
|
msgid "git tag -v <tagname>..."
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:81
|
|
#, c-format
|
|
msgid "tag name too long: %.*s..."
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:86
|
|
#, c-format
|
|
msgid "tag '%s' not found."
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:101
|
|
#, c-format
|
|
msgid "Deleted tag '%s' (was %s)\n"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:117
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"Write a message for tag:\n"
|
|
" %s\n"
|
|
"Lines starting with '%c' will be ignored.\n"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:121
|
|
#, 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/tag.c:199
|
|
msgid "unable to sign the tag"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:201
|
|
msgid "unable to write tag file"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:226
|
|
msgid "bad object type."
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:239
|
|
msgid "tag header too big."
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:275
|
|
msgid "no tag message?"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:281
|
|
#, c-format
|
|
msgid "The tag message has been left in %s\n"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:339
|
|
msgid "list tag names"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:341
|
|
msgid "print <n> lines of each tag message"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:343
|
|
msgid "delete tags"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:344
|
|
msgid "verify tags"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:346
|
|
msgid "Tag creation options"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:348
|
|
msgid "annotated tag, needs a message"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:350
|
|
msgid "tag message"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:352
|
|
msgid "annotated and GPG-signed tag"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:356
|
|
msgid "use another key to sign the tag"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:357
|
|
msgid "replace the tag if exists"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:358 builtin/update-ref.c:368
|
|
msgid "create a reflog"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:360
|
|
msgid "Tag listing options"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:361
|
|
msgid "show tag list in columns"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:362 builtin/tag.c:363
|
|
msgid "print only tags that contain the commit"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:364
|
|
msgid "print only tags that are merged"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:365
|
|
msgid "print only tags that are not merged"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:370
|
|
msgid "print only tags of the object"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:399
|
|
msgid "--column and -n are incompatible"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:419
|
|
msgid "-n option is only allowed with -l."
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:421
|
|
msgid "--contains option is only allowed with -l."
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:423
|
|
msgid "--points-at option is only allowed with -l."
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:425
|
|
msgid "--merged and --no-merged option are only allowed with -l"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:433
|
|
msgid "only one -F or -m option is allowed."
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:452
|
|
msgid "too many params"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:458
|
|
#, c-format
|
|
msgid "'%s' is not a valid tag name."
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:463
|
|
#, c-format
|
|
msgid "tag '%s' already exists"
|
|
msgstr ""
|
|
|
|
#: builtin/tag.c:491
|
|
#, c-format
|
|
msgid "Updated tag '%s' (was %s)\n"
|
|
msgstr ""
|
|
|
|
#: builtin/unpack-objects.c:493
|
|
msgid "Unpacking objects"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:79
|
|
#, c-format
|
|
msgid "failed to create directory %s"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:85
|
|
#, c-format
|
|
msgid "failed to stat %s"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:95
|
|
#, c-format
|
|
msgid "failed to create file %s"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:103
|
|
#, c-format
|
|
msgid "failed to delete file %s"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:110 builtin/update-index.c:212
|
|
#, c-format
|
|
msgid "failed to delete directory %s"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:133
|
|
#, c-format
|
|
msgid "Testing mtime in '%s' "
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:145
|
|
msgid "directory stat info does not change after adding a new file"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:158
|
|
msgid "directory stat info does not change after adding a new directory"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:171
|
|
msgid "directory stat info changes after updating a file"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:182
|
|
msgid "directory stat info changes after adding a file inside subdirectory"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:193
|
|
msgid "directory stat info does not change after deleting a file"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:206
|
|
msgid "directory stat info does not change after deleting a directory"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:213
|
|
msgid " OK"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:564
|
|
msgid "git update-index [<options>] [--] [<file>...]"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:919
|
|
msgid "continue refresh even when index needs update"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:922
|
|
msgid "refresh: ignore submodules"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:925
|
|
msgid "do not ignore new files"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:927
|
|
msgid "let files replace directories and vice-versa"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:929
|
|
msgid "notice files missing from worktree"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:931
|
|
msgid "refresh even if index contains unmerged entries"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:934
|
|
msgid "refresh stat information"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:938
|
|
msgid "like --refresh, but ignore assume-unchanged setting"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:942
|
|
msgid "<mode>,<object>,<path>"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:943
|
|
msgid "add the specified entry to the index"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:952
|
|
msgid "mark files as \"not changing\""
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:955
|
|
msgid "clear assumed-unchanged bit"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:958
|
|
msgid "mark files as \"index-only\""
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:961
|
|
msgid "clear skip-worktree bit"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:964
|
|
msgid "add to index only; do not add content to object database"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:966
|
|
msgid "remove named paths even if present in worktree"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:968
|
|
msgid "with --stdin: input lines are terminated by null bytes"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:970
|
|
msgid "read list of paths to be updated from standard input"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:974
|
|
msgid "add entries from standard input to the index"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:978
|
|
msgid "repopulate stages #2 and #3 for the listed paths"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:982
|
|
msgid "only update entries that differ from HEAD"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:986
|
|
msgid "ignore files missing from worktree"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:989
|
|
msgid "report actions to standard output"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:991
|
|
msgid "(for porcelains) forget saved unresolved conflicts"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:995
|
|
msgid "write index in this format"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:997
|
|
msgid "enable or disable split index"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:999
|
|
msgid "enable/disable untracked cache"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:1001
|
|
msgid "test if the filesystem supports untracked cache"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:1003
|
|
msgid "enable untracked cache without testing the filesystem"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:1119
|
|
msgid ""
|
|
"core.untrackedCache is set to true; remove or change it, if you really want "
|
|
"to disable the untracked cache"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:1123
|
|
msgid "Untracked cache disabled"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:1131
|
|
msgid ""
|
|
"core.untrackedCache is set to false; remove or change it, if you really want "
|
|
"to enable the untracked cache"
|
|
msgstr ""
|
|
|
|
#: builtin/update-index.c:1135
|
|
#, c-format
|
|
msgid "Untracked cache enabled for '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/update-ref.c:9
|
|
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
|
|
msgstr ""
|
|
|
|
#: builtin/update-ref.c:10
|
|
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
|
|
msgstr ""
|
|
|
|
#: builtin/update-ref.c:11
|
|
msgid "git update-ref [<options>] --stdin [-z]"
|
|
msgstr ""
|
|
|
|
#: builtin/update-ref.c:363
|
|
msgid "delete the reference"
|
|
msgstr ""
|
|
|
|
#: builtin/update-ref.c:365
|
|
msgid "update <refname> not the one it points to"
|
|
msgstr ""
|
|
|
|
#: builtin/update-ref.c:366
|
|
msgid "stdin has NUL-terminated arguments"
|
|
msgstr ""
|
|
|
|
#: builtin/update-ref.c:367
|
|
msgid "read updates from stdin"
|
|
msgstr ""
|
|
|
|
#: builtin/update-server-info.c:6
|
|
msgid "git update-server-info [--force]"
|
|
msgstr ""
|
|
|
|
#: builtin/update-server-info.c:14
|
|
msgid "update the info files from scratch"
|
|
msgstr ""
|
|
|
|
#: builtin/verify-commit.c:17
|
|
msgid "git verify-commit [-v | --verbose] <commit>..."
|
|
msgstr ""
|
|
|
|
#: builtin/verify-commit.c:72
|
|
msgid "print commit contents"
|
|
msgstr ""
|
|
|
|
#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
|
|
msgid "print raw gpg status output"
|
|
msgstr ""
|
|
|
|
#: builtin/verify-pack.c:54
|
|
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
|
|
msgstr ""
|
|
|
|
#: builtin/verify-pack.c:64
|
|
msgid "verbose"
|
|
msgstr ""
|
|
|
|
#: builtin/verify-pack.c:66
|
|
msgid "show statistics only"
|
|
msgstr ""
|
|
|
|
#: builtin/verify-tag.c:17
|
|
msgid "git verify-tag [-v | --verbose] <tag>..."
|
|
msgstr ""
|
|
|
|
#: builtin/verify-tag.c:34
|
|
msgid "print tag contents"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:15
|
|
msgid "git worktree add [<options>] <path> [<branch>]"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:16
|
|
msgid "git worktree list [<options>]"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:17
|
|
msgid "git worktree lock [<options>] <path>"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:18
|
|
msgid "git worktree prune [<options>]"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:19
|
|
msgid "git worktree unlock <path>"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:42
|
|
#, c-format
|
|
msgid "Removing worktrees/%s: not a valid directory"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:48
|
|
#, c-format
|
|
msgid "Removing worktrees/%s: gitdir file does not exist"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:53
|
|
#, c-format
|
|
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:64
|
|
#, c-format
|
|
msgid "Removing worktrees/%s: invalid gitdir file"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:80
|
|
#, c-format
|
|
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:204
|
|
#, c-format
|
|
msgid "'%s' already exists"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:236
|
|
#, c-format
|
|
msgid "could not create directory of '%s'"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:272
|
|
#, c-format
|
|
msgid "Preparing %s (identifier %s)"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:323
|
|
msgid "checkout <branch> even if already checked out in other worktree"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:325
|
|
msgid "create a new branch"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:327
|
|
msgid "create or reset a branch"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:329
|
|
msgid "populate the new working tree"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:337
|
|
msgid "-b, -B, and --detach are mutually exclusive"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:470
|
|
msgid "reason for locking"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:482 builtin/worktree.c:515
|
|
#, c-format
|
|
msgid "'%s' is not a working tree"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:484 builtin/worktree.c:517
|
|
msgid "The main working tree cannot be locked or unlocked"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:489
|
|
#, c-format
|
|
msgid "'%s' is already locked, reason: %s"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:491
|
|
#, c-format
|
|
msgid "'%s' is already locked"
|
|
msgstr ""
|
|
|
|
#: builtin/worktree.c:519
|
|
#, c-format
|
|
msgid "'%s' is not locked"
|
|
msgstr ""
|
|
|
|
#: builtin/write-tree.c:13
|
|
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
|
msgstr ""
|
|
|
|
#: builtin/write-tree.c:26
|
|
msgid "<prefix>/"
|
|
msgstr ""
|
|
|
|
#: builtin/write-tree.c:27
|
|
msgid "write tree object for a subdirectory <prefix>"
|
|
msgstr ""
|
|
|
|
#: builtin/write-tree.c:30
|
|
msgid "only useful for debugging"
|
|
msgstr ""
|
|
|
|
#: upload-pack.c:22
|
|
msgid "git upload-pack [<options>] <dir>"
|
|
msgstr ""
|
|
|
|
#: upload-pack.c:1028
|
|
msgid "quit after a single request/response exchange"
|
|
msgstr ""
|
|
|
|
#: upload-pack.c:1030
|
|
msgid "exit immediately after initial ref advertisement"
|
|
msgstr ""
|
|
|
|
#: upload-pack.c:1032
|
|
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
|
|
msgstr ""
|
|
|
|
#: upload-pack.c:1034
|
|
msgid "interrupt transfer after <n> seconds of inactivity"
|
|
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"
|
|
msgstr ""
|
|
|
|
#: credential-cache--daemon.c:271
|
|
msgid "print debugging messages to stderr"
|
|
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."
|
|
msgstr ""
|
|
|
|
#: http.c:342
|
|
msgid "Delegation control is not supported with cURL < 7.22.0"
|
|
msgstr ""
|
|
|
|
#: http.c:351
|
|
msgid "Public key pinning not supported with cURL < 7.44.0"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:9
|
|
msgid "start a working area (see also: git help tutorial)"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:10
|
|
msgid "work on the current change (see also: git help everyday)"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:11
|
|
msgid "examine the history and state (see also: git help revisions)"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:12
|
|
msgid "grow, mark and tweak your common history"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:13
|
|
msgid "collaborate (see also: git help workflows)"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:17
|
|
msgid "Add file contents to the index"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:18
|
|
msgid "Use binary search to find the commit that introduced a bug"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:19
|
|
msgid "List, create, or delete branches"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:20
|
|
msgid "Switch branches or restore working tree files"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:21
|
|
msgid "Clone a repository into a new directory"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:22
|
|
msgid "Record changes to the repository"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:23
|
|
msgid "Show changes between commits, commit and working tree, etc"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:24
|
|
msgid "Download objects and refs from another repository"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:25
|
|
msgid "Print lines matching a pattern"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:26
|
|
msgid "Create an empty Git repository or reinitialize an existing one"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:27
|
|
msgid "Show commit logs"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:28
|
|
msgid "Join two or more development histories together"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:29
|
|
msgid "Move or rename a file, a directory, or a symlink"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:30
|
|
msgid "Fetch from and integrate with another repository or a local branch"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:31
|
|
msgid "Update remote refs along with associated objects"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:32
|
|
msgid "Reapply commits on top of another base tip"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:33
|
|
msgid "Reset current HEAD to the specified state"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:34
|
|
msgid "Remove files from the working tree and from the index"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:35
|
|
msgid "Show various types of objects"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:36
|
|
msgid "Show the working tree status"
|
|
msgstr ""
|
|
|
|
#: common-cmds.h:37
|
|
msgid "Create, list, delete or verify a tag object signed with GPG"
|
|
msgstr ""
|
|
|
|
#: parse-options.h:145
|
|
msgid "expiry-date"
|
|
msgstr ""
|
|
|
|
#: parse-options.h:160
|
|
msgid "no-op (backward compatibility)"
|
|
msgstr ""
|
|
|
|
#: parse-options.h:238
|
|
msgid "be more verbose"
|
|
msgstr ""
|
|
|
|
#: parse-options.h:240
|
|
msgid "be more quiet"
|
|
msgstr ""
|
|
|
|
#: parse-options.h:246
|
|
msgid "use <n> digits to display SHA-1s"
|
|
msgstr ""
|
|
|
|
#: rerere.h:40
|
|
msgid "update the index with reused conflict resolution if possible"
|
|
msgstr ""
|
|
|
|
#: 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:60
|
|
msgid "Do you want me to do it for you [Y/n]? "
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:121
|
|
#, sh-format
|
|
msgid "unrecognised option: '$arg'"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:125
|
|
#, sh-format
|
|
msgid "'$arg' does not appear to be a valid revision"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:154
|
|
msgid "Bad HEAD - I need a HEAD"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:167
|
|
#, sh-format
|
|
msgid ""
|
|
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:177
|
|
msgid "won't bisect on cg-seek'ed tree"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:181
|
|
msgid "Bad HEAD - strange symbolic ref"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:233
|
|
#, sh-format
|
|
msgid "Bad bisect_write argument: $state"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:262
|
|
#, sh-format
|
|
msgid "Bad rev input: $arg"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:281
|
|
#, sh-format
|
|
msgid "Bad rev input: $bisected_head"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:290
|
|
#, sh-format
|
|
msgid "Bad rev input: $rev"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:299
|
|
#, sh-format
|
|
msgid "'git bisect $TERM_BAD' can take only one argument."
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:322
|
|
#, sh-format
|
|
msgid "Warning: bisecting only with a $TERM_BAD commit."
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
#. translation. The program will only accept English input
|
|
#. at this point.
|
|
#: git-bisect.sh:328
|
|
msgid "Are you sure [Y/n]? "
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:340
|
|
#, sh-format
|
|
msgid ""
|
|
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
|
|
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:343
|
|
#, 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."
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:421
|
|
#, sh-format
|
|
msgid "'$invalid' is not a valid commit"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:430
|
|
#, sh-format
|
|
msgid ""
|
|
"Could not check out original HEAD '$branch'.\n"
|
|
"Try 'git bisect reset <commit>'."
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:458
|
|
msgid "No logfile given"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:459
|
|
#, sh-format
|
|
msgid "cannot read $file for replaying"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:480
|
|
msgid "?? what are you talking about?"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:492
|
|
#, sh-format
|
|
msgid "running $command"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:499
|
|
#, sh-format
|
|
msgid ""
|
|
"bisect run failed:\n"
|
|
"exit code $res from '$command' is < 0 or >= 128"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:525
|
|
msgid "bisect run cannot continue any more"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:531
|
|
#, sh-format
|
|
msgid ""
|
|
"bisect run failed:\n"
|
|
"'bisect_state $state' exited with error code $res"
|
|
msgstr ""
|
|
|
|
#: git-bisect.sh:538
|
|
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."
|
|
msgstr ""
|
|
|
|
#: git-merge-octopus.sh:46
|
|
msgid ""
|
|
"Error: Your local changes to the following files would be overwritten by "
|
|
"merge"
|
|
msgstr ""
|
|
|
|
#: git-merge-octopus.sh:61
|
|
msgid "Automated merge did not work."
|
|
msgstr ""
|
|
|
|
#: git-merge-octopus.sh:62
|
|
msgid "Should not be doing an octopus."
|
|
msgstr ""
|
|
|
|
#: git-merge-octopus.sh:73
|
|
#, sh-format
|
|
msgid "Unable to find common commit with $pretty_name"
|
|
msgstr ""
|
|
|
|
#: git-merge-octopus.sh:77
|
|
#, sh-format
|
|
msgid "Already up-to-date with $pretty_name"
|
|
msgstr ""
|
|
|
|
#: git-merge-octopus.sh:89
|
|
#, sh-format
|
|
msgid "Fast-forwarding to: $pretty_name"
|
|
msgstr ""
|
|
|
|
#: git-merge-octopus.sh:97
|
|
#, sh-format
|
|
msgid "Trying simple merge with $pretty_name"
|
|
msgstr ""
|
|
|
|
#: git-merge-octopus.sh:102
|
|
msgid "Simple merge did not work, trying automatic merge."
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:56
|
|
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:156 git-rebase.sh:395
|
|
#, sh-format
|
|
msgid "Could not move back to $head_name"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:167
|
|
msgid "Applied autostash."
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:170
|
|
#, sh-format
|
|
msgid "Cannot store $stash_sha1"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:171
|
|
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 ""
|
|
|
|
#: git-rebase.sh:210
|
|
msgid "The pre-rebase hook refused to rebase."
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:215
|
|
msgid "It looks like git-am is in progress. Cannot rebase."
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:356
|
|
msgid "No rebase in progress?"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:367
|
|
msgid "The --edit-todo action can only be used during interactive rebase."
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:374
|
|
msgid "Cannot read HEAD"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:377
|
|
msgid ""
|
|
"You must edit all merge conflicts and then\n"
|
|
"mark them as resolved using git add"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:414
|
|
#, 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."
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:465
|
|
#, sh-format
|
|
msgid "invalid upstream $upstream_name"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:489
|
|
#, sh-format
|
|
msgid "$onto_name: there are more than one merge bases"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:492 git-rebase.sh:496
|
|
#, sh-format
|
|
msgid "$onto_name: there is no merge base"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:501
|
|
#, sh-format
|
|
msgid "Does not point to a valid commit: $onto_name"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:524
|
|
#, sh-format
|
|
msgid "fatal: no such branch: $branch_name"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:557
|
|
msgid "Cannot autostash"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:562
|
|
#, sh-format
|
|
msgid "Created autostash: $stash_abbrev"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:566
|
|
msgid "Please commit or stash them."
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:586
|
|
#, sh-format
|
|
msgid "Current branch $branch_name is up to date."
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:590
|
|
#, sh-format
|
|
msgid "Current branch $branch_name is up to date, rebase forced."
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:601
|
|
#, sh-format
|
|
msgid "Changes from $mb to $onto:"
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:610
|
|
msgid "First, rewinding head to replay your work on top of it..."
|
|
msgstr ""
|
|
|
|
#: git-rebase.sh:620
|
|
#, sh-format
|
|
msgid "Fast-forwarded $branch_name to $onto_name."
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:50
|
|
msgid "git stash clear with parameters is unimplemented"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:73
|
|
msgid "You do not have the initial commit yet"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:88
|
|
msgid "Cannot save the current index state"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:103
|
|
msgid "Cannot save the untracked files"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:123 git-stash.sh:136
|
|
msgid "Cannot save the current worktree state"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:140
|
|
msgid "No changes selected"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:143
|
|
msgid "Cannot remove temporary index (can't happen)"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:156
|
|
msgid "Cannot record working tree state"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:188
|
|
#, 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:238
|
|
#, sh-format
|
|
msgid ""
|
|
"error: unknown option for 'stash save': $option\n"
|
|
" To provide a message, use git stash save -- '$option'"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:251
|
|
msgid "Can't use --patch and --include-untracked or --all at the same time"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:259
|
|
msgid "No local changes to save"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:263
|
|
msgid "Cannot initialize stash"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:267
|
|
msgid "Cannot save the current status"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:268
|
|
#, sh-format
|
|
msgid "Saved working directory and index state $stash_msg"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:285
|
|
msgid "Cannot remove worktree changes"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:403
|
|
#, sh-format
|
|
msgid "unknown option: $opt"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:416
|
|
msgid "No stash found."
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:423
|
|
#, sh-format
|
|
msgid "Too many revisions specified: $REV"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:438
|
|
#, sh-format
|
|
msgid "$reference is not a valid reference"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:466
|
|
#, sh-format
|
|
msgid "'$args' is not a stash-like commit"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:477
|
|
#, sh-format
|
|
msgid "'$args' is not a stash reference"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:485
|
|
msgid "unable to refresh index"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:489
|
|
msgid "Cannot apply a stash in the middle of a merge"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:497
|
|
msgid "Conflicts in index. Try without --index."
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:499
|
|
msgid "Could not save index tree"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:508
|
|
msgid "Could not restore untracked files from stash"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:533
|
|
msgid "Cannot unstage modified files"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:548
|
|
msgid "Index was not unstashed."
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:562
|
|
msgid "The stash is kept in case you need it again."
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:571
|
|
#, sh-format
|
|
msgid "Dropped ${REV} ($s)"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:572
|
|
#, sh-format
|
|
msgid "${REV}: Could not drop stash entry"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:580
|
|
msgid "No branch name specified"
|
|
msgstr ""
|
|
|
|
#: git-stash.sh:652
|
|
msgid "(To restore them type \"git stash apply\")"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:184
|
|
msgid "Relative path can only be used from the toplevel of the working tree"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:194
|
|
#, sh-format
|
|
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:211
|
|
#, sh-format
|
|
msgid "'$sm_path' already exists in the index"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:215
|
|
#, sh-format
|
|
msgid ""
|
|
"The following path is ignored by one of your .gitignore files:\n"
|
|
"$sm_path\n"
|
|
"Use -f if you really want to add it."
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:233
|
|
#, sh-format
|
|
msgid "Adding existing repo at '$sm_path' to the index"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:235
|
|
#, sh-format
|
|
msgid "'$sm_path' already exists and is not a valid git repo"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:243
|
|
#, sh-format
|
|
msgid "A git directory for '$sm_name' is found locally with remote(s):"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:245
|
|
#, sh-format
|
|
msgid ""
|
|
"If you want to reuse this local git directory instead of cloning again from\n"
|
|
" $realrepo\n"
|
|
"use the '--force' option. If the local git directory is not the correct "
|
|
"repo\n"
|
|
"or you are unsure what this means choose another name with the '--name' "
|
|
"option."
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:251
|
|
#, sh-format
|
|
msgid "Reactivating local git directory for submodule '$sm_name'."
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:263
|
|
#, sh-format
|
|
msgid "Unable to checkout submodule '$sm_path'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:268
|
|
#, sh-format
|
|
msgid "Failed to add submodule '$sm_path'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:277
|
|
#, sh-format
|
|
msgid "Failed to register submodule '$sm_path'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:324
|
|
#, sh-format
|
|
msgid "Entering '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:344
|
|
#, sh-format
|
|
msgid "Stopping at '$displaypath'; script returned non-zero status."
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:415
|
|
#, sh-format
|
|
msgid "pathspec and --all are incompatible"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:420
|
|
#, sh-format
|
|
msgid "Use '--all' if you really want to deinitialize all submodules"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:440
|
|
#, 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:448
|
|
#, sh-format
|
|
msgid ""
|
|
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
|
|
"discard them"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:451
|
|
#, sh-format
|
|
msgid "Cleared directory '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:452
|
|
#, sh-format
|
|
msgid "Could not remove submodule work tree '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:455
|
|
#, sh-format
|
|
msgid "Could not create empty submodule directory '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:464
|
|
#, sh-format
|
|
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:617
|
|
#, sh-format
|
|
msgid "Unable to find current revision in submodule path '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:627
|
|
#, sh-format
|
|
msgid "Unable to fetch in submodule path '$sm_path'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:632
|
|
#, sh-format
|
|
msgid ""
|
|
"Unable to find current ${remote_name}/${branch} revision in submodule path "
|
|
"'$sm_path'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:650
|
|
#, sh-format
|
|
msgid "Unable to fetch in submodule path '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:656
|
|
#, sh-format
|
|
msgid ""
|
|
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
|
|
"Direct fetching of that commit failed."
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:663
|
|
#, sh-format
|
|
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:664
|
|
#, sh-format
|
|
msgid "Submodule path '$displaypath': checked out '$sha1'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:668
|
|
#, sh-format
|
|
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:669
|
|
#, sh-format
|
|
msgid "Submodule path '$displaypath': rebased into '$sha1'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:674
|
|
#, sh-format
|
|
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:675
|
|
#, sh-format
|
|
msgid "Submodule path '$displaypath': merged in '$sha1'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:680
|
|
#, sh-format
|
|
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:681
|
|
#, sh-format
|
|
msgid "Submodule path '$displaypath': '$command $sha1'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:712
|
|
#, sh-format
|
|
msgid "Failed to recurse into submodule path '$displaypath'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:820
|
|
msgid "The --cached option cannot be used with the --files option"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:872
|
|
#, sh-format
|
|
msgid "unexpected mode $mod_dst"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:892
|
|
#, sh-format
|
|
msgid " Warn: $display_name doesn't contain commit $sha1_src"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:895
|
|
#, sh-format
|
|
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:898
|
|
#, sh-format
|
|
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:1045
|
|
#, sh-format
|
|
msgid "Failed to recurse into submodule path '$sm_path'"
|
|
msgstr ""
|
|
|
|
#: git-submodule.sh:1112
|
|
#, 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
|
|
#, sh-format
|
|
msgid "Rebasing ($new_count/$total)"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:156
|
|
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"
|
|
"\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
|
|
#, sh-format
|
|
msgid ""
|
|
"You can amend the commit now, with\n"
|
|
"\n"
|
|
"\tgit commit --amend $gpg_sign_opt_quoted\n"
|
|
"\n"
|
|
"Once you are satisfied with your changes, run\n"
|
|
"\n"
|
|
"\tgit rebase --continue"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:236
|
|
#, sh-format
|
|
msgid "$sha1: not a commit that can be picked"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:275
|
|
#, sh-format
|
|
msgid "Invalid commit name: $sha1"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:317
|
|
msgid "Cannot write current commit's replacement sha1"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:369
|
|
#, sh-format
|
|
msgid "Fast-forward to $sha1"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:371
|
|
#, sh-format
|
|
msgid "Cannot fast-forward to $sha1"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:380
|
|
#, sh-format
|
|
msgid "Cannot move HEAD to $first_parent"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:385
|
|
#, sh-format
|
|
msgid "Refusing to squash a merge: $sha1"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:399
|
|
#, sh-format
|
|
msgid "Error redoing merge $sha1"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:407
|
|
#, sh-format
|
|
msgid "Could not pick $sha1"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:416
|
|
#, sh-format
|
|
msgid "This is the commit message #${n}:"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:421
|
|
#, sh-format
|
|
msgid "The commit message #${n} will be skipped:"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:432
|
|
#, 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:440
|
|
#, sh-format
|
|
msgid "Cannot write $fixup_msg"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:443
|
|
msgid "This is a combination of 2 commits."
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:444
|
|
msgid "This is the 1st commit message:"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527
|
|
#: git-rebase--interactive.sh:530
|
|
#, sh-format
|
|
msgid "Could not apply $sha1... $rest"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:558
|
|
#, sh-format
|
|
msgid ""
|
|
"Could not amend commit after successfully picking $sha1... $rest\n"
|
|
"This is most likely due to an empty commit message, or the pre-commit hook\n"
|
|
"failed. If the pre-commit hook failed, you may need to resolve the issue "
|
|
"before\n"
|
|
"you are able to reword the commit."
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:573
|
|
#, sh-format
|
|
msgid "Stopped at $sha1_abbrev... $rest"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:588
|
|
#, sh-format
|
|
msgid "Cannot '$squash_style' without a previous commit"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:630
|
|
#, sh-format
|
|
msgid "Executing: $rest"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:638
|
|
#, sh-format
|
|
msgid "Execution failed: $rest"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:640
|
|
msgid "and made changes to the index and/or the working tree"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:642
|
|
msgid ""
|
|
"You can fix the problem, and then run\n"
|
|
"\n"
|
|
"\tgit rebase --continue"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: after these lines is a command to be issued by the user
|
|
#: git-rebase--interactive.sh:655
|
|
#, sh-format
|
|
msgid ""
|
|
"Execution succeeded: $rest\n"
|
|
"but left changes to the index and/or the working tree\n"
|
|
"Commit or stash your changes, and then run\n"
|
|
"\n"
|
|
"\tgit rebase --continue"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:666
|
|
#, sh-format
|
|
msgid "Unknown command: $command $sha1 $rest"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:667
|
|
msgid "Please fix this using 'git rebase --edit-todo'."
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:702
|
|
#, sh-format
|
|
msgid "Successfully rebased and updated $head_name."
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:749
|
|
msgid "Could not skip unnecessary pick commands"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:907
|
|
#, 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:940
|
|
#, sh-format
|
|
msgid ""
|
|
"Warning: the command isn't recognized in the following line:\n"
|
|
" - $line"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:979
|
|
msgid "could not detach HEAD"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1017
|
|
msgid ""
|
|
"Warning: some commits may have been dropped accidentally.\n"
|
|
"Dropped commits (newer to older):"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1025
|
|
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:1036
|
|
#, sh-format
|
|
msgid ""
|
|
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
|
|
"Ignoring."
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1053
|
|
msgid ""
|
|
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
|
"continue'."
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1054
|
|
msgid "Or you can abort the rebase with 'git rebase --abort'."
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1078
|
|
msgid "Could not remove CHERRY_PICK_HEAD"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1083
|
|
#, sh-format
|
|
msgid ""
|
|
"You have staged changes in your working tree.\n"
|
|
"If these changes are meant to be\n"
|
|
"squashed into the previous commit, run:\n"
|
|
"\n"
|
|
" git commit --amend $gpg_sign_opt_quoted\n"
|
|
"\n"
|
|
"If they are meant to go into a new commit, run:\n"
|
|
"\n"
|
|
" git commit $gpg_sign_opt_quoted\n"
|
|
"\n"
|
|
"In both cases, once you're done, continue with:\n"
|
|
"\n"
|
|
" git rebase --continue\n"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1100
|
|
msgid "Error trying to find the author identity to amend commit"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1105
|
|
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:1110 git-rebase--interactive.sh:1114
|
|
msgid "Could not commit staged changes."
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1138
|
|
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:1146 git-rebase--interactive.sh:1304
|
|
msgid "Could not execute editor"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1159
|
|
#, sh-format
|
|
msgid "Could not checkout $switch_to"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1164
|
|
msgid "No HEAD?"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1165
|
|
#, sh-format
|
|
msgid "Could not create temporary $state_dir"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1167
|
|
msgid "Could not mark as interactive"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182
|
|
msgid "Could not init rewritten commits"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1282
|
|
#, 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:1287
|
|
msgid ""
|
|
"\n"
|
|
"However, if you remove everything, the rebase will be aborted.\n"
|
|
"\n"
|
|
msgstr ""
|
|
|
|
#: git-rebase--interactive.sh:1294
|
|
msgid "Note that empty commits are commented out"
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:89 git-sh-setup.sh:94
|
|
#, sh-format
|
|
msgid "usage: $dashless $USAGE"
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:190
|
|
#, sh-format
|
|
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:199 git-sh-setup.sh:206
|
|
#, sh-format
|
|
msgid "fatal: $program_name cannot be used without a working tree."
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:220
|
|
msgid "Cannot rebase: You have unstaged changes."
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:223
|
|
msgid "Cannot rewrite branches: You have unstaged changes."
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:226
|
|
msgid "Cannot pull with rebase: You have unstaged changes."
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:229
|
|
#, sh-format
|
|
msgid "Cannot $action: You have unstaged changes."
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:242
|
|
msgid "Cannot rebase: Your index contains uncommitted changes."
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:245
|
|
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:248
|
|
#, sh-format
|
|
msgid "Cannot $action: Your index contains uncommitted changes."
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:252
|
|
msgid "Additionally, your index contains uncommitted changes."
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:372
|
|
msgid "You need to run this command from the toplevel of the working tree."
|
|
msgstr ""
|
|
|
|
#: git-sh-setup.sh:377
|
|
msgid "Unable to determine absolute path of git directory"
|
|
msgstr ""
|