diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 10718 |
1 files changed, 7619 insertions, 3099 deletions
diff --git a/po/git.pot b/po/git.pot index c94a95591f..db2ff70767 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-04-03 08:13+0800\n" +"POT-Creation-Date: 2017-05-05 09:35+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" @@ -23,183 +23,993 @@ msgstr "" msgid "hint: %.*s\n" msgstr "" -#: advice.c:88 +#: 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 "" -#: archive.c:11 -msgid "git archive [<options>] <tree-ish> [<path>...]" +#: advice.c:109 +msgid "Exiting because of an unresolved conflict." +msgstr "" + +#: advice.c:114 builtin/merge.c:1185 +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:2265 +#, c-format +msgid "unable to read symlink %s" +msgstr "" + +#: apply.c:2269 +#, c-format +msgid "unable to open or read %s" +msgstr "" + +#: apply.c:2922 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "" + +#: apply.c:3041 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "" +msgstr[1] "" + +#: apply.c:3053 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "" + +#: apply.c:3059 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" + +#: apply.c:3081 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "" + +#: apply.c:3089 +#, c-format +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" +msgstr "" + +#: apply.c:3135 +#, c-format +msgid "cannot apply binary patch to '%s' without full index line" +msgstr "" + +#: apply.c:3145 +#, c-format +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "" + +#: apply.c:3153 +#, c-format +msgid "the patch applies to an empty '%s' but it is not empty" +msgstr "" + +#: apply.c:3171 +#, c-format +msgid "the necessary postimage %s for '%s' cannot be read" +msgstr "" + +#: apply.c:3184 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "" + +#: apply.c:3190 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" + +#: apply.c:3211 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "" + +#: apply.c:3333 +#, c-format +msgid "cannot checkout %s" +msgstr "" + +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 +#, c-format +msgid "failed to read %s" +msgstr "" + +#: apply.c:3389 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "" + +#: apply.c:3418 apply.c:3658 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "" + +#: apply.c:3501 apply.c:3672 +#, c-format +msgid "%s: does not exist in index" +msgstr "" + +#: apply.c:3510 apply.c:3680 +#, c-format +msgid "%s: does not match index" +msgstr "" + +#: apply.c:3545 +msgid "repository lacks the necessary blob to fall back on 3-way merge." +msgstr "" + +#: apply.c:3548 +#, c-format +msgid "Falling back to three-way merge...\n" +msgstr "" + +#: apply.c:3564 apply.c:3568 +#, c-format +msgid "cannot read the current contents of '%s'" +msgstr "" + +#: apply.c:3580 +#, c-format +msgid "Failed to fall back on three-way merge...\n" +msgstr "" + +#: apply.c:3594 +#, c-format +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "" + +#: apply.c:3599 +#, c-format +msgid "Applied patch to '%s' cleanly.\n" +msgstr "" + +#: apply.c:3625 +msgid "removal patch leaves file contents" +msgstr "" + +#: apply.c:3697 +#, c-format +msgid "%s: wrong type" +msgstr "" + +#: apply.c:3699 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "" + +#: apply.c:3850 apply.c:3852 +#, c-format +msgid "invalid path '%s'" +msgstr "" + +#: apply.c:3908 +#, c-format +msgid "%s: already exists in index" +msgstr "" + +#: apply.c:3911 +#, c-format +msgid "%s: already exists in working directory" +msgstr "" + +#: apply.c:3931 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "" + +#: apply.c:3936 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "" + +#: apply.c:3956 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "" + +#: apply.c:3960 +#, c-format +msgid "%s: patch does not apply" +msgstr "" + +#: apply.c:3975 +#, c-format +msgid "Checking patch %s..." +msgstr "" + +#: apply.c:4066 +#, c-format +msgid "sha1 information is lacking or useless for submodule %s" +msgstr "" + +#: apply.c:4073 +#, c-format +msgid "mode change for %s, which is not in current HEAD" +msgstr "" + +#: apply.c:4076 +#, c-format +msgid "sha1 information is lacking or useless (%s)." +msgstr "" + +#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: apply.c:4085 +#, c-format +msgid "could not add %s to temporary index" +msgstr "" + +#: apply.c:4095 +#, c-format +msgid "could not write temporary index to %s" +msgstr "" + +#: apply.c:4233 +#, c-format +msgid "unable to remove %s from index" +msgstr "" + +#: apply.c:4268 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "" + +#: apply.c:4274 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "" + +#: apply.c:4282 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "" + +#: apply.c:4288 apply.c:4432 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "" + +#: apply.c:4329 +#, c-format +msgid "failed to write to '%s'" +msgstr "" + +#: apply.c:4333 +#, c-format +msgid "closing file '%s'" +msgstr "" + +#: apply.c:4403 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "" + +#: apply.c:4501 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "" + +#: apply.c:4509 +msgid "internal error" +msgstr "" + +#: apply.c:4512 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "" +msgstr[1] "" + +#: apply.c:4523 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "" + +#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 +#, c-format +msgid "cannot open %s" +msgstr "" + +#: apply.c:4545 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "" + +#: apply.c:4549 +#, c-format +msgid "Rejected hunk #%d." +msgstr "" + +#: apply.c:4659 +#, c-format +msgid "Skipped patch '%s'." +msgstr "" + +#: apply.c:4667 +msgid "unrecognized input" +msgstr "" + +#: apply.c:4686 +msgid "unable to read index file" +msgstr "" + +#: apply.c:4823 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "" + +#: apply.c:4850 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "" +msgstr[1] "" + +#: apply.c:4856 apply.c:4871 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "" +msgstr[1] "" + +#: apply.c:4864 +#, c-format +msgid "%d line applied after fixing whitespace errors." +msgid_plural "%d lines applied after fixing whitespace errors." +msgstr[0] "" +msgstr[1] "" + +#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +msgid "Unable to write new index file" +msgstr "" + +#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 +#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 +#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 +#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 +#: git-add--interactive.perl:239 +msgid "path" +msgstr "" + +#: apply.c:4912 +msgid "don't apply changes matching the given path" +msgstr "" + +#: apply.c:4915 +msgid "apply changes matching the given path" +msgstr "" + +#: apply.c:4917 builtin/am.c:2285 +msgid "num" +msgstr "" + +#: apply.c:4918 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "" + +#: apply.c:4921 +msgid "ignore additions made by the patch" +msgstr "" + +#: apply.c:4923 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "" + +#: apply.c:4927 +msgid "show number of added and deleted lines in decimal notation" +msgstr "" + +#: apply.c:4929 +msgid "instead of applying the patch, output a summary for the input" +msgstr "" + +#: apply.c:4931 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "" + +#: apply.c:4933 +msgid "make sure the patch is applicable to the current index" +msgstr "" + +#: apply.c:4935 +msgid "apply a patch without touching the working tree" +msgstr "" + +#: apply.c:4937 +msgid "accept a patch that touches outside the working area" +msgstr "" + +#: apply.c:4939 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "" + +#: apply.c:4941 +msgid "attempt three-way merge if a patch does not apply" +msgstr "" + +#: apply.c:4943 +msgid "build a temporary index based on embedded index information" +msgstr "" + +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 +msgid "paths are separated with NUL character" +msgstr "" + +#: apply.c:4948 +msgid "ensure at least <n> lines of context match" +msgstr "" + +#: apply.c:4949 builtin/am.c:2264 +msgid "action" +msgstr "" + +#: apply.c:4950 +msgid "detect new or modified lines that have whitespace errors" +msgstr "" + +#: apply.c:4953 apply.c:4956 +msgid "ignore changes in whitespace when finding context" +msgstr "" + +#: apply.c:4959 +msgid "apply the patch in reverse" +msgstr "" + +#: apply.c:4961 +msgid "don't expect at least one line of context" +msgstr "" + +#: apply.c:4963 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "" + +#: apply.c:4965 +msgid "allow overlapping hunks" +msgstr "" + +#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 +#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134 +msgid "be verbose" +msgstr "" + +#: apply.c:4968 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "" + +#: apply.c:4971 +msgid "do not trust the line counts in the hunk headers" +msgstr "" + +#: apply.c:4973 builtin/am.c:2273 +msgid "root" +msgstr "" + +#: apply.c:4974 +msgid "prepend <root> to all filenames" msgstr "" #: archive.c:12 -msgid "git archive --list" +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:14 +#: archive.c:15 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:427 +#: archive.c:417 msgid "fmt" msgstr "" -#: archive.c:427 +#: archive.c:417 msgid "archive format" msgstr "" -#: archive.c:428 builtin/log.c:1204 +#: archive.c:418 builtin/log.c:1436 msgid "prefix" msgstr "" -#: archive.c:429 +#: archive.c:419 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 -#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 -#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 +#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 +#: parse-options.h:153 msgid "file" msgstr "" -#: archive.c:431 builtin/archive.c:89 +#: archive.c:421 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:433 +#: archive.c:423 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:434 +#: archive.c:424 msgid "report archived files on stderr" msgstr "" -#: archive.c:435 +#: archive.c:425 msgid "store only" msgstr "" -#: archive.c:436 +#: archive.c:426 msgid "compress faster" msgstr "" -#: archive.c:444 +#: archive.c:434 msgid "compress better" msgstr "" -#: archive.c:447 +#: archive.c:437 msgid "list supported archive formats" msgstr "" -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 msgid "repo" msgstr "" -#: archive.c:450 builtin/archive.c:91 +#: archive.c:440 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478 +#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 msgid "command" msgstr "" -#: archive.c:452 builtin/archive.c:93 +#: archive.c:442 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" -#: attr.c:264 +#: archive.c:449 +msgid "Unexpected option --remote" +msgstr "" + +#: archive.c:451 +msgid "Option --exec can only be used together with --remote" +msgstr "" + +#: archive.c:453 +msgid "Unexpected option --output" +msgstr "" + +#: archive.c:475 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "" + +#: archive.c:482 +#, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "" + +#: attr.c:212 +#, c-format +msgid "%.*s is not a valid attribute name" +msgstr "" + +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -#: branch.c:60 +#: bisect.c:444 +#, c-format +msgid "Could not open file '%s'" +msgstr "" + +#: bisect.c:449 +#, c-format +msgid "Badly quoted content in file '%s': %s" +msgstr "" + +#: bisect.c:657 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "" + +#: bisect.c:710 +#, c-format +msgid "Not a valid commit name %s" +msgstr "" + +#: bisect.c:734 +#, 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:739 +#, c-format +msgid "" +"The merge base %s is new.\n" +"The property has changed between %s and [%s].\n" +msgstr "" + +#: bisect.c:744 +#, 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:752 +#, c-format +msgid "" +"Some %s revs are not ancestors 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:765 +#, 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:800 +#, c-format +msgid "Bisecting: a merge base must be tested\n" +msgstr "" + +#: bisect.c:851 +#, c-format +msgid "a %s revision is needed" +msgstr "" + +#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 +#, c-format +msgid "could not create file '%s'" +msgstr "" + +#: bisect.c:919 +#, c-format +msgid "could not read file '%s'" +msgstr "" + +#: bisect.c:949 +msgid "reading bisect refs failed" +msgstr "" + +#: bisect.c:969 +#, c-format +msgid "%s was both %s and %s\n" +msgstr "" + +#: bisect.c:977 +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +msgstr "" + +#: bisect.c:996 +#, 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:1000 +#, 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:83 +#: branch.c:93 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "" -#: branch.c:84 +#: branch.c:94 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "" -#: branch.c:88 +#: branch.c:98 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "" -#: branch.c:89 +#: branch.c:99 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "" -#: branch.c:94 +#: branch.c:104 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "" -#: branch.c:95 +#: branch.c:105 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "" -#: branch.c:99 +#: branch.c:109 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "" -#: branch.c:100 +#: branch.c:110 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "" -#: branch.c:133 +#: 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:162 +#: branch.c:185 #, c-format msgid "'%s' is not a valid branch name." msgstr "" -#: branch.c:167 +#: branch.c:190 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:175 +#: branch.c:198 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:195 +#: branch.c:218 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:197 +#: branch.c:220 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:199 +#: branch.c:222 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -211,21 +1021,31 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:243 +#: branch.c:265 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:263 +#: branch.c:285 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:268 +#: 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:364 +#, 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" @@ -236,7 +1056,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "" @@ -245,10 +1065,10 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 -#: builtin/shortlog.c:158 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 +#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 +#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 +#: builtin/merge.c:359 builtin/shortlog.c:176 msgid "revision walk setup failed" msgstr "" @@ -270,47 +1090,48 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:251 +#: bundle.c:253 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:269 +#: bundle.c:264 msgid "pack-objects died" msgstr "" -#: bundle.c:309 +#: bundle.c:304 msgid "rev-list died" msgstr "" -#: bundle.c:358 +#: bundle.c:353 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:443 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:453 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:474 +#: bundle.c:491 msgid "index-pack died" msgstr "" -#: color.c:260 +#: color.c:300 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit.c:40 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 +#: builtin/am.c:1489 builtin/am.c:2126 #, c-format msgid "could not parse %s" msgstr "" @@ -320,124 +1141,266 @@ msgstr "" msgid "%s %s is not a commit!" msgstr "" +#: commit.c:1511 +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:474 config.c:476 +#: config.c:191 +msgid "relative config include conditionals must come from files" +msgstr "" + +#: config.c:711 #, c-format -msgid "bad config file line %d in %s" +msgid "bad config line %d in blob %s" msgstr "" -#: config.c:592 +#: config.c:715 #, c-format -msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgid "bad config line %d in file %s" +msgstr "" + +#: config.c:719 +#, c-format +msgid "bad config line %d in standard input" +msgstr "" + +#: config.c:723 +#, c-format +msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:594 +#: config.c:727 +#, c-format +msgid "bad config line %d in command line %s" +msgstr "" + +#: config.c:731 +#, c-format +msgid "bad config line %d in %s" +msgstr "" + +#: config.c:859 +msgid "out of range" +msgstr "" + +#: config.c:859 +msgid "invalid unit" +msgstr "" + +#: config.c:865 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:679 +#: config.c:870 +#, c-format +msgid "bad numeric config value '%s' for '%s' in blob %s: %s" +msgstr "" + +#: config.c:873 +#, c-format +msgid "bad numeric config value '%s' for '%s' in file %s: %s" +msgstr "" + +#: config.c:876 +#, c-format +msgid "bad numeric config value '%s' for '%s' in standard input: %s" +msgstr "" + +#: config.c:879 +#, c-format +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" +msgstr "" + +#: config.c:882 +#, c-format +msgid "bad numeric config value '%s' for '%s' in command line %s: %s" +msgstr "" + +#: config.c:885 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "" + +#: config.c:980 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:757 config.c:768 +#: config.c:1075 config.c:1086 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:890 +#: config.c:1203 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1216 +#: config.c:1359 +#, c-format +msgid "bad pack compression level %d" +msgstr "" + +#: config.c:1557 msgid "unable to parse command-line config" msgstr "" -#: config.c:1277 -msgid "unknown error occured while reading the configuration files" +#: config.c:1611 +msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:1601 +#: config.c:1970 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "" + +#: config.c:1991 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" + +#: config.c:2017 +#, c-format +msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" +msgstr "" + +#: config.c:2028 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:1603 +#: config.c:2030 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:1662 +#: config.c:2089 #, c-format msgid "%s has multiple values" msgstr "" -#: connected.c:69 +#: config.c:2423 config.c:2648 +#, c-format +msgid "fstat on %s failed" +msgstr "" + +#: config.c:2541 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "" + +#: config.c:2543 builtin/remote.c:774 +#, 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:190 builtin/prune.c:140 +msgid "Checking connectivity" +msgstr "" + +#: connected.c:75 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:89 +#: 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 "failed write to rev-list: %s" +msgid "" +"LF will be replaced by CRLF in %s.\n" +"The file will have its original line endings in your working directory." msgstr "" -#: connected.c:97 +#: convert.c:215 #, c-format -msgid "failed to close rev-list's stdin: %s" +msgid "LF would be replaced by CRLF in %s" msgstr "" -#: date.c:95 +#: date.c:97 msgid "in the future" msgstr "" -#: date.c:101 +#: date.c:103 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" msgstr[0] "" msgstr[1] "" -#: date.c:108 +#: date.c:110 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" msgstr[0] "" msgstr[1] "" -#: date.c:115 +#: date.c:117 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" msgstr[0] "" msgstr[1] "" -#: date.c:122 +#: date.c:124 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" msgstr[0] "" msgstr[1] "" -#: date.c:128 +#: date.c:130 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" msgstr[0] "" msgstr[1] "" -#: date.c:135 +#: date.c:137 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" msgstr[0] "" msgstr[1] "" -#: date.c:146 +#: date.c:148 #, c-format msgid "%lu year" msgid_plural "%lu years" @@ -445,14 +1408,14 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:149 +#: date.c:151 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" msgstr[0] "" msgstr[1] "" -#: date.c:154 date.c:159 +#: date.c:156 date.c:161 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" @@ -468,128 +1431,352 @@ msgstr "" msgid "Performing inexact rename detection" msgstr "" -#: diff.c:114 +#: 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:119 +#: diff.c:129 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:214 +#: diff.c:281 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:266 +#: diff.c:344 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:2956 +#: diff.c:3102 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3351 +#: diff.c:3428 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" +msgstr "" + +#: diff.c:3518 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3514 +#: diff.c:3681 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3528 +#: diff.c:3695 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: gpg-interface.c:129 gpg-interface.c:200 -msgid "could not run gpg." +#: diff.c:4719 +msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: gpg-interface.c:141 -msgid "gpg did not accept the data" +#: diff.c:4722 +msgid "only found copies from modified paths due to too many files." msgstr "" -#: gpg-interface.c:152 -msgid "gpg failed to sign the data" +#: diff.c:4725 +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "" + +#: dir.c:1899 +msgid "failed to get kernel name and information" +msgstr "" + +#: dir.c:2018 +msgid "Untracked cache is disabled on this system or location." +msgstr "" + +#: dir.c:2776 dir.c:2781 +#, c-format +msgid "could not create directories for %s" +msgstr "" + +#: dir.c:2806 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "" + +#: entry.c:280 +#, c-format +msgid "could not stat file '%s'" +msgstr "" + +#: fetch-pack.c:249 +msgid "git fetch-pack: expected shallow list" +msgstr "" + +#: fetch-pack.c:261 +msgid "git fetch-pack: expected ACK/NAK, got EOF" +msgstr "" + +#: fetch-pack.c:280 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "" + +#: fetch-pack.c:281 +#, c-format +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "" + +#: fetch-pack.c:333 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "" + +#: fetch-pack.c:419 +#, c-format +msgid "invalid shallow line: %s" +msgstr "" + +#: fetch-pack.c:425 +#, c-format +msgid "invalid unshallow line: %s" +msgstr "" + +#: fetch-pack.c:427 +#, c-format +msgid "object not found: %s" +msgstr "" + +#: fetch-pack.c:430 +#, c-format +msgid "error in object: %s" +msgstr "" + +#: fetch-pack.c:432 +#, c-format +msgid "no shallow found: %s" +msgstr "" + +#: fetch-pack.c:435 +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "" + +#: fetch-pack.c:474 +#, c-format +msgid "got %s %d %s" +msgstr "" + +#: fetch-pack.c:488 +#, c-format +msgid "invalid commit %s" +msgstr "" + +#: fetch-pack.c:521 +msgid "giving up" +msgstr "" + +#: fetch-pack.c:531 progress.c:235 +msgid "done" +msgstr "" + +#: fetch-pack.c:543 +#, c-format +msgid "got %s (%d) %s" +msgstr "" + +#: fetch-pack.c:589 +#, c-format +msgid "Marking %s as complete" +msgstr "" + +#: fetch-pack.c:737 +#, c-format +msgid "already have %s (%s)" +msgstr "" + +#: fetch-pack.c:775 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "" + +#: fetch-pack.c:783 +msgid "protocol error: bad pack header" +msgstr "" + +#: fetch-pack.c:839 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "" + +#: fetch-pack.c:855 +#, c-format +msgid "%s failed" +msgstr "" + +#: fetch-pack.c:857 +msgid "error in sideband demultiplexer" +msgstr "" + +#: fetch-pack.c:884 +msgid "Server does not support shallow clients" +msgstr "" + +#: fetch-pack.c:888 +msgid "Server supports multi_ack_detailed" +msgstr "" + +#: fetch-pack.c:891 +msgid "Server supports no-done" +msgstr "" + +#: fetch-pack.c:897 +msgid "Server supports multi_ack" +msgstr "" + +#: fetch-pack.c:901 +msgid "Server supports side-band-64k" +msgstr "" + +#: fetch-pack.c:905 +msgid "Server supports side-band" +msgstr "" + +#: fetch-pack.c:909 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "" + +#: fetch-pack.c:913 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "" + +#: fetch-pack.c:923 +msgid "Server supports ofs-delta" +msgstr "" + +#: fetch-pack.c:930 +#, c-format +msgid "Server version is %.*s" +msgstr "" + +#: fetch-pack.c:936 +msgid "Server does not support --shallow-since" +msgstr "" + +#: fetch-pack.c:940 +msgid "Server does not support --shallow-exclude" +msgstr "" + +#: fetch-pack.c:942 +msgid "Server does not support --deepen" +msgstr "" + +#: fetch-pack.c:953 +msgid "no common commits" +msgstr "" + +#: fetch-pack.c:965 +msgid "git fetch-pack: fetch failed." +msgstr "" + +#: fetch-pack.c:1127 +msgid "no matching remote head" +msgstr "" + +#: fetch-pack.c:1149 +#, c-format +msgid "no such remote ref %s" +msgstr "" + +#: fetch-pack.c:1152 +#, c-format +msgid "Server does not allow request for unadvertised object %s" 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 "could not create temporary file '%s': %s" +msgid "failed writing detached signature to '%s'" msgstr "" -#: gpg-interface.c:188 +#: graph.c:96 #, c-format -msgid "failed writing detached signature to '%s': %s" +msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:1718 +#: grep.c:1796 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1735 +#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 #, c-format -msgid "'%s': %s" +msgid "failed to stat '%s'" msgstr "" -#: grep.c:1746 +#: grep.c:1824 #, c-format -msgid "'%s': short read %s" +msgid "'%s': short read" msgstr "" -#: help.c:207 +#: help.c:218 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:214 +#: help.c:225 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:230 -msgid "The most commonly used git commands are:" +#: help.c:256 +msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:289 +#: help.c:321 #, 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:346 +#: help.c:376 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:368 +#: help.c:398 #, 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:373 +#: help.c:403 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:380 +#: help.c:410 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:384 help.c:444 +#: help.c:414 help.c:480 msgid "" "\n" "Did you mean this?" @@ -599,450 +1786,856 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:440 +#: help.c:476 #, c-format msgid "%s: %s - %s" msgstr "" -#: lockfile.c:283 -msgid "BUG: reopen a lockfile that is still open" +#: ident.c:343 +msgid "" +"\n" +"*** Please tell me who you are.\n" +"\n" +"Run\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"to set your account's default identity.\n" +"Omit --global to set the identity only in this repository.\n" +"\n" +msgstr "" + +#: ident.c:367 +msgid "no email was given and auto-detection is disabled" +msgstr "" + +#: ident.c:372 +#, c-format +msgid "unable to auto-detect email address (got '%s')" +msgstr "" + +#: ident.c:382 +msgid "no name was given and auto-detection is disabled" +msgstr "" + +#: ident.c:388 +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "" + +#: ident.c:396 +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "" + +#: ident.c:402 +#, c-format +msgid "name consists only of disallowed characters: %s" +msgstr "" + +#: ident.c:417 builtin/commit.c:611 +#, c-format +msgid "invalid date format: %s" +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:285 -msgid "BUG: reopen a lockfile that has been committed" +#: 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:94 builtin/checkout.c:374 builtin/checkout.c:580 -#: builtin/clone.c:662 +#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 +#: builtin/checkout.c:607 builtin/clone.c:749 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:189 -#, c-format +#: merge-recursive.c:209 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:209 +#: merge-recursive.c:231 merge-recursive.c:239 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:270 +#: merge-recursive.c:303 msgid "error building trees" msgstr "" -#: merge-recursive.c:688 +#: merge-recursive.c:727 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:699 +#: merge-recursive.c:738 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:713 merge-recursive.c:734 +#: merge-recursive.c:752 merge-recursive.c:771 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:724 +#: merge-recursive.c:761 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:764 +#: merge-recursive.c:803 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:766 +#: merge-recursive.c:805 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:789 builtin/clone.c:321 +#: merge-recursive.c:829 #, c-format -msgid "failed to open '%s'" +msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:797 +#: merge-recursive.c:840 #, c-format -msgid "failed to symlink '%s'" +msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:800 +#: merge-recursive.c:845 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:938 +#: merge-recursive.c:985 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:942 +#: merge-recursive.c:989 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:958 -msgid "unsupported object type in the tree" -msgstr "" - -#: merge-recursive.c:1033 merge-recursive.c:1047 +#: merge-recursive.c:1092 #, 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:1039 merge-recursive.c:1052 +#: merge-recursive.c:1097 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." +msgstr "" + +#: merge-recursive.c:1104 #, 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:1093 +#: merge-recursive.c:1109 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." +msgstr "" + +#: merge-recursive.c:1143 msgid "rename" msgstr "" -#: merge-recursive.c:1093 +#: merge-recursive.c:1143 msgid "renamed" msgstr "" -#: merge-recursive.c:1149 +#: merge-recursive.c:1200 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1171 +#: 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:1176 +#: merge-recursive.c:1230 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1230 +#: merge-recursive.c:1292 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1260 +#: merge-recursive.c:1325 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1459 +#: merge-recursive.c:1528 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1469 +#: merge-recursive.c:1543 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1474 merge-recursive.c:1672 +#: merge-recursive.c:1550 merge-recursive.c:1780 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1525 +#: merge-recursive.c:1607 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1528 +#: merge-recursive.c:1610 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1576 +#: merge-recursive.c:1679 msgid "modify" msgstr "" -#: merge-recursive.c:1576 +#: merge-recursive.c:1679 msgid "modified" msgstr "" -#: merge-recursive.c:1586 +#: merge-recursive.c:1689 msgid "content" msgstr "" -#: merge-recursive.c:1593 +#: merge-recursive.c:1696 msgid "add/add" msgstr "" -#: merge-recursive.c:1627 +#: merge-recursive.c:1732 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1641 +#: merge-recursive.c:1746 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1645 git-submodule.sh:1150 +#: merge-recursive.c:1750 git-submodule.sh:944 msgid "submodule" msgstr "" -#: merge-recursive.c:1646 +#: merge-recursive.c:1751 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1732 +#: merge-recursive.c:1845 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1757 +#: merge-recursive.c:1871 msgid "file/directory" msgstr "" -#: merge-recursive.c:1763 +#: merge-recursive.c:1877 msgid "directory/file" msgstr "" -#: merge-recursive.c:1768 +#: merge-recursive.c:1883 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1778 +#: merge-recursive.c:1892 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1795 -msgid "Fatal merge failure, shouldn't happen." -msgstr "" - -#: merge-recursive.c:1814 +#: merge-recursive.c:1929 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1823 +#: merge-recursive.c:1938 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1853 -#, c-format -msgid "Unprocessed path??? %s" -msgstr "" - -#: merge-recursive.c:1901 +#: merge-recursive.c:2021 msgid "Merging:" msgstr "" -#: merge-recursive.c:1914 +#: merge-recursive.c:2034 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1951 +#: merge-recursive.c:2073 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2008 +#: merge-recursive.c:2136 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2019 builtin/merge.c:667 +#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 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:82 +#: notes-utils.c:100 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: notes-utils.c:92 +#: 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:119 +#: notes-utils.c:137 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: object.c:241 +#: object.c:240 #, c-format msgid "unable to parse object: %s" msgstr "" -#: parse-options.c:546 +#: parse-options.c:572 msgid "..." msgstr "" -#: parse-options.c:564 +#: 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:568 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:571 +#: parse-options.c:597 #, c-format msgid " %s" msgstr "" -#: parse-options.c:605 +#: parse-options.c:631 msgid "-NUM" msgstr "" -#: pathspec.c:133 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +#: parse-options-cb.c:108 +#, c-format +msgid "malformed object name '%s'" +msgstr "" + +#: path.c:810 +#, c-format +msgid "Could not make %s writable by group" +msgstr "" + +#: pathspec.c:125 +msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" #: pathspec.c:143 +msgid "Only one 'attr:' specification is allowed." +msgstr "" + +#: pathspec.c:146 +msgid "attr spec must not be empty" +msgstr "" + +#: pathspec.c:189 +#, c-format +msgid "invalid attribute name %s" +msgstr "" + +#: pathspec.c:254 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +msgstr "" + +#: pathspec.c:261 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:177 +#: pathspec.c:301 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:183 +#: pathspec.c:322 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:187 +#: pathspec.c:327 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:205 +#: pathspec.c:365 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:230 +#: pathspec.c:421 pathspec.c:443 #, c-format -msgid "%s: 'literal' and 'glob' are incompatible" +msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: pathspec.c:241 +#: pathspec.c:483 #, c-format -msgid "%s: '%s' is outside repository" +msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:291 +#: pathspec.c:496 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" +msgid "%s: '%s' is outside repository" msgstr "" -#: pathspec.c:353 +#: pathspec.c:584 #, c-format -msgid "%s: pathspec magic not supported by this command: %s" +msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:432 +#: pathspec.c:594 #, c-format -msgid "pathspec '%s' is beyond a symbolic link" +msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:441 +#: pathspec.c:644 msgid "" -"There is nothing to exclude from by :(exclude) patterns.\n" -"Perhaps you forgot to add either ':/' or '.' ?" +"empty strings as pathspecs will be made invalid in upcoming releases. please " +"use . instead if you meant to match all paths" msgstr "" -#: pretty.c:968 -msgid "unable to parse --pretty format" +#: pathspec.c:668 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: progress.c:225 -msgid "done" +#: pretty.c:982 +msgid "unable to parse --pretty format" msgstr "" -#: read-cache.c:1275 +#: read-cache.c:1442 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1285 +#: read-cache.c:1452 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: remote.c:782 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 +#, c-format +msgid "could not stat '%s'" +msgstr "" + +#: read-cache.c:2388 +#, c-format +msgid "unable to open git dir: %s" +msgstr "" + +#: read-cache.c:2400 +#, c-format +msgid "unable to unlink: %s" +msgstr "" + +#: refs.c:620 builtin/merge.c:844 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "" + +#: refs.c:1667 +msgid "ref updates forbidden inside quarantine environment" +msgstr "" + +#: refs/files-backend.c:1631 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "" + +#: refs/files-backend.c:1634 +#, c-format +msgid "could not delete references: %s" +msgstr "" + +#: refs/files-backend.c:1643 +#, c-format +msgid "could not remove reference %s" +msgstr "" + +#: ref-filter.c:35 wt-status.c:1780 +msgid "gone" +msgstr "" + +#: ref-filter.c:36 +#, c-format +msgid "ahead %d" +msgstr "" + +#: ref-filter.c:37 +#, c-format +msgid "behind %d" +msgstr "" + +#: ref-filter.c:38 +#, c-format +msgid "ahead %d, behind %d" +msgstr "" + +#: ref-filter.c:104 +#, c-format +msgid "expected format: %%(color:<color>)" +msgstr "" + +#: ref-filter.c:106 +#, c-format +msgid "unrecognized color: %%(color:%s)" +msgstr "" + +#: ref-filter.c:120 +#, c-format +msgid "Integer value expected refname:lstrip=%s" +msgstr "" + +#: ref-filter.c:124 +#, c-format +msgid "Integer value expected refname:rstrip=%s" +msgstr "" + +#: ref-filter.c:126 +#, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "" + +#: ref-filter.c:166 +#, c-format +msgid "%%(body) does not take arguments" +msgstr "" + +#: ref-filter.c:173 +#, c-format +msgid "%%(subject) does not take arguments" +msgstr "" + +#: ref-filter.c:180 +#, c-format +msgid "%%(trailers) does not take arguments" +msgstr "" + +#: ref-filter.c:199 +#, c-format +msgid "positive value expected contents:lines=%s" +msgstr "" + +#: ref-filter.c:201 +#, c-format +msgid "unrecognized %%(contents) argument: %s" +msgstr "" + +#: ref-filter.c:214 +#, c-format +msgid "positive value expected objectname:short=%s" +msgstr "" + +#: ref-filter.c:218 +#, c-format +msgid "unrecognized %%(objectname) argument: %s" +msgstr "" + +#: ref-filter.c:245 +#, c-format +msgid "expected format: %%(align:<width>,<position>)" +msgstr "" + +#: ref-filter.c:257 +#, c-format +msgid "unrecognized position:%s" +msgstr "" + +#: ref-filter.c:261 +#, c-format +msgid "unrecognized width:%s" +msgstr "" + +#: ref-filter.c:267 +#, c-format +msgid "unrecognized %%(align) argument: %s" +msgstr "" + +#: ref-filter.c:271 +#, c-format +msgid "positive width expected with the %%(align) atom" +msgstr "" + +#: ref-filter.c:286 +#, c-format +msgid "unrecognized %%(if) argument: %s" +msgstr "" + +#: ref-filter.c:371 +#, c-format +msgid "malformed field name: %.*s" +msgstr "" + +#: ref-filter.c:397 +#, c-format +msgid "unknown field name: %.*s" +msgstr "" + +#: ref-filter.c:501 +#, c-format +msgid "format: %%(if) atom used without a %%(then) atom" +msgstr "" + +#: ref-filter.c:561 +#, c-format +msgid "format: %%(then) atom used without an %%(if) atom" +msgstr "" + +#: ref-filter.c:563 +#, c-format +msgid "format: %%(then) atom used more than once" +msgstr "" + +#: ref-filter.c:565 +#, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "" + +#: ref-filter.c:591 +#, c-format +msgid "format: %%(else) atom used without an %%(if) atom" +msgstr "" + +#: ref-filter.c:593 +#, c-format +msgid "format: %%(else) atom used without a %%(then) atom" +msgstr "" + +#: ref-filter.c:595 +#, c-format +msgid "format: %%(else) atom used more than once" +msgstr "" + +#: ref-filter.c:608 +#, c-format +msgid "format: %%(end) atom used without corresponding atom" +msgstr "" + +#: ref-filter.c:663 +#, c-format +msgid "malformed format string %s" +msgstr "" + +#: ref-filter.c:1247 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "" + +#: ref-filter.c:1250 +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "" + +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: ref-filter.c:1256 +#, c-format +msgid "(HEAD detached at %s)" +msgstr "" + +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: ref-filter.c:1261 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "" + +#: ref-filter.c:1265 +msgid "(no branch)" +msgstr "" + +#: ref-filter.c:1420 ref-filter.c:1451 +#, c-format +msgid "missing object %s for %s" +msgstr "" + +#: ref-filter.c:1423 ref-filter.c:1454 +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "" + +#: ref-filter.c:1692 +#, c-format +msgid "malformed object at '%s'" +msgstr "" + +#: ref-filter.c:1759 +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "" + +#: ref-filter.c:1764 +#, c-format +msgid "ignoring broken ref %s" +msgstr "" + +#: ref-filter.c:2028 +#, c-format +msgid "format: %%(end) atom missing" +msgstr "" + +#: ref-filter.c:2109 +#, c-format +msgid "malformed object name %s" +msgstr "" + +#: remote.c:754 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:786 +#: remote.c:758 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:790 +#: remote.c:762 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:798 +#: remote.c:770 msgid "Internal error" msgstr "" -#: remote.c:1980 +#: remote.c:1685 remote.c:1787 +msgid "HEAD does not point to a branch" +msgstr "" + +#: remote.c:1694 +#, c-format +msgid "no such branch: '%s'" +msgstr "" + +#: remote.c:1697 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "" + +#: remote.c:1703 +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgstr "" + +#: remote.c:1718 +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgstr "" + +#: remote.c:1730 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "" + +#: remote.c:1741 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "" + +#: remote.c:1754 +msgid "push has no destination (push.default is 'nothing')" +msgstr "" + +#: remote.c:1776 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "" + +#: remote.c:2081 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:1984 +#: remote.c:2085 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:1987 +#: remote.c:2088 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:1991 +#: remote.c:2092 #, 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:1997 +#: remote.c:2098 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2000 +#: remote.c:2101 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1050,11 +2643,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2008 +#: remote.c:2109 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2011 +#: remote.c:2112 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1065,278 +2658,646 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2021 +#: remote.c:2122 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2348 +#: 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:83 +#: run-command.c:125 msgid "open /dev/null failed" msgstr "" -#: run-command.c:85 +#: run-command.c:127 #, c-format msgid "dup2(%d,%d) failed" msgstr "" -#: send-pack.c:272 +#: send-pack.c:150 +#, c-format +msgid "unable to parse remote unpack status: %s" +msgstr "" + +#: send-pack.c:152 +#, c-format +msgid "remote unpack failed: %s" +msgstr "" + +#: send-pack.c:315 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:356 +#: send-pack.c:428 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:366 +#: send-pack.c:430 +msgid "" +"not sending a push certificate since the receiving end does not support --" +"signed push" +msgstr "" + +#: send-pack.c:442 msgid "the receiving end does not support --atomic push" msgstr "" -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 -#: builtin/merge.c:1005 -#, c-format -msgid "Could not open '%s' for writing" +#: send-pack.c:447 +msgid "the receiving end does not support push options" +msgstr "" + +#: sequencer.c:215 +msgid "revert" +msgstr "" + +#: sequencer.c:217 +msgid "cherry-pick" +msgstr "" + +#: sequencer.c:219 +msgid "rebase -i" msgstr "" -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 -#: builtin/merge.c:1010 +#: sequencer.c:221 #, c-format -msgid "Could not write to '%s'" +msgid "Unknown action: %d" msgstr "" -#: sequencer.c:195 +#: sequencer.c:278 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:198 +#: sequencer.c:281 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:211 sequencer.c:861 sequencer.c:944 +#: sequencer.c:294 sequencer.c:1682 #, c-format -msgid "Could not write to %s" +msgid "could not lock '%s'" msgstr "" -#: sequencer.c:214 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 #, c-format -msgid "Error wrapping up %s" +msgid "could not write to '%s'" msgstr "" -#: sequencer.c:229 -msgid "Your local changes would be overwritten by cherry-pick." +#: sequencer.c:301 +#, c-format +msgid "could not write eol to '%s'" +msgstr "" + +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 +#, c-format +msgid "failed to finalize '%s'." +msgstr "" + +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 +#: builtin/commit.c:749 builtin/merge.c:1018 +#, c-format +msgid "could not read '%s'" msgstr "" -#: sequencer.c:231 -msgid "Your local changes would be overwritten by revert." +#: sequencer.c:355 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "" + +#: sequencer.c:359 +msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:234 -msgid "Commit your changes or stash them to proceed." +#: sequencer.c:388 +#, c-format +msgid "%s: fast-forward" msgstr "" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:321 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. * "rebase -i". +#. +#: sequencer.c:470 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:339 -msgid "Could not resolve HEAD commit\n" +#: sequencer.c:489 +msgid "could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:359 -msgid "Unable to update cache tree\n" +#: sequencer.c:509 +msgid "unable to update cache tree\n" msgstr "" -#: sequencer.c:411 +#: sequencer.c:592 #, c-format -msgid "Could not parse commit %s\n" +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:694 +#, c-format +msgid "could not parse commit %s\n" msgstr "" -#: sequencer.c:416 +#: sequencer.c:699 #, c-format -msgid "Could not parse parent commit %s\n" +msgid "could not parse parent commit %s\n" msgstr "" -#: sequencer.c:482 -msgid "Your index file is unmerged." +#: sequencer.c:821 +#, c-format +msgid "" +"unexpected 1st line of squash message:\n" +"\n" +"\t%.*s" msgstr "" -#: sequencer.c:501 +#: sequencer.c:827 #, c-format -msgid "Commit %s is a merge but no -m option was given." +msgid "" +"invalid 1st line of squash message:\n" +"\n" +"\t%.*s" msgstr "" -#: sequencer.c:509 +#: sequencer.c:833 sequencer.c:858 #, c-format -msgid "Commit %s does not have parent %d" +msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:513 +#: sequencer.c:842 +msgid "need a HEAD to fixup" +msgstr "" + +#: sequencer.c:844 +msgid "could not read HEAD" +msgstr "" + +#: sequencer.c:846 +msgid "could not read HEAD's commit message" +msgstr "" + +#: sequencer.c:852 +#, c-format +msgid "cannot write '%s'" +msgstr "" + +#: sequencer.c:861 git-rebase--interactive.sh:445 +msgid "This is the 1st commit message:" +msgstr "" + +#: sequencer.c:869 #, c-format -msgid "Mainline was specified but commit %s is not a merge." +msgid "could not read commit message of %s" msgstr "" -#. TRANSLATORS: The first %s will be "revert" or -#. "cherry-pick", the second %s a SHA1 -#: sequencer.c:526 +#: sequencer.c:876 +#, c-format +msgid "This is the commit message #%d:" +msgstr "" + +#: sequencer.c:881 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "" + +#: sequencer.c:886 +#, c-format +msgid "unknown command: %d" +msgstr "" + +#: sequencer.c:952 +msgid "your index file is unmerged." +msgstr "" + +#: sequencer.c:970 +#, c-format +msgid "commit %s is a merge but no -m option was given." +msgstr "" + +#: sequencer.c:978 +#, c-format +msgid "commit %s does not have parent %d" +msgstr "" + +#: sequencer.c:982 +#, c-format +msgid "mainline was specified but commit %s is not a merge." +msgstr "" + +#: sequencer.c:988 +#, c-format +msgid "cannot get commit message for %s" +msgstr "" + +#. TRANSLATORS: The first %s will be a "todo" command like +#. "revert" or "pick", the second %s a SHA1. +#: sequencer.c:1009 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:530 +#: sequencer.c:1071 sequencer.c:1827 #, c-format -msgid "Cannot get commit message for %s" +msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:616 +#: sequencer.c:1122 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:617 +#: sequencer.c:1123 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:653 +#: sequencer.c:1165 msgid "empty commit set passed" msgstr "" -#: sequencer.c:661 +#: sequencer.c:1175 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:665 +#: sequencer.c:1182 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:725 +#: sequencer.c:1303 #, c-format -msgid "Cannot %s during a %s" +msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:747 +#: sequencer.c:1311 #, c-format -msgid "Could not parse line %d." +msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:752 -msgid "No commits parsed." +#: sequencer.c:1344 +#, c-format +msgid "could not read '%s'." msgstr "" -#: sequencer.c:765 -#, c-format -msgid "Could not open %s" +#: sequencer.c:1356 +msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:769 +#: sequencer.c:1358 #, c-format -msgid "Could not read %s." +msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:776 -#, c-format -msgid "Unusable instruction sheet: %s" +#: sequencer.c:1363 +msgid "no commits parsed." msgstr "" -#: sequencer.c:806 +#: sequencer.c:1374 +msgid "cannot cherry-pick during a revert." +msgstr "" + +#: sequencer.c:1376 +msgid "cannot revert during a cherry-pick." +msgstr "" + +#: sequencer.c:1439 #, c-format -msgid "Invalid key: %s" +msgid "invalid key: %s" msgstr "" -#: sequencer.c:809 +#: sequencer.c:1442 #, c-format -msgid "Invalid value for %s: %s" +msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:821 +#: sequencer.c:1499 #, c-format -msgid "Malformed options sheet: %s" +msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:842 +#: sequencer.c:1537 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:843 +#: sequencer.c:1538 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:847 +#: sequencer.c:1541 #, c-format -msgid "Could not create sequencer directory %s" +msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:863 sequencer.c:948 -#, c-format -msgid "Error wrapping up %s." +#: sequencer.c:1555 +msgid "could not lock HEAD" msgstr "" -#: sequencer.c:882 sequencer.c:1018 +#: sequencer.c:1611 sequencer.c:2181 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:884 +#: sequencer.c:1613 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:886 +#: sequencer.c:1615 sequencer.c:1649 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:908 builtin/apply.c:4288 +#: sequencer.c:1635 builtin/grep.c:910 #, c-format -msgid "cannot open %s: %s" +msgid "cannot open '%s'" msgstr "" -#: sequencer.c:911 +#: sequencer.c:1637 #, c-format -msgid "cannot read %s: %s" +msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:912 +#: sequencer.c:1638 msgid "unexpected end of file" msgstr "" -#: sequencer.c:918 +#: sequencer.c:1644 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:941 +#: sequencer.c:1655 +msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" +msgstr "" + +#: sequencer.c:1792 sequencer.c:2080 +msgid "cannot read HEAD" +msgstr "" + +#: sequencer.c:1832 builtin/difftool.c:616 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "" + +#: sequencer.c:1848 +msgid "could not read index" +msgstr "" + +#: sequencer.c:1853 +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" + +#: sequencer.c:1859 +msgid "and made changes to the index and/or the working tree\n" +msgstr "" + +#: sequencer.c:1865 +#, c-format +msgid "" +"execution succeeded: %s\n" +"but left changes to the index and/or the working tree\n" +"Commit or stash your changes, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" + +#: sequencer.c:1920 git-rebase.sh:169 +#, c-format +msgid "Applied autostash." +msgstr "" + +#: sequencer.c:1932 #, c-format -msgid "Could not format %s." +msgid "cannot store %s" msgstr "" -#: sequencer.c:1086 +#: sequencer.c:1934 git-rebase.sh:173 +#, c-format +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" + +#: sequencer.c:2016 +#, c-format +msgid "Stopped at %s... %.*s\n" +msgstr "" + +#: sequencer.c:2058 +#, c-format +msgid "unknown command %d" +msgstr "" + +#: sequencer.c:2088 +msgid "could not read orig-head" +msgstr "" + +#: sequencer.c:2092 +msgid "could not read 'onto'" +msgstr "" + +#: sequencer.c:2099 +#, c-format +msgid "could not update %s" +msgstr "" + +#: sequencer.c:2106 +#, c-format +msgid "could not update HEAD to %s" +msgstr "" + +#: sequencer.c:2190 +msgid "cannot rebase: You have unstaged changes." +msgstr "" + +#: sequencer.c:2195 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "" + +#: sequencer.c:2204 +msgid "cannot amend non-existing commit" +msgstr "" + +#: sequencer.c:2206 +#, c-format +msgid "invalid file: '%s'" +msgstr "" + +#: sequencer.c:2208 +#, c-format +msgid "invalid contents: '%s'" +msgstr "" + +#: sequencer.c:2211 +msgid "" +"\n" +"You have uncommitted changes in your working tree. Please, commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" + +#: sequencer.c:2221 +msgid "could not commit staged changes." +msgstr "" + +#: sequencer.c:2301 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1089 +#: sequencer.c:2305 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1123 -msgid "Can't revert as initial commit" +#: sequencer.c:2338 +msgid "can't revert as initial commit" +msgstr "" + +#: setup.c:165 +#, 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 "" -#: sequencer.c:1124 -msgid "Can't cherry-pick into empty head" +#: setup.c:178 +#, 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 "" -#: sha1_name.c:440 +#: setup.c:228 +#, 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:475 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "" + +#: setup.c:483 +msgid "unknown repository extensions found:" +msgstr "" + +#: setup.c:776 +#, c-format +msgid "Not a git repository (or any of the parent directories): %s" +msgstr "" + +#: setup.c:778 builtin/index-pack.c:1646 +msgid "Cannot come back to cwd" +msgstr "" + +#: setup.c:1010 +msgid "Unable to read current working directory" +msgstr "" + +#: setup.c:1022 setup.c:1028 +#, c-format +msgid "Cannot change to '%s'" +msgstr "" + +#: setup.c:1041 +#, 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:1106 +#, 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:559 +#, c-format +msgid "path '%s' does not exist" +msgstr "" + +#: sha1_file.c:585 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" + +#: sha1_file.c:591 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "" + +#: sha1_file.c:597 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "" + +#: sha1_file.c:605 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "" + +#: sha1_file.c:1245 +msgid "offset before end of packfile (broken .idx?)" +msgstr "" + +#: sha1_file.c:2721 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "" + +#: sha1_file.c:2725 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "" + +#: sha1_name.c:409 +#, c-format +msgid "short SHA1 %s is ambiguous" +msgstr "" + +#: sha1_name.c:420 +msgid "The candidates are:" +msgstr "" + +#: sha1_name.c:580 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" @@ -1349,463 +3310,824 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: sha1_name.c:1068 -msgid "HEAD does not point to a branch" +#: submodule.c:67 submodule.c:101 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: sha1_name.c:1071 +#: submodule.c:71 submodule.c:105 #, c-format -msgid "No such branch: '%s'" +msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: sha1_name.c:1073 +#: submodule.c:79 #, c-format -msgid "No upstream configured for branch '%s'" +msgid "Could not update .gitmodules entry %s" msgstr "" -#: sha1_name.c:1077 +#: submodule.c:112 #, c-format -msgid "Upstream branch '%s' not stored as a remote-tracking branch" +msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:64 submodule.c:98 -msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +#: submodule.c:123 +msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:68 submodule.c:102 +#: submodule.c:161 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "" + +#: submodule.c:1194 #, c-format -msgid "Could not find section in .gitmodules where path=%s" +msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:76 +#: submodule.c:1332 #, c-format -msgid "Could not update .gitmodules entry %s" +msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:109 +#: submodule.c:1345 #, c-format -msgid "Could not remove .gitmodules entry for %s" +msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:120 -msgid "staging updated .gitmodules failed" +#: submodule.c:1421 +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "" + +#: submodule.c:1678 +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "" + +#: submodule.c:1690 submodule.c:1746 +#, c-format +msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:1109 builtin/init-db.c:371 +#: submodule.c:1694 builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:688 #, c-format -msgid "Could not create git link %s" +msgid "could not create directory '%s'" msgstr "" -#: submodule.c:1120 +#: submodule.c:1697 #, c-format -msgid "Could not set core.worktree in %s" +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" msgstr "" -#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 -#: trailer.c:561 +#: submodule.c:1781 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "" + +#: submodule.c:1825 +msgid "could not start ls-files in .." +msgstr "" + +#: submodule.c:1845 +msgid "BUG: returned path string doesn't match cwd?" +msgstr "" + +#: submodule.c:1864 +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "" + +#: submodule-config.c:380 +#, c-format +msgid "invalid value for %s" +msgstr "" + +#: trailer.c:240 +#, c-format +msgid "running trailer command '%s' failed" +msgstr "" + +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 +#: trailer.c:543 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:543 trailer.c:548 builtin/remote.c:290 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "" -#: trailer.c:581 +#: trailer.c:702 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:701 +#: trailer.c:722 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:704 +#: trailer.c:725 msgid "could not read from stdin" msgstr "" -#: unpack-trees.c:202 +#: trailer.c:949 builtin/am.c:44 +#, c-format +msgid "could not stat %s" +msgstr "" + +#: trailer.c:951 +#, c-format +msgid "file %s is not a regular file" +msgstr "" + +#: trailer.c:953 +#, c-format +msgid "file %s is not writable by user" +msgstr "" + +#: trailer.c:965 +msgid "could not open temporary file" +msgstr "" + +#: trailer.c:1001 +#, 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:889 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" + +#: transport.c:893 +#, 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:901 +msgid "Aborting." +msgstr "" + +#: transport-helper.c:1080 +#, 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:104 +#, 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:106 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:109 +#, 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:111 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:114 +#, 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:116 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:121 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in them:\n" +"%s" +msgstr "" + +#: unpack-trees.c:125 +#, 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:127 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:130 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you merge." +msgstr "" + +#: unpack-trees.c:132 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:135 +#, 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:137 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:142 +#, 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:144 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:147 +#, 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:149 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:152 +#, 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:154 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:161 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "" + +#: unpack-trees.c:164 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" + +#: unpack-trees.c:166 +#, c-format +msgid "" +"The following working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" + +#: unpack-trees.c:168 +#, c-format +msgid "" +"The following working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" + +#: unpack-trees.c:170 +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" + +#: unpack-trees.c:247 +#, c-format +msgid "Aborting\n" +msgstr "" + +#: unpack-trees.c:272 +#, c-format +msgid "submodule update strategy not supported for submodule '%s'" +msgstr "" + +#: unpack-trees.c:340 msgid "Checking out files" msgstr "" -#: urlmatch.c:120 +#: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "" -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 #, c-format msgid "invalid %XX escape sequence" msgstr "" -#: urlmatch.c:172 +#: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" msgstr "" -#: urlmatch.c:189 +#: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" msgstr "" -#: urlmatch.c:199 +#: urlmatch.c:247 msgid "invalid characters in host name" msgstr "" -#: urlmatch.c:244 urlmatch.c:255 +#: urlmatch.c:292 urlmatch.c:303 msgid "invalid port number" msgstr "" -#: urlmatch.c:322 +#: urlmatch.c:371 msgid "invalid '..' path segment" msgstr "" -#: wrapper.c:523 +#: worktree.c:285 #, c-format -msgid "unable to access '%s': %s" +msgid "failed to read '%s'" msgstr "" -#: wrapper.c:544 +#: wrapper.c:222 wrapper.c:392 #, c-format -msgid "unable to access '%s'" +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:555 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 +#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 +#: builtin/pull.c:341 #, c-format -msgid "unable to look up current user in the passwd file: %s" +msgid "could not open '%s' for reading" msgstr "" -#: wrapper.c:556 -msgid "no such user" +#: wrapper.c:581 wrapper.c:602 +#, c-format +msgid "unable to access '%s'" msgstr "" -#: wrapper.c:564 +#: wrapper.c:610 msgid "unable to get current working directory" msgstr "" -#: wt-status.c:150 +#: wrapper.c:634 +#, c-format +msgid "could not write to %s" +msgstr "" + +#: wrapper.c:636 +#, c-format +msgid "could not close %s" +msgstr "" + +#: wt-status.c:151 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:178 wt-status.c:205 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:180 wt-status.c:207 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:183 +#: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:186 wt-status.c:190 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:187 +#: wt-status.c:188 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:198 wt-status.c:878 +#: wt-status.c:199 wt-status.c:958 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:216 wt-status.c:887 +#: wt-status.c:217 wt-status.c:967 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:220 +#: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:222 +#: wt-status.c:223 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:223 +#: wt-status.c:224 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:237 +#: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:252 +#: wt-status.c:253 msgid "both deleted:" msgstr "" -#: wt-status.c:254 +#: wt-status.c:255 msgid "added by us:" msgstr "" -#: wt-status.c:256 +#: wt-status.c:257 msgid "deleted by them:" msgstr "" -#: wt-status.c:258 +#: wt-status.c:259 msgid "added by them:" msgstr "" -#: wt-status.c:260 +#: wt-status.c:261 msgid "deleted by us:" msgstr "" -#: wt-status.c:262 +#: wt-status.c:263 msgid "both added:" msgstr "" -#: wt-status.c:264 +#: wt-status.c:265 msgid "both modified:" msgstr "" -#: wt-status.c:266 -#, c-format -msgid "bug: unhandled unmerged status %x" -msgstr "" - -#: wt-status.c:274 +#: wt-status.c:275 msgid "new file:" msgstr "" -#: wt-status.c:276 +#: wt-status.c:277 msgid "copied:" msgstr "" -#: wt-status.c:278 +#: wt-status.c:279 msgid "deleted:" msgstr "" -#: wt-status.c:280 +#: wt-status.c:281 msgid "modified:" msgstr "" -#: wt-status.c:282 +#: wt-status.c:283 msgid "renamed:" msgstr "" -#: wt-status.c:284 +#: wt-status.c:285 msgid "typechange:" msgstr "" -#: wt-status.c:286 +#: wt-status.c:287 msgid "unknown:" msgstr "" -#: wt-status.c:288 +#: wt-status.c:289 msgid "unmerged:" msgstr "" -#: wt-status.c:370 +#: wt-status.c:371 msgid "new commits, " msgstr "" -#: wt-status.c:372 +#: wt-status.c:373 msgid "modified content, " msgstr "" -#: wt-status.c:374 +#: wt-status.c:375 msgid "untracked content, " msgstr "" -#: wt-status.c:391 -#, c-format -msgid "bug: unhandled diff status %c" -msgstr "" - -#: wt-status.c:753 +#: wt-status.c:831 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:755 +#: wt-status.c:833 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:835 +#: wt-status.c:914 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:946 +#: wt-status.c:1026 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:949 +#: wt-status.c:1029 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:952 +#: wt-status.c:1031 +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr "" + +#: wt-status.c:1036 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:955 +#: wt-status.c:1039 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:965 +#: wt-status.c:1049 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:968 +#: wt-status.c:1052 msgid "The current patch is empty." msgstr "" -#: wt-status.c:972 +#: wt-status.c:1056 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:974 +#: wt-status.c:1058 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:976 +#: wt-status.c:1060 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1036 wt-status.c:1053 +#: wt-status.c:1189 +msgid "git-rebase-todo is missing." +msgstr "" + +#: wt-status.c:1191 +msgid "No commands done." +msgstr "" + +#: wt-status.c:1194 +#, c-format +msgid "Last command done (%d command done):" +msgid_plural "Last commands done (%d commands done):" +msgstr[0] "" +msgstr[1] "" + +#: wt-status.c:1205 +#, c-format +msgid " (see more in file %s)" +msgstr "" + +#: wt-status.c:1210 +msgid "No commands remaining." +msgstr "" + +#: wt-status.c:1213 +#, c-format +msgid "Next command to do (%d remaining command):" +msgid_plural "Next commands to do (%d remaining commands):" +msgstr[0] "" +msgstr[1] "" + +#: wt-status.c:1221 +msgid " (use \"git rebase --edit-todo\" to view and edit)" +msgstr "" + +#: wt-status.c:1234 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1041 wt-status.c:1058 +#: wt-status.c:1239 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1044 +#: wt-status.c:1253 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1046 +#: wt-status.c:1255 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1048 +#: wt-status.c:1257 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1061 +#: wt-status.c:1263 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1065 +#: wt-status.c:1267 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1070 +#: wt-status.c:1272 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1073 +#: wt-status.c:1275 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1077 +#: wt-status.c:1279 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1082 +#: wt-status.c:1284 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1085 +#: wt-status.c:1287 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1087 +#: wt-status.c:1289 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1097 +#: wt-status.c:1299 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1102 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1105 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1107 +#: wt-status.c:1309 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1116 +#: wt-status.c:1318 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1121 +#: wt-status.c:1323 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1124 +#: wt-status.c:1326 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1126 +#: wt-status.c:1328 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1137 +#: wt-status.c:1339 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1141 +#: wt-status.c:1343 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1144 +#: wt-status.c:1346 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1321 +#: wt-status.c:1543 msgid "On branch " msgstr "" -#: wt-status.c:1328 +#: wt-status.c:1549 +msgid "interactive rebase in progress; onto " +msgstr "" + +#: wt-status.c:1551 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1333 +#: wt-status.c:1556 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1335 +#: wt-status.c:1558 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1338 +#: wt-status.c:1561 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1355 +#: wt-status.c:1579 msgid "Initial commit" msgstr "" -#: wt-status.c:1369 +#: wt-status.c:1593 msgid "Untracked files" msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1595 msgid "Ignored files" msgstr "" -#: wt-status.c:1375 +#: wt-status.c:1599 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1813,78 +4135,93 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1381 +#: wt-status.c:1605 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1383 +#: wt-status.c:1607 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1389 +#: wt-status.c:1613 msgid "No changes" msgstr "" -#: wt-status.c:1394 +#: wt-status.c:1618 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1397 +#: wt-status.c:1621 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1400 +#: wt-status.c:1624 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1403 +#: wt-status.c:1627 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1630 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1409 wt-status.c:1414 +#: wt-status.c:1633 wt-status.c:1638 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1412 +#: wt-status.c:1636 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1416 +#: wt-status.c:1640 #, c-format -msgid "nothing to commit, working directory clean\n" +msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1525 +#: wt-status.c:1749 +msgid "Initial commit on " +msgstr "" + +#: wt-status.c:1753 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1531 -msgid "Initial commit on " +#: wt-status.c:1782 wt-status.c:1790 +msgid "behind " msgstr "" -#: wt-status.c:1563 -msgid "gone" +#: wt-status.c:1785 wt-status.c:1788 +msgid "ahead " msgstr "" -#: wt-status.c:1565 wt-status.c:1573 -msgid "behind " +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2280 +#, c-format +msgid "cannot %s: You have unstaged changes." msgstr "" -#: compat/precompose_utf8.c:55 builtin/clone.c:360 +#: wt-status.c:2286 +msgid "additionally, your index contains uncommitted changes." +msgstr "" + +#: wt-status.c:2288 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "" + +#: compat/precompose_utf8.c:57 builtin/clone.c:432 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -1893,630 +4230,511 @@ msgstr "" msgid "git add [<options>] [--] <pathspec>..." msgstr "" -#: builtin/add.c:65 +#: builtin/add.c:80 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:70 builtin/commit.c:277 +#: builtin/add.c:85 builtin/commit.c:291 msgid "updating files failed" msgstr "" -#: builtin/add.c:80 +#: builtin/add.c:95 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:134 +#: builtin/add.c:149 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:194 builtin/rev-parse.c:785 +#: builtin/add.c:209 builtin/rev-parse.c:872 msgid "Could not read the index" msgstr "" -#: builtin/add.c:205 +#: builtin/add.c:220 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:209 +#: builtin/add.c:224 msgid "Could not write patch" msgstr "" -#: builtin/add.c:214 +#: builtin/add.c:227 +msgid "editing patch failed" +msgstr "" + +#: builtin/add.c:230 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:216 +#: builtin/add.c:232 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:221 +#: builtin/add.c:237 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:231 +#: builtin/add.c:247 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 -#: builtin/rm.c:269 +#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 +#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163 msgid "dry run" msgstr "" -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608 -#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 -msgid "be verbose" -msgstr "" - -#: builtin/add.c:251 +#: builtin/add.c:269 msgid "interactive picking" msgstr "" -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:253 +#: builtin/add.c:271 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:254 +#: builtin/add.c:272 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:255 +#: builtin/add.c:273 msgid "update tracked files" msgstr "" -#: builtin/add.c:256 +#: builtin/add.c:274 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:257 +#: builtin/add.c:275 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:260 +#: builtin/add.c:278 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:262 +#: builtin/add.c:280 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:263 +#: builtin/add.c:281 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:264 +#: builtin/add.c:282 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:286 +#: builtin/add.c:283 builtin/update-index.c:951 +msgid "(+/-)x" +msgstr "" + +#: builtin/add.c:283 builtin/update-index.c:952 +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:293 +#: builtin/add.c:312 msgid "adding files failed" msgstr "" -#: builtin/add.c:329 +#: builtin/add.c:348 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:336 +#: builtin/add.c:355 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:357 +#: builtin/add.c:359 #, c-format -msgid "Nothing specified, nothing added.\n" +msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:358 +#: builtin/add.c:374 #, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "" - -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 -msgid "index file corrupt" -msgstr "" - -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431 -msgid "Unable to write new index file" -msgstr "" - -#: builtin/apply.c:59 -msgid "git apply [<options>] [<patch>...]" +msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/apply.c:112 +#: builtin/add.c:375 #, c-format -msgid "unrecognized whitespace option '%s'" +msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/apply.c:127 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 +#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 +#: builtin/submodule--helper.c:244 +msgid "index file corrupt" msgstr "" -#: builtin/apply.c:822 -#, c-format -msgid "Cannot prepare timestamp regexp %s" +#: builtin/am.c:412 +msgid "could not parse author script" msgstr "" -#: builtin/apply.c:831 +#: builtin/am.c:489 #, c-format -msgid "regexec returned %d for input: %s" +msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/apply.c:912 +#: builtin/am.c:530 #, c-format -msgid "unable to find filename in patch at line %d" +msgid "Malformed input line: '%s'." msgstr "" -#: builtin/apply.c:944 +#: builtin/am.c:567 #, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/apply.c:948 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" +#: builtin/am.c:593 +msgid "fseek failed" msgstr "" -#: builtin/apply.c:949 +#: builtin/am.c:777 #, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgid "could not parse patch '%s'" msgstr "" -#: builtin/apply.c:956 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" +#: builtin/am.c:842 +msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/apply.c:1419 -#, c-format -msgid "recount: unexpected line: %.*s" +#: builtin/am.c:889 +msgid "invalid timestamp" msgstr "" -#: builtin/apply.c:1476 -#, c-format -msgid "patch fragment without header at line %d: %.*s" +#: builtin/am.c:892 builtin/am.c:900 +msgid "invalid Date line" msgstr "" -#: builtin/apply.c:1493 -#, 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] "" - -#: builtin/apply.c:1656 -msgid "new file depends on old contents" +#: builtin/am.c:897 +msgid "invalid timezone offset" msgstr "" -#: builtin/apply.c:1658 -msgid "deleted file still has contents" +#: builtin/am.c:986 +msgid "Patch format detection failed." msgstr "" -#: builtin/apply.c:1684 +#: builtin/am.c:991 builtin/clone.c:397 #, c-format -msgid "corrupt patch at line %d" +msgid "failed to create directory '%s'" msgstr "" -#: builtin/apply.c:1720 -#, c-format -msgid "new file %s depends on old contents" +#: builtin/am.c:995 +msgid "Failed to split patches." msgstr "" -#: builtin/apply.c:1722 -#, c-format -msgid "deleted file %s still has contents" +#: builtin/am.c:1127 builtin/commit.c:376 +msgid "unable to write index file" msgstr "" -#: builtin/apply.c:1725 +#: builtin/am.c:1178 #, c-format -msgid "** warning: file %s becomes empty but is not deleted" +msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/apply.c:1871 +#: builtin/am.c:1179 #, c-format -msgid "corrupt binary patch at line %d: %.*s" +msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/apply.c:1900 +#: builtin/am.c:1180 #, c-format -msgid "unrecognized binary patch at line %d" +msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/apply.c:2051 -#, c-format -msgid "patch with only garbage at line %d" +#: builtin/am.c:1315 +msgid "Patch is empty. Was it split wrong?" msgstr "" -#: builtin/apply.c:2141 +#: builtin/am.c:1386 builtin/log.c:1557 #, c-format -msgid "unable to read symlink %s" +msgid "invalid ident line: %s" msgstr "" -#: builtin/apply.c:2145 +#: builtin/am.c:1413 #, c-format -msgid "unable to open or read %s" +msgid "unable to parse commit %s" msgstr "" -#: builtin/apply.c:2778 -#, c-format -msgid "invalid start of line: '%c'" +#: builtin/am.c:1606 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/apply.c:2897 -#, 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] "" - -#: builtin/apply.c:2909 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +#: builtin/am.c:1608 +msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/apply.c:2915 -#, c-format +#: builtin/am.c:1627 msgid "" -"while searching for:\n" -"%.*s" -msgstr "" - -#: builtin/apply.c:2935 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "" - -#: builtin/apply.c:3036 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "" - -#: builtin/apply.c:3042 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "" - -#: builtin/apply.c:3063 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "" - -#: builtin/apply.c:3187 -#, c-format -msgid "cannot checkout %s" -msgstr "" - -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288 -#, c-format -msgid "read of %s failed" -msgstr "" - -#: builtin/apply.c:3240 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "" - -#: builtin/apply.c:3268 builtin/apply.c:3490 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "" - -#: builtin/apply.c:3349 builtin/apply.c:3504 -#, c-format -msgid "%s: does not exist in index" -msgstr "" - -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518 -#, c-format -msgid "%s: %s" -msgstr "" - -#: builtin/apply.c:3358 builtin/apply.c:3512 -#, c-format -msgid "%s: does not match index" -msgstr "" - -#: builtin/apply.c:3460 -msgid "removal patch leaves file contents" -msgstr "" - -#: builtin/apply.c:3529 -#, c-format -msgid "%s: wrong type" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." msgstr "" -#: builtin/apply.c:3531 -#, c-format -msgid "%s has type %o, expected %o" +#: builtin/am.c:1633 +msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/apply.c:3690 builtin/apply.c:3692 -#, c-format -msgid "invalid path '%s'" +#: builtin/am.c:1658 +msgid "Failed to merge in the changes." msgstr "" -#: builtin/apply.c:3747 -#, c-format -msgid "%s: already exists in index" +#: builtin/am.c:1682 builtin/merge.c:631 +msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/apply.c:3750 -#, c-format -msgid "%s: already exists in working directory" +#: builtin/am.c:1689 +msgid "applying to an empty history" msgstr "" -#: builtin/apply.c:3770 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" +#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/merge.c:827 +msgid "failed to write commit object" msgstr "" -#: builtin/apply.c:3775 +#: builtin/am.c:1735 builtin/am.c:1739 #, c-format -msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/apply.c:3795 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" +#: builtin/am.c:1755 +msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/apply.c:3799 -#, c-format -msgid "%s: patch does not apply" +#: builtin/am.c:1760 +msgid "Commit Body is:" msgstr "" -#: builtin/apply.c:3813 -#, c-format -msgid "Checking patch %s..." +#. 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:1770 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/am.c:1820 #, c-format -msgid "make_cache_entry failed for path '%s'" +msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/apply.c:4049 +#: builtin/am.c:1860 builtin/am.c:1932 #, c-format -msgid "unable to remove %s from index" +msgid "Applying: %.*s" msgstr "" -#: builtin/apply.c:4078 -#, c-format -msgid "corrupt patch for submodule %s" +#: builtin/am.c:1876 +msgid "No changes -- Patch already applied." msgstr "" -#: builtin/apply.c:4082 +#: builtin/am.c:1884 #, c-format -msgid "unable to stat newly created file '%s'" +msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/apply.c:4087 +#: builtin/am.c:1890 #, c-format -msgid "unable to create backing store for newly created file %s" +msgid "The copy of the patch that failed is found in: %s" msgstr "" -#: builtin/apply.c:4090 builtin/apply.c:4198 -#, c-format -msgid "unable to add cache entry for %s" +#: builtin/am.c:1935 +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/apply.c:4123 -#, c-format -msgid "closing file '%s'" +#: builtin/am.c:1942 +msgid "" +"You still have unmerged paths in your index.\n" +"Did you forget to use 'git add'?" msgstr "" -#: builtin/apply.c:4172 +#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 +#: builtin/reset.c:316 #, c-format -msgid "unable to write file '%s' mode %o" +msgid "Could not parse object '%s'." msgstr "" -#: builtin/apply.c:4259 -#, c-format -msgid "Applied patch %s cleanly." +#: builtin/am.c:2102 +msgid "failed to clean index" msgstr "" -#: builtin/apply.c:4267 -msgid "internal error" +#: builtin/am.c:2136 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/apply.c:4270 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "" -msgstr[1] "" - -#: builtin/apply.c:4280 +#: builtin/am.c:2199 #, c-format -msgid "truncating .rej filename to %.*s.rej" +msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/apply.c:4301 -#, c-format -msgid "Hunk #%d applied cleanly." +#: builtin/am.c:2232 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/apply.c:4304 -#, c-format -msgid "Rejected hunk #%d." +#: builtin/am.c:2233 +msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/apply.c:4394 -msgid "unrecognized input" +#: builtin/am.c:2239 +msgid "run interactively" msgstr "" -#: builtin/apply.c:4405 -msgid "unable to read index file" +#: builtin/am.c:2241 +msgid "historical option -- no-op" msgstr "" -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 -#: builtin/fetch.c:92 -msgid "path" +#: builtin/am.c:2243 +msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/apply.c:4523 -msgid "don't apply changes matching the given path" +#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 +#: builtin/repack.c:178 +msgid "be quiet" msgstr "" -#: builtin/apply.c:4526 -msgid "apply changes matching the given path" +#: builtin/am.c:2246 +msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/apply.c:4528 -msgid "num" +#: builtin/am.c:2249 +msgid "recode into utf8 (default)" msgstr "" -#: builtin/apply.c:4529 -msgid "remove <num> leading slashes from traditional diff paths" +#: builtin/am.c:2251 +msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/apply.c:4532 -msgid "ignore additions made by the patch" +#: builtin/am.c:2253 +msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/apply.c:4534 -msgid "instead of applying the patch, output diffstat for the input" +#: builtin/am.c:2255 +msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/apply.c:4538 -msgid "show number of added and deleted lines in decimal notation" +#: builtin/am.c:2257 +msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/apply.c:4540 -msgid "instead of applying the patch, output a summary for the input" +#: builtin/am.c:2260 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/apply.c:4542 -msgid "instead of applying the patch, see if the patch is applicable" +#: builtin/am.c:2263 +msgid "strip everything before a scissors line" msgstr "" -#: builtin/apply.c:4544 -msgid "make sure the patch is applicable to the current index" +#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 +#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 +#: builtin/am.c:2292 +msgid "pass it through git-apply" msgstr "" -#: builtin/apply.c:4546 -msgid "apply a patch without touching the working tree" -msgstr "" - -#: builtin/apply.c:4548 -msgid "accept a patch that touches outside the working area" -msgstr "" - -#: builtin/apply.c:4550 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "" - -#: builtin/apply.c:4552 -msgid "attempt three-way merge if a patch does not apply" +#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 +#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 +msgid "n" msgstr "" -#: builtin/apply.c:4554 -msgid "build a temporary index based on embedded index information" +#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 +#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 +msgid "format" msgstr "" -#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 -msgid "paths are separated with NUL character" +#: builtin/am.c:2289 +msgid "format the patch(es) are in" msgstr "" -#: builtin/apply.c:4559 -msgid "ensure at least <n> lines of context match" +#: builtin/am.c:2295 +msgid "override error message when patch failure occurs" msgstr "" -#: builtin/apply.c:4560 -msgid "action" +#: builtin/am.c:2297 +msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/apply.c:4561 -msgid "detect new or modified lines that have whitespace errors" +#: builtin/am.c:2300 +msgid "synonyms for --continue" msgstr "" -#: builtin/apply.c:4564 builtin/apply.c:4567 -msgid "ignore changes in whitespace when finding context" +#: builtin/am.c:2303 +msgid "skip the current patch" msgstr "" -#: builtin/apply.c:4570 -msgid "apply the patch in reverse" +#: builtin/am.c:2306 +msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/apply.c:4572 -msgid "don't expect at least one line of context" +#: builtin/am.c:2310 +msgid "lie about committer date" msgstr "" -#: builtin/apply.c:4574 -msgid "leave the rejected hunks in corresponding *.rej files" +#: builtin/am.c:2312 +msgid "use current timestamp for author date" msgstr "" -#: builtin/apply.c:4576 -msgid "allow overlapping hunks" +#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 +#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 +msgid "key-id" msgstr "" -#: builtin/apply.c:4579 -msgid "tolerate incorrectly detected missing new-line at the end of file" +#: builtin/am.c:2315 +msgid "GPG-sign commits" msgstr "" -#: builtin/apply.c:4582 -msgid "do not trust the line counts in the hunk headers" +#: builtin/am.c:2318 +msgid "(internal use for git-rebase)" msgstr "" -#: builtin/apply.c:4584 -msgid "root" +#: builtin/am.c:2333 +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/apply.c:4585 -msgid "prepend <root> to all filenames" +#: builtin/am.c:2340 +msgid "failed to read the index" msgstr "" -#: builtin/apply.c:4607 -msgid "--3way outside a repository" +#: builtin/am.c:2355 +#, c-format +msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/apply.c:4615 -msgid "--index outside a repository" +#: builtin/am.c:2379 +#, c-format +msgid "" +"Stray %s directory found.\n" +"Use \"git am --abort\" to remove it." msgstr "" -#: builtin/apply.c:4618 -msgid "--cached outside a repository" +#: builtin/am.c:2385 +msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/apply.c:4637 -#, c-format -msgid "can't open patch '%s'" +#: builtin/apply.c:8 +msgid "git apply [<options>] [<patch>...]" msgstr "" -#: builtin/apply.c:4651 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "" -msgstr[1] "" - -#: builtin/apply.c:4657 builtin/apply.c:4667 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "" -msgstr[1] "" - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -2539,11 +4757,6 @@ msgstr "" 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 "" @@ -2564,178 +4777,236 @@ msgstr "" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/blame.c:30 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file" +#: builtin/blame.c:33 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" -#: builtin/blame.c:35 +#: builtin/blame.c:38 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2500 +#: builtin/blame.c:1777 +msgid "Blaming lines" +msgstr "" + +#: builtin/blame.c:2573 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2501 +#: builtin/blame.c:2574 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2502 +#: builtin/blame.c:2575 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2503 +#: builtin/blame.c:2576 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2504 +#: builtin/blame.c:2577 +msgid "Force progress reporting" +msgstr "" + +#: builtin/blame.c:2578 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2505 +#: builtin/blame.c:2579 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2506 +#: builtin/blame.c:2580 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2507 +#: builtin/blame.c:2581 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2508 +#: builtin/blame.c:2582 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2509 +#: builtin/blame.c:2583 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2510 +#: builtin/blame.c:2584 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2511 +#: builtin/blame.c:2585 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2512 +#: builtin/blame.c:2586 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2513 +#: builtin/blame.c:2587 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2514 +#: builtin/blame.c:2588 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2515 +#: builtin/blame.c:2595 +msgid "Use an experimental heuristic to improve diffs" +msgstr "" + +#: builtin/blame.c:2597 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2516 +#: builtin/blame.c:2598 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2517 +#: builtin/blame.c:2599 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2518 builtin/blame.c:2519 +#: builtin/blame.c:2600 builtin/blame.c:2601 msgid "score" msgstr "" -#: builtin/blame.c:2518 +#: builtin/blame.c:2600 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2519 +#: builtin/blame.c:2601 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2520 +#: builtin/blame.c:2602 msgid "n,m" msgstr "" -#: builtin/blame.c:2520 +#: builtin/blame.c:2602 msgid "Process only line range n,m, counting from 1" msgstr "" +#: builtin/blame.c:2649 +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:2601 +#: builtin/blame.c:2697 msgid "4 years, 11 months ago" msgstr "" -#: builtin/branch.c:24 +#: builtin/blame.c:2777 +msgid "--contents and --reverse do not blend well." +msgstr "" + +#: builtin/blame.c:2797 +msgid "cannot use --contents with final commit object name" +msgstr "" + +#: builtin/blame.c:2802 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" + +#: builtin/blame.c:2829 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" + +#: builtin/blame.c:2840 +#, c-format +msgid "no such path %s in %s" +msgstr "" + +#: builtin/blame.c:2851 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "" + +#: builtin/blame.c:2870 +#, 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:25 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "" -#: builtin/branch.c:26 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "" -#: builtin/branch.c:27 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" -#: builtin/branch.c:152 +#: builtin/branch.c:30 +msgid "git branch [<options>] [-r | -a] [--points-at]" +msgstr "" + +#: builtin/branch.c:31 +msgid "git branch [<options>] [-r | -a] [--format]" +msgstr "" + +#: builtin/branch.c:144 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:156 +#: builtin/branch.c:148 #, 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:170 +#: builtin/branch.c:162 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:174 +#: builtin/branch.c:166 #, 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:187 +#: builtin/branch.c:179 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:215 +#: builtin/branch.c:210 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:221 +#: builtin/branch.c:216 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:229 +#: builtin/branch.c:230 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." +msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "" #: builtin/branch.c:245 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "" #: builtin/branch.c:246 @@ -2743,323 +5014,285 @@ msgstr "" msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:260 -#, c-format -msgid "Error deleting remote branch '%s'" -msgstr "" - #: builtin/branch.c:261 #, c-format -msgid "Error deleting branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:268 +#: builtin/branch.c:262 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Error deleting branch '%s'" msgstr "" #: builtin/branch.c:269 #, c-format -msgid "Deleted branch %s (was %s).\n" -msgstr "" - -#: builtin/branch.c:370 -#, c-format -msgid "branch '%s' does not point at a commit" -msgstr "" - -#: builtin/branch.c:459 -#, c-format -msgid "[%s: gone]" -msgstr "" - -#: builtin/branch.c:464 -#, c-format -msgid "[%s]" -msgstr "" - -#: builtin/branch.c:469 -#, c-format -msgid "[%s: behind %d]" -msgstr "" - -#: builtin/branch.c:471 -#, c-format -msgid "[behind %d]" -msgstr "" - -#: builtin/branch.c:475 -#, c-format -msgid "[%s: ahead %d]" -msgstr "" - -#: builtin/branch.c:477 -#, c-format -msgid "[ahead %d]" -msgstr "" - -#: builtin/branch.c:480 -#, c-format -msgid "[%s: ahead %d, behind %d]" -msgstr "" - -#: builtin/branch.c:483 -#, c-format -msgid "[ahead %d, behind %d]" -msgstr "" - -#: builtin/branch.c:496 -msgid " **** invalid ref ****" -msgstr "" - -#: builtin/branch.c:587 -#, c-format -msgid "(no branch, rebasing %s)" -msgstr "" - -#: builtin/branch.c:590 -#, c-format -msgid "(no branch, bisect started on %s)" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:596 +#: builtin/branch.c:270 #, c-format -msgid "(HEAD detached at %s)" +msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:599 +#: builtin/branch.c:441 #, c-format -msgid "(HEAD detached from %s)" +msgid "Branch %s is being rebased at %s" msgstr "" -#: builtin/branch.c:603 -msgid "(no branch)" -msgstr "" - -#: builtin/branch.c:650 +#: builtin/branch.c:445 #, c-format -msgid "object '%s' does not point to a commit" -msgstr "" - -#: builtin/branch.c:698 -msgid "some refs could not be read" +msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:711 +#: builtin/branch.c:460 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:721 +#: builtin/branch.c:470 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:736 +#: builtin/branch.c:487 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:740 +#: builtin/branch.c:490 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:744 +#: builtin/branch.c:493 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:751 +#: builtin/branch.c:502 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:766 -#, c-format -msgid "malformed object name %s" -msgstr "" - -#: builtin/branch.c:790 +#: builtin/branch.c:518 #, c-format -msgid "could not write branch description template: %s" +msgid "" +"Please edit the description for the branch\n" +" %s\n" +"Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:820 +#: builtin/branch.c:551 msgid "Generic options" msgstr "" -#: builtin/branch.c:822 +#: builtin/branch.c:553 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:823 +#: builtin/branch.c:554 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:824 +#: builtin/branch.c:555 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:826 +#: builtin/branch.c:557 msgid "change upstream info" msgstr "" -#: builtin/branch.c:830 +#: builtin/branch.c:559 +msgid "upstream" +msgstr "" + +#: builtin/branch.c:559 +msgid "change the upstream info" +msgstr "" + +#: builtin/branch.c:560 +msgid "Unset the upstream info" +msgstr "" + +#: builtin/branch.c:561 msgid "use colored output" msgstr "" -#: builtin/branch.c:831 +#: builtin/branch.c:562 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616 -#: builtin/tag.c:622 -msgid "commit" +#: builtin/branch.c:564 builtin/branch.c:566 +msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:835 builtin/branch.c:841 -msgid "print only branches that contain the commit" +#: builtin/branch.c:565 builtin/branch.c:567 +msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:847 +#: builtin/branch.c:570 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:848 +#: builtin/branch.c:571 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:850 +#: builtin/branch.c:573 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:851 +#: builtin/branch.c:574 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:852 +#: builtin/branch.c:575 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:853 +#: builtin/branch.c:576 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:854 +#: builtin/branch.c:577 msgid "list branch names" msgstr "" -#: builtin/branch.c:855 +#: builtin/branch.c:578 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:857 +#: builtin/branch.c:580 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:858 +#: builtin/branch.c:581 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:861 -msgid "print only not merged branches" +#: builtin/branch.c:582 +msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:867 -msgid "print only merged branches" +#: builtin/branch.c:583 +msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:871 +#: builtin/branch.c:584 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:884 +#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 +msgid "key" +msgstr "" + +#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 +msgid "field name to sort on" +msgstr "" + +#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 +#: builtin/tag.c:429 +msgid "object" +msgstr "" + +#: builtin/branch.c:589 +msgid "print only branches of the object" +msgstr "" + +#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 +msgid "sorting and filtering are case insensitive" +msgstr "" + +#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 +#: builtin/verify-tag.c:38 +msgid "format to use for the output" +msgstr "" + +#: builtin/branch.c:611 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:888 builtin/clone.c:637 +#: builtin/branch.c:615 builtin/clone.c:724 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:910 +#: builtin/branch.c:638 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:921 builtin/branch.c:960 +#: builtin/branch.c:649 builtin/branch.c:701 msgid "branch name required" msgstr "" -#: builtin/branch.c:936 +#: builtin/branch.c:677 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:941 +#: builtin/branch.c:682 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:948 +#: builtin/branch.c:689 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:951 +#: builtin/branch.c:692 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:966 +#: builtin/branch.c:707 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:971 +#: builtin/branch.c:712 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:975 +#: builtin/branch.c:716 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 +#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:982 +#: builtin/branch.c:723 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:994 +#: builtin/branch.c:735 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:998 +#: builtin/branch.c:739 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:1004 +#: builtin/branch.c:745 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:1018 +#: builtin/branch.c:759 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:1024 +#: builtin/branch.c:765 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:1027 +#: builtin/branch.c:768 #, 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:1044 +#: builtin/branch.c:785 #, c-format msgid "" "\n" @@ -3067,75 +5300,97 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:1045 -#, c-format -msgid " git branch -d %s\n" -msgstr "" - -#: builtin/branch.c:1046 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr "" - -#: builtin/bundle.c:47 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "" -#: builtin/bundle.c:56 +#: builtin/bundle.c:58 msgid "Need a repository to create a bundle." msgstr "" -#: builtin/bundle.c:60 +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:326 -msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>" +#: 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:327 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>" +#: builtin/cat-file.c:514 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" msgstr "" -#: builtin/cat-file.c:364 +#: builtin/cat-file.c:551 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:365 +#: builtin/cat-file.c:552 msgid "show object type" msgstr "" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:553 msgid "show object size" msgstr "" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:555 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:556 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:558 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:560 +msgid "for blob objects, run filters on object's content" +msgstr "" + +#: builtin/cat-file.c:561 git-submodule.sh:943 +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:376 +#: 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>...] < <list-of-paths>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "" #: builtin/check-attr.c:19 @@ -3154,7 +5409,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 msgid "suppress progress reporting" msgstr "" @@ -3207,157 +5462,164 @@ msgstr "" msgid "no contacts specified" msgstr "" -#: builtin/checkout-index.c:126 +#: builtin/checkout-index.c:127 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/checkout-index.c:188 +#: 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:189 +#: builtin/checkout-index.c:161 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:191 +#: builtin/checkout-index.c:163 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:165 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:195 +#: builtin/checkout-index.c:167 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:201 +#: builtin/checkout-index.c:171 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:173 msgid "write the content to temporary files" msgstr "" -#: builtin/checkout-index.c:204 builtin/column.c:30 +#: builtin/checkout-index.c:174 builtin/column.c:30 +#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 +#: builtin/worktree.c:477 msgid "string" msgstr "" -#: builtin/checkout-index.c:205 +#: builtin/checkout-index.c:175 msgid "when creating files, prepend <string>" msgstr "" -#: builtin/checkout-index.c:208 +#: builtin/checkout-index.c:177 msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:25 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "" -#: builtin/checkout.c:26 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "" -#: builtin/checkout.c:132 builtin/checkout.c:165 +#: builtin/checkout.c:153 builtin/checkout.c:186 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:155 builtin/checkout.c:188 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:150 +#: builtin/checkout.c:171 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:194 +#: builtin/checkout.c:215 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:211 +#: builtin/checkout.c:232 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:228 +#: builtin/checkout.c:249 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 -#: builtin/checkout.c:258 +#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 +#: builtin/checkout.c:278 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:261 builtin/checkout.c:264 +#: builtin/checkout.c:281 builtin/checkout.c:284 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:267 +#: builtin/checkout.c:287 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:278 builtin/checkout.c:467 -msgid "corrupt index file" -msgstr "" - -#: builtin/checkout.c:338 builtin/checkout.c:345 +#: builtin/checkout.c:358 builtin/checkout.c:365 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:489 +#: builtin/checkout.c:513 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:615 +#: builtin/checkout.c:644 #, c-format -msgid "Can not do reflog for '%s'\n" +msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:653 +#: builtin/checkout.c:685 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:660 +#: builtin/checkout.c:689 builtin/clone.c:678 +msgid "unable to update HEAD" +msgstr "" + +#: builtin/checkout.c:693 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:663 +#: builtin/checkout.c:696 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:667 +#: builtin/checkout.c:700 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:669 builtin/checkout.c:1050 +#: builtin/checkout.c:702 builtin/checkout.c:1090 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:671 +#: builtin/checkout.c:704 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:723 +#: builtin/checkout.c:755 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:729 +#: builtin/checkout.c:761 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3372,205 +5634,225 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:747 +#: builtin/checkout.c:780 #, 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 "" +msgstr[0] "" +msgstr[1] "" -#: builtin/checkout.c:777 +#: builtin/checkout.c:816 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:781 +#: builtin/checkout.c:820 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:808 builtin/checkout.c:1045 +#: builtin/checkout.c:847 builtin/checkout.c:1085 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:952 +#: builtin/checkout.c:991 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:991 +#: builtin/checkout.c:1031 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1020 +#: builtin/checkout.c:1060 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1099 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1062 builtin/checkout.c:1066 +#: builtin/checkout.c:1102 builtin/checkout.c:1106 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 +#: builtin/checkout.c:1121 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1086 +#: builtin/checkout.c:1126 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 -#: builtin/remote.c:159 builtin/remote.c:161 +#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 +#: builtin/worktree.c:331 msgid "branch" msgstr "" -#: builtin/checkout.c:1109 +#: builtin/checkout.c:1160 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1162 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1112 +#: builtin/checkout.c:1163 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1113 -msgid "detach the HEAD at named commit" +#: builtin/checkout.c:1164 builtin/worktree.c:333 +msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1114 +#: builtin/checkout.c:1165 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1167 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1167 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1168 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1119 +#: builtin/checkout.c:1170 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1172 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1173 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1123 builtin/merge.c:227 +#: builtin/checkout.c:1174 builtin/merge.c:234 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 +#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 msgid "style" msgstr "" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1176 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1179 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1181 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1183 +msgid "do not check if another worktree is holding the given ref" +msgstr "" + +#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 +#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539 +#: builtin/send-pack.c:172 +msgid "force progress reporting" +msgstr "" + +#: builtin/checkout.c:1224 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1241 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1246 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1282 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1289 #, 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:1224 +#: builtin/checkout.c:1294 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1228 +#: builtin/checkout.c:1298 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:26 +#: builtin/clean.c:25 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:30 +#: builtin/clean.c:29 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:31 +#: builtin/clean.c:30 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:32 +#: builtin/clean.c:31 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:32 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:34 +#: builtin/clean.c:33 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:295 +#: builtin/clean.c:297 git-add--interactive.perl:614 +#, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" -" - (empty) select nothing" +" - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:299 +#: builtin/clean.c:301 git-add--interactive.perl:623 +#, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -3579,12 +5861,13 @@ msgid "" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" -" - (empty) finish selecting" +" - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:517 -#, c-format -msgid "Huh (%s)?" +#: builtin/clean.c:517 git-add--interactive.perl:589 +#: git-add--interactive.perl:594 +#, c-format, perl-format +msgid "Huh (%s)?\n" msgstr "" #: builtin/clean.c:659 @@ -3607,8 +5890,9 @@ msgstr "" msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:783 -msgid "Bye." +#: builtin/clean.c:783 git-add--interactive.perl:1660 +#, c-format +msgid "Bye.\n" msgstr "" #: builtin/clean.c:791 @@ -3622,11 +5906,11 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:818 +#: builtin/clean.c:818 git-add--interactive.perl:1736 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:819 +#: builtin/clean.c:819 git-add--interactive.perl:1733 msgid "What now" msgstr "" @@ -3656,8 +5940,9 @@ msgstr "" msgid "remove whole directories" msgstr "" -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 +#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 +#: builtin/name-rev.c:350 builtin/show-ref.c:176 msgid "pattern" msgstr "" @@ -3693,270 +5978,310 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 -#: builtin/push.c:523 -msgid "force progress reporting" -msgstr "" - -#: builtin/clone.c:68 +#: builtin/clone.c:80 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 +#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:73 +#: builtin/clone.c:85 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:75 +#: builtin/clone.c:87 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:77 +#: builtin/clone.c:89 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:79 +#: builtin/clone.c:91 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:81 builtin/clone.c:83 +#: builtin/clone.c:93 builtin/clone.c:97 +msgid "pathspec" +msgstr "" + +#: builtin/clone.c:93 builtin/clone.c:97 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:84 builtin/init-db.c:493 +#: builtin/clone.c:100 +msgid "number of submodules cloned in parallel" +msgstr "" + +#: builtin/clone.c:101 builtin/init-db.c:475 msgid "template-directory" msgstr "" -#: builtin/clone.c:85 builtin/init-db.c:494 +#: builtin/clone.c:102 builtin/init-db.c:476 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:87 +#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 +#: builtin/submodule--helper.c:983 msgid "reference repository" msgstr "" -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:108 +msgid "use --reference only while cloning" +msgstr "" + +#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 msgid "name" msgstr "" -#: builtin/clone.c:89 +#: builtin/clone.c:110 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:91 +#: builtin/clone.c:112 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:93 +#: builtin/clone.c:114 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 +#: builtin/pull.c:202 msgid "depth" msgstr "" -#: builtin/clone.c:95 +#: builtin/clone.c:116 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:97 +#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 +#: parse-options.h:142 +msgid "time" +msgstr "" + +#: builtin/clone.c:118 +msgid "create a shallow clone since a specific time" +msgstr "" + +#: builtin/clone.c:119 builtin/fetch.c:124 +msgid "revision" +msgstr "" + +#: builtin/clone.c:120 builtin/fetch.c:125 +msgid "deepen history of shallow clone, excluding rev" +msgstr "" + +#: builtin/clone.c:122 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:99 -msgid "use --reference only while cloning" +#: builtin/clone.c:124 +msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:100 builtin/init-db.c:502 +#: builtin/clone.c:125 builtin/init-db.c:484 msgid "gitdir" msgstr "" -#: builtin/clone.c:101 builtin/init-db.c:503 +#: builtin/clone.c:126 builtin/init-db.c:485 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:102 +#: builtin/clone.c:127 msgid "key=value" msgstr "" -#: builtin/clone.c:103 +#: builtin/clone.c:128 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:256 -#, c-format -msgid "reference repository '%s' is not a local repository." +#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 +msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:260 -#, c-format -msgid "reference repository '%s' is shallow" +#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 +msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:263 -#, c-format -msgid "reference repository '%s' is grafted" +#: builtin/clone.c:268 +msgid "" +"No directory name could be guessed.\n" +"Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:325 +#: builtin/clone.c:321 #, c-format -msgid "failed to create directory '%s'" +msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:327 builtin/diff.c:84 +#: builtin/clone.c:393 #, c-format -msgid "failed to stat '%s'" +msgid "failed to open '%s'" msgstr "" -#: builtin/clone.c:329 +#: builtin/clone.c:401 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:343 +#: builtin/clone.c:415 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:365 +#: builtin/clone.c:437 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:369 +#: builtin/clone.c:441 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:392 builtin/clone.c:566 +#: builtin/clone.c:466 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:404 +#: builtin/clone.c:478 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:481 +#: builtin/clone.c:555 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:561 -#, c-format -msgid "Checking connectivity... " +#: builtin/clone.c:650 +msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:564 -msgid "remote did not send all necessary objects" +#: builtin/clone.c:666 +#, c-format +msgid "unable to update %s" msgstr "" -#: builtin/clone.c:628 +#: builtin/clone.c:715 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:659 +#: builtin/clone.c:746 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:746 +#: builtin/clone.c:786 +msgid "unable to write parameters to config file" +msgstr "" + +#: builtin/clone.c:849 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:748 +#: builtin/clone.c:851 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:778 +#: builtin/clone.c:884 builtin/receive-pack.c:1900 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:782 +#: builtin/clone.c:888 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:793 +#: builtin/clone.c:901 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:796 +#: builtin/clone.c:904 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:809 +#: builtin/clone.c:917 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:815 builtin/fetch.c:1156 +#: builtin/clone.c:923 builtin/fetch.c:1337 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:825 +#: builtin/clone.c:933 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:835 +#: builtin/clone.c:943 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:850 builtin/clone.c:861 +#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 +#: builtin/worktree.c:221 builtin/worktree.c:251 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:853 +#: builtin/clone.c:961 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:871 +#: builtin/clone.c:973 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:873 +#: builtin/clone.c:975 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:898 -msgid "--dissociate given, but there is no --reference" +#: builtin/clone.c:999 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" msgstr "" -#: builtin/clone.c:913 +#: builtin/clone.c:1055 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:916 +#: builtin/clone.c:1057 +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:1059 +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:1062 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:921 +#: builtin/clone.c:1067 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:925 +#: builtin/clone.c:1071 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:976 builtin/clone.c:984 +#: builtin/clone.c:1126 builtin/clone.c:1134 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:987 +#: builtin/clone.c:1137 msgid "You appear to have cloned an empty repository." msgstr "" @@ -3992,15 +6317,15 @@ msgstr "" msgid "--command must be the first argument" msgstr "" -#: builtin/commit.c:37 +#: builtin/commit.c:38 msgid "git commit [<options>] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:42 +#: builtin/commit.c:43 msgid "git status [<options>] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:47 +#: builtin/commit.c:48 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4015,7 +6340,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:60 +#: 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" @@ -4029,14 +6354,14 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:72 +#: 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:77 +#: 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" @@ -4045,11 +6370,11 @@ msgid "" "\n" msgstr "" -#: builtin/commit.c:84 +#: builtin/commit.c:85 msgid "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:87 +#: builtin/commit.c:88 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4059,112 +6384,98 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:304 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:344 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:350 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:361 -msgid "unable to write index file" -msgstr "" - -#: builtin/commit.c:363 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:365 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:445 +#: builtin/commit.c:458 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:447 +#: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:456 +#: builtin/commit.c:469 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:475 +#: builtin/commit.c:488 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:609 -#, c-format -msgid "invalid date format: %s" -msgstr "" - -#: builtin/commit.c:653 +#: 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:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:702 builtin/shortlog.c:273 +#: builtin/commit.c:704 builtin/shortlog.c:294 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:738 -#, c-format -msgid "could not read '%s'" +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:785 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -4174,7 +6485,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -4184,14 +6495,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:821 +#: 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:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4199,645 +6510,677 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:938 +#: builtin/commit.c:954 msgid "Error building trees" msgstr "" -#: builtin/commit.c:953 builtin/tag.c:495 +#: builtin/commit.c:968 builtin/tag.c:273 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1055 +#: builtin/commit.c:1071 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1086 builtin/commit.c:1325 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1107 +#: builtin/commit.c:1124 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1137 +#: builtin/commit.c:1154 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1146 +#: builtin/commit.c:1163 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1149 +#: builtin/commit.c:1166 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1151 +#: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1154 +#: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1164 +#: builtin/commit.c:1181 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1166 +#: builtin/commit.c:1183 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1174 +#: builtin/commit.c:1191 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1191 +#: builtin/commit.c:1208 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1193 +#: builtin/commit.c:1210 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1195 -msgid "Clever... amending the last one with dirty index." -msgstr "" - -#: builtin/commit.c:1197 +#: builtin/commit.c:1212 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1209 builtin/tag.c:728 +#: builtin/commit.c:1224 builtin/tag.c:551 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1214 +#: builtin/commit.c:1229 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1324 builtin/commit.c:1604 +#: builtin/commit.c:1339 builtin/commit.c:1612 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1326 builtin/commit.c:1606 +#: builtin/commit.c:1341 builtin/commit.c:1614 msgid "show branch information" msgstr "" -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 +#: builtin/commit.c:1343 +msgid "version" +msgstr "" + +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 +#: builtin/worktree.c:448 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1331 builtin/commit.c:1610 +#: builtin/commit.c:1346 builtin/commit.c:1618 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1334 builtin/commit.c:1613 +#: builtin/commit.c:1349 builtin/commit.c:1621 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980 -#: builtin/fast-export.c:983 builtin/tag.c:603 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:411 msgid "mode" msgstr "" -#: builtin/commit.c:1337 builtin/commit.c:1616 +#: builtin/commit.c:1352 builtin/commit.c:1624 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1340 +#: builtin/commit.c:1355 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1341 parse-options.h:153 +#: builtin/commit.c:1356 parse-options.h:155 msgid "when" msgstr "" -#: builtin/commit.c:1342 +#: builtin/commit.c:1357 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1344 +#: builtin/commit.c:1359 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1431 +#: builtin/commit.c:1435 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1433 +#: builtin/commit.c:1437 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1478 +#: builtin/commit.c:1482 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1481 +#: builtin/commit.c:1485 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1574 +#: builtin/commit.c:1582 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1575 +#: builtin/commit.c:1583 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1577 +#: builtin/commit.c:1585 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1578 builtin/tag.c:601 +#: builtin/commit.c:1586 builtin/tag.c:409 msgid "read message from file" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1587 msgid "author" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1587 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1580 builtin/gc.c:275 +#: builtin/commit.c:1588 builtin/gc.c:357 msgid "date" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1588 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391 -#: builtin/notes.c:554 builtin/tag.c:599 +#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:407 msgid "message" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1589 msgid "commit message" msgstr "" -#: builtin/commit.c:1582 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77 +msgid "commit" +msgstr "" + +#: builtin/commit.c:1590 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1591 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1584 +#: builtin/commit.c:1592 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1585 +#: builtin/commit.c:1593 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1586 +#: builtin/commit.c:1594 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1596 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1597 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1598 msgid "default" msgstr "" -#: builtin/commit.c:1590 builtin/tag.c:604 +#: builtin/commit.c:1598 builtin/tag.c:412 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1591 +#: builtin/commit.c:1599 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92 -#: builtin/tag.c:605 -msgid "key-id" -msgstr "" - -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 +#: builtin/revert.c:112 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1596 +#: builtin/commit.c:1604 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1605 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1598 +#: builtin/commit.c:1606 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1607 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1608 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1609 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1602 -msgid "bypass pre-commit hook" +#: builtin/commit.c:1610 +msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1611 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1614 +#: builtin/commit.c:1622 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1615 +#: builtin/commit.c:1623 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1620 +#: builtin/commit.c:1628 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1622 +#: builtin/commit.c:1630 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1651 +#: builtin/commit.c:1659 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1690 builtin/merge.c:519 -#, c-format -msgid "could not open '%s' for reading" -msgstr "" - -#: builtin/commit.c:1697 +#: builtin/commit.c:1707 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1704 +#: builtin/commit.c:1714 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1723 +#: builtin/commit.c:1733 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1734 +#: builtin/commit.c:1744 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1739 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876 -msgid "failed to write commit object" -msgstr "" - -#: builtin/commit.c:1787 +#: builtin/commit.c:1797 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:8 +#: builtin/config.c:9 msgid "git config [<options>]" msgstr "" -#: builtin/config.c:53 +#: builtin/config.c:56 msgid "Config file location" msgstr "" -#: builtin/config.c:54 +#: builtin/config.c:57 msgid "use global config file" msgstr "" -#: builtin/config.c:55 +#: builtin/config.c:58 msgid "use system config file" msgstr "" -#: builtin/config.c:56 +#: builtin/config.c:59 msgid "use repository config file" msgstr "" -#: builtin/config.c:57 +#: builtin/config.c:60 msgid "use given config file" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:61 msgid "blob-id" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:61 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:62 msgid "Action" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:63 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:61 +#: builtin/config.c:64 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:65 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:66 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:64 +#: builtin/config.c:67 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:65 +#: builtin/config.c:68 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:66 +#: builtin/config.c:69 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:67 +#: builtin/config.c:70 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:71 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:72 msgid "remove a section: name" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:73 msgid "list all" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:74 msgid "open an editor" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:75 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:76 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:77 msgid "Type" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:78 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:79 msgid "value is decimal number" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:80 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:78 +#: builtin/config.c:81 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:79 +#: builtin/config.c:82 msgid "Other" msgstr "" -#: builtin/config.c:80 +#: builtin/config.c:83 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:81 +#: builtin/config.c:84 +msgid "show variable names only" +msgstr "" + +#: builtin/config.c:85 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:316 +#: builtin/config.c:86 +msgid "show origin of config (file, standard input, blob, command line)" +msgstr "" + +#: builtin/config.c:328 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:457 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" -"[core]\n" +"[user]\n" "# Please adapt and uncomment the following lines:\n" -"#\tuser = %s\n" +"#\tname = %s\n" "#\temail = %s\n" msgstr "" -#: builtin/config.c:589 +#: builtin/config.c:615 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/count-objects.c:55 +#: builtin/config.c:627 +#, 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:65 +#: builtin/count-objects.c:96 msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [<options>] [<commit-ish>...]" msgstr "" -#: builtin/describe.c:18 +#: builtin/describe.c:19 msgid "git describe [<options>] --dirty" msgstr "" -#: builtin/describe.c:217 +#: builtin/describe.c:53 +msgid "head" +msgstr "" + +#: builtin/describe.c:53 +msgid "lightweight" +msgstr "" + +#: builtin/describe.c:53 +msgid "annotated" +msgstr "" + +#: builtin/describe.c:250 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:221 +#: builtin/describe.c:254 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:223 +#: builtin/describe.c:256 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:250 builtin/log.c:452 +#: builtin/describe.c:283 builtin/log.c:487 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:253 +#: builtin/describe.c:286 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:270 +#: builtin/describe.c:303 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:272 +#: builtin/describe.c:305 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:319 +#: builtin/describe.c:352 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:346 +#: builtin/describe.c:379 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:350 +#: builtin/describe.c:383 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:371 +#: builtin/describe.c:413 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:374 +#: builtin/describe.c:416 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:396 +#: builtin/describe.c:438 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:397 +#: builtin/describe.c:439 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:398 +#: builtin/describe.c:440 msgid "use any ref" msgstr "" -#: builtin/describe.c:399 +#: builtin/describe.c:441 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:400 +#: builtin/describe.c:442 msgid "always use long format" msgstr "" -#: builtin/describe.c:401 +#: builtin/describe.c:443 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:404 +#: builtin/describe.c:446 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:406 +#: builtin/describe.c:448 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:408 +#: builtin/describe.c:450 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:410 builtin/name-rev.c:318 +#: builtin/describe.c:452 +msgid "do not consider tags matching <pattern>" +msgstr "" + +#: builtin/describe.c:454 builtin/name-rev.c:357 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:411 +#: builtin/describe.c:455 builtin/describe.c:458 msgid "mark" msgstr "" -#: builtin/describe.c:412 +#: builtin/describe.c:456 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:430 +#: builtin/describe.c:459 +msgid "append <mark> on broken working tree (default: \"-broken\")" +msgstr "" + +#: builtin/describe.c:477 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:456 +#: builtin/describe.c:506 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:476 +#: builtin/describe.c:549 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/diff.c:86 +#: builtin/describe.c:551 +msgid "--broken is incompatible with commit-ishes" +msgstr "" + +#: builtin/diff.c:83 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:237 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "" @@ -4861,330 +7204,433 @@ msgstr "" msgid "unhandled object '%s' given." msgstr "" -#: builtin/fast-export.c:24 +#: builtin/difftool.c:28 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +msgstr "" + +#: builtin/difftool.c:241 +#, c-format +msgid "failed: %d" +msgstr "" + +#: builtin/difftool.c:283 +#, c-format +msgid "could not read symlink %s" +msgstr "" + +#: builtin/difftool.c:285 +#, c-format +msgid "could not read symlink file %s" +msgstr "" + +#: builtin/difftool.c:293 +#, c-format +msgid "could not read object %s for symlink %s" +msgstr "" + +#: builtin/difftool.c:395 +msgid "" +"combined diff formats('-c' and '--cc') are not supported in\n" +"directory diff mode('-d' and '--dir-diff')." +msgstr "" + +#: builtin/difftool.c:609 +#, c-format +msgid "both files modified: '%s' and '%s'." +msgstr "" + +#: builtin/difftool.c:611 +msgid "working tree file has been left." +msgstr "" + +#: builtin/difftool.c:622 +#, c-format +msgid "temporary files exist in '%s'." +msgstr "" + +#: builtin/difftool.c:623 +msgid "you may want to cleanup or recover these." +msgstr "" + +#: builtin/difftool.c:669 +msgid "use `diff.guitool` instead of `diff.tool`" +msgstr "" + +#: builtin/difftool.c:671 +msgid "perform a full-directory diff" +msgstr "" + +#: builtin/difftool.c:673 +msgid "do not prompt before launching a diff tool" +msgstr "" + +#: builtin/difftool.c:679 +msgid "use symlinks in dir-diff mode" +msgstr "" + +#: builtin/difftool.c:680 +msgid "<tool>" +msgstr "" + +#: builtin/difftool.c:681 +msgid "use the specified diff tool" +msgstr "" + +#: builtin/difftool.c:683 +msgid "print a list of diff tools that may be used with `--tool`" +msgstr "" + +#: builtin/difftool.c:686 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" +msgstr "" + +#: builtin/difftool.c:688 +msgid "<command>" +msgstr "" + +#: builtin/difftool.c:689 +msgid "specify a custom command for viewing diffs" +msgstr "" + +#: builtin/difftool.c:713 +msgid "no <tool> given for --tool=<tool>" +msgstr "" + +#: builtin/difftool.c:720 +msgid "no <cmd> given for --extcmd=<cmd>" +msgstr "" + +#: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:979 +#: builtin/fast-export.c:980 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:981 +#: builtin/fast-export.c:982 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:984 +#: builtin/fast-export.c:985 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:987 +#: builtin/fast-export.c:988 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:989 +#: builtin/fast-export.c:990 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:991 +#: builtin/fast-export.c:992 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:993 +#: builtin/fast-export.c:994 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:995 +#: builtin/fast-export.c:996 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:997 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:998 msgid "refspec" msgstr "" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:999 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1000 msgid "anonymize output" msgstr "" -#: builtin/fetch.c:19 +#: builtin/fetch.c:21 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:20 +#: builtin/fetch.c:22 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:21 +#: builtin/fetch.c:23 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:22 +#: builtin/fetch.c:24 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:89 +#: builtin/fetch.c:95 builtin/pull.c:175 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:91 +#: builtin/fetch.c:97 builtin/pull.c:178 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:93 +#: builtin/fetch.c:99 builtin/pull.c:181 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:94 +#: builtin/fetch.c:100 builtin/pull.c:183 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:96 +#: builtin/fetch.c:102 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:98 +#: builtin/fetch.c:104 builtin/pull.c:185 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:100 +#: builtin/fetch.c:106 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:102 +#: 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:103 +#: builtin/fetch.c:111 builtin/pull.c:191 msgid "on-demand" msgstr "" -#: builtin/fetch.c:104 +#: builtin/fetch.c:112 builtin/pull.c:192 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:108 +#: builtin/fetch.c:116 builtin/pull.c:200 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:110 +#: builtin/fetch.c:118 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:113 +#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:115 +#: 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:117 builtin/log.c:1208 +#: builtin/fetch.c:131 builtin/log.c:1440 msgid "dir" msgstr "" -#: builtin/fetch.c:118 +#: builtin/fetch.c:132 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:121 +#: builtin/fetch.c:135 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:123 +#: builtin/fetch.c:137 builtin/pull.c:209 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:124 +#: builtin/fetch.c:138 builtin/pull.c:211 msgid "refmap" msgstr "" -#: builtin/fetch.c:125 +#: builtin/fetch.c:139 builtin/pull.c:212 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:375 +#: builtin/fetch.c:395 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:455 +#: builtin/fetch.c:513 +#, c-format +msgid "configuration fetch.output contains invalid value %s" +msgstr "" + +#: builtin/fetch.c:606 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:460 +#: builtin/fetch.c:610 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:474 -#, c-format -msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +#: builtin/fetch.c:623 builtin/fetch.c:703 +msgid "[rejected]" msgstr "" -#: builtin/fetch.c:475 builtin/fetch.c:561 -msgid "[rejected]" +#: builtin/fetch.c:624 +msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:486 +#: builtin/fetch.c:633 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 -msgid " (unable to update local ref)" +#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 +#: builtin/fetch.c:698 +msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:506 +#: builtin/fetch.c:653 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:509 +#: builtin/fetch.c:656 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:512 +#: builtin/fetch.c:659 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:557 -msgid "unable to update local ref" -msgstr "" - -#: builtin/fetch.c:557 +#: builtin/fetch.c:698 msgid "forced update" msgstr "" -#: builtin/fetch.c:563 -msgid "(non-fast-forward)" -msgstr "" - -#: builtin/fetch.c:596 builtin/fetch.c:829 -#, c-format -msgid "cannot open %s: %s\n" +#: builtin/fetch.c:703 +msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:605 +#: builtin/fetch.c:748 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:623 +#: builtin/fetch.c:768 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:711 builtin/fetch.c:794 +#: builtin/fetch.c:855 builtin/fetch.c:951 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:722 +#: builtin/fetch.c:866 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:774 +#: builtin/fetch.c:921 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:775 +#: builtin/fetch.c:922 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:799 +#: builtin/fetch.c:954 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:800 builtin/remote.c:1060 +#: builtin/fetch.c:955 builtin/remote.c:1022 msgid "(none)" msgstr "" -#: builtin/fetch.c:819 +#: builtin/fetch.c:978 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:838 +#: builtin/fetch.c:997 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:841 +#: builtin/fetch.c:1000 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:897 +#: builtin/fetch.c:1076 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1059 +#: builtin/fetch.c:1236 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1061 builtin/remote.c:90 +#: builtin/fetch.c:1238 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1079 +#: builtin/fetch.c:1256 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1279 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1144 +#: builtin/fetch.c:1321 +msgid "Negative depth in --deepen is not supported" +msgstr "" + +#: builtin/fetch.c:1323 +msgid "--deepen and --depth are mutually exclusive" +msgstr "" + +#: builtin/fetch.c:1328 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1146 +#: builtin/fetch.c:1330 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1352 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1171 +#: builtin/fetch.c:1354 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1365 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1190 +#: builtin/fetch.c:1373 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fmt-merge-msg.c:13 +#: 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:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 -#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 -#: parse-options.h:132 parse-options.h:239 -msgid "n" -msgstr "" - #: builtin/fmt-merge-msg.c:663 msgid "populate log with at most <n> entries from shortlog" msgstr "" @@ -5205,398 +7651,455 @@ msgstr "" msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:675 -msgid "unable to parse format" +#: builtin/for-each-ref.c:9 +msgid "git for-each-ref [<options>] [<pattern>]" msgstr "" -#: builtin/for-each-ref.c:1063 -msgid "git for-each-ref [<options>] [<pattern>]" +#: 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) [<commit>]]" +msgstr "" + +#: builtin/for-each-ref.c:12 +msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:27 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:1080 +#: builtin/for-each-ref.c:29 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:1087 +#: builtin/for-each-ref.c:36 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:1088 builtin/replace.c:438 -msgid "format" +#: builtin/for-each-ref.c:41 +msgid "print only refs which points at the given object" msgstr "" -#: builtin/for-each-ref.c:1088 -msgid "format to use for the output" +#: builtin/for-each-ref.c:43 +msgid "print only refs that are merged" msgstr "" -#: builtin/for-each-ref.c:1089 -msgid "key" +#: builtin/for-each-ref.c:44 +msgid "print only refs that are not merged" msgstr "" -#: builtin/for-each-ref.c:1090 -msgid "field name to sort on" +#: builtin/for-each-ref.c:45 +msgid "print only refs which contain the commit" msgstr "" -#: builtin/fsck.c:147 builtin/prune.c:137 -msgid "Checking connectivity" +#: builtin/for-each-ref.c:46 +msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:540 +#: builtin/fsck.c:554 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:603 +#: builtin/fsck.c:646 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:609 +#: builtin/fsck.c:652 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:610 +#: builtin/fsck.c:653 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:611 +#: builtin/fsck.c:654 msgid "report tags" msgstr "" -#: builtin/fsck.c:612 +#: builtin/fsck.c:655 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:613 +#: builtin/fsck.c:656 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:614 +#: builtin/fsck.c:657 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:615 +#: builtin/fsck.c:658 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:616 +#: builtin/fsck.c:659 +msgid "check only connectivity" +msgstr "" + +#: builtin/fsck.c:660 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:618 +#: builtin/fsck.c:662 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:619 builtin/prune.c:108 +#: builtin/fsck.c:663 builtin/prune.c:107 msgid "show progress" msgstr "" -#: builtin/fsck.c:669 +#: builtin/fsck.c:664 +msgid "show verbose names for reachable objects" +msgstr "" + +#: builtin/fsck.c:725 msgid "Checking objects" msgstr "" -#: builtin/gc.c:24 +#: builtin/gc.c:25 msgid "git gc [<options>]" msgstr "" -#: builtin/gc.c:79 +#: builtin/gc.c:78 #, c-format -msgid "Invalid gc.pruneexpire: '%s'" +msgid "Failed to fstat %s: %s" msgstr "" -#: builtin/gc.c:107 +#: builtin/gc.c:310 #, c-format -msgid "insanely long object directory %.*s" +msgid "Can't stat %s" msgstr "" -#: builtin/gc.c:276 +#: builtin/gc.c:319 +#, 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:358 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:278 +#: builtin/gc.c:360 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:279 +#: builtin/gc.c:361 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:280 +#: builtin/gc.c:362 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:321 +#: builtin/gc.c:379 +#, c-format +msgid "Failed to parse gc.logexpiry value %s" +msgstr "" + +#: builtin/gc.c:407 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:323 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:324 +#: builtin/gc.c:410 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:342 +#: builtin/gc.c:431 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:364 +#: builtin/gc.c:475 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:23 +#: builtin/grep.c:25 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" -#: builtin/grep.c:218 +#: builtin/grep.c:232 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:441 builtin/grep.c:476 +#: builtin/grep.c:290 #, c-format -msgid "unable to read tree (%s)" +msgid "invalid number of threads specified (%d) for %s" msgstr "" -#: builtin/grep.c:491 +#: builtin/grep.c:769 builtin/grep.c:810 #, c-format -msgid "unable to grep from object of type %s" +msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:547 +#: builtin/grep.c:829 #, c-format -msgid "switch `%c' expects a numerical value" +msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:564 +#: builtin/grep.c:893 #, c-format -msgid "cannot open '%s'" +msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:638 +#: builtin/grep.c:980 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:640 +#: builtin/grep.c:982 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:642 +#: builtin/grep.c:984 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:644 +#: builtin/grep.c:986 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:647 +#: builtin/grep.c:988 +msgid "recursively search in each submodule" +msgstr "" + +#: builtin/grep.c:990 +msgid "basename" +msgstr "" + +#: builtin/grep.c:991 +msgid "prepend parent project's basename to output" +msgstr "" + +#: builtin/grep.c:994 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:649 +#: builtin/grep.c:996 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:651 +#: builtin/grep.c:998 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:653 +#: builtin/grep.c:1000 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:655 +#: builtin/grep.c:1002 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:658 +#: builtin/grep.c:1005 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:660 +#: builtin/grep.c:1007 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:664 +#: builtin/grep.c:1011 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:667 +#: builtin/grep.c:1014 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:670 +#: builtin/grep.c:1017 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:673 +#: builtin/grep.c:1020 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:676 +#: builtin/grep.c:1023 msgid "show line numbers" msgstr "" -#: builtin/grep.c:677 +#: builtin/grep.c:1024 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:678 +#: builtin/grep.c:1025 msgid "show filenames" msgstr "" -#: builtin/grep.c:680 +#: builtin/grep.c:1027 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:682 +#: builtin/grep.c:1029 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:684 +#: builtin/grep.c:1031 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:687 +#: builtin/grep.c:1034 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:689 +#: builtin/grep.c:1036 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:691 +#: builtin/grep.c:1038 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:692 +#: builtin/grep.c:1039 msgid "highlight matches" msgstr "" -#: builtin/grep.c:694 +#: builtin/grep.c:1041 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:696 +#: builtin/grep.c:1043 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:699 +#: builtin/grep.c:1046 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:702 +#: builtin/grep.c:1049 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:704 +#: builtin/grep.c:1051 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:705 +#: builtin/grep.c:1053 +msgid "use <n> worker threads" +msgstr "" + +#: builtin/grep.c:1054 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:708 +#: builtin/grep.c:1057 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:710 +#: builtin/grep.c:1059 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:713 +#: builtin/grep.c:1062 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:715 +#: builtin/grep.c:1064 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:717 +#: builtin/grep.c:1066 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:729 +#: builtin/grep.c:1078 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:731 +#: builtin/grep.c:1080 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:733 +#: builtin/grep.c:1082 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:1086 msgid "pager" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:1086 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:740 +#: builtin/grep.c:1089 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:741 builtin/show-ref.c:187 -msgid "show usage" +#: builtin/grep.c:1153 +msgid "no pattern given." msgstr "" -#: builtin/grep.c:808 -msgid "no pattern given." +#: builtin/grep.c:1189 +msgid "--no-index or --untracked cannot be used with revs" +msgstr "" + +#: builtin/grep.c:1195 +#, c-format +msgid "unable to resolve revision: %s" +msgstr "" + +#: builtin/grep.c:1228 builtin/index-pack.c:1485 +#, c-format +msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:1251 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:892 -msgid "--cached or --untracked cannot be used with --no-index." +#: builtin/grep.c:1274 +msgid "option not supported with --recurse-submodules." msgstr "" -#: builtin/grep.c:897 -msgid "--no-index or --untracked cannot be used with revs." +#: builtin/grep.c:1280 +msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:1286 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:908 +#: builtin/grep.c:1294 msgid "both --cached and trees are given." msgstr "" -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:81 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." msgstr "" -#: builtin/hash-object.c:83 -msgid "git hash-object --stdin-paths < <list-of-paths>" +#: builtin/hash-object.c:82 +msgid "git hash-object --stdin-paths" msgstr "" -#: builtin/hash-object.c:94 builtin/tag.c:612 +#: builtin/hash-object.c:94 msgid "type" msgstr "" @@ -5625,1159 +8128,1239 @@ msgstr "" msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:41 +#: builtin/help.c:42 msgid "print all available commands" msgstr "" -#: builtin/help.c:42 +#: builtin/help.c:43 +msgid "exclude guides" +msgstr "" + +#: builtin/help.c:44 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:43 +#: builtin/help.c:45 msgid "show man page" msgstr "" -#: builtin/help.c:44 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:48 msgid "show info page" msgstr "" -#: builtin/help.c:52 +#: builtin/help.c:54 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 +#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 #, c-format -msgid "failed to exec '%s': %s" +msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:215 +#: 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:227 +#: 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:354 +#: builtin/help.c:336 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:371 +#: builtin/help.c:353 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:379 +#: builtin/help.c:361 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:428 +#: builtin/help.c:403 msgid "Defining attributes per path" msgstr "" -#: builtin/help.c:429 +#: builtin/help.c:404 msgid "Everyday Git With 20 Commands Or So" msgstr "" -#: builtin/help.c:430 +#: builtin/help.c:405 msgid "A Git glossary" msgstr "" -#: builtin/help.c:431 +#: builtin/help.c:406 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: builtin/help.c:432 +#: builtin/help.c:407 msgid "Defining submodule properties" msgstr "" -#: builtin/help.c:433 +#: builtin/help.c:408 msgid "Specifying revisions and ranges for Git" msgstr "" -#: builtin/help.c:434 +#: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" -#: builtin/help.c:435 +#: builtin/help.c:410 msgid "An overview of recommended workflows with Git" msgstr "" -#: builtin/help.c:447 +#: builtin/help.c:422 msgid "The common Git guides are:\n" msgstr "" -#: builtin/help.c:468 builtin/help.c:485 +#: builtin/help.c:440 #, c-format -msgid "usage: %s%s" +msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/help.c:501 +#: builtin/help.c:462 builtin/help.c:479 #, c-format -msgid "`git %s' is aliased to `%s'" +msgid "usage: %s%s" msgstr "" -#: builtin/index-pack.c:150 +#: builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "" -#: builtin/index-pack.c:200 +#: builtin/index-pack.c:204 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:220 +#: builtin/index-pack.c:224 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:227 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:265 +#: 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:275 +#: builtin/index-pack.c:279 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:276 +#: builtin/index-pack.c:280 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:288 +#: builtin/index-pack.c:292 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:299 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:311 +#: 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:316 +#: builtin/index-pack.c:323 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:330 +#: builtin/index-pack.c:337 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:339 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:350 +#: builtin/index-pack.c:357 #, c-format -msgid "pack has bad object at offset %lu: %s" +msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "" -#: builtin/index-pack.c:471 +#: builtin/index-pack.c:479 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:520 +#: builtin/index-pack.c:528 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:536 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:544 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:567 +#: builtin/index-pack.c:575 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:577 #, c-format -msgid "premature end of pack file, %lu byte missing" -msgid_plural "premature end of pack file, %lu bytes missing" +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:595 +#: builtin/index-pack.c:603 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 -#: builtin/index-pack.c:749 builtin/index-pack.c:758 +#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:816 builtin/index-pack.c:825 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:689 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:752 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:257 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:755 +#: builtin/index-pack.c:814 +#, c-format +msgid "cannot read existing object info %s" +msgstr "" + +#: builtin/index-pack.c:822 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:769 +#: builtin/index-pack.c:836 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:783 +#: builtin/index-pack.c:850 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:787 +#: builtin/index-pack.c:853 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:789 +#: builtin/index-pack.c:855 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:861 builtin/index-pack.c:890 +#: builtin/index-pack.c:927 builtin/index-pack.c:958 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1128 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1128 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1081 +#: builtin/index-pack.c:1160 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1086 +#: builtin/index-pack.c:1165 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1089 +#: builtin/index-pack.c:1168 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1179 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1202 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1133 +#: builtin/index-pack.c:1213 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1255 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1181 +#: builtin/index-pack.c:1261 #, c-format -msgid "completed with %d local objects" -msgstr "" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "" +msgstr[1] "" -#: builtin/index-pack.c:1191 +#: builtin/index-pack.c:1273 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1277 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1219 +#: builtin/index-pack.c:1301 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1377 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1322 +#: builtin/index-pack.c:1403 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1335 +#: builtin/index-pack.c:1415 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1343 +#: builtin/index-pack.c:1423 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1356 +#: builtin/index-pack.c:1433 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1479 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1406 -#, c-format -msgid "invalid number of threads specified (%d)" -msgstr "" - -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 +#: builtin/index-pack.c:1489 builtin/index-pack.c:1686 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1547 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1549 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1596 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1524 +#: builtin/index-pack.c:1603 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1553 -msgid "Cannot come back to cwd" +#: builtin/index-pack.c:1616 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 +#: builtin/index-pack.c:1698 builtin/index-pack.c:1701 +#: builtin/index-pack.c:1717 builtin/index-pack.c:1721 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1634 +#: builtin/index-pack.c:1737 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" +#: builtin/index-pack.c:1739 +msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1655 +#: builtin/index-pack.c:1747 msgid "--verify with no packfile name given" msgstr "" -#: builtin/init-db.c:35 -#, c-format -msgid "Could not make %s writable by group" -msgstr "" - -#: builtin/init-db.c:62 -#, c-format -msgid "insanely long template name %s" -msgstr "" - -#: builtin/init-db.c:67 +#: builtin/init-db.c:54 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/init-db.c:73 +#: builtin/init-db.c:60 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:80 +#: builtin/init-db.c:65 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:97 +#: builtin/init-db.c:76 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:99 -#, c-format -msgid "insanely long symlink %s" -msgstr "" - -#: builtin/init-db.c:102 +#: builtin/init-db.c:78 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:106 +#: builtin/init-db.c:84 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:110 +#: builtin/init-db.c:88 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:136 +#: builtin/init-db.c:119 #, c-format -msgid "insanely long template path %s" +msgid "templates not found %s" msgstr "" -#: builtin/init-db.c:144 +#: builtin/init-db.c:134 #, c-format -msgid "templates not found %s" +msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:157 +#: builtin/init-db.c:327 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" +msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:197 +#: builtin/init-db.c:330 #, c-format -msgid "insane git directory %s" +msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:331 builtin/init-db.c:334 +#: builtin/init-db.c:347 builtin/init-db.c:350 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:363 +#: builtin/init-db.c:403 #, c-format -msgid "unable to handle file type %d" +msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:366 +#: builtin/init-db.c:404 #, c-format -msgid "unable to move %s to %s" +msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#. TRANSLATORS: The first '%s' is either "Reinitialized -#. existing" or "Initialized empty", the second " shared" or -#. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:426 +#: builtin/init-db.c:408 #, c-format -msgid "%s%s Git repository in %s%s\n" -msgstr "" - -#: builtin/init-db.c:427 -msgid "Reinitialized existing" -msgstr "" - -#: builtin/init-db.c:427 -msgid "Initialized empty" +msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:428 -msgid " shared" +#: builtin/init-db.c:409 +#, c-format +msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:475 +#: builtin/init-db.c:457 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:498 +#: builtin/init-db.c:480 msgid "permissions" msgstr "" -#: builtin/init-db.c:499 +#: builtin/init-db.c:481 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171 -msgid "be quiet" -msgstr "" - -#: builtin/init-db.c:533 builtin/init-db.c:538 +#: builtin/init-db.c:515 builtin/init-db.c:520 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:542 +#: builtin/init-db.c:524 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:563 +#: 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:591 +#: builtin/init-db.c:573 #, c-format msgid "Cannot access work tree '%s'" msgstr "" #: builtin/interpret-trailers.c:15 msgid "" -"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " -"[<file>...]" +"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:25 +#: builtin/interpret-trailers.c:27 msgid "trim empty trailers" msgstr "" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:28 msgid "trailer" msgstr "" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:29 msgid "trailer(s) to add" msgstr "" -#: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]" +#: 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:42 +#: builtin/log.c:45 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:81 +#: builtin/log.c:89 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:127 +#: builtin/log.c:144 msgid "suppress diff output" msgstr "" -#: builtin/log.c:128 +#: builtin/log.c:145 msgid "show source" msgstr "" -#: builtin/log.c:129 +#: builtin/log.c:146 msgid "Use mail map file" msgstr "" -#: builtin/log.c:130 +#: builtin/log.c:147 msgid "decorate options" msgstr "" -#: builtin/log.c:133 +#: builtin/log.c:150 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:229 +#: builtin/log.c:246 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:458 +#: builtin/log.c:493 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:472 builtin/log.c:564 +#: builtin/log.c:507 builtin/log.c:601 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:588 +#: builtin/log.c:625 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:689 +#: builtin/log.c:746 msgid "format.headers without value" msgstr "" -#: builtin/log.c:773 +#: builtin/log.c:846 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:789 +#: builtin/log.c:861 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:803 +#: builtin/log.c:875 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:811 +#: builtin/log.c:885 msgid "Not a range." msgstr "" -#: builtin/log.c:919 +#: builtin/log.c:991 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:998 +#: builtin/log.c:1071 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1026 +#: builtin/log.c:1098 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1071 +#: builtin/log.c:1148 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1186 +#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/log.c:1270 +msgid "Could not find exact merge base." +msgstr "" + +#: builtin/log.c:1274 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" + +#: builtin/log.c:1294 +msgid "Failed to find exact merge base" +msgstr "" + +#: builtin/log.c:1305 +msgid "base commit should be the ancestor of revision list" +msgstr "" + +#: builtin/log.c:1309 +msgid "base commit shouldn't be in revision list" +msgstr "" + +#: builtin/log.c:1358 +msgid "cannot get patch id" +msgstr "" + +#: builtin/log.c:1415 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1189 +#: builtin/log.c:1418 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1193 +#: builtin/log.c:1422 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1195 +#: builtin/log.c:1424 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1197 +#: builtin/log.c:1426 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1198 +#: builtin/log.c:1427 msgid "sfx" msgstr "" -#: builtin/log.c:1199 +#: builtin/log.c:1428 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1201 +#: builtin/log.c:1430 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1203 +#: builtin/log.c:1432 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1205 +#: builtin/log.c:1434 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "" + +#: builtin/log.c:1437 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1208 +#: builtin/log.c:1440 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1211 +#: builtin/log.c:1443 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1214 +#: builtin/log.c:1446 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1216 +#: builtin/log.c:1448 +msgid "output all-zero hash in From header" +msgstr "" + +#: builtin/log.c:1450 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1218 +#: builtin/log.c:1452 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1220 +#: builtin/log.c:1454 msgid "Messaging" msgstr "" -#: builtin/log.c:1221 +#: builtin/log.c:1455 msgid "header" msgstr "" -#: builtin/log.c:1222 +#: builtin/log.c:1456 msgid "add email header" msgstr "" -#: builtin/log.c:1223 builtin/log.c:1225 +#: builtin/log.c:1457 builtin/log.c:1459 msgid "email" msgstr "" -#: builtin/log.c:1223 +#: builtin/log.c:1457 msgid "add To: header" msgstr "" -#: builtin/log.c:1225 +#: builtin/log.c:1459 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1227 +#: builtin/log.c:1461 msgid "ident" msgstr "" -#: builtin/log.c:1228 +#: builtin/log.c:1462 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1230 +#: builtin/log.c:1464 msgid "message-id" msgstr "" -#: builtin/log.c:1231 +#: builtin/log.c:1465 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1232 builtin/log.c:1235 +#: builtin/log.c:1466 builtin/log.c:1469 msgid "boundary" msgstr "" -#: builtin/log.c:1233 +#: builtin/log.c:1467 msgid "attach the patch" msgstr "" -#: builtin/log.c:1236 +#: builtin/log.c:1470 msgid "inline the patch" msgstr "" -#: builtin/log.c:1240 +#: builtin/log.c:1474 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1242 +#: builtin/log.c:1476 msgid "signature" msgstr "" -#: builtin/log.c:1243 +#: builtin/log.c:1477 msgid "add a signature" msgstr "" -#: builtin/log.c:1245 -msgid "add a signature from a file" +#: builtin/log.c:1478 +msgid "base-commit" msgstr "" -#: builtin/log.c:1246 -msgid "don't print the patch filenames" +#: builtin/log.c:1479 +msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1320 -#, c-format -msgid "invalid ident line: %s" +#: builtin/log.c:1481 +msgid "add a signature from a file" +msgstr "" + +#: builtin/log.c:1482 +msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1335 +#: builtin/log.c:1572 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1337 -msgid "--subject-prefix and -k are mutually exclusive." +#: builtin/log.c:1574 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1345 +#: builtin/log.c:1582 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1347 +#: builtin/log.c:1584 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1349 +#: builtin/log.c:1586 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1372 +#: builtin/log.c:1616 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1374 +#: builtin/log.c:1618 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1472 +#: builtin/log.c:1712 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1535 +#: builtin/log.c:1784 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1583 +#: builtin/log.c:1833 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1638 +#: builtin/log.c:1887 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 -#, c-format -msgid "Unknown commit %s" -msgstr "" - -#: builtin/ls-files.c:358 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:415 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:417 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:419 +#: builtin/ls-files.c:521 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:421 +#: builtin/ls-files.c:523 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:423 +#: builtin/ls-files.c:525 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:425 +#: builtin/ls-files.c:527 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:427 +#: builtin/ls-files.c:529 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:532 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:534 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:536 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:437 +#: builtin/ls-files.c:538 +msgid "show line endings of files" +msgstr "" + +#: builtin/ls-files.c:540 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:543 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:442 +#: builtin/ls-files.c:545 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:444 +#: builtin/ls-files.c:547 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:550 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:450 +#: builtin/ls-files.c:553 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:452 +#: builtin/ls-files.c:555 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:455 +#: builtin/ls-files.c:558 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:561 +msgid "recurse through submodules" +msgstr "" + +#: builtin/ls-files.c:563 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:459 +#: builtin/ls-files.c:564 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:565 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:567 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:52 +msgid "do not print remote URL" +msgstr "" + +#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 +msgid "exec" +msgstr "" + +#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 +msgid "path of git-upload-pack on the remote host" +msgstr "" + +#: builtin/ls-remote.c:58 +msgid "limit to tags" +msgstr "" + +#: builtin/ls-remote.c:59 +msgid "limit to heads" +msgstr "" + +#: builtin/ls-remote.c:60 +msgid "do not show peeled tags" +msgstr "" + +#: builtin/ls-remote.c:62 +msgid "take url.<base>.insteadOf into account" +msgstr "" + +#: builtin/ls-remote.c:64 +msgid "exit with exit code 2 if no matching refs are found" +msgstr "" + +#: builtin/ls-remote.c:66 +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:127 +#: builtin/ls-tree.c:126 msgid "only show trees" msgstr "" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:128 msgid "recurse into subtrees" msgstr "" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:130 msgid "show trees when recursing" msgstr "" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" msgstr "" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:134 msgid "include object size" msgstr "" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" msgstr "" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:141 msgid "use full path names" msgstr "" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" -#: builtin/merge.c:45 -msgid "git merge [<options>] [<commit>...]" -msgstr "" - #: builtin/merge.c:46 -msgid "git merge [<options>] <msg> HEAD <commit>" +msgid "git merge [<options>] [<commit>...]" msgstr "" #: builtin/merge.c:47 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:100 +#: builtin/merge.c:48 +msgid "git merge --continue" +msgstr "" + +#: builtin/merge.c:103 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:137 +#: builtin/merge.c:140 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:138 +#: builtin/merge.c:141 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:143 +#: builtin/merge.c:146 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:193 +#: builtin/merge.c:196 builtin/pull.c:127 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:196 +#: builtin/merge.c:199 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:197 +#: builtin/merge.c:200 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:199 +#: builtin/merge.c:202 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:202 +#: builtin/merge.c:205 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:204 +#: builtin/merge.c:207 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:206 +#: builtin/merge.c:209 builtin/pull.c:145 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:207 +#: builtin/merge.c:210 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:209 +#: builtin/merge.c:212 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:213 -msgid "Verify that the named commit has a valid GPG signature" +#: builtin/merge.c:216 builtin/pull.c:154 +msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89 +#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 +#: builtin/revert.c:108 msgid "strategy" msgstr "" -#: builtin/merge.c:215 +#: builtin/merge.c:218 builtin/pull.c:159 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:216 +#: builtin/merge.c:219 builtin/pull.c:162 msgid "option=value" msgstr "" -#: builtin/merge.c:217 +#: builtin/merge.c:220 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:219 +#: builtin/merge.c:222 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:223 +#: builtin/merge.c:226 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:251 +#: builtin/merge.c:228 +msgid "continue the current in-progress merge" +msgstr "" + +#: builtin/merge.c:230 builtin/pull.c:170 +msgid "allow merging unrelated histories" +msgstr "" + +#: builtin/merge.c:258 msgid "could not run stash." msgstr "" -#: builtin/merge.c:256 +#: builtin/merge.c:263 msgid "stash failed" msgstr "" -#: builtin/merge.c:261 +#: builtin/merge.c:268 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:287 builtin/merge.c:304 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:327 +#: builtin/merge.c:334 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:340 +#: builtin/merge.c:345 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:372 -msgid "Writing SQUASH_MSG" -msgstr "" - -#: builtin/merge.c:374 -msgid "Finishing SQUASH_MSG" -msgstr "" - -#: builtin/merge.c:397 +#: builtin/merge.c:395 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:447 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:559 +#: builtin/merge.c:536 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:654 -msgid "git write-tree failed to write a tree" -msgstr "" - -#: builtin/merge.c:678 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:692 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:705 +#: builtin/merge.c:685 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:794 +#: builtin/merge.c:737 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:803 +#: builtin/merge.c:746 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:809 +#: builtin/merge.c:752 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6787,156 +9370,190 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:833 +#: builtin/merge.c:776 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:845 +#: builtin/merge.c:796 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:900 +#: builtin/merge.c:851 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:916 -#, c-format -msgid "'%s' is not a commit" -msgstr "" - -#: builtin/merge.c:957 +#: builtin/merge.c:890 msgid "No current branch." msgstr "" -#: builtin/merge.c:959 +#: builtin/merge.c:892 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:961 +#: builtin/merge.c:894 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:966 +#: builtin/merge.c:899 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1122 +#: builtin/merge.c:946 +#, c-format +msgid "Bad value '%s' in environment '%s'" +msgstr "" + +#: builtin/merge.c:1020 +#, c-format +msgid "could not close '%s'" +msgstr "" + +#: builtin/merge.c:1047 +#, c-format +msgid "not something we can merge in %s: %s" +msgstr "" + +#: builtin/merge.c:1081 +msgid "not something we can merge" +msgstr "" + +#: builtin/merge.c:1146 +msgid "--abort expects no arguments" +msgstr "" + +#: builtin/merge.c:1150 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1138 +#: builtin/merge.c:1162 +msgid "--continue expects no arguments" +msgstr "" + +#: builtin/merge.c:1166 +msgid "There is no merge in progress (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1182 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1141 git-pull.sh:34 -msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "" - -#: builtin/merge.c:1145 +#: builtin/merge.c:1189 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1148 +#: builtin/merge.c:1192 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1157 +#: builtin/merge.c:1201 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1166 +#: builtin/merge.c:1209 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1198 -msgid "Can merge only exactly one commit into empty head" -msgstr "" - -#: builtin/merge.c:1201 +#: builtin/merge.c:1226 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1203 +#: builtin/merge.c:1228 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1208 +#: builtin/merge.c:1233 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1259 +#: builtin/merge.c:1235 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1269 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1262 +#: builtin/merge.c:1272 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1265 +#: builtin/merge.c:1275 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1268 +#: builtin/merge.c:1278 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" +#: builtin/merge.c:1340 +msgid "refusing to merge unrelated histories" +msgstr "" + #: builtin/merge.c:1349 +msgid "Already up-to-date." +msgstr "" + +#: builtin/merge.c:1359 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1388 +#: builtin/merge.c:1400 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1395 +#: builtin/merge.c:1407 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1427 +#: builtin/merge.c:1432 +msgid "Already up-to-date. Yeeah!" +msgstr "" + +#: builtin/merge.c:1438 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1450 builtin/merge.c:1529 +#: builtin/merge.c:1461 builtin/merge.c:1540 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1454 +#: builtin/merge.c:1465 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1520 +#: builtin/merge.c:1531 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1522 +#: builtin/merge.c:1533 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1531 +#: builtin/merge.c:1542 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1543 +#: builtin/merge.c:1554 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6961,23 +9578,23 @@ msgstr "" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:217 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:219 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:221 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:223 msgid "is the first one ancestor of the other?" msgstr "" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:225 msgid "find where <commit> forked from reflog of <ref>" msgstr "" @@ -6987,687 +9604,794 @@ msgid "" "<orig-file> <file2>" msgstr "" -#: builtin/merge-file.c:33 +#: builtin/merge-file.c:32 msgid "send results to standard output" msgstr "" -#: builtin/merge-file.c:34 +#: builtin/merge-file.c:33 msgid "use a diff3 based merge" msgstr "" -#: builtin/merge-file.c:35 +#: builtin/merge-file.c:34 msgid "for conflicts, use our version" msgstr "" -#: builtin/merge-file.c:37 +#: builtin/merge-file.c:36 msgid "for conflicts, use their version" msgstr "" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c:38 msgid "for conflicts, use a union version" msgstr "" -#: builtin/merge-file.c:42 +#: builtin/merge-file.c:41 msgid "for conflicts, use this marker size" msgstr "" -#: builtin/merge-file.c:43 +#: builtin/merge-file.c:42 msgid "do not warn about conflicts" msgstr "" -#: builtin/merge-file.c:45 +#: builtin/merge-file.c:44 msgid "set labels for file1/orig-file/file2" msgstr "" -#: builtin/mktree.c:64 +#: 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:150 +#: builtin/mktree.c:152 msgid "input is NUL terminated" msgstr "" -#: builtin/mktree.c:151 builtin/write-tree.c:24 +#: builtin/mktree.c:153 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "" -#: builtin/mktree.c:152 +#: builtin/mktree.c:154 msgid "allow creation of more than one tree" msgstr "" -#: builtin/mv.c:15 +#: builtin/mv.c:16 msgid "git mv [<options>] <source>... <destination>" msgstr "" -#: builtin/mv.c:69 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:71 +#: builtin/mv.c:84 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -#: builtin/mv.c:89 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "" -#: builtin/mv.c:111 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "" -#: builtin/mv.c:112 +#: builtin/mv.c:125 msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:151 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "" -#: builtin/mv.c:162 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:166 +#: builtin/mv.c:182 msgid "bad source" msgstr "" -#: builtin/mv.c:169 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:172 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:181 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:206 +#: builtin/mv.c:222 msgid "not under version control" msgstr "" -#: builtin/mv.c:209 +#: builtin/mv.c:225 msgid "destination exists" msgstr "" -#: builtin/mv.c:217 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:220 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:223 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:225 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:232 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:253 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 +#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:255 +#: builtin/name-rev.c:289 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:256 +#: builtin/name-rev.c:290 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:257 +#: builtin/name-rev.c:291 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:309 +#: builtin/name-rev.c:346 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:347 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:349 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:351 +msgid "ignore refs matching <pattern>" +msgstr "" + +#: builtin/name-rev.c:353 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:354 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:355 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:322 +#: builtin/name-rev.c:361 msgid "dereference tags in the input (internal use)" msgstr "" -#: builtin/notes.c:24 +#: builtin/notes.c:25 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "" -#: builtin/notes.c:25 +#: 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:26 +#: builtin/notes.c:27 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:27 +#: 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:28 +#: builtin/notes.c:29 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "" -#: builtin/notes.c:29 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "" -#: builtin/notes.c:30 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -#: builtin/notes.c:31 +#: builtin/notes.c:32 msgid "git notes merge --commit [-v | -q]" msgstr "" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --abort [-v | -q]" msgstr "" -#: builtin/notes.c:33 +#: builtin/notes.c:34 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "" -#: builtin/notes.c:34 +#: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "" -#: builtin/notes.c:35 +#: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "" -#: builtin/notes.c:40 +#: builtin/notes.c:41 msgid "git notes [list [<object>]]" msgstr "" -#: builtin/notes.c:45 +#: builtin/notes.c:46 msgid "git notes add [<options>] [<object>]" msgstr "" -#: builtin/notes.c:50 +#: builtin/notes.c:51 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "" -#: builtin/notes.c:56 +#: builtin/notes.c:57 msgid "git notes append [<options>] [<object>]" msgstr "" -#: builtin/notes.c:61 +#: builtin/notes.c:62 msgid "git notes edit [<object>]" msgstr "" -#: builtin/notes.c:66 +#: builtin/notes.c:67 msgid "git notes show [<object>]" msgstr "" -#: builtin/notes.c:71 +#: builtin/notes.c:72 msgid "git notes merge [<options>] <notes-ref>" msgstr "" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge --commit [<options>]" msgstr "" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --abort [<options>]" msgstr "" -#: builtin/notes.c:78 +#: builtin/notes.c:79 msgid "git notes remove [<object>]" msgstr "" -#: builtin/notes.c:83 +#: builtin/notes.c:84 msgid "git notes prune [<options>]" msgstr "" -#: builtin/notes.c:88 +#: builtin/notes.c:89 msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:146 +#: 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:150 +#: builtin/notes.c:151 msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:158 +#: builtin/notes.c:159 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:173 builtin/tag.c:477 -#, c-format -msgid "could not create file '%s'" -msgstr "" - -#: builtin/notes.c:192 -msgid "Please supply the note contents using either -m or -F option" +#: builtin/notes.c:194 +msgid "please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:201 +#: builtin/notes.c:203 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:203 +#: builtin/notes.c:205 #, c-format -msgid "The note contents have been left in %s" +msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:231 builtin/tag.c:693 +#: builtin/notes.c:233 builtin/tag.c:516 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:233 builtin/tag.c:696 +#: builtin/notes.c:235 builtin/tag.c:519 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305 -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506 -#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652 -#: builtin/notes.c:854 builtin/tag.c:709 +#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 +#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 +#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658 #, c-format -msgid "Failed to resolve '%s' as a valid ref." +msgid "failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:255 +#: builtin/notes.c:257 #, c-format -msgid "Failed to read object '%s'." +msgid "failed to read object '%s'." msgstr "" -#: builtin/notes.c:259 +#: builtin/notes.c:261 #, c-format -msgid "Cannot read note data from non-blob object '%s'." +msgid "cannot read note data from non-blob object '%s'." msgstr "" -#: builtin/notes.c:299 +#: builtin/notes.c:301 #, c-format -msgid "Malformed input line: '%s'." +msgid "malformed input line: '%s'." msgstr "" -#: builtin/notes.c:314 +#: builtin/notes.c:316 #, c-format -msgid "Failed to copy notes from '%s' to '%s'" +msgid "failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489 -#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645 -#: builtin/notes.c:919 +#. 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:651 +#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969 msgid "too many parameters" msgstr "" -#: builtin/notes.c:371 builtin/notes.c:658 +#: builtin/notes.c:378 builtin/notes.c:664 #, c-format -msgid "No note found for object %s." +msgid "no note found for object %s." msgstr "" -#: builtin/notes.c:392 builtin/notes.c:555 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:395 builtin/notes.c:558 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560 -#: builtin/notes.c:563 builtin/tag.c:628 -msgid "object" -msgstr "" - -#: builtin/notes.c:398 builtin/notes.c:561 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:401 builtin/notes.c:564 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:404 builtin/notes.c:567 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "allow storing empty note" msgstr "" -#: builtin/notes.c:405 builtin/notes.c:476 +#: builtin/notes.c:412 builtin/notes.c:483 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:430 +#: 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:445 builtin/notes.c:524 +#: builtin/notes.c:452 builtin/notes.c:531 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859 +#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:477 +#: builtin/notes.c:484 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:479 +#: builtin/notes.c:486 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:497 +#: builtin/notes.c:504 msgid "too few parameters" msgstr "" -#: builtin/notes.c:518 +#: 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:530 +#: builtin/notes.c:537 #, c-format -msgid "Missing notes on source object %s. Cannot copy." +msgid "missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:582 +#: 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:750 +#: builtin/notes.c:684 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "" + +#: builtin/notes.c:686 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "" + +#: builtin/notes.c:688 +msgid "failed to remove 'git notes merge' worktree" +msgstr "" + +#: builtin/notes.c:708 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "" + +#: builtin/notes.c:710 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "" + +#: builtin/notes.c:712 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "" + +#: builtin/notes.c:725 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "" + +#: builtin/notes.c:728 +msgid "failed to finalize notes merge" +msgstr "" + +#: builtin/notes.c:754 +#, c-format +msgid "unknown notes merge strategy %s" +msgstr "" + +#: builtin/notes.c:770 msgid "General options" msgstr "" -#: builtin/notes.c:752 +#: builtin/notes.c:772 msgid "Merge options" msgstr "" -#: builtin/notes.c:754 +#: builtin/notes.c:774 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:756 +#: builtin/notes.c:776 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:758 +#: builtin/notes.c:778 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:760 +#: builtin/notes.c:780 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:762 +#: builtin/notes.c:782 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:857 +#: builtin/notes.c:793 +msgid "cannot mix --commit, --abort or -s/--strategy" +msgstr "" + +#: builtin/notes.c:798 +msgid "must specify a notes ref to merge" +msgstr "" + +#: builtin/notes.c:822 +#, c-format +msgid "unknown -s/--strategy: %s" +msgstr "" + +#: builtin/notes.c:859 +#, c-format +msgid "a notes merge into %s is already in-progress at %s" +msgstr "" + +#: builtin/notes.c:862 +#, c-format +msgid "failed to store link to current notes ref (%s)" +msgstr "" + +#: builtin/notes.c:864 +#, c-format +msgid "" +"Automatic notes merge failed. Fix conflicts in %s and commit the result with " +"'git notes merge --commit', or abort the merge with 'git notes merge --" +"abort'.\n" +msgstr "" + +#: builtin/notes.c:886 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:869 +#: builtin/notes.c:898 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:872 +#: builtin/notes.c:901 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:953 +#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 +msgid "do not remove, show only" +msgstr "" + +#: builtin/notes.c:940 +msgid "report pruned notes" +msgstr "" + +#: builtin/notes.c:982 msgid "notes-ref" msgstr "" -#: builtin/notes.c:954 +#: builtin/notes.c:983 msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:989 builtin/remote.c:1621 +#: builtin/notes.c:1018 #, c-format -msgid "Unknown subcommand: %s" +msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:28 -msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +#: builtin/pack-objects.c:29 +msgid "" +"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:29 -msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +#: builtin/pack-objects.c:30 +msgid "" +"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:770 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" + +#: builtin/pack-objects.c:783 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1013 +#: builtin/pack-objects.c:1063 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2173 +#: builtin/pack-objects.c:2426 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2570 +#: builtin/pack-objects.c:2829 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2833 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2597 -#, c-format -msgid "option %s does not accept negative form" -msgstr "" - -#: builtin/pack-objects.c:2601 -#, c-format -msgid "unable to parse value '%s' for option %s" -msgstr "" - -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2863 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2865 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2867 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2870 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2871 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2872 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2875 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2877 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2879 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2881 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2883 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2885 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2887 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2889 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2891 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2893 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2895 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2897 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2899 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2660 +#: builtin/pack-objects.c:2902 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2905 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2908 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2911 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2913 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2915 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2674 parse-options.h:140 -msgid "time" +#: builtin/pack-objects.c:2917 +msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2919 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2678 +#: builtin/pack-objects.c:2922 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2924 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2926 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2928 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2930 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2932 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2934 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:3061 msgid "Counting objects" msgstr "" @@ -7691,41 +10415,193 @@ msgstr "" msgid "Removing duplicate objects" msgstr "" -#: builtin/prune.c:12 +#: builtin/prune.c:11 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "" #: builtin/prune.c:106 -msgid "do not remove, show only" -msgstr "" - -#: builtin/prune.c:107 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:110 +#: builtin/prune.c:109 msgid "expire objects older than <time>" msgstr "" -#: builtin/push.c:14 +#: 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/rebase--helper.c:18 builtin/revert.c:120 +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:456 +#: 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:85 +#: builtin/push.c:89 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:95 +#: builtin/push.c:99 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:139 +#: builtin/push.c:143 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:142 +#: builtin/push.c:146 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7740,7 +10616,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:157 +#: builtin/push.c:161 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7750,7 +10626,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:171 +#: builtin/push.c:175 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7759,12 +10635,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:179 +#: builtin/push.c:183 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:182 +#: builtin/push.c:186 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7772,37 +10648,12 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:205 -msgid "" -"push.default is unset; its implicit value has changed in\n" -"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" -"and maintain the traditional behavior, use:\n" -"\n" -" git config --global push.default matching\n" -"\n" -"To squelch this message and adopt the new behavior now, use:\n" -"\n" -" git config --global push.default simple\n" -"\n" -"When push.default is set to 'matching', git will push local branches\n" -"to the remote branches that already exist with the same name.\n" -"\n" -"Since Git 2.0, Git defaults to the more conservative 'simple'\n" -"behavior, which only pushes the current branch to the corresponding\n" -"remote branch that 'git pull' uses to update the current branch.\n" -"\n" -"See 'git help config' and search for 'push.default' for further " -"information.\n" -"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" -"'current' instead of 'simple' if you sometimes use older versions of Git)" -msgstr "" - -#: builtin/push.c:272 +#: builtin/push.c:245 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:279 +#: builtin/push.c:252 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7810,7 +10661,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:285 +#: builtin/push.c:258 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" @@ -7818,7 +10669,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:291 +#: builtin/push.c:264 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -7827,33 +10678,33 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:298 +#: builtin/push.c:271 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:301 +#: builtin/push.c:274 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:360 +#: builtin/push.c:334 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:364 +#: builtin/push.c:338 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:394 +#: builtin/push.c:369 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:395 +#: builtin/push.c:370 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7866,179 +10717,245 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:410 +#: builtin/push.c:388 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:411 +#: builtin/push.c:389 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:416 +#: builtin/push.c:394 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:417 +#: builtin/push.c:395 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:422 +#: builtin/push.c:400 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:502 +#: builtin/push.c:518 msgid "repository" msgstr "" -#: builtin/push.c:503 +#: builtin/push.c:519 builtin/send-pack.c:162 msgid "push all refs" msgstr "" -#: builtin/push.c:504 +#: builtin/push.c:520 builtin/send-pack.c:164 msgid "mirror all refs" msgstr "" -#: builtin/push.c:506 +#: builtin/push.c:522 msgid "delete refs" msgstr "" -#: builtin/push.c:507 +#: builtin/push.c:523 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:510 +#: builtin/push.c:526 builtin/send-pack.c:165 msgid "force updates" msgstr "" -#: builtin/push.c:512 +#: builtin/push.c:528 builtin/send-pack.c:179 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:513 +#: builtin/push.c:529 builtin/send-pack.c:180 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:516 +#: builtin/push.c:532 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:518 +#: builtin/push.c:534 builtin/send-pack.c:173 msgid "use thin pack" msgstr "" -#: builtin/push.c:519 builtin/push.c:520 +#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 +#: builtin/send-pack.c:160 msgid "receive pack program" msgstr "" -#: builtin/push.c:521 +#: builtin/push.c:537 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:524 +#: builtin/push.c:540 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:526 +#: builtin/push.c:542 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:527 +#: builtin/push.c:543 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:529 +#: builtin/push.c:546 builtin/send-pack.c:167 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:530 +#: builtin/push.c:548 builtin/send-pack.c:174 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:539 +#: builtin/push.c:549 builtin/send-pack.c:170 +msgid "server-specific" +msgstr "" + +#: builtin/push.c:549 builtin/send-pack.c:171 +msgid "option to transmit" +msgstr "" + +#: builtin/push.c:563 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:541 +#: builtin/push.c:565 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/read-tree.c:37 +#: builtin/push.c:584 +msgid "push options must not have new line characters" +msgstr "" + +#: builtin/read-tree.c:40 msgid "" -"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"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 +#: builtin/read-tree.c:130 msgid "write resulting index to <file>" msgstr "" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:133 msgid "only empty the index" msgstr "" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:135 msgid "Merging" msgstr "" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:137 msgid "perform a merge in addition to a read" msgstr "" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:139 msgid "3-way merge if no file level merging required" msgstr "" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:141 msgid "3-way merge in presence of adds and removes" msgstr "" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:143 msgid "same as -m, but discard unmerged entries" msgstr "" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:144 msgid "<subdirectory>/" msgstr "" -#: builtin/read-tree.c:125 +#: builtin/read-tree.c:145 msgid "read the tree into the index under <subdirectory>/" msgstr "" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:148 msgid "update working tree with merge result" msgstr "" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:150 msgid "gitignore" msgstr "" -#: builtin/read-tree.c:131 +#: builtin/read-tree.c:151 msgid "allow explicitly ignored files to be overwritten" msgstr "" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:154 msgid "don't check the working tree after merging" msgstr "" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:155 msgid "don't update the index or the work tree" msgstr "" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:157 msgid "skip applying sparse checkout filter" msgstr "" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:159 msgid "debug unpack-trees" msgstr "" -#: builtin/reflog.c:429 +#: builtin/rebase--helper.c:7 +msgid "git rebase--helper [<options>]" +msgstr "" + +#: builtin/rebase--helper.c:19 +msgid "continue rebase" +msgstr "" + +#: builtin/rebase--helper.c:21 +msgid "abort rebase" +msgstr "" + +#: builtin/receive-pack.c:27 +msgid "git receive-pack <git-dir>" +msgstr "" + +#: builtin/receive-pack.c:795 +msgid "" +"By default, updating the current branch in a non-bare repository\n" +"is denied, because it will make the index and work tree inconsistent\n" +"with what you pushed, and will require 'git reset --hard' to match\n" +"the work tree to HEAD.\n" +"\n" +"You can set the 'receive.denyCurrentBranch' configuration variable\n" +"to 'ignore' or 'warn' in the remote repository to allow pushing into\n" +"its current branch; however, this is not recommended unless you\n" +"arranged to update its work tree to match what you pushed in some\n" +"other way.\n" +"\n" +"To squelch this message and still keep the default behaviour, set\n" +"'receive.denyCurrentBranch' configuration variable to 'refuse'." +msgstr "" + +#: builtin/receive-pack.c:815 +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:1888 +msgid "quiet" +msgstr "" + +#: builtin/receive-pack.c:1902 +msgid "You must specify a directory." +msgstr "" + +#: builtin/reflog.c:423 #, c-format -msgid "%s' for '%s' is not a valid timestamp" +msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: builtin/reflog.c:546 builtin/reflog.c:551 +#: builtin/reflog.c:540 builtin/reflog.c:545 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" @@ -8053,15 +10970,15 @@ msgid "" "mirror=<fetch|push>] <name> <url>" msgstr "" -#: builtin/remote.c:14 builtin/remote.c:33 +#: builtin/remote.c:14 builtin/remote.c:34 msgid "git remote rename <old> <new>" msgstr "" -#: builtin/remote.c:15 builtin/remote.c:38 +#: builtin/remote.c:15 builtin/remote.c:39 msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:16 builtin/remote.c:43 +#: builtin/remote.c:16 builtin/remote.c:44 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" @@ -8082,143 +10999,137 @@ msgstr "" msgid "git remote set-branches [--add] <name> <branch>..." msgstr "" -#: builtin/remote.c:21 builtin/remote.c:69 +#: 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:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url --add <name> <newurl>" msgstr "" -#: builtin/remote.c:23 builtin/remote.c:71 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --delete <name> <url>" msgstr "" -#: builtin/remote.c:28 +#: builtin/remote.c:29 msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches <name> <branch>..." msgstr "" -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches --add <name> <branch>..." msgstr "" -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote show [<options>] <name>" msgstr "" -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote prune [<options>] <name>" msgstr "" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "" -#: builtin/remote.c:88 +#: builtin/remote.c:94 #, c-format msgid "Updating %s" msgstr "" -#: builtin/remote.c:120 +#: builtin/remote.c:126 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -#: builtin/remote.c:137 +#: builtin/remote.c:143 #, c-format msgid "unknown mirror argument: %s" msgstr "" -#: builtin/remote.c:153 +#: builtin/remote.c:159 msgid "fetch the remote branches" msgstr "" -#: builtin/remote.c:155 +#: builtin/remote.c:161 msgid "import all tags and associated objects when fetching" msgstr "" -#: builtin/remote.c:158 +#: builtin/remote.c:164 msgid "or do not fetch any tag at all (--no-tags)" msgstr "" -#: builtin/remote.c:160 +#: builtin/remote.c:166 msgid "branch(es) to track" msgstr "" -#: builtin/remote.c:161 +#: builtin/remote.c:167 msgid "master branch" msgstr "" -#: builtin/remote.c:162 +#: builtin/remote.c:168 msgid "push|fetch" msgstr "" -#: builtin/remote.c:163 +#: builtin/remote.c:169 msgid "set up remote as a mirror to push to or fetch from" msgstr "" -#: builtin/remote.c:175 +#: builtin/remote.c:181 msgid "specifying a master branch makes no sense with --mirror" msgstr "" -#: builtin/remote.c:177 +#: builtin/remote.c:183 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:187 builtin/remote.c:643 +#: builtin/remote.c:190 builtin/remote.c:629 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:191 builtin/remote.c:647 +#: builtin/remote.c:194 builtin/remote.c:633 #, c-format msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/remote.c:235 +#: builtin/remote.c:234 #, c-format msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:335 +#: builtin/remote.c:336 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:436 builtin/remote.c:444 +#: builtin/remote.c:437 builtin/remote.c:445 msgid "(matching)" msgstr "" -#: builtin/remote.c:448 +#: builtin/remote.c:449 msgid "(delete)" msgstr "" -#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 -#, c-format -msgid "Could not append '%s' to '%s'" -msgstr "" - -#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 +#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 #, c-format msgid "No such remote: %s" msgstr "" -#: builtin/remote.c:653 +#: builtin/remote.c:639 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:659 builtin/remote.c:847 -#, c-format -msgid "Could not remove config section '%s'" -msgstr "" - -#: builtin/remote.c:674 +#: builtin/remote.c:659 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8226,32 +11137,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:680 -#, c-format -msgid "Could not append '%s'" -msgstr "" - -#: builtin/remote.c:691 -#, c-format -msgid "Could not set '%s'" -msgstr "" - -#: builtin/remote.c:713 +#: builtin/remote.c:695 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:747 +#: builtin/remote.c:729 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:766 -#, c-format -msgid "Could not remove branch %s" -msgstr "" - -#: builtin/remote.c:833 +#: builtin/remote.c:794 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8261,231 +11157,261 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:948 +#: builtin/remote.c:808 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "" + +#: builtin/remote.c:909 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:951 +#: builtin/remote.c:912 msgid " tracked" msgstr "" -#: builtin/remote.c:953 +#: builtin/remote.c:914 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:955 +#: builtin/remote.c:916 msgid " ???" msgstr "" -#: builtin/remote.c:996 +#: builtin/remote.c:957 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:1003 +#: builtin/remote.c:965 #, c-format -msgid "rebases onto remote %s" +msgid "rebases interactively onto remote %s" msgstr "" -#: builtin/remote.c:1006 +#: builtin/remote.c:966 #, c-format -msgid " merges with remote %s" +msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:1007 -msgid " and with remote" +#: builtin/remote.c:969 +#, c-format +msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:1009 +#: builtin/remote.c:972 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:1010 -msgid " and with remote" +#: builtin/remote.c:975 +#, c-format +msgid "%-*s and with remote %s\n" msgstr "" -#: builtin/remote.c:1056 +#: builtin/remote.c:1018 msgid "create" msgstr "" -#: builtin/remote.c:1059 +#: builtin/remote.c:1021 msgid "delete" msgstr "" -#: builtin/remote.c:1063 +#: builtin/remote.c:1025 msgid "up to date" msgstr "" -#: builtin/remote.c:1066 +#: builtin/remote.c:1028 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1069 +#: builtin/remote.c:1031 msgid "local out of date" msgstr "" -#: builtin/remote.c:1076 +#: builtin/remote.c:1038 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1079 +#: builtin/remote.c:1041 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1083 +#: builtin/remote.c:1045 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1086 +#: builtin/remote.c:1048 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1154 +#: builtin/remote.c:1116 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1181 +#: builtin/remote.c:1143 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1182 +#: builtin/remote.c:1144 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1183 builtin/remote.c:1334 +#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 msgid "(no URL)" msgstr "" -#: builtin/remote.c:1192 builtin/remote.c:1194 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1156 builtin/remote.c:1158 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 +#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1202 +#: builtin/remote.c:1160 +msgid "(not queried)" +msgstr "" + +#: builtin/remote.c:1162 +msgid "(unknown)" +msgstr "" + +#: builtin/remote.c:1166 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1214 +#: builtin/remote.c:1178 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1217 builtin/remote.c:1244 +#: builtin/remote.c:1181 builtin/remote.c:1207 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1226 +#: builtin/remote.c:1190 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1234 +#: builtin/remote.c:1198 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1241 +#: builtin/remote.c:1204 #, 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:1262 +#: builtin/remote.c:1225 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1264 +#: builtin/remote.c:1227 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1279 +#: builtin/remote.c:1242 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1281 +#: builtin/remote.c:1244 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1291 +#: builtin/remote.c:1254 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1299 +#: builtin/remote.c:1262 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1301 +#: builtin/remote.c:1264 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1319 +#: builtin/remote.c:1282 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1320 +#: builtin/remote.c:1283 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1330 +#: builtin/remote.c:1293 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1331 +#: builtin/remote.c:1294 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1354 +#: builtin/remote.c:1310 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1357 +#: builtin/remote.c:1313 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1402 +#: builtin/remote.c:1358 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1468 builtin/remote.c:1542 +#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1488 +#: builtin/remote.c:1437 msgid "add branch" msgstr "" -#: builtin/remote.c:1495 +#: builtin/remote.c:1444 msgid "no remote specified" msgstr "" +#: builtin/remote.c:1461 +msgid "query push URLs rather than fetch URLs" +msgstr "" + +#: builtin/remote.c:1463 +msgid "return all URLs" +msgstr "" + +#: builtin/remote.c:1491 +#, c-format +msgid "no URLs configured for remote '%s'" +msgstr "" + #: builtin/remote.c:1517 msgid "manipulate push URLs" msgstr "" @@ -8502,95 +11428,118 @@ msgstr "" msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1568 +#: builtin/remote.c:1569 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1576 +#: builtin/remote.c:1577 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1578 +#: builtin/remote.c:1579 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1592 +#: builtin/remote.c:1593 msgid "be verbose; must be placed before a subcommand" msgstr "" +#: builtin/remote.c:1624 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + #: builtin/repack.c:17 msgid "git repack [<options>]" msgstr "" -#: builtin/repack.c:159 +#: builtin/repack.c:22 +msgid "" +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +msgstr "" + +#: builtin/repack.c:166 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:161 +#: builtin/repack.c:168 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:164 +#: builtin/repack.c:171 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:166 +#: builtin/repack.c:173 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:168 +#: builtin/repack.c:175 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:170 +#: builtin/repack.c:177 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:173 +#: builtin/repack.c:180 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:175 +#: builtin/repack.c:182 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:176 +#: builtin/repack.c:183 msgid "approxidate" msgstr "" -#: builtin/repack.c:177 +#: builtin/repack.c:184 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:179 +#: builtin/repack.c:186 +msgid "with -a, repack unreachable objects" +msgstr "" + +#: builtin/repack.c:188 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:180 builtin/repack.c:184 +#: builtin/repack.c:189 builtin/repack.c:193 msgid "bytes" msgstr "" -#: builtin/repack.c:181 +#: builtin/repack.c:190 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:183 +#: builtin/repack.c:192 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:185 +#: builtin/repack.c:194 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:187 +#: builtin/repack.c:196 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:375 +#: builtin/repack.c:206 +msgid "cannot delete packs in a precious-objects repo" +msgstr "" + +#: builtin/repack.c:210 +msgid "--keep-unreachable and -A are incompatible" +msgstr "" + +#: builtin/repack.c:400 builtin/worktree.c:115 #, c-format -msgid "removing '%s' failed" +msgid "failed to remove '%s'" msgstr "" #: builtin/replace.c:19 @@ -8613,67 +11562,67 @@ msgstr "" msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "" -#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 +#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 #, c-format msgid "Not a valid object name: '%s'" msgstr "" -#: builtin/replace.c:355 +#: builtin/replace.c:360 #, c-format msgid "bad mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:357 +#: builtin/replace.c:362 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:368 +#: builtin/replace.c:373 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" -#: builtin/replace.c:401 +#: builtin/replace.c:406 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "" -#: builtin/replace.c:402 +#: builtin/replace.c:407 msgid "the signature will be removed in the replacement commit!" msgstr "" -#: builtin/replace.c:408 +#: builtin/replace.c:413 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "" -#: builtin/replace.c:432 +#: builtin/replace.c:437 msgid "list replace refs" msgstr "" -#: builtin/replace.c:433 +#: builtin/replace.c:438 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:434 +#: builtin/replace.c:439 msgid "edit existing object" msgstr "" -#: builtin/replace.c:435 +#: builtin/replace.c:440 msgid "change a commit's parents" msgstr "" -#: builtin/replace.c:436 +#: builtin/replace.c:441 msgid "replace the ref if it exists" msgstr "" -#: builtin/replace.c:437 +#: builtin/replace.c:442 msgid "do not pretty-print contents for --edit" msgstr "" -#: builtin/replace.c:438 +#: builtin/replace.c:443 msgid "use this format" msgstr "" @@ -8681,7 +11630,7 @@ msgstr "" msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" -#: builtin/rerere.c:57 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "" @@ -8691,7 +11640,7 @@ msgid "" msgstr "" #: builtin/reset.c:27 -msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "" #: builtin/reset.c:28 @@ -8770,11 +11719,6 @@ msgstr "" msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:308 builtin/reset.c:316 -#, c-format -msgid "Could not parse object '%s'." -msgstr "" - #: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." @@ -8815,23 +11759,27 @@ msgstr "" msgid "Could not write new index file." msgstr "" -#: builtin/rev-parse.c:361 +#: builtin/rev-list.c:354 +msgid "rev-list does not support display of notes" +msgstr "" + +#: builtin/rev-parse.c:393 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:366 +#: builtin/rev-parse.c:398 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:400 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:371 +#: builtin/rev-parse.c:403 msgid "output in stuck long form" msgstr "" -#: builtin/rev-parse.c:499 +#: builtin/rev-parse.c:534 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -8856,76 +11804,72 @@ msgstr "" msgid "git cherry-pick <subcommand>" msgstr "" -#: builtin/revert.c:71 +#: builtin/revert.c:89 #, c-format msgid "%s: %s cannot be used with %s" msgstr "" -#: builtin/revert.c:80 +#: builtin/revert.c:98 msgid "end revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:81 +#: builtin/revert.c:99 msgid "resume revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:82 +#: builtin/revert.c:100 msgid "cancel revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:83 +#: builtin/revert.c:101 msgid "don't automatically commit" msgstr "" -#: builtin/revert.c:84 +#: builtin/revert.c:102 msgid "edit the commit message" msgstr "" -#: builtin/revert.c:87 -msgid "parent number" +#: builtin/revert.c:105 +msgid "parent-number" msgstr "" -#: builtin/revert.c:89 +#: builtin/revert.c:106 +msgid "select mainline parent" +msgstr "" + +#: builtin/revert.c:108 msgid "merge strategy" msgstr "" -#: builtin/revert.c:90 +#: builtin/revert.c:109 msgid "option" msgstr "" -#: builtin/revert.c:91 +#: builtin/revert.c:110 msgid "option for merge strategy" msgstr "" -#: builtin/revert.c:104 +#: builtin/revert.c:119 msgid "append commit name" msgstr "" -#: builtin/revert.c:105 -msgid "allow fast-forward" -msgstr "" - -#: builtin/revert.c:106 +#: builtin/revert.c:121 msgid "preserve initially empty commits" msgstr "" -#: builtin/revert.c:107 +#: builtin/revert.c:122 msgid "allow commits with empty messages" msgstr "" -#: builtin/revert.c:108 +#: builtin/revert.c:123 msgid "keep redundant, empty commits" msgstr "" -#: builtin/revert.c:112 -msgid "program error" -msgstr "" - -#: builtin/revert.c:197 +#: builtin/revert.c:211 msgid "revert failed" msgstr "" -#: builtin/revert.c:212 +#: builtin/revert.c:224 msgid "cherry-pick failed" msgstr "" @@ -8933,23 +11877,7 @@ msgstr "" 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:231 +#: builtin/rm.c:205 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -8959,94 +11887,118 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:236 +#: builtin/rm.c:210 msgid "" "\n" "(use -f to force removal)" msgstr "" -#: builtin/rm.c:240 +#: builtin/rm.c:214 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:244 builtin/rm.c:255 +#: builtin/rm.c:218 builtin/rm.c:227 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:252 +#: builtin/rm.c:224 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:270 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "" -#: builtin/rm.c:271 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:272 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:273 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:275 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:318 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" - -#: builtin/rm.c:336 +#: builtin/rm.c:308 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:375 +#: builtin/rm.c:347 #, c-format msgid "git rm: unable to remove %s" msgstr "" +#: builtin/rm.c:370 +#, c-format +msgid "could not 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:161 +msgid "remote name" +msgstr "" + +#: builtin/send-pack.c:175 +msgid "use stateless RPC protocol" +msgstr "" + +#: builtin/send-pack.c:176 +msgid "read refs from stdin" +msgstr "" + +#: builtin/send-pack.c:177 +msgid "print status from remote helper" +msgstr "" + #: builtin/shortlog.c:13 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "" -#: builtin/shortlog.c:131 -#, c-format -msgid "Missing author: %s" +#: builtin/shortlog.c:248 +msgid "Group by committer rather than author" msgstr "" -#: builtin/shortlog.c:230 +#: builtin/shortlog.c:250 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:232 +#: builtin/shortlog.c:252 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:234 +#: builtin/shortlog.c:254 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:235 +#: builtin/shortlog.c:255 msgid "w[,i1[,i2]]" msgstr "" -#: builtin/shortlog.c:236 +#: builtin/shortlog.c:256 msgid "Linewrap output" msgstr "" -#: builtin/show-branch.c:9 +#: 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" @@ -9054,74 +12006,128 @@ msgid "" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -#: builtin/show-branch.c:13 +#: builtin/show-branch.c:14 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:374 +#, c-format +msgid "ignoring %s; cannot handle more than %d ref" +msgid_plural "ignoring %s; cannot handle more than %d refs" +msgstr[0] "" +msgstr[1] "" + +#: builtin/show-branch.c:536 +#, c-format +msgid "no matching refs with %s" +msgstr "" + +#: builtin/show-branch.c:632 msgid "show remote-tracking and local branches" msgstr "" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:634 msgid "show remote-tracking branches" msgstr "" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:636 msgid "color '*!+-' corresponding to the branch" msgstr "" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:638 msgid "show <n> more commits after the common ancestor" msgstr "" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:640 msgid "synonym to more=-1" msgstr "" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:641 msgid "suppress naming strings" msgstr "" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:643 msgid "include the current branch" msgstr "" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:645 msgid "name commits with their object names" msgstr "" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:647 msgid "show possible merge bases" msgstr "" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:649 msgid "show refs unreachable from any other ref" msgstr "" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:651 msgid "show commits in topological order" msgstr "" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:654 msgid "show only commits not on the first branch" msgstr "" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:656 msgid "show merges reachable from only one tip" msgstr "" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:658 msgid "topologically sort, maintaining date order where possible" msgstr "" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:661 msgid "<n>[,<base>]" msgstr "" -#: builtin/show-branch.c:682 +#: builtin/show-branch.c:662 msgid "show <n> most recent ref-log entries starting at base" msgstr "" +#: builtin/show-branch.c:696 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "" + +#: builtin/show-branch.c:720 +msgid "no branches given, and HEAD is not valid" +msgstr "" + +#: builtin/show-branch.c:723 +msgid "--reflog option needs one branch name" +msgstr "" + +#: builtin/show-branch.c:726 +#, c-format +msgid "only %d entry can be shown at one time." +msgid_plural "only %d entries can be shown at one time." +msgstr[0] "" +msgstr[1] "" + +#: builtin/show-branch.c:730 +#, c-format +msgid "no such ref %s" +msgstr "" + +#: builtin/show-branch.c:814 +#, c-format +msgid "cannot handle more than %d rev." +msgid_plural "cannot handle more than %d revs." +msgstr[0] "" +msgstr[1] "" + +#: builtin/show-branch.c:818 +#, c-format +msgid "'%s' is not a valid ref." +msgstr "" + +#: builtin/show-branch.c:821 +#, 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 | --" @@ -9129,41 +12135,274 @@ msgid "" msgstr "" #: builtin/show-ref.c:11 -msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:159 msgid "only show tags (can be combined with heads)" msgstr "" -#: builtin/show-ref.c:169 +#: builtin/show-ref.c:160 msgid "only show heads (can be combined with tags)" msgstr "" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:161 msgid "stricter reference checking, requires exact ref path" msgstr "" -#: builtin/show-ref.c:173 builtin/show-ref.c:175 +#: builtin/show-ref.c:164 builtin/show-ref.c:166 msgid "show the HEAD reference, even if it would be filtered out" msgstr "" -#: builtin/show-ref.c:177 +#: builtin/show-ref.c:168 msgid "dereference tags into object IDs" msgstr "" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:170 msgid "only show SHA1 hash using <n> digits" msgstr "" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:174 msgid "do not print results to stdout (useful with --verify)" msgstr "" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:176 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:1075 +#, c-format +msgid "No such ref: %s" +msgstr "" + +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 +#, 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:305 builtin/submodule--helper.c:630 +msgid "alternative anchor for relative paths" +msgstr "" + +#: builtin/submodule--helper.c:310 +msgid "git submodule--helper list [--prefix=<path>] [<path>...]" +msgstr "" + +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "" + +#: builtin/submodule--helper.c:395 +#, c-format +msgid "" +"could not lookup configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "" + +#: builtin/submodule--helper.c:406 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:410 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:420 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:427 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:443 +msgid "Suppress output for initializing a submodule" +msgstr "" + +#: builtin/submodule--helper.c:448 +msgid "git submodule--helper init [<path>]" +msgstr "" + +#: builtin/submodule--helper.c:476 +msgid "git submodule--helper name <path>" +msgstr "" + +#: builtin/submodule--helper.c:482 +#, c-format +msgid "no submodule mapping found in .gitmodules for path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 +#, c-format +msgid "submodule '%s' cannot add alternate: %s" +msgstr "" + +#: builtin/submodule--helper.c:604 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "" + +#: builtin/submodule--helper.c:611 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "" + +#: builtin/submodule--helper.c:633 +msgid "where the new submodule will be cloned to" +msgstr "" + +#: builtin/submodule--helper.c:636 +msgid "name of the new submodule" +msgstr "" + +#: builtin/submodule--helper.c:639 +msgid "url where to clone the submodule from" +msgstr "" + +#: builtin/submodule--helper.c:645 +msgid "depth for shallow clones" +msgstr "" + +#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 +msgid "force cloning progress" +msgstr "" + +#: builtin/submodule--helper.c:653 +msgid "" +"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "" + +#: builtin/submodule--helper.c:684 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "" + +#: builtin/submodule--helper.c:699 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "" + +#: builtin/submodule--helper.c:764 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "" + +#: builtin/submodule--helper.c:768 +msgid "Maybe you want to use 'update --init'?" +msgstr "" + +#: builtin/submodule--helper.c:793 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "" + +#: builtin/submodule--helper.c:814 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:942 +#, c-format +msgid "Failed to clone '%s'. Retry scheduled" +msgstr "" + +#: builtin/submodule--helper.c:953 +#, c-format +msgid "Failed to clone '%s' a second time, aborting" +msgstr "" + +#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 +msgid "path into the working tree" +msgstr "" + +#: builtin/submodule--helper.c:977 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "" + +#: builtin/submodule--helper.c:981 +msgid "rebase, merge, checkout or none" +msgstr "" + +#: builtin/submodule--helper.c:985 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "" + +#: builtin/submodule--helper.c:988 +msgid "parallel jobs" +msgstr "" + +#: builtin/submodule--helper.c:990 +msgid "whether the initial clone should follow the shallow recommendation" +msgstr "" + +#: builtin/submodule--helper.c:991 +msgid "don't print cloning progress" +msgstr "" + +#: builtin/submodule--helper.c:998 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "" + +#: builtin/submodule--helper.c:1008 +msgid "bad value for update parameter" +msgstr "" + +#: builtin/submodule--helper.c:1079 +#, 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:1163 +msgid "recurse into submodules" +msgstr "" + +#: builtin/submodule--helper.c:1169 +msgid "git submodule--helper embed-git-dir [<path>...]" +msgstr "" + +#: builtin/submodule--helper.c:1226 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "" + +#: builtin/submodule--helper.c:1233 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "" + +#: builtin/submodule--helper.c:1239 +#, 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 "" @@ -9184,60 +12423,46 @@ msgstr "" msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "" -#: builtin/tag.c:22 +#: builtin/tag.c:23 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" msgstr "" -#: builtin/tag.c:23 +#: builtin/tag.c:24 msgid "git tag -d <tagname>..." msgstr "" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" -"\t\t[<pattern>...]" -msgstr "" - -#: builtin/tag.c:26 -msgid "git tag -v <tagname>..." -msgstr "" - -#: builtin/tag.c:69 -#, c-format -msgid "malformed object at '%s'" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <object>]\n" +"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" -#: builtin/tag.c:301 -#, c-format -msgid "tag name too long: %.*s..." +#: builtin/tag.c:27 +msgid "git tag -v [--format=<format>] <tagname>..." msgstr "" -#: builtin/tag.c:306 +#: builtin/tag.c:83 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:321 +#: builtin/tag.c:99 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:333 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "" - -#: builtin/tag.c:343 +#: builtin/tag.c:128 #, c-format msgid "" "\n" @@ -9246,7 +12471,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:347 +#: builtin/tag.c:132 #, c-format msgid "" "\n" @@ -9256,273 +12481,361 @@ msgid "" "want to.\n" msgstr "" -#: builtin/tag.c:371 -#, c-format -msgid "unsupported sort specification '%s'" -msgstr "" - -#: builtin/tag.c:373 -#, c-format -msgid "unsupported sort specification '%s' in variable '%s'" -msgstr "" - -#: builtin/tag.c:428 +#: builtin/tag.c:210 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:430 +#: builtin/tag.c:212 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:455 +#: builtin/tag.c:236 msgid "bad object type." msgstr "" -#: builtin/tag.c:468 -msgid "tag header too big." -msgstr "" - -#: builtin/tag.c:504 +#: builtin/tag.c:282 msgid "no tag message?" msgstr "" -#: builtin/tag.c:510 +#: builtin/tag.c:289 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:559 -msgid "switch 'points-at' requires an object" -msgstr "" - -#: builtin/tag.c:561 -#, c-format -msgid "malformed object name '%s'" -msgstr "" - -#: builtin/tag.c:589 +#: builtin/tag.c:397 msgid "list tag names" msgstr "" -#: builtin/tag.c:591 +#: builtin/tag.c:399 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:593 +#: builtin/tag.c:401 msgid "delete tags" msgstr "" -#: builtin/tag.c:594 +#: builtin/tag.c:402 msgid "verify tags" msgstr "" -#: builtin/tag.c:596 +#: builtin/tag.c:404 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:598 +#: builtin/tag.c:406 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:600 +#: builtin/tag.c:408 msgid "tag message" msgstr "" -#: builtin/tag.c:602 +#: builtin/tag.c:410 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:606 +#: builtin/tag.c:414 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:607 +#: builtin/tag.c:415 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:609 +#: builtin/tag.c:416 builtin/update-ref.c:368 +msgid "create a reflog" +msgstr "" + +#: builtin/tag.c:418 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:610 +#: builtin/tag.c:419 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:612 -msgid "sort tags" +#: builtin/tag.c:420 builtin/tag.c:422 +msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:617 builtin/tag.c:623 -msgid "print only tags that contain the commit" +#: builtin/tag.c:421 builtin/tag.c:423 +msgid "print only tags that don't contain the commit" +msgstr "" + +#: builtin/tag.c:424 +msgid "print only tags that are merged" +msgstr "" + +#: builtin/tag.c:425 +msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:629 +#: builtin/tag.c:430 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:655 +#: builtin/tag.c:469 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:667 -msgid "--sort and -n are incompatible" +#: builtin/tag.c:491 +msgid "-n option is only allowed in list mode" msgstr "" -#: builtin/tag.c:674 -msgid "-n option is only allowed with -l." +#: builtin/tag.c:493 +msgid "--contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:676 -msgid "--contains option is only allowed with -l." +#: builtin/tag.c:495 +msgid "--no-contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:678 -msgid "--points-at option is only allowed with -l." +#: builtin/tag.c:497 +msgid "--points-at option is only allowed in list mode" msgstr "" -#: builtin/tag.c:686 +#: builtin/tag.c:499 +msgid "--merged and --no-merged options are only allowed in list mode" +msgstr "" + +#: builtin/tag.c:510 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:706 +#: builtin/tag.c:529 msgid "too many params" msgstr "" -#: builtin/tag.c:712 +#: builtin/tag.c:535 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:717 +#: builtin/tag.c:540 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:741 +#: builtin/tag.c:570 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/unpack-objects.c:489 +#: builtin/unpack-objects.c:493 msgid "Unpacking objects" msgstr "" -#: builtin/update-index.c:403 +#: 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:216 +#, c-format +msgid "failed to delete directory %s" +msgstr "" + +#: builtin/update-index.c:135 +#, c-format +msgid "Testing mtime in '%s' " +msgstr "" + +#: builtin/update-index.c:149 +msgid "directory stat info does not change after adding a new file" +msgstr "" + +#: builtin/update-index.c:162 +msgid "directory stat info does not change after adding a new directory" +msgstr "" + +#: builtin/update-index.c:175 +msgid "directory stat info changes after updating a file" +msgstr "" + +#: builtin/update-index.c:186 +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "" + +#: builtin/update-index.c:197 +msgid "directory stat info does not change after deleting a file" +msgstr "" + +#: builtin/update-index.c:210 +msgid "directory stat info does not change after deleting a directory" +msgstr "" + +#: builtin/update-index.c:217 +msgid " OK" +msgstr "" + +#: builtin/update-index.c:568 msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:757 +#: builtin/update-index.c:923 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:760 +#: builtin/update-index.c:926 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:763 +#: builtin/update-index.c:929 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:765 +#: builtin/update-index.c:931 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:767 +#: builtin/update-index.c:933 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:769 +#: builtin/update-index.c:935 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:772 +#: builtin/update-index.c:938 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:776 +#: builtin/update-index.c:942 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:780 +#: builtin/update-index.c:946 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:781 +#: builtin/update-index.c:947 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:785 -msgid "(+/-)x" -msgstr "" - -#: builtin/update-index.c:786 -msgid "override the executable bit of the listed files" -msgstr "" - -#: builtin/update-index.c:790 +#: builtin/update-index.c:956 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:793 +#: builtin/update-index.c:959 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:796 +#: builtin/update-index.c:962 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:799 +#: builtin/update-index.c:965 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:802 +#: builtin/update-index.c:968 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:804 +#: builtin/update-index.c:970 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:806 +#: builtin/update-index.c:972 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:808 +#: builtin/update-index.c:974 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:812 +#: builtin/update-index.c:978 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:816 +#: builtin/update-index.c:982 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:820 +#: builtin/update-index.c:986 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:824 +#: builtin/update-index.c:990 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:827 +#: builtin/update-index.c:993 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:829 +#: builtin/update-index.c:995 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:833 +#: builtin/update-index.c:999 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:835 +#: builtin/update-index.c:1001 msgid "enable or disable split index" msgstr "" +#: builtin/update-index.c:1003 +msgid "enable/disable untracked cache" +msgstr "" + +#: builtin/update-index.c:1005 +msgid "test if the filesystem supports untracked cache" +msgstr "" + +#: builtin/update-index.c:1007 +msgid "enable untracked cache without testing the filesystem" +msgstr "" + +#: builtin/update-index.c:1107 +msgid "" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" +msgstr "" + +#: builtin/update-index.c:1116 +msgid "" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" +msgstr "" + +#: builtin/update-index.c:1127 +msgid "" +"core.untrackedCache is set to true; remove or change it, if you really want " +"to disable the untracked cache" +msgstr "" + +#: builtin/update-index.c:1131 +msgid "Untracked cache disabled" +msgstr "" + +#: builtin/update-index.c:1139 +msgid "" +"core.untrackedCache is set to false; remove or change it, if you really want " +"to enable the untracked cache" +msgstr "" + +#: builtin/update-index.c:1143 +#, c-format +msgid "Untracked cache enabled for '%s'" +msgstr "" + #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "" @@ -9535,19 +12848,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:359 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:361 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:362 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "" @@ -9563,10 +12876,14 @@ msgstr "" msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "" -#: builtin/verify-commit.c:75 +#: builtin/verify-commit.c:72 msgid "print commit contents" msgstr "" +#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 +msgid "print raw gpg status output" +msgstr "" + #: builtin/verify-pack.c:54 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "" @@ -9579,482 +12896,565 @@ msgstr "" msgid "show statistics only" msgstr "" -#: builtin/verify-tag.c:17 -msgid "git verify-tag [-v | --verbose] <tag>..." +#: builtin/verify-tag.c:18 +msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "" -#: builtin/verify-tag.c:73 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "" -#: builtin/write-tree.c:13 -msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +#: builtin/worktree.c:15 +msgid "git worktree add [<options>] <path> [<branch>]" msgstr "" -#: builtin/write-tree.c:26 -msgid "<prefix>/" +#: builtin/worktree.c:16 +msgid "git worktree list [<options>]" msgstr "" -#: builtin/write-tree.c:27 -msgid "write tree object for a subdirectory <prefix>" +#: builtin/worktree.c:17 +msgid "git worktree lock [<options>] <path>" msgstr "" -#: builtin/write-tree.c:30 -msgid "only useful for debugging" +#: builtin/worktree.c:18 +msgid "git worktree prune [<options>]" msgstr "" -#: credential-cache--daemon.c:267 -msgid "print debugging messages to stderr" +#: builtin/worktree.c:19 +msgid "git worktree unlock <path>" 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." +#: builtin/worktree.c:43 +#, c-format +msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: common-cmds.h:8 -msgid "Add file contents to the index" +#: builtin/worktree.c:49 +#, c-format +msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: common-cmds.h:9 -msgid "Find by binary search the change that introduced a bug" +#: builtin/worktree.c:54 +#, c-format +msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: common-cmds.h:10 -msgid "List, create, or delete branches" +#: builtin/worktree.c:65 +#, c-format +msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: common-cmds.h:11 -msgid "Checkout a branch or paths to the working tree" +#: builtin/worktree.c:81 +#, c-format +msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: common-cmds.h:12 -msgid "Clone a repository into a new directory" +#: builtin/worktree.c:128 +msgid "report pruned working trees" msgstr "" -#: common-cmds.h:13 -msgid "Record changes to the repository" +#: builtin/worktree.c:130 +msgid "expire working trees older than <time>" msgstr "" -#: common-cmds.h:14 -msgid "Show changes between commits, commit and working tree, etc" +#: builtin/worktree.c:204 +#, c-format +msgid "'%s' already exists" msgstr "" -#: common-cmds.h:15 -msgid "Download objects and refs from another repository" +#: builtin/worktree.c:235 +#, c-format +msgid "could not create directory of '%s'" msgstr "" -#: common-cmds.h:16 -msgid "Print lines matching a pattern" +#: builtin/worktree.c:274 +#, c-format +msgid "Preparing %s (identifier %s)" msgstr "" -#: common-cmds.h:17 -msgid "Create an empty Git repository or reinitialize an existing one" +#: builtin/worktree.c:328 +msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: common-cmds.h:18 -msgid "Show commit logs" +#: builtin/worktree.c:330 +msgid "create a new branch" msgstr "" -#: common-cmds.h:19 -msgid "Join two or more development histories together" +#: builtin/worktree.c:332 +msgid "create or reset a branch" msgstr "" -#: common-cmds.h:20 -msgid "Move or rename a file, a directory, or a symlink" +#: builtin/worktree.c:334 +msgid "populate the new working tree" msgstr "" -#: common-cmds.h:21 -msgid "Fetch from and integrate with another repository or a local branch" +#: builtin/worktree.c:335 +msgid "keep the new working tree locked" msgstr "" -#: common-cmds.h:22 -msgid "Update remote refs along with associated objects" +#: builtin/worktree.c:343 +msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: common-cmds.h:23 -msgid "Forward-port local commits to the updated upstream head" +#: builtin/worktree.c:478 +msgid "reason for locking" msgstr "" -#: common-cmds.h:24 -msgid "Reset current HEAD to the specified state" +#: builtin/worktree.c:490 builtin/worktree.c:523 +#, c-format +msgid "'%s' is not a working tree" msgstr "" -#: common-cmds.h:25 -msgid "Remove files from the working tree and from the index" +#: builtin/worktree.c:492 builtin/worktree.c:525 +msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: common-cmds.h:26 -msgid "Show various types of objects" +#: builtin/worktree.c:497 +#, c-format +msgid "'%s' is already locked, reason: %s" msgstr "" -#: common-cmds.h:27 -msgid "Show the working tree status" +#: builtin/worktree.c:499 +#, c-format +msgid "'%s' is already locked" msgstr "" -#: common-cmds.h:28 -msgid "Create, list, delete or verify a tag object signed with GPG" +#: builtin/worktree.c:527 +#, c-format +msgid "'%s' is not locked" msgstr "" -#: parse-options.h:143 -msgid "expiry-date" +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "" -#: parse-options.h:158 -msgid "no-op (backward compatibility)" +#: builtin/write-tree.c:26 +msgid "<prefix>/" msgstr "" -#: parse-options.h:232 -msgid "be more verbose" +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" msgstr "" -#: parse-options.h:234 -msgid "be more quiet" +#: builtin/write-tree.c:30 +msgid "only useful for debugging" msgstr "" -#: parse-options.h:240 -msgid "use <n> digits to display SHA-1s" +#: upload-pack.c:22 +msgid "git upload-pack [<options>] <dir>" msgstr "" -#: rerere.h:27 -msgid "update the index with reused conflict resolution if possible" +#: upload-pack.c:1040 +msgid "quit after a single request/response exchange" +msgstr "" + +#: upload-pack.c:1042 +msgid "exit immediately after initial ref advertisement" +msgstr "" + +#: upload-pack.c:1044 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" -#: git-am.sh:53 -msgid "You need to set your committer info first" +#: upload-pack.c:1046 +msgid "interrupt transfer after <n> seconds of inactivity" msgstr "" -#: git-am.sh:98 +#: credential-cache--daemon.c:223 +#, c-format msgid "" -"You seem to have moved HEAD since the last 'am' failure.\n" -"Not rewinding to ORIG_HEAD" +"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 "" -#: git-am.sh:108 -#, sh-format +#: credential-cache--daemon.c:271 +msgid "print debugging messages to stderr" +msgstr "" + +#: git.c:14 msgid "" -"When you have resolved this problem, run \"$cmdline --continue\".\n" -"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" -"To restore the original branch and stop patching, run \"$cmdline --abort\"." +"'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 "" -#: git-am.sh:124 -msgid "Cannot fall back to three-way merge." +#: http.c:336 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" -#: git-am.sh:140 -msgid "Repository lacks necessary blobs to fall back on 3-way merge." +#: http.c:357 +msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "" -#: git-am.sh:142 -msgid "Using index info to reconstruct a base tree..." +#: http.c:366 +msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" -#: git-am.sh:157 +#: http.c:1766 +#, c-format msgid "" -"Did you hand edit your patch?\n" -"It does not apply to blobs recorded in its index." +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" msgstr "" -#: git-am.sh:166 -msgid "Falling back to patching base and 3-way merge..." +#: remote-curl.c:323 +#, c-format +msgid "redirecting to %s" msgstr "" -#: git-am.sh:182 -msgid "Failed to merge in the changes." +#: common-cmds.h:9 +msgid "start a working area (see also: git help tutorial)" msgstr "" -#: git-am.sh:277 -msgid "Only one StGIT patch series can be applied at once" +#: common-cmds.h:10 +msgid "work on the current change (see also: git help everyday)" msgstr "" -#: git-am.sh:364 -#, sh-format -msgid "Patch format $patch_format is not supported." +#: common-cmds.h:11 +msgid "examine the history and state (see also: git help revisions)" msgstr "" -#: git-am.sh:366 -msgid "Patch format detection failed." +#: common-cmds.h:12 +msgid "grow, mark and tweak your common history" msgstr "" -#: git-am.sh:398 -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." +#: common-cmds.h:13 +msgid "collaborate (see also: git help workflows)" msgstr "" -#: git-am.sh:496 -#, sh-format -msgid "previous rebase directory $dotest still exists but mbox given." +#: common-cmds.h:17 +msgid "Add file contents to the index" msgstr "" -#: git-am.sh:501 -msgid "Please make up your mind. --skip or --abort?" +#: common-cmds.h:18 +msgid "Use binary search to find the commit that introduced a bug" msgstr "" -#: git-am.sh:537 -#, sh-format -msgid "" -"Stray $dotest directory found.\n" -"Use \"git am --abort\" to remove it." +#: common-cmds.h:19 +msgid "List, create, or delete branches" msgstr "" -#: git-am.sh:545 -msgid "Resolve operation not in progress, we are not resuming." +#: common-cmds.h:20 +msgid "Switch branches or restore working tree files" msgstr "" -#: git-am.sh:612 -#, sh-format -msgid "Dirty index: cannot apply patches (dirty: $files)" +#: common-cmds.h:21 +msgid "Clone a repository into a new directory" msgstr "" -#: git-am.sh:722 -#, sh-format -msgid "" -"Patch is empty. Was it split wrong?\n" -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" -"To restore the original branch and stop patching run \"$cmdline --abort\"." +#: common-cmds.h:22 +msgid "Record changes to the repository" msgstr "" -#: git-am.sh:749 -msgid "Patch does not have a valid e-mail address." +#: common-cmds.h:23 +msgid "Show changes between commits, commit and working tree, etc" msgstr "" -#: git-am.sh:796 -msgid "cannot be interactive without stdin connected to a terminal." +#: common-cmds.h:24 +msgid "Download objects and refs from another repository" msgstr "" -#: git-am.sh:800 -msgid "Commit Body is:" +#: common-cmds.h:25 +msgid "Print lines matching a pattern" 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. -#: git-am.sh:807 -msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +#: common-cmds.h:26 +msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" -#: git-am.sh:843 -#, sh-format -msgid "Applying: $FIRSTLINE" +#: common-cmds.h:27 +msgid "Show commit logs" msgstr "" -#: git-am.sh:864 -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." +#: common-cmds.h:28 +msgid "Join two or more development histories together" msgstr "" -#: git-am.sh:872 -msgid "" -"You still have unmerged paths in your index\n" -"did you forget to use 'git add'?" +#: common-cmds.h:29 +msgid "Move or rename a file, a directory, or a symlink" msgstr "" -#: git-am.sh:888 -msgid "No changes -- Patch already applied." +#: common-cmds.h:30 +msgid "Fetch from and integrate with another repository or a local branch" msgstr "" -#: git-am.sh:898 -#, sh-format -msgid "Patch failed at $msgnum $FIRSTLINE" +#: common-cmds.h:31 +msgid "Update remote refs along with associated objects" msgstr "" -#: git-am.sh:901 -#, sh-format -msgid "" -"The copy of the patch that failed is found in:\n" -" $dotest/patch" +#: common-cmds.h:32 +msgid "Reapply commits on top of another base tip" msgstr "" -#: git-am.sh:919 -msgid "applying to an empty history" +#: 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 "" -#: git-bisect.sh:48 +#: 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:54 +#: git-bisect.sh:60 msgid "Do you want me to do it for you [Y/n]? " msgstr "" -#: git-bisect.sh:95 +#: git-bisect.sh:121 #, sh-format msgid "unrecognised option: '$arg'" msgstr "" -#: git-bisect.sh:99 +#: git-bisect.sh:125 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "" -#: git-bisect.sh:117 +#: git-bisect.sh:154 msgid "Bad HEAD - I need a HEAD" msgstr "" -#: git-bisect.sh:130 +#: git-bisect.sh:167 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" -#: git-bisect.sh:140 +#: git-bisect.sh:177 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: git-bisect.sh:144 +#: git-bisect.sh:181 msgid "Bad HEAD - strange symbolic ref" msgstr "" -#: git-bisect.sh:189 +#: git-bisect.sh:233 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "" -#: git-bisect.sh:218 +#: git-bisect.sh:262 #, sh-format msgid "Bad rev input: $arg" msgstr "" -#: git-bisect.sh:232 -msgid "Please call 'bisect_state' with at least one argument." +#: git-bisect.sh:281 +#, sh-format +msgid "Bad rev input: $bisected_head" msgstr "" -#: git-bisect.sh:244 +#: git-bisect.sh:290 #, sh-format msgid "Bad rev input: $rev" msgstr "" -#: git-bisect.sh:253 -msgid "'git bisect bad' can take only one argument." +#: git-bisect.sh:299 +#, sh-format +msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "" -#: git-bisect.sh:276 -msgid "Warning: bisecting only with a bad commit." +#: 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:282 +#: git-bisect.sh:328 msgid "Are you sure [Y/n]? " msgstr "" -#: git-bisect.sh:292 +#: git-bisect.sh:340 +#, sh-format msgid "" -"You need to give me at least one good and one bad revision.\n" -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +"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:295 +#: 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 and one bad revision.\n" -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +"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:366 git-bisect.sh:493 +#: git-bisect.sh:414 git-bisect.sh:546 msgid "We are not bisecting." msgstr "" -#: git-bisect.sh:373 +#: git-bisect.sh:421 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "" -#: git-bisect.sh:382 +#: git-bisect.sh:430 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset <commit>'." msgstr "" -#: git-bisect.sh:409 +#: git-bisect.sh:458 msgid "No logfile given" msgstr "" -#: git-bisect.sh:410 +#: git-bisect.sh:459 #, sh-format msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:427 +#: git-bisect.sh:480 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:439 +#: git-bisect.sh:492 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:446 +#: git-bisect.sh:499 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:472 +#: git-bisect.sh:525 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:478 +#: git-bisect.sh:531 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:485 +#: git-bisect.sh:538 msgid "bisect run success" msgstr "" -#: git-pull.sh:21 -msgid "" -"Pull is not possible because you have unmerged files.\n" -"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" -"as appropriate to mark resolution and make a commit." +#: git-bisect.sh:565 +msgid "please use two different terms" msgstr "" -#: git-pull.sh:25 -msgid "Pull is not possible because you have unmerged files." +#: git-bisect.sh:575 +#, sh-format +msgid "'$term' is not a valid term" msgstr "" -#: git-pull.sh:31 -msgid "" -"You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +#: git-bisect.sh:578 +#, sh-format +msgid "can't use the builtin command '$term' as a term" msgstr "" -#: git-pull.sh:245 -msgid "updating an unborn branch with changes added to the index" +#: git-bisect.sh:587 git-bisect.sh:593 +#, sh-format +msgid "can't change the meaning of term '$term'" msgstr "" -#: git-pull.sh:269 +#: 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 "" -"Warning: fetch updated the current branch head.\n" -"Warning: fast-forwarding your working tree from\n" -"Warning: commit $orig_head." +"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-pull.sh:294 -msgid "Cannot merge multiple branches into empty head" +#: 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-pull.sh:298 -msgid "Cannot rebase onto multiple branches" +#: 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:57 +#: git-rebase.sh:58 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -10062,58 +13462,43 @@ msgid "" "\"." msgstr "" -#: git-rebase.sh:165 -msgid "Applied autostash." +#: git-rebase.sh:158 git-rebase.sh:397 +#, sh-format +msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:168 +#: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:169 -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:208 +#: git-rebase.sh:212 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:213 +#: git-rebase.sh:217 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:351 -msgid "The --exec option must be used with the --interactive option" -msgstr "" - -#: git-rebase.sh:356 +#: git-rebase.sh:358 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:367 +#: git-rebase.sh:369 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:374 +#: git-rebase.sh:376 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:377 +#: git-rebase.sh:379 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:395 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "" - -#: git-rebase.sh:414 +#: git-rebase.sh:419 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -10126,97 +13511,101 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:465 +#: git-rebase.sh:470 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:489 +#: git-rebase.sh:494 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:492 git-rebase.sh:496 +#: git-rebase.sh:497 git-rebase.sh:501 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:501 +#: git-rebase.sh:506 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:524 +#: git-rebase.sh:529 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:557 +#: git-rebase.sh:562 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:562 +#: git-rebase.sh:567 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:566 +#: git-rebase.sh:571 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:586 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:590 +#: git-rebase.sh:595 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:601 +#: git-rebase.sh:606 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:610 +#: git-rebase.sh:615 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:620 +#: git-rebase.sh:625 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" -#: git-stash.sh:51 +#: git-stash.sh:53 msgid "git stash clear with parameters is unimplemented" msgstr "" -#: git-stash.sh:74 +#: git-stash.sh:94 msgid "You do not have the initial commit yet" msgstr "" -#: git-stash.sh:89 +#: git-stash.sh:109 msgid "Cannot save the current index state" msgstr "" -#: git-stash.sh:124 git-stash.sh:137 +#: git-stash.sh:124 +msgid "Cannot save the untracked files" +msgstr "" + +#: git-stash.sh:144 git-stash.sh:157 msgid "Cannot save the current worktree state" msgstr "" -#: git-stash.sh:141 +#: git-stash.sh:161 msgid "No changes selected" msgstr "" -#: git-stash.sh:144 +#: git-stash.sh:164 msgid "Cannot remove temporary index (can't happen)" msgstr "" -#: git-stash.sh:157 +#: git-stash.sh:177 msgid "Cannot record working tree state" msgstr "" -#: git-stash.sh:191 +#: git-stash.sh:209 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" @@ -10231,366 +13620,1497 @@ msgstr "" #. $ 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 +#: git-stash.sh:265 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" -#: git-stash.sh:259 +#: git-stash.sh:278 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "" + +#: git-stash.sh:286 msgid "No local changes to save" msgstr "" -#: git-stash.sh:263 +#: git-stash.sh:291 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:267 +#: git-stash.sh:295 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:285 +#: git-stash.sh:296 +#, sh-format +msgid "Saved working directory and index state $stash_msg" +msgstr "" + +#: git-stash.sh:323 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:384 +#: git-stash.sh:471 +#, sh-format +msgid "unknown option: $opt" +msgstr "" + +#: git-stash.sh:484 msgid "No stash found." msgstr "" -#: git-stash.sh:391 +#: git-stash.sh:491 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:397 +#: git-stash.sh:506 #, sh-format msgid "$reference is not a valid reference" msgstr "" -#: git-stash.sh:425 +#: git-stash.sh:534 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:436 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:444 +#: git-stash.sh:553 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:448 +#: git-stash.sh:557 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:456 +#: git-stash.sh:565 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:458 +#: git-stash.sh:567 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:492 +#: git-stash.sh:576 +msgid "Could not restore untracked files from stash" +msgstr "" + +#: git-stash.sh:601 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:507 +#: git-stash.sh:616 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:530 +#: git-stash.sh:630 +msgid "The stash is kept in case you need it again." +msgstr "" + +#: git-stash.sh:639 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:531 +#: git-stash.sh:640 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:539 +#: git-stash.sh:648 msgid "No branch name specified" msgstr "" -#: git-stash.sh:611 +#: git-stash.sh:727 msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:95 +#: git-submodule.sh:181 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "" + +#: git-submodule.sh:191 #, sh-format -msgid "cannot strip one component off url '$remoteurl'" +msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:237 +#: git-submodule.sh:210 #, sh-format -msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:287 +#: git-submodule.sh:213 #, sh-format -msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "" -#: git-submodule.sh:296 +#: git-submodule.sh:218 #, sh-format -msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +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:406 -msgid "Relative path can only be used from the toplevel of the working tree" +#: git-submodule.sh:236 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:416 +#: git-submodule.sh:238 #, sh-format -msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:433 +#: git-submodule.sh:246 #, sh-format -msgid "'$sm_path' already exists in the index" +msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:437 +#: git-submodule.sh:248 #, 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." +"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:455 +#: git-submodule.sh:254 #, sh-format -msgid "Adding existing repo at '$sm_path' to the index" +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "" + +#: git-submodule.sh:266 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:271 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:280 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:341 +#, sh-format +msgid "Entering '$displaypath'" +msgstr "" + +#: git-submodule.sh:361 +#, sh-format +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:432 +#, sh-format +msgid "pathspec and --all are incompatible" +msgstr "" + +#: git-submodule.sh:437 +#, sh-format +msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" #: git-submodule.sh:457 #, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" +msgid "" +"Submodule work tree '$displaypath' contains a .git directory\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" #: git-submodule.sh:465 #, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgid "" +"Submodule work tree '$displaypath' contains local modifications; use '-f' to " +"discard them" msgstr "" -#: git-submodule.sh:467 +#: git-submodule.sh:468 #, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from" +msgid "Cleared directory '$displaypath'" msgstr "" #: git-submodule.sh:469 #, sh-format +msgid "Could not remove submodule work tree '$displaypath'" +msgstr "" + +#: git-submodule.sh:472 +#, sh-format +msgid "Could not create empty submodule directory '$displaypath'" +msgstr "" + +#: git-submodule.sh:481 +#, sh-format +msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +msgstr "" + +#: git-submodule.sh:637 +#, sh-format +msgid "Unable to find current revision in submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:647 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:652 +#, sh-format msgid "" -"use the '--force' option. If the local git directory is not the correct repo" +"Unable to find current ${remote_name}/${branch} revision in submodule path " +"'$sm_path'" +msgstr "" + +#: git-submodule.sh:670 +#, sh-format +msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:470 +#: git-submodule.sh:676 #, sh-format msgid "" -"or you are unsure what this means choose another name with the '--name' " -"option." +"Fetched in submodule path '$displaypath', but it did not contain $sha1. " +"Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:472 +#: git-submodule.sh:683 #, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:484 +#: git-submodule.sh:684 #, sh-format -msgid "Unable to checkout submodule '$sm_path'" +msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:489 +#: git-submodule.sh:688 #, sh-format -msgid "Failed to add submodule '$sm_path'" +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:498 +#: git-submodule.sh:689 #, sh-format -msgid "Failed to register submodule '$sm_path'" +msgid "Submodule path '$displaypath': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:694 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:695 +#, sh-format +msgid "Submodule path '$displaypath': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:700 +#, sh-format +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:542 +#: git-submodule.sh:701 +#, sh-format +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "" + +#: git-submodule.sh:732 #, sh-format -msgid "Entering '$prefix$displaypath'" +msgid "Failed to recurse into submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:840 +msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:562 +#: git-submodule.sh:892 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:608 +#: git-submodule.sh:912 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" +msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:617 +#: git-submodule.sh:915 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" +msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:619 +#: git-submodule.sh:918 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" +msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:636 +#: git-submodule.sh:1064 #, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" +msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:674 +#: git-submodule.sh:1136 #, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" +msgid "Synchronizing submodule url for '$displaypath'" msgstr "" -#: git-submodule.sh:691 +#: git-parse-remote.sh:89 #, sh-format -msgid "Submodule work tree '$displaypath' contains a .git directory" +msgid "See git-${cmd}(1) for details." msgstr "" -#: git-submodule.sh:692 +#: git-rebase--interactive.sh:140 #, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "" + +#: git-rebase--interactive.sh:156 msgid "" -"(use 'rm -rf' if you really want to remove it including all of its history)" +"\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-submodule.sh:698 +#: git-rebase--interactive.sh:211 #, sh-format msgid "" -"Submodule work tree '$displaypath' contains local modifications; use '-f' to " -"discard them" +"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-submodule.sh:701 +#: git-rebase--interactive.sh:236 #, sh-format -msgid "Cleared directory '$displaypath'" +msgid "$sha1: not a commit that can be picked" msgstr "" -#: git-submodule.sh:702 +#: git-rebase--interactive.sh:275 #, sh-format -msgid "Could not remove submodule work tree '$displaypath'" +msgid "Invalid commit name: $sha1" +msgstr "" + +#: git-rebase--interactive.sh:317 +msgid "Cannot write current commit's replacement sha1" msgstr "" -#: git-submodule.sh:705 +#: git-rebase--interactive.sh:369 #, sh-format -msgid "Could not create empty submodule directory '$displaypath'" +msgid "Fast-forward to $sha1" msgstr "" -#: git-submodule.sh:714 +#: git-rebase--interactive.sh:371 #, sh-format -msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +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:441 +#, sh-format +msgid "Cannot write $fixup_msg" msgstr "" -#: git-submodule.sh:830 +#: git-rebase--interactive.sh:444 +msgid "This is a combination of 2 commits." +msgstr "" + +#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 +#: git-rebase--interactive.sh:531 +#, sh-format +msgid "Could not apply $sha1... $rest" +msgstr "" + +#: git-rebase--interactive.sh:559 #, sh-format msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" +"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-submodule.sh:843 +#: git-rebase--interactive.sh:574 #, sh-format -msgid "Unable to find current revision in submodule path '$displaypath'" +msgid "Stopped at $sha1_abbrev... $rest" msgstr "" -#: git-submodule.sh:852 +#: git-rebase--interactive.sh:589 #, sh-format -msgid "Unable to fetch in submodule path '$sm_path'" +msgid "Cannot '$squash_style' without a previous commit" msgstr "" -#: git-submodule.sh:876 +#: git-rebase--interactive.sh:631 #, sh-format -msgid "Unable to fetch in submodule path '$displaypath'" +msgid "Executing: $rest" msgstr "" -#: git-submodule.sh:890 +#: git-rebase--interactive.sh:639 #, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgid "Execution failed: $rest" +msgstr "" + +#: git-rebase--interactive.sh:641 +msgid "and made changes to the index and/or the working tree" +msgstr "" + +#: git-rebase--interactive.sh:643 +msgid "" +"You can fix the problem, and then run\n" +"\n" +"\tgit rebase --continue" msgstr "" -#: git-submodule.sh:891 +#. TRANSLATORS: after these lines is a command to be issued by the user +#: git-rebase--interactive.sh:656 #, sh-format -msgid "Submodule path '$displaypath': checked out '$sha1'" +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-submodule.sh:895 +#: git-rebase--interactive.sh:667 #, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" +msgid "Unknown command: $command $sha1 $rest" +msgstr "" + +#: git-rebase--interactive.sh:668 +msgid "Please fix this using 'git rebase --edit-todo'." msgstr "" -#: git-submodule.sh:896 +#: git-rebase--interactive.sh:703 #, sh-format -msgid "Submodule path '$displaypath': rebased into '$sha1'" +msgid "Successfully rebased and updated $head_name." +msgstr "" + +#: git-rebase--interactive.sh:750 +msgid "Could not skip unnecessary pick commands" msgstr "" -#: git-submodule.sh:901 +#: git-rebase--interactive.sh:908 #, sh-format -msgid "Unable to merge '$sha1' in submodule path '$displaypath'" +msgid "" +"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" +" - $line" msgstr "" -#: git-submodule.sh:902 +#: git-rebase--interactive.sh:941 #, sh-format -msgid "Submodule path '$displaypath': merged in '$sha1'" +msgid "" +"Warning: the command isn't recognized in the following line:\n" +" - $line" +msgstr "" + +#: git-rebase--interactive.sh:980 +msgid "could not detach HEAD" +msgstr "" + +#: git-rebase--interactive.sh:1018 +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):" +msgstr "" + +#: git-rebase--interactive.sh:1026 +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error." msgstr "" -#: git-submodule.sh:907 +#: git-rebase--interactive.sh:1037 #, sh-format msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " +"Ignoring." +msgstr "" + +#: git-rebase--interactive.sh:1054 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'." msgstr "" -#: git-submodule.sh:908 +#: git-rebase--interactive.sh:1055 +msgid "Or you can abort the rebase with 'git rebase --abort'." +msgstr "" + +#: git-rebase--interactive.sh:1083 +msgid "Could not remove CHERRY_PICK_HEAD" +msgstr "" + +#: git-rebase--interactive.sh:1088 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +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:1105 +msgid "Error trying to find the author identity to amend commit" +msgstr "" + +#: git-rebase--interactive.sh:1110 +msgid "" +"You have uncommitted changes in your working tree. Please commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" + +#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 +msgid "Could not commit staged changes." +msgstr "" + +#: git-rebase--interactive.sh:1147 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" + +#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 +msgid "Could not execute editor" msgstr "" -#: git-submodule.sh:938 +#: git-rebase--interactive.sh:1168 #, sh-format -msgid "Failed to recurse into submodule path '$displaypath'" +msgid "Could not checkout $switch_to" msgstr "" -#: git-submodule.sh:1046 -msgid "The --cached option cannot be used with the --files option" +#: git-rebase--interactive.sh:1173 +msgid "No HEAD?" msgstr "" -#: git-submodule.sh:1098 +#: git-rebase--interactive.sh:1174 #, sh-format -msgid "unexpected mode $mod_dst" +msgid "Could not create temporary $state_dir" +msgstr "" + +#: git-rebase--interactive.sh:1176 +msgid "Could not mark as interactive" +msgstr "" + +#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 +msgid "Could not init rewritten commits" msgstr "" -#: git-submodule.sh:1118 +#: git-rebase--interactive.sh:1291 #, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "" +msgstr[1] "" + +#: git-rebase--interactive.sh:1296 +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "" + +#: git-rebase--interactive.sh:1303 +msgid "Note that empty commits are commented out" msgstr "" -#: git-submodule.sh:1121 +#: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" +msgid "usage: $dashless $USAGE" msgstr "" -#: git-submodule.sh:1124 +#: git-sh-setup.sh:190 #, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "" -#: git-submodule.sh:1149 -msgid "blob" +#: 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-submodule.sh:1267 +#: git-sh-setup.sh:226 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "" + +#: git-sh-setup.sh:229 #, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" +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-submodule.sh:1331 +#: git-sh-setup.sh:248 #, sh-format -msgid "Synchronizing submodule url for '$displaypath'" +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 "" + +#. TRANSLATORS: you can adjust this to align "git add -i" status menu +#: git-add--interactive.perl:238 +#, perl-format +msgid "%12s %12s %s" +msgstr "" + +#: git-add--interactive.perl:239 +msgid "staged" +msgstr "" + +#: git-add--interactive.perl:239 +msgid "unstaged" +msgstr "" + +#: git-add--interactive.perl:288 git-add--interactive.perl:313 +msgid "binary" +msgstr "" + +#: git-add--interactive.perl:297 git-add--interactive.perl:351 +msgid "nothing" +msgstr "" + +#: git-add--interactive.perl:333 git-add--interactive.perl:348 +msgid "unchanged" +msgstr "" + +#: git-add--interactive.perl:644 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:647 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:650 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:653 +#, perl-format +msgid "touched %d path\n" +msgid_plural "touched %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:662 +msgid "Update" +msgstr "" + +#: git-add--interactive.perl:674 +msgid "Revert" +msgstr "" + +#: git-add--interactive.perl:697 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "" + +#: git-add--interactive.perl:708 +msgid "Add untracked" +msgstr "" + +#: git-add--interactive.perl:714 +msgid "No untracked files.\n" +msgstr "" + +#: git-add--interactive.perl:1030 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging." +msgstr "" + +#: git-add--interactive.perl:1033 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for stashing." +msgstr "" + +#: git-add--interactive.perl:1036 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for unstaging." +msgstr "" + +#: git-add--interactive.perl:1039 git-add--interactive.perl:1048 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for applying." +msgstr "" + +#: git-add--interactive.perl:1042 git-add--interactive.perl:1045 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding." +msgstr "" + +#: git-add--interactive.perl:1058 +#, perl-format +msgid "failed to open hunk edit file for writing: %s" +msgstr "" + +#: git-add--interactive.perl:1059 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" + +#: git-add--interactive.perl:1065 +#, perl-format +msgid "" +"---\n" +"To remove '%s' lines, make them ' ' lines (context).\n" +"To remove '%s' lines, delete them.\n" +"Lines starting with %s will be removed.\n" +msgstr "" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1073 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" + +#: git-add--interactive.perl:1087 +#, perl-format +msgid "failed to open hunk edit file for reading: %s" +msgstr "" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1178 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" + +#: git-add--interactive.perl:1187 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file" +msgstr "" + +#: git-add--interactive.perl:1193 +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file" +msgstr "" + +#: git-add--interactive.perl:1199 +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file" +msgstr "" + +#: git-add--interactive.perl:1205 +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" + +#: git-add--interactive.perl:1211 +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file" +msgstr "" + +#: git-add--interactive.perl:1217 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file" +msgstr "" + +#: git-add--interactive.perl:1223 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" + +#: git-add--interactive.perl:1232 +msgid "" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" + +#: git-add--interactive.perl:1263 +msgid "The selected hunks do not apply to the index!\n" +msgstr "" + +#: git-add--interactive.perl:1264 +msgid "Apply them to the worktree anyway? " +msgstr "" + +#: git-add--interactive.perl:1267 +msgid "Nothing was applied.\n" +msgstr "" + +#: git-add--interactive.perl:1278 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "" + +#: git-add--interactive.perl:1287 +msgid "Only binary files changed.\n" +msgstr "" + +#: git-add--interactive.perl:1289 +msgid "No changes.\n" +msgstr "" + +#: git-add--interactive.perl:1297 +msgid "Patch update" +msgstr "" + +#: git-add--interactive.perl:1349 +#, perl-format +msgid "Stage mode change [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1350 +#, perl-format +msgid "Stage deletion [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1351 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1354 +#, perl-format +msgid "Stash mode change [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1355 +#, perl-format +msgid "Stash deletion [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1356 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1359 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1360 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1361 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1364 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1365 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1366 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1369 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1370 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1371 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1374 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1375 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1376 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1379 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1380 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1381 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1484 +msgid "go to which hunk (<ret> to see more)? " +msgstr "" + +#: git-add--interactive.perl:1486 +msgid "go to which hunk? " +msgstr "" + +#: git-add--interactive.perl:1495 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "" + +#: git-add--interactive.perl:1500 +#, perl-format +msgid "Sorry, only %d hunk available.\n" +msgid_plural "Sorry, only %d hunks available.\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:1526 +msgid "search for regex? " +msgstr "" + +#: git-add--interactive.perl:1539 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "" + +#: git-add--interactive.perl:1549 +msgid "No hunk matches the given pattern\n" +msgstr "" + +#: git-add--interactive.perl:1561 git-add--interactive.perl:1583 +msgid "No previous hunk\n" +msgstr "" + +#: git-add--interactive.perl:1570 git-add--interactive.perl:1589 +msgid "No next hunk\n" +msgstr "" + +#: git-add--interactive.perl:1597 +#, perl-format +msgid "Split into %d hunk.\n" +msgid_plural "Split into %d hunks.\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:1649 +msgid "Review diff" +msgstr "" + +#. TRANSLATORS: please do not translate the command names +#. 'status', 'update', 'revert', etc. +#: git-add--interactive.perl:1668 +msgid "" +"status - show paths with changes\n" +"update - add working tree state to the staged set of changes\n" +"revert - revert staged set of changes back to the HEAD version\n" +"patch - pick hunks and update selectively\n" +"diff - view diff between HEAD and index\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" +msgstr "" + +#: git-add--interactive.perl:1685 git-add--interactive.perl:1690 +#: git-add--interactive.perl:1693 git-add--interactive.perl:1700 +#: git-add--interactive.perl:1704 git-add--interactive.perl:1710 +msgid "missing --" +msgstr "" + +#: git-add--interactive.perl:1706 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "" + +#: git-add--interactive.perl:1712 git-add--interactive.perl:1718 +#, perl-format +msgid "invalid argument %s, expecting --" +msgstr "" + +#: git-send-email.perl:121 +msgid "local zone differs from GMT by a non-minute interval\n" +msgstr "" + +#: git-send-email.perl:128 git-send-email.perl:134 +msgid "local time offset greater than or equal to 24 hours\n" +msgstr "" + +#: git-send-email.perl:202 git-send-email.perl:208 +msgid "the editor exited uncleanly, aborting everything" +msgstr "" + +#: git-send-email.perl:282 +#, perl-format +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" +msgstr "" + +#: git-send-email.perl:287 +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "" + +#: git-send-email.perl:305 +msgid "--dump-aliases incompatible with other options\n" +msgstr "" + +#: git-send-email.perl:368 git-send-email.perl:623 +msgid "Cannot run git format-patch from outside a repository\n" +msgstr "" + +#: git-send-email.perl:437 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "" + +#: git-send-email.perl:466 +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "" + +#: git-send-email.perl:498 +#, perl-format +msgid "warning: sendmail alias with quotes is not supported: %s\n" +msgstr "" + +#: git-send-email.perl:500 +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "" + +#: git-send-email.perl:502 +#, perl-format +msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" +msgstr "" + +#: git-send-email.perl:507 +#, perl-format +msgid "warning: sendmail line is not recognized: %s\n" +msgstr "" + +#: git-send-email.perl:589 +#, perl-format +msgid "" +"File '%s' exists but it could also be the range of commits\n" +"to produce patches for. Please disambiguate by...\n" +"\n" +" * Saying \"./%s\" if you mean a file; or\n" +" * Giving --format-patch option if you mean a range.\n" +msgstr "" + +#: git-send-email.perl:610 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "" + +#: git-send-email.perl:634 +#, perl-format +msgid "" +"fatal: %s: %s\n" +"warning: no patches were sent\n" +msgstr "" + +#: git-send-email.perl:645 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "" + +#: git-send-email.perl:658 +#, perl-format +msgid "No subject line in %s?" +msgstr "" + +#: git-send-email.perl:668 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "" + +#: git-send-email.perl:678 +msgid "" +"Lines beginning in \"GIT:\" will be removed.\n" +"Consider including an overall diffstat or table of contents\n" +"for the patch you are writing.\n" +"\n" +"Clear the body content if you don't wish to send a summary.\n" +msgstr "" + +#: git-send-email.perl:701 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "" + +#: git-send-email.perl:704 +#, perl-format +msgid "Failed to open %s: %s" +msgstr "" + +#: git-send-email.perl:739 +msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" +msgstr "" + +#: git-send-email.perl:748 +msgid "Summary email is empty, skipping it\n" +msgstr "" + +#. TRANSLATORS: please keep [y/N] as is. +#: git-send-email.perl:780 +#, perl-format +msgid "Are you sure you want to use <%s> [y/N]? " +msgstr "" + +#: git-send-email.perl:809 +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "" + +#: git-send-email.perl:814 +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "" + +#: git-send-email.perl:822 +#, perl-format +msgid "" +"Refusing to send because the patch\n" +"\t%s\n" +"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " +"want to send.\n" +msgstr "" + +#: git-send-email.perl:841 +msgid "To whom should the emails be sent (if anyone)?" +msgstr "" + +#: git-send-email.perl:859 +#, perl-format +msgid "fatal: alias '%s' expands to itself\n" +msgstr "" + +#: git-send-email.perl:871 +msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " +msgstr "" + +#: git-send-email.perl:921 git-send-email.perl:929 +#, perl-format +msgid "error: unable to extract a valid address from: %s\n" +msgstr "" + +#. TRANSLATORS: Make sure to include [q] [d] [e] in your +#. translation. The program will only accept English input +#. at this point. +#: git-send-email.perl:933 +msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " +msgstr "" + +#: git-send-email.perl:1234 +#, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "" + +#: git-send-email.perl:1309 +msgid "" +" The Cc list above has been expanded by additional\n" +" addresses found in the patch commit message. By default\n" +" send-email prompts before sending whenever this occurs.\n" +" This behavior is controlled by the sendemail.confirm\n" +" configuration setting.\n" +"\n" +" For additional information, run 'git send-email --help'.\n" +" To retain the current behavior, but squelch this message,\n" +" run 'git config --global sendemail.confirm auto'.\n" +"\n" +msgstr "" + +#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your +#. translation. The program will only accept English input +#. at this point. +#: git-send-email.perl:1324 +msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " +msgstr "" + +#: git-send-email.perl:1327 +msgid "Send this email reply required" +msgstr "" + +#: git-send-email.perl:1353 +msgid "The required SMTP server is not properly defined." +msgstr "" + +#: git-send-email.perl:1397 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "" + +#: git-send-email.perl:1403 +msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." +msgstr "" + +#: git-send-email.perl:1421 +#, perl-format +msgid "Failed to send %s\n" +msgstr "" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Sent %s\n" +msgstr "" + +#: git-send-email.perl:1426 +msgid "Dry-OK. Log says:\n" +msgstr "" + +#: git-send-email.perl:1426 +msgid "OK. Log says:\n" +msgstr "" + +#: git-send-email.perl:1438 +msgid "Result: " +msgstr "" + +#: git-send-email.perl:1441 +msgid "Result: OK\n" +msgstr "" + +#: git-send-email.perl:1454 +#, perl-format +msgid "can't open file %s" +msgstr "" + +#: git-send-email.perl:1501 git-send-email.perl:1521 +#, perl-format +msgid "(mbox) Adding cc: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1507 +#, perl-format +msgid "(mbox) Adding to: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1555 +#, perl-format +msgid "(non-mbox) Adding cc: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1578 +#, perl-format +msgid "(body) Adding cc: %s from line '%s'\n" +msgstr "" + +#: git-send-email.perl:1676 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "" + +#: git-send-email.perl:1683 +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "" + +#: git-send-email.perl:1687 +#, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "" + +#: git-send-email.perl:1714 +msgid "cannot send message as 7bit" +msgstr "" + +#: git-send-email.perl:1722 +msgid "invalid transfer encoding" +msgstr "" + +#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "" + +#: git-send-email.perl:1744 +#, perl-format +msgid "%s: patch contains a line longer than 998 characters" +msgstr "" + +#: git-send-email.perl:1760 +#, perl-format +msgid "Skipping %s with backup suffix '%s'.\n" +msgstr "" + +#. TRANSLATORS: please keep "[y|N]" as is. +#: git-send-email.perl:1764 +#, perl-format +msgid "Do you really want to send %s? [y|N]: " msgstr "" |