# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2019-06-04 08:24+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: advice.c:103 #, c-format msgid "%shint: %.*s%s\n" msgstr "" #: advice.c:156 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" #: advice.c:158 msgid "Committing is not possible because you have unmerged files." msgstr "" #: advice.c:160 msgid "Merging is not possible because you have unmerged files." msgstr "" #: advice.c:162 msgid "Pulling is not possible because you have unmerged files." msgstr "" #: advice.c:164 msgid "Reverting is not possible because you have unmerged files." msgstr "" #: advice.c:166 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" #: advice.c:174 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." msgstr "" #: advice.c:182 msgid "Exiting because of an unresolved conflict." msgstr "" #: advice.c:187 builtin/merge.c:1320 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" #: advice.c:189 msgid "Please, commit your changes before merging." msgstr "" #: advice.c:190 msgid "Exiting because of unfinished merge." msgstr "" #: advice.c:196 #, 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 \n" "\n" msgstr "" #: alias.c:50 msgid "cmdline ends with \\" msgstr "" #: alias.c:51 msgid "unclosed quote" msgstr "" #: apply.c:63 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" #: apply.c:79 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" #: apply.c:129 msgid "--reject and --3way cannot be used together." msgstr "" #: apply.c:131 msgid "--cached and --3way cannot be used together." msgstr "" #: apply.c:134 msgid "--3way outside a repository" msgstr "" #: apply.c:145 msgid "--index outside a repository" msgstr "" #: apply.c:148 msgid "--cached outside a repository" msgstr "" #: apply.c:829 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" #: apply.c:838 #, c-format msgid "regexec returned %d for input: %s" msgstr "" #: apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" #: apply.c:950 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" #: apply.c:956 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" #: apply.c:957 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" #: apply.c:962 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" #: apply.c:991 #, c-format msgid "invalid mode on line %d: %s" msgstr "" #: apply.c:1310 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" #: apply.c:1482 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" #: apply.c:1551 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" #: apply.c:1571 #, 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:1584 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" #: apply.c:1772 msgid "new file depends on old contents" msgstr "" #: apply.c:1774 msgid "deleted file still has contents" msgstr "" #: apply.c:1808 #, c-format msgid "corrupt patch at line %d" msgstr "" #: apply.c:1845 #, c-format msgid "new file %s depends on old contents" msgstr "" #: apply.c:1847 #, c-format msgid "deleted file %s still has contents" msgstr "" #: apply.c:1850 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" #: apply.c:1997 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #: apply.c:2034 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" #: apply.c:2196 #, c-format msgid "patch with only garbage at line %d" msgstr "" #: apply.c:2282 #, c-format msgid "unable to read symlink %s" msgstr "" #: apply.c:2286 #, c-format msgid "unable to open or read %s" msgstr "" #: apply.c:2945 #, c-format msgid "invalid start of line: '%c'" msgstr "" #: apply.c:3066 #, 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:3078 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" #: apply.c:3084 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" #: apply.c:3106 #, c-format msgid "missing binary patch data for '%s'" msgstr "" #: apply.c:3114 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" #: apply.c:3161 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" #: apply.c:3171 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" #: apply.c:3179 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" #: apply.c:3197 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" #: apply.c:3210 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" #: apply.c:3216 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" #: apply.c:3237 #, c-format msgid "patch failed: %s:%ld" msgstr "" #: apply.c:3360 #, c-format msgid "cannot checkout %s" msgstr "" #: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 #, c-format msgid "failed to read %s" msgstr "" #: apply.c:3420 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" #: apply.c:3449 apply.c:3692 #, c-format msgid "path %s has been renamed/deleted" msgstr "" #: apply.c:3535 apply.c:3707 #, c-format msgid "%s: does not exist in index" msgstr "" #: apply.c:3544 apply.c:3715 #, c-format msgid "%s: does not match index" msgstr "" #: apply.c:3579 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" #: apply.c:3582 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" #: apply.c:3598 apply.c:3602 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" #: apply.c:3614 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" #: apply.c:3628 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" #: apply.c:3633 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" #: apply.c:3659 msgid "removal patch leaves file contents" msgstr "" #: apply.c:3732 #, c-format msgid "%s: wrong type" msgstr "" #: apply.c:3734 #, c-format msgid "%s has type %o, expected %o" msgstr "" #: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 #: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "" #: apply.c:3943 #, c-format msgid "%s: already exists in index" msgstr "" #: apply.c:3946 #, c-format msgid "%s: already exists in working directory" msgstr "" #: apply.c:3966 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" #: apply.c:3971 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" #: apply.c:3991 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" #: apply.c:3995 #, c-format msgid "%s: patch does not apply" msgstr "" #: apply.c:4010 #, c-format msgid "Checking patch %s..." msgstr "" #: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" #: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" #: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" #: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" #: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "" #: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "" #: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "" #: apply.c:4303 #, c-format msgid "corrupt patch for submodule %s" msgstr "" #: apply.c:4309 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" #: apply.c:4317 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" #: apply.c:4323 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "" #: apply.c:4366 #, c-format msgid "failed to write to '%s'" msgstr "" #: apply.c:4370 #, c-format msgid "closing file '%s'" msgstr "" #: apply.c:4440 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" #: apply.c:4538 #, c-format msgid "Applied patch %s cleanly." msgstr "" #: apply.c:4546 msgid "internal error" msgstr "" #: apply.c:4549 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" #: apply.c:4560 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" #: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 #, c-format msgid "cannot open %s" msgstr "" #: apply.c:4582 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" #: apply.c:4586 #, c-format msgid "Rejected hunk #%d." msgstr "" #: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "" #: apply.c:4704 msgid "unrecognized input" msgstr "" #: apply.c:4724 msgid "unable to read index file" msgstr "" #: apply.c:4879 #, c-format msgid "can't open patch '%s': %s" msgstr "" #: apply.c:4906 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" #: apply.c:4912 apply.c:4927 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" #: apply.c:4920 #, 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:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "" #: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213 #: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271 #: builtin/pull.c:207 builtin/submodule--helper.c:407 #: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369 #: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 #: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 msgid "path" msgstr "" #: apply.c:4964 msgid "don't apply changes matching the given path" msgstr "" #: apply.c:4967 msgid "apply changes matching the given path" msgstr "" #: apply.c:4969 builtin/am.c:2219 msgid "num" msgstr "" #: apply.c:4970 msgid "remove leading slashes from traditional diff paths" msgstr "" #: apply.c:4973 msgid "ignore additions made by the patch" msgstr "" #: apply.c:4975 msgid "instead of applying the patch, output diffstat for the input" msgstr "" #: apply.c:4979 msgid "show number of added and deleted lines in decimal notation" msgstr "" #: apply.c:4981 msgid "instead of applying the patch, output a summary for the input" msgstr "" #: apply.c:4983 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" #: apply.c:4985 msgid "make sure the patch is applicable to the current index" msgstr "" #: apply.c:4987 msgid "mark new files with `git add --intent-to-add`" msgstr "" #: apply.c:4989 msgid "apply a patch without touching the working tree" msgstr "" #: apply.c:4991 msgid "accept a patch that touches outside the working area" msgstr "" #: apply.c:4994 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" #: apply.c:4996 msgid "attempt three-way merge if a patch does not apply" msgstr "" #: apply.c:4998 msgid "build a temporary index based on embedded index information" msgstr "" #: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "" #: apply.c:5003 msgid "ensure at least lines of context match" msgstr "" #: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 #: builtin/pack-objects.c:3317 builtin/rebase.c:1415 msgid "action" msgstr "" #: apply.c:5005 msgid "detect new or modified lines that have whitespace errors" msgstr "" #: apply.c:5008 apply.c:5011 msgid "ignore changes in whitespace when finding context" msgstr "" #: apply.c:5014 msgid "apply the patch in reverse" msgstr "" #: apply.c:5016 msgid "don't expect at least one line of context" msgstr "" #: apply.c:5018 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" #: apply.c:5020 msgid "allow overlapping hunks" msgstr "" #: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22 #: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786 #: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" #: apply.c:5023 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" #: apply.c:5026 msgid "do not trust the line counts in the hunk headers" msgstr "" #: apply.c:5028 builtin/am.c:2207 msgid "root" msgstr "" #: apply.c:5029 msgid "prepend to all filenames" msgstr "" #: archive.c:14 msgid "git archive [] [...]" msgstr "" #: archive.c:15 msgid "git archive --list" msgstr "" #: archive.c:16 msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" #: archive.c:17 msgid "git archive --remote [--exec ] --list" msgstr "" #: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" #: archive.c:396 #, c-format msgid "no such ref: %.*s" msgstr "" #: archive.c:401 #, c-format msgid "not a valid object name: %s" msgstr "" #: archive.c:414 #, c-format msgid "not a tree object: %s" msgstr "" #: archive.c:424 msgid "current working directory is untracked" msgstr "" #: archive.c:455 msgid "fmt" msgstr "" #: archive.c:455 msgid "archive format" msgstr "" #: archive.c:456 builtin/log.c:1557 msgid "prefix" msgstr "" #: archive.c:457 msgid "prepend prefix to each pathname in the archive" msgstr "" #: archive.c:458 builtin/blame.c:821 builtin/blame.c:822 #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091 #: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105 #: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "" #: archive.c:459 builtin/archive.c:90 msgid "write the archive to this file" msgstr "" #: archive.c:461 msgid "read .gitattributes in working directory" msgstr "" #: archive.c:462 msgid "report archived files on stderr" msgstr "" #: archive.c:463 msgid "store only" msgstr "" #: archive.c:464 msgid "compress faster" msgstr "" #: archive.c:472 msgid "compress better" msgstr "" #: archive.c:475 msgid "list supported archive formats" msgstr "" #: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113 #: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858 msgid "repo" msgstr "" #: archive.c:478 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "" #: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "" #: archive.c:480 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "" #: archive.c:487 msgid "Unexpected option --remote" msgstr "" #: archive.c:489 msgid "Option --exec can only be used together with --remote" msgstr "" #: archive.c:491 msgid "Unexpected option --output" msgstr "" #: archive.c:513 #, c-format msgid "Unknown archive format '%s'" msgstr "" #: archive.c:520 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" #: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "" #: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "" #: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "" #: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "" #: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "" #: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "" #: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "" #: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" #: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 #, c-format msgid "deflate error (%d)" msgstr "" #: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %" msgstr "" #: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" #: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "" #: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" #: bisect.c:468 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" #: bisect.c:678 #, c-format msgid "We cannot bisect more!\n" msgstr "" #: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "" #: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" #: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" #: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" #: bisect.c:776 #, 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:789 #, 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:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" #: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "" #: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "" #: bisect.c:928 builtin/merge.c:146 #, c-format msgid "could not read file '%s'" msgstr "" #: bisect.c:958 msgid "reading bisect refs failed" msgstr "" #: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "" #: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" #: bisect.c:1004 #, 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:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" #: blame.c:1794 msgid "--contents and --reverse do not blend well." msgstr "" #: blame.c:1808 msgid "cannot use --contents with final commit object name" msgstr "" #: blame.c:1829 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" #: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030 #: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940 #: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415 #: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" #: blame.c:1856 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" #: blame.c:1867 #, c-format msgid "no such path %s in %s" msgstr "" #: blame.c:1878 #, c-format msgid "cannot read blob %s for path %s" msgstr "" #: branch.c:53 #, c-format msgid "" "\n" "After fixing the error cause you may try to fix up\n" "the remote tracking information by invoking\n" "\"git branch --set-upstream-to=%s%s%s\"." msgstr "" #: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "" #: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" #: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "" #: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" #: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "" #: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" #: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "" #: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" #: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "" #: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "" #: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" #: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "" #: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "" #: branch.c:213 msgid "Cannot force update the current branch." msgstr "" #: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" #: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" #: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" "branch that already exists at the remote, you may need to\n" "run \"git fetch\" to retrieve it.\n" "\n" "If you are planning to push out a new local branch that\n" "will track its remote counterpart, you may want to use\n" "\"git push -u\" to set the upstream config as you push." msgstr "" #: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "" #: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" #: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" #: branch.c:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" #: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" #: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" #: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 #: builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "" #: bundle.c:143 msgid "Repository lacks these prerequisite commits:" msgstr "" #: bundle.c:194 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" #: bundle.c:201 msgid "The bundle records a complete history." msgstr "" #: bundle.c:203 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" #: bundle.c:269 msgid "unable to dup bundle descriptor" msgstr "" #: bundle.c:276 msgid "Could not spawn pack-objects" msgstr "" #: bundle.c:287 msgid "pack-objects died" msgstr "" #: bundle.c:329 msgid "rev-list died" msgstr "" #: bundle.c:378 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" #: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "" #: bundle.c:465 msgid "Refusing to create empty bundle." msgstr "" #: bundle.c:475 #, c-format msgid "cannot create '%s'" msgstr "" #: bundle.c:500 msgid "index-pack died" msgstr "" #: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "" #: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399 #: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "" #: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "" #: commit.c:193 msgid "" "Support for /info/grafts is deprecated\n" "and will be removed in a future Git version.\n" "\n" "Please use \"git replace --convert-graft-file\"\n" "to convert the grafts into replace refs.\n" "\n" "Turn this message off by running\n" "\"git config advice.graftFileDeprecated false\"" msgstr "" #: commit.c:1128 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" #: commit.c:1131 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" #: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" #: commit.c:1137 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" #: commit.c:1391 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" #: commit-graph.c:105 msgid "commit-graph file is too small" msgstr "" #: commit-graph.c:170 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" #: commit-graph.c:177 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" #: commit-graph.c:184 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" #: commit-graph.c:207 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" #: commit-graph.c:218 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" #: commit-graph.c:255 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" #: commit-graph.c:390 #, c-format msgid "could not find commit %s" msgstr "" #: commit-graph.c:732 builtin/pack-objects.c:2649 #, c-format msgid "unable to get type of object %s" msgstr "" #: commit-graph.c:765 msgid "Loading known commits in commit graph" msgstr "" #: commit-graph.c:781 msgid "Expanding reachable commits in commit graph" msgstr "" #: commit-graph.c:793 msgid "Clearing commit marks in commit graph" msgstr "" #: commit-graph.c:813 msgid "Computing commit graph generation numbers" msgstr "" #: commit-graph.c:930 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" #: commit-graph.c:943 #, c-format msgid "error adding pack %s" msgstr "" #: commit-graph.c:945 #, c-format msgid "error opening index for %s" msgstr "" #: commit-graph.c:959 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "" msgstr[1] "" #: commit-graph.c:991 msgid "Finding commits for commit graph among packed objects" msgstr "" #: commit-graph.c:1004 msgid "Counting distinct commits in commit graph" msgstr "" #: commit-graph.c:1017 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" #: commit-graph.c:1026 msgid "Finding extra edges in commit graph" msgstr "" #: commit-graph.c:1050 msgid "too many commits to write graph" msgstr "" #: commit-graph.c:1057 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "" #: commit-graph.c:1097 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" #: commit-graph.c:1162 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" #: commit-graph.c:1172 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" #: commit-graph.c:1182 commit-graph.c:1197 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" #: commit-graph.c:1189 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" #: commit-graph.c:1206 msgid "Verifying commits in commit graph" msgstr "" #: commit-graph.c:1219 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" #: commit-graph.c:1226 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" #: commit-graph.c:1236 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" #: commit-graph.c:1242 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" #: commit-graph.c:1255 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" #: commit-graph.c:1260 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" #: commit-graph.c:1264 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" #: commit-graph.c:1279 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" #: commit-graph.c:1285 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "" #: config.c:123 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" "\t%s\n" "from\n" "\t%s\n" "This might be due to circular includes." msgstr "" #: config.c:139 #, c-format msgid "could not expand include path '%s'" msgstr "" #: config.c:150 msgid "relative config includes must come from files" msgstr "" #: config.c:190 msgid "relative config include conditionals must come from files" msgstr "" #: config.c:348 #, c-format msgid "key does not contain a section: %s" msgstr "" #: config.c:354 #, c-format msgid "key does not contain variable name: %s" msgstr "" #: config.c:378 sequencer.c:2459 #, c-format msgid "invalid key: %s" msgstr "" #: config.c:384 #, c-format msgid "invalid key (newline): %s" msgstr "" #: config.c:420 config.c:432 #, c-format msgid "bogus config parameter: %s" msgstr "" #: config.c:467 #, c-format msgid "bogus format in %s" msgstr "" #: config.c:793 #, c-format msgid "bad config line %d in blob %s" msgstr "" #: config.c:797 #, c-format msgid "bad config line %d in file %s" msgstr "" #: config.c:801 #, c-format msgid "bad config line %d in standard input" msgstr "" #: config.c:805 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" #: config.c:809 #, c-format msgid "bad config line %d in command line %s" msgstr "" #: config.c:813 #, c-format msgid "bad config line %d in %s" msgstr "" #: config.c:952 msgid "out of range" msgstr "" #: config.c:952 msgid "invalid unit" msgstr "" #: config.c:958 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" #: config.c:963 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" #: config.c:966 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" #: config.c:969 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" #: config.c:972 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" #: config.c:975 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" #: config.c:978 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" #: config.c:1073 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" #: config.c:1082 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" #: config.c:1173 #, c-format msgid "abbrev length out of range: %d" msgstr "" #: config.c:1187 config.c:1198 #, c-format msgid "bad zlib compression level %d" msgstr "" #: config.c:1290 msgid "core.commentChar should only be one character" msgstr "" #: config.c:1323 #, c-format msgid "invalid mode for object creation: %s" msgstr "" #: config.c:1395 #, c-format msgid "malformed value for %s" msgstr "" #: config.c:1421 #, c-format msgid "malformed value for %s: %s" msgstr "" #: config.c:1422 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" #: config.c:1483 builtin/pack-objects.c:3397 #, c-format msgid "bad pack compression level %d" msgstr "" #: config.c:1604 #, c-format msgid "unable to load config blob object '%s'" msgstr "" #: config.c:1607 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" #: config.c:1624 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" #: config.c:1654 #, c-format msgid "failed to parse %s" msgstr "" #: config.c:1710 msgid "unable to parse command-line config" msgstr "" #: config.c:2059 msgid "unknown error occurred while reading the configuration files" msgstr "" #: config.c:2229 #, c-format msgid "Invalid %s: '%s'" msgstr "" #: config.c:2272 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" #: config.c:2298 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" #: config.c:2344 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" #: config.c:2346 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" #: config.c:2427 #, c-format msgid "invalid section name '%s'" msgstr "" #: config.c:2459 #, c-format msgid "%s has multiple values" msgstr "" #: config.c:2488 #, c-format msgid "failed to write new configuration file %s" msgstr "" #: config.c:2740 config.c:3064 #, c-format msgid "could not lock config file %s" msgstr "" #: config.c:2751 #, c-format msgid "opening %s" msgstr "" #: config.c:2786 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "" #: config.c:2811 #, c-format msgid "invalid config file %s" msgstr "" #: config.c:2824 config.c:3077 #, c-format msgid "fstat on %s failed" msgstr "" #: config.c:2835 #, c-format msgid "unable to mmap '%s'" msgstr "" #: config.c:2844 config.c:3082 #, c-format msgid "chmod on %s failed" msgstr "" #: config.c:2929 config.c:3179 #, c-format msgid "could not write config file %s" msgstr "" #: config.c:2963 #, c-format msgid "could not set '%s' to '%s'" msgstr "" #: config.c:2965 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "" #: config.c:3055 #, c-format msgid "invalid section name: %s" msgstr "" #: config.c:3222 #, c-format msgid "missing value for '%s'" msgstr "" #: connect.c:61 msgid "the remote end hung up upon initial contact" msgstr "" #: connect.c:63 msgid "" "Could not read from remote repository.\n" "\n" "Please make sure you have the correct access rights\n" "and the repository exists." msgstr "" #: connect.c:81 #, c-format msgid "server doesn't support '%s'" msgstr "" #: connect.c:103 #, c-format msgid "server doesn't support feature '%s'" msgstr "" #: connect.c:114 msgid "expected flush after capabilities" msgstr "" #: connect.c:233 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "" #: connect.c:252 msgid "protocol error: unexpected capabilities^{}" msgstr "" #: connect.c:273 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "" #: connect.c:275 msgid "repository on the other end cannot be shallow" msgstr "" #: connect.c:313 msgid "invalid packet" msgstr "" #: connect.c:333 #, c-format msgid "protocol error: unexpected '%s'" msgstr "" #: connect.c:441 #, c-format msgid "invalid ls-refs response: %s" msgstr "" #: connect.c:445 msgid "expected flush after ref listing" msgstr "" #: connect.c:544 #, c-format msgid "protocol '%s' is not supported" msgstr "" #: connect.c:595 msgid "unable to set SO_KEEPALIVE on socket" msgstr "" #: connect.c:635 connect.c:698 #, c-format msgid "Looking up %s ... " msgstr "" #: connect.c:639 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "" #. TRANSLATORS: this is the end of "Looking up %s ... " #: connect.c:643 connect.c:714 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" #: connect.c:665 connect.c:742 #, c-format msgid "" "unable to connect to %s:\n" "%s" msgstr "" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " #: connect.c:671 connect.c:748 msgid "done." msgstr "" #: connect.c:702 #, c-format msgid "unable to look up %s (%s)" msgstr "" #: connect.c:708 #, c-format msgid "unknown port %s" msgstr "" #: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "" #: connect.c:847 #, c-format msgid "strange port '%s' blocked" msgstr "" #: connect.c:857 #, c-format msgid "cannot start proxy %s" msgstr "" #: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" #: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "" #: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "" #: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "" #: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "" #: connect.c:1307 msgid "unable to fork" msgstr "" #: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "" #: connected.c:97 msgid "Could not run 'git rev-list'" msgstr "" #: connected.c:117 msgid "failed write to rev-list" msgstr "" #: connected.c:124 msgid "failed to close rev-list's stdin" msgstr "" #: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "" #: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "" #: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" #: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" #: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" #: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" #: convert.c:286 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" "tree-encoding." msgstr "" #: convert.c:304 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "" #: convert.c:306 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" #: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "" #: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" #: convert.c:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "" #: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "" #: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "" #: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "" #: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "" #: convert.c:844 msgid "unexpected filter type" msgstr "" #: convert.c:855 msgid "path name too long for external filter" msgstr "" #: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" #: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "" #: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" #: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "" #: date.c:137 msgid "in the future" msgstr "" #: date.c:143 #, c-format msgid "% second ago" msgid_plural "% seconds ago" msgstr[0] "" msgstr[1] "" #: date.c:150 #, c-format msgid "% minute ago" msgid_plural "% minutes ago" msgstr[0] "" msgstr[1] "" #: date.c:157 #, c-format msgid "% hour ago" msgid_plural "% hours ago" msgstr[0] "" msgstr[1] "" #: date.c:164 #, c-format msgid "% day ago" msgid_plural "% days ago" msgstr[0] "" msgstr[1] "" #: date.c:170 #, c-format msgid "% week ago" msgid_plural "% weeks ago" msgstr[0] "" msgstr[1] "" #: date.c:177 #, c-format msgid "% month ago" msgid_plural "% months ago" msgstr[0] "" msgstr[1] "" #: date.c:188 #, c-format msgid "% year" msgid_plural "% years" msgstr[0] "" msgstr[1] "" #. TRANSLATORS: "%s" is " years" #: date.c:191 #, c-format msgid "%s, % month ago" msgid_plural "%s, % months ago" msgstr[0] "" msgstr[1] "" #: date.c:196 date.c:201 #, c-format msgid "% year ago" msgid_plural "% years ago" msgstr[0] "" msgstr[1] "" #: delta-islands.c:272 msgid "Propagating island marks" msgstr "" #: delta-islands.c:290 #, c-format msgid "bad tree object %s" msgstr "" #: delta-islands.c:334 #, c-format msgid "failed to load island regex for '%s': %s" msgstr "" #: delta-islands.c:390 #, c-format msgid "island regex from config has too many capture groups (max=%d)" msgstr "" #: delta-islands.c:466 #, c-format msgid "Marked %d islands, done.\n" msgstr "" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "" #: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "" #: diff-no-index.c:238 msgid "git diff --no-index [] " msgstr "" #: diff-no-index.c:263 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" msgstr "" #: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" #: diff.c:160 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" #: diff.c:296 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" #: diff.c:324 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" #: diff.c:332 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "" #: diff.c:405 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" #: diff.c:465 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" #: diff.c:4210 #, c-format msgid "external diff died, stopping at %s" msgstr "" #: diff.c:4555 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" #: diff.c:4558 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" #: diff.c:4636 msgid "--follow requires exactly one pathspec" msgstr "" #: diff.c:4684 #, c-format msgid "invalid --stat value: %s" msgstr "" #: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "" #: diff.c:4721 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" #: diff.c:4806 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" #: diff.c:4830 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" #: diff.c:4844 #, c-format msgid "unable to resolve '%s'" msgstr "" #: diff.c:4894 diff.c:4900 #, c-format msgid "%s expects / form" msgstr "" #: diff.c:4912 #, c-format msgid "%s expects a character, got '%s'" msgstr "" #: diff.c:4933 #, c-format msgid "bad --color-moved argument: %s" msgstr "" #: diff.c:4952 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" #: diff.c:4992 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" #: diff.c:5028 diff.c:5048 #, c-format msgid "invalid argument to %s" msgstr "" #: diff.c:5186 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" #: diff.c:5242 #, c-format msgid "bad --word-diff argument: %s" msgstr "" #: diff.c:5265 msgid "Diff output format options" msgstr "" #: diff.c:5267 diff.c:5273 msgid "generate patch" msgstr "" #: diff.c:5270 builtin/log.c:167 msgid "suppress diff output" msgstr "" #: diff.c:5275 diff.c:5389 diff.c:5396 msgid "" msgstr "" #: diff.c:5276 diff.c:5279 msgid "generate diffs with lines context" msgstr "" #: diff.c:5281 msgid "generate the diff in raw format" msgstr "" #: diff.c:5284 msgid "synonym for '-p --raw'" msgstr "" #: diff.c:5288 msgid "synonym for '-p --stat'" msgstr "" #: diff.c:5292 msgid "machine friendly --stat" msgstr "" #: diff.c:5295 msgid "output only the last line of --stat" msgstr "" #: diff.c:5297 diff.c:5305 msgid "..." msgstr "" #: diff.c:5298 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" #: diff.c:5302 msgid "synonym for --dirstat=cumulative" msgstr "" #: diff.c:5306 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" #: diff.c:5310 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" #: diff.c:5313 msgid "condensed summary such as creations, renames and mode changes" msgstr "" #: diff.c:5316 msgid "show only names of changed files" msgstr "" #: diff.c:5319 msgid "show only names and status of changed files" msgstr "" #: diff.c:5321 msgid "[,[,]]" msgstr "" #: diff.c:5322 msgid "generate diffstat" msgstr "" #: diff.c:5324 diff.c:5327 diff.c:5330 msgid "" msgstr "" #: diff.c:5325 msgid "generate diffstat with a given width" msgstr "" #: diff.c:5328 msgid "generate diffstat with a given name width" msgstr "" #: diff.c:5331 msgid "generate diffstat with a given graph width" msgstr "" #: diff.c:5333 msgid "" msgstr "" #: diff.c:5334 msgid "generate diffstat with limited lines" msgstr "" #: diff.c:5337 msgid "generate compact summary in diffstat" msgstr "" #: diff.c:5340 msgid "output a binary diff that can be applied" msgstr "" #: diff.c:5343 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" #: diff.c:5345 msgid "show colored diff" msgstr "" #: diff.c:5346 msgid "" msgstr "" #: diff.c:5347 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" #: diff.c:5350 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" #: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465 msgid "" msgstr "" #: diff.c:5354 msgid "show the given source prefix instead of \"a/\"" msgstr "" #: diff.c:5357 msgid "show the given destination prefix instead of \"b/\"" msgstr "" #: diff.c:5360 msgid "prepend an additional prefix to every line of output" msgstr "" #: diff.c:5363 msgid "do not show any source or destination prefix" msgstr "" #: diff.c:5366 msgid "show context between diff hunks up to the specified number of lines" msgstr "" #: diff.c:5370 diff.c:5375 diff.c:5380 msgid "" msgstr "" #: diff.c:5371 msgid "specify the character to indicate a new line instead of '+'" msgstr "" #: diff.c:5376 msgid "specify the character to indicate an old line instead of '-'" msgstr "" #: diff.c:5381 msgid "specify the character to indicate a context instead of ' '" msgstr "" #: diff.c:5384 msgid "Diff rename options" msgstr "" #: diff.c:5385 msgid "[/]" msgstr "" #: diff.c:5386 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" #: diff.c:5390 msgid "detect renames" msgstr "" #: diff.c:5394 msgid "omit the preimage for deletes" msgstr "" #: diff.c:5397 msgid "detect copies" msgstr "" #: diff.c:5401 msgid "use unmodified files as source to find copies" msgstr "" #: diff.c:5403 msgid "disable rename detection" msgstr "" #: diff.c:5406 msgid "use empty blobs as rename source" msgstr "" #: diff.c:5408 msgid "continue listing the history of a file beyond renames" msgstr "" #: diff.c:5411 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" #: diff.c:5413 msgid "Diff algorithm options" msgstr "" #: diff.c:5415 msgid "produce the smallest possible diff" msgstr "" #: diff.c:5418 msgid "ignore whitespace when comparing lines" msgstr "" #: diff.c:5421 msgid "ignore changes in amount of whitespace" msgstr "" #: diff.c:5424 msgid "ignore changes in whitespace at EOL" msgstr "" #: diff.c:5427 msgid "ignore carrier-return at the end of line" msgstr "" #: diff.c:5430 msgid "ignore changes whose lines are all blank" msgstr "" #: diff.c:5433 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" #: diff.c:5436 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" #: diff.c:5440 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" #: diff.c:5442 msgid "" msgstr "" #: diff.c:5443 msgid "choose a diff algorithm" msgstr "" #: diff.c:5445 msgid "" msgstr "" #: diff.c:5446 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" #: diff.c:5448 diff.c:5457 diff.c:5460 msgid "" msgstr "" #: diff.c:5449 msgid "show word diff, using to delimit changed words" msgstr "" #: diff.c:5451 diff.c:5454 diff.c:5499 msgid "" msgstr "" #: diff.c:5452 msgid "use to decide what a word is" msgstr "" #: diff.c:5455 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "" #: diff.c:5458 msgid "moved lines of code are colored differently" msgstr "" #: diff.c:5461 msgid "how white spaces are ignored in --color-moved" msgstr "" #: diff.c:5464 msgid "Other diff options" msgstr "" #: diff.c:5466 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" #: diff.c:5470 msgid "treat all files as text" msgstr "" #: diff.c:5472 msgid "swap two inputs, reverse the diff" msgstr "" #: diff.c:5474 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" #: diff.c:5476 msgid "disable all output of the program" msgstr "" #: diff.c:5478 msgid "allow an external diff helper to be executed" msgstr "" #: diff.c:5480 msgid "run external text conversion filters when comparing binary files" msgstr "" #: diff.c:5482 msgid "" msgstr "" #: diff.c:5483 msgid "ignore changes to submodules in the diff generation" msgstr "" #: diff.c:5486 msgid "" msgstr "" #: diff.c:5487 msgid "specify how differences in submodules are shown" msgstr "" #: diff.c:5491 msgid "hide 'git add -N' entries from the index" msgstr "" #: diff.c:5494 msgid "treat 'git add -N' entries as real in the index" msgstr "" #: diff.c:5496 msgid "" msgstr "" #: diff.c:5497 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" #: diff.c:5500 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" #: diff.c:5503 msgid "show all changes in the changeset with -S or -G" msgstr "" #: diff.c:5506 msgid "treat in -S as extended POSIX regular expression" msgstr "" #: diff.c:5509 msgid "control the order in which files appear in the output" msgstr "" #: diff.c:5510 msgid "" msgstr "" #: diff.c:5511 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" #: diff.c:5513 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" #: diff.c:5514 msgid "select files by diff type" msgstr "" #: diff.c:5516 msgid "" msgstr "" #: diff.c:5517 msgid "Output to a specific file" msgstr "" #: diff.c:6150 msgid "inexact rename detection was skipped due to too many files." msgstr "" #: diff.c:6153 msgid "only found copies from modified paths due to too many files." msgstr "" #: diff.c:6156 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" #: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" #: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "" #: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "" #: dir.c:2085 msgid "failed to get kernel name and information" msgstr "" #: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "" #: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "" #: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "" #: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" #: editor.c:73 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" #: entry.c:178 msgid "Filtering content" msgstr "" #: entry.c:476 #, c-format msgid "could not stat file '%s'" msgstr "" #: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" #: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" #: exec-cmd.c:363 #, c-format msgid "too many args to run %s" msgstr "" #: fetch-object.c:17 msgid "Remote with no URL" msgstr "" #: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "" #: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" #: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" #: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" #: fetch-pack.c:196 msgid "unable to write to remote" msgstr "" #: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" #: fetch-pack.c:360 fetch-pack.c:1271 #, c-format msgid "invalid shallow line: %s" msgstr "" #: fetch-pack.c:366 fetch-pack.c:1277 #, c-format msgid "invalid unshallow line: %s" msgstr "" #: fetch-pack.c:368 fetch-pack.c:1279 #, c-format msgid "object not found: %s" msgstr "" #: fetch-pack.c:371 fetch-pack.c:1282 #, c-format msgid "error in object: %s" msgstr "" #: fetch-pack.c:373 fetch-pack.c:1284 #, c-format msgid "no shallow found: %s" msgstr "" #: fetch-pack.c:376 fetch-pack.c:1288 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" #: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "" #: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "" #: fetch-pack.c:465 msgid "giving up" msgstr "" #: fetch-pack.c:477 progress.c:284 msgid "done" msgstr "" #: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "" #: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "" #: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "" #: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" #: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "" #: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" #: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "" #: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "" #: fetch-pack.c:906 msgid "Server does not support shallow clients" msgstr "" #: fetch-pack.c:910 msgid "Server supports multi_ack_detailed" msgstr "" #: fetch-pack.c:913 msgid "Server supports no-done" msgstr "" #: fetch-pack.c:919 msgid "Server supports multi_ack" msgstr "" #: fetch-pack.c:923 msgid "Server supports side-band-64k" msgstr "" #: fetch-pack.c:927 msgid "Server supports side-band" msgstr "" #: fetch-pack.c:931 msgid "Server supports allow-tip-sha1-in-want" msgstr "" #: fetch-pack.c:935 msgid "Server supports allow-reachable-sha1-in-want" msgstr "" #: fetch-pack.c:945 msgid "Server supports ofs-delta" msgstr "" #: fetch-pack.c:951 fetch-pack.c:1144 msgid "Server supports filter" msgstr "" #: fetch-pack.c:959 #, c-format msgid "Server version is %.*s" msgstr "" #: fetch-pack.c:965 msgid "Server does not support --shallow-since" msgstr "" #: fetch-pack.c:969 msgid "Server does not support --shallow-exclude" msgstr "" #: fetch-pack.c:971 msgid "Server does not support --deepen" msgstr "" #: fetch-pack.c:988 msgid "no common commits" msgstr "" #: fetch-pack.c:1000 fetch-pack.c:1449 msgid "git fetch-pack: fetch failed." msgstr "" #: fetch-pack.c:1138 msgid "Server does not support shallow requests" msgstr "" #: fetch-pack.c:1171 msgid "unable to write request to remote" msgstr "" #: fetch-pack.c:1189 #, c-format msgid "error reading section header '%s'" msgstr "" #: fetch-pack.c:1195 #, c-format msgid "expected '%s', received '%s'" msgstr "" #: fetch-pack.c:1234 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" #: fetch-pack.c:1239 #, c-format msgid "error processing acks: %d" msgstr "" #: fetch-pack.c:1249 msgid "expected packfile to be sent after 'ready'" msgstr "" #: fetch-pack.c:1251 msgid "expected no other sections to be sent after no 'ready'" msgstr "" #: fetch-pack.c:1293 #, c-format msgid "error processing shallow info: %d" msgstr "" #: fetch-pack.c:1340 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" #: fetch-pack.c:1345 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" #: fetch-pack.c:1350 #, c-format msgid "error processing wanted refs: %d" msgstr "" #: fetch-pack.c:1676 msgid "no matching remote head" msgstr "" #: fetch-pack.c:1699 builtin/clone.c:673 msgid "remote did not send all necessary objects" msgstr "" #: fetch-pack.c:1726 #, c-format msgid "no such remote ref %s" msgstr "" #: fetch-pack.c:1729 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" #: gpg-interface.c:318 msgid "gpg failed to sign the data" msgstr "" #: gpg-interface.c:344 msgid "could not create temporary file" msgstr "" #: gpg-interface.c:347 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" #: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" #: grep.c:2113 #, c-format msgid "'%s': unable to read %s" msgstr "" #: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "" #: grep.c:2141 #, c-format msgid "'%s': short read" msgstr "" #: help.c:23 msgid "start a working area (see also: git help tutorial)" msgstr "" #: help.c:24 msgid "work on the current change (see also: git help everyday)" msgstr "" #: help.c:25 msgid "examine the history and state (see also: git help revisions)" msgstr "" #: help.c:26 msgid "grow, mark and tweak your common history" msgstr "" #: help.c:27 msgid "collaborate (see also: git help workflows)" msgstr "" #: help.c:31 msgid "Main Porcelain Commands" msgstr "" #: help.c:32 msgid "Ancillary Commands / Manipulators" msgstr "" #: help.c:33 msgid "Ancillary Commands / Interrogators" msgstr "" #: help.c:34 msgid "Interacting with Others" msgstr "" #: help.c:35 msgid "Low-level Commands / Manipulators" msgstr "" #: help.c:36 msgid "Low-level Commands / Interrogators" msgstr "" #: help.c:37 msgid "Low-level Commands / Synching Repositories" msgstr "" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "" #: help.c:298 #, c-format msgid "available git commands in '%s'" msgstr "" #: help.c:305 msgid "git commands available from elsewhere on your $PATH" msgstr "" #: help.c:314 msgid "These are common Git commands used in various situations:" msgstr "" #: help.c:363 git.c:97 #, c-format msgid "unsupported command listing type '%s'" msgstr "" #: help.c:403 msgid "The common Git guides are:" msgstr "" #: help.c:512 msgid "See 'git help ' to read about a specific subcommand" msgstr "" #: help.c:517 msgid "External commands" msgstr "" #: help.c:532 msgid "Command aliases" msgstr "" #: help.c:596 #, 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:655 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" #: help.c:677 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" #: help.c:682 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" #: help.c:687 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" #: help.c:695 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" #: help.c:699 msgid "" "\n" "The most similar command is" msgid_plural "" "\n" "The most similar commands are" msgstr[0] "" msgstr[1] "" #: help.c:714 msgid "git version []" msgstr "" #: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "" #: help.c:786 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" msgstr[1] "" #: ident.c:349 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:379 msgid "no email was given and auto-detection is disabled" msgstr "" #: ident.c:384 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" #: ident.c:401 msgid "no name was given and auto-detection is disabled" msgstr "" #: ident.c:407 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "" #: ident.c:415 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "" #: ident.c:421 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "" #: ident.c:436 builtin/commit.c:608 #, c-format msgid "invalid date format: %s" msgstr "" #: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "" #: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" #: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "" #: list-objects-filter-options.c:36 msgid "multiple filter-specs cannot be combined" msgstr "" #: list-objects-filter-options.c:58 msgid "expected 'tree:'" msgstr "" #: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "" #: list-objects-filter-options.c:158 msgid "cannot change partial clone promisor remote" msgstr "" #: lockfile.c:151 #, 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:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "" #: merge.c:41 msgid "failed to read the cache" msgstr "" #: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921 #: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "" #: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "" #: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" #: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" #: merge-recursive.c:437 msgid "error building trees" msgstr "" #: merge-recursive.c:861 #, c-format msgid "failed to create path '%s'%s" msgstr "" #: merge-recursive.c:872 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" #: merge-recursive.c:886 merge-recursive.c:905 msgid ": perhaps a D/F conflict?" msgstr "" #: merge-recursive.c:895 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" #: merge-recursive.c:936 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "" #: merge-recursive.c:939 #, c-format msgid "blob expected for %s '%s'" msgstr "" #: merge-recursive.c:963 #, c-format msgid "failed to open '%s': %s" msgstr "" #: merge-recursive.c:974 #, c-format msgid "failed to symlink '%s': %s" msgstr "" #: merge-recursive.c:979 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" #: merge-recursive.c:1175 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" #: merge-recursive.c:1182 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" #: merge-recursive.c:1189 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" #: merge-recursive.c:1197 merge-recursive.c:1209 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" #: merge-recursive.c:1200 merge-recursive.c:1212 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" #: merge-recursive.c:1235 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" #: merge-recursive.c:1239 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" #: merge-recursive.c:1240 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" #: merge-recursive.c:1243 #, c-format msgid "" "If this is correct simply add it to the index for example\n" "by using:\n" "\n" " git update-index --cacheinfo 160000 %s \"%s\"\n" "\n" "which will accept this suggestion.\n" msgstr "" #: merge-recursive.c:1252 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" #: merge-recursive.c:1325 msgid "Failed to execute internal merge" msgstr "" #: merge-recursive.c:1330 #, c-format msgid "Unable to add %s to database" msgstr "" #: merge-recursive.c:1362 #, c-format msgid "Auto-merging %s" msgstr "" #: merge-recursive.c:1385 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" #: merge-recursive.c:1457 #, 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:1462 #, 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:1469 #, 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:1474 #, 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:1509 msgid "rename" msgstr "" #: merge-recursive.c:1509 msgid "renamed" msgstr "" #: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" #: merge-recursive.c:1599 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" #: merge-recursive.c:1657 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" #: merge-recursive.c:1687 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" #: merge-recursive.c:1692 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" #: merge-recursive.c:1711 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" #: merge-recursive.c:1716 msgid " (left unresolved)" msgstr "" #: merge-recursive.c:1825 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" #: merge-recursive.c:2030 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " "directory %s was renamed to multiple other directories, with no destination " "getting a majority of the files." msgstr "" #: merge-recursive.c:2062 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" #: merge-recursive.c:2072 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" #: merge-recursive.c:2164 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" #: merge-recursive.c:2408 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" #: merge-recursive.c:2929 #, c-format msgid "cannot read object %s" msgstr "" #: merge-recursive.c:2932 #, c-format msgid "object %s is not a blob" msgstr "" #: merge-recursive.c:2996 msgid "modify" msgstr "" #: merge-recursive.c:2996 msgid "modified" msgstr "" #: merge-recursive.c:3008 msgid "content" msgstr "" #: merge-recursive.c:3012 msgid "add/add" msgstr "" #: merge-recursive.c:3035 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" #: merge-recursive.c:3057 git-submodule.sh:937 msgid "submodule" msgstr "" #: merge-recursive.c:3058 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" #: merge-recursive.c:3088 #, c-format msgid "Adding as %s instead" msgstr "" #: merge-recursive.c:3170 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" #: merge-recursive.c:3173 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" #: merge-recursive.c:3177 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" #: merge-recursive.c:3180 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" #: merge-recursive.c:3294 #, c-format msgid "Removing %s" msgstr "" #: merge-recursive.c:3317 msgid "file/directory" msgstr "" #: merge-recursive.c:3322 msgid "directory/file" msgstr "" #: merge-recursive.c:3329 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" #: merge-recursive.c:3338 #, c-format msgid "Adding %s" msgstr "" #: merge-recursive.c:3347 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" #: merge-recursive.c:3385 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" #: merge-recursive.c:3396 msgid "Already up to date!" msgstr "" #: merge-recursive.c:3405 #, c-format msgid "merging of trees %s and %s failed" msgstr "" #: merge-recursive.c:3504 msgid "Merging:" msgstr "" #: merge-recursive.c:3517 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" #: merge-recursive.c:3556 msgid "merge returned no commit" msgstr "" #: merge-recursive.c:3622 #, c-format msgid "Could not parse object '%s'" msgstr "" #: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873 msgid "Unable to write index." msgstr "" #: midx.c:66 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" #: midx.c:82 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" #: midx.c:87 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" #: midx.c:92 #, c-format msgid "hash version %u does not match" msgstr "" #: midx.c:106 msgid "invalid chunk offset (too large)" msgstr "" #: midx.c:130 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" #: midx.c:143 msgid "multi-pack-index missing required pack-name chunk" msgstr "" #: midx.c:145 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" #: midx.c:147 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" #: midx.c:149 msgid "multi-pack-index missing required object offsets chunk" msgstr "" #: midx.c:163 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" #: midx.c:208 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" #: midx.c:258 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" #: midx.c:286 msgid "error preparing packfile from multi-pack-index" msgstr "" #: midx.c:457 #, c-format msgid "failed to add packfile '%s'" msgstr "" #: midx.c:463 #, c-format msgid "failed to open pack-index '%s'" msgstr "" #: midx.c:557 #, c-format msgid "failed to locate object %d in packfile" msgstr "" #: midx.c:993 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" #: midx.c:1048 msgid "Looking for referenced packfiles" msgstr "" #: midx.c:1063 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "" #: midx.c:1067 msgid "Verifying OID order in MIDX" msgstr "" #: midx.c:1076 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" #: midx.c:1095 msgid "Sorting objects by packfile" msgstr "" #: midx.c:1101 msgid "Verifying object offsets" msgstr "" #: midx.c:1117 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" #: midx.c:1123 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" #: midx.c:1132 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "" #: name-hash.c:531 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "" #: name-hash.c:553 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "" #: name-hash.c:559 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "" #: notes-merge.c:277 #, 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:284 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "" #: notes-utils.c:46 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" #: notes-utils.c:105 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" #: notes-utils.c:115 #, 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:145 #, c-format msgid "Bad %s value: '%s'" msgstr "" #: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "" #: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "" #: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "" #: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "" #: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "" #: packfile.c:617 msgid "offset before end of packfile (broken .idx?)" msgstr "" #: packfile.c:1868 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" #: packfile.c:1872 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" #: parse-options.c:38 #, c-format msgid "%s requires a value" msgstr "" #: parse-options.c:73 #, c-format msgid "%s is incompatible with %s" msgstr "" #: parse-options.c:78 #, c-format msgid "%s : incompatible with something else" msgstr "" #: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "" #: parse-options.c:94 #, c-format msgid "%s isn't available" msgstr "" #: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" #: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "" #: parse-options.c:423 parse-options.c:431 #, c-format msgid "did you mean `--%s` (with two dashes ?)" msgstr "" #: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "" #: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "" #: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" #: parse-options.c:887 msgid "..." msgstr "" #: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. #: parse-options.c:912 #, c-format msgid " or: %s" msgstr "" #: parse-options.c:915 #, c-format msgid " %s" msgstr "" #: parse-options.c:954 msgid "-NUM" msgstr "" #: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "" #: parse-options-cb.c:20 parse-options-cb.c:24 #, c-format msgid "option `%s' expects a numerical value" msgstr "" #: parse-options-cb.c:41 #, c-format msgid "malformed expiration date '%s'" msgstr "" #: parse-options-cb.c:54 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "" #: parse-options-cb.c:130 parse-options-cb.c:147 #, c-format msgid "malformed object name '%s'" msgstr "" #: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "" #: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" #: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "" #: pathspec.c:149 msgid "attr spec must not be empty" msgstr "" #: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "" #: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" #: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" #: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" #: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" #: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" #: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" #: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" #: pathspec.c:440 #, c-format msgid "%s: '%s' is outside repository" msgstr "" #: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" #: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" #: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "" #: pkt-line.c:99 msgid "unable to write delim packet" msgstr "" #: pkt-line.c:106 msgid "flush packet write failed" msgstr "" #: pkt-line.c:146 pkt-line.c:232 msgid "protocol error: impossibly long line" msgstr "" #: pkt-line.c:162 pkt-line.c:164 msgid "packet write with format failed" msgstr "" #: pkt-line.c:196 msgid "packet write failed - data exceeds max packet size" msgstr "" #: pkt-line.c:203 pkt-line.c:210 msgid "packet write failed" msgstr "" #: pkt-line.c:295 msgid "read error" msgstr "" #: pkt-line.c:303 msgid "the remote end hung up unexpectedly" msgstr "" #: pkt-line.c:331 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "" #: pkt-line.c:341 pkt-line.c:346 #, c-format msgid "protocol error: bad line length %d" msgstr "" #: pkt-line.c:362 #, c-format msgid "remote error: %s" msgstr "" #: preload-index.c:119 msgid "Refreshing index" msgstr "" #: preload-index.c:138 #, c-format msgid "unable to create threaded lstat: %s" msgstr "" #: pretty.c:966 msgid "unable to parse --pretty format" msgstr "" #: range-diff.c:56 msgid "could not start `log`" msgstr "" #: range-diff.c:59 msgid "could not read `log` output" msgstr "" #: range-diff.c:74 sequencer.c:4897 #, c-format msgid "could not parse commit '%s'" msgstr "" #: range-diff.c:224 msgid "failed to generate diff" msgstr "" #: range-diff.c:455 range-diff.c:457 #, c-format msgid "could not parse log for '%s'" msgstr "" #: read-cache.c:680 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" #: read-cache.c:696 msgid "cannot create an empty blob in the object database" msgstr "" #: read-cache.c:718 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" #: read-cache.c:723 #, c-format msgid "'%s' does not have a commit checked out" msgstr "" #: read-cache.c:775 #, c-format msgid "unable to index file '%s'" msgstr "" #: read-cache.c:794 #, c-format msgid "unable to add '%s' to index" msgstr "" #: read-cache.c:805 #, c-format msgid "unable to stat '%s'" msgstr "" #: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" #: read-cache.c:1499 msgid "Refresh index" msgstr "" #: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" #: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" #: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "" #: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "" #: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "" #: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" #: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "" #: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" #: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" #: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "" #: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" #: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "" #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 #: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358 #: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955 #: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498 #: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271 #: builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "" #: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" #: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" #: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "" #: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "" #: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "" #: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "" #: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" #: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" #: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "" #: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" #: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117 #, c-format msgid "could not close '%s'" msgstr "" #: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807 #, c-format msgid "could not stat '%s'" msgstr "" #: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "" #: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "" #: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" #: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" #: rebase-interactive.c:26 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" #: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" "p, pick = use commit\n" "r, reword = use commit, but edit the commit message\n" "e, edit = use commit, but stop for amending\n" "s, squash = use commit, but meld into previous commit\n" "f, fixup = like \"squash\", but discard this commit's log message\n" "x, exec = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop = remove commit\n" "l, label