# 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: 2015-04-03 08:13+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:55 #, c-format msgid "hint: %.*s\n" msgstr "" #: advice.c:88 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 "" #: archive.c:11 msgid "git archive [] [...]" msgstr "" #: archive.c:12 msgid "git archive --list" msgstr "" #: archive.c:13 msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" #: archive.c:14 msgid "git archive --remote [--exec ] --list" msgstr "" #: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" #: archive.c:427 msgid "fmt" msgstr "" #: archive.c:427 msgid "archive format" msgstr "" #: archive.c:428 builtin/log.c:1204 msgid "prefix" msgstr "" #: archive.c:429 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 msgid "file" msgstr "" #: archive.c:431 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" #: archive.c:433 msgid "read .gitattributes in working directory" msgstr "" #: archive.c:434 msgid "report archived files on stderr" msgstr "" #: archive.c:435 msgid "store only" msgstr "" #: archive.c:436 msgid "compress faster" msgstr "" #: archive.c:444 msgid "compress better" msgstr "" #: archive.c:447 msgid "list supported archive formats" msgstr "" #: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 msgid "repo" msgstr "" #: archive.c:450 builtin/archive.c:91 msgid "retrieve the archive from remote repository " msgstr "" #: archive.c:451 builtin/archive.c:92 builtin/notes.c:478 msgid "command" msgstr "" #: archive.c:452 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" #: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" #: branch.c:60 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "" #: branch.c:83 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "" #: branch.c:84 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "" #: branch.c:88 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "" #: branch.c:89 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "" #: branch.c:94 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "" #: branch.c:95 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "" #: branch.c:99 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "" #: branch.c:100 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "" #: branch.c:133 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" #: branch.c:162 #, c-format msgid "'%s' is not a valid branch name." msgstr "" #: branch.c:167 #, c-format msgid "A branch named '%s' already exists." msgstr "" #: branch.c:175 msgid "Cannot force update the current branch." msgstr "" #: branch.c:195 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" #: branch.c:197 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" #: branch.c:199 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:243 #, c-format msgid "Not a valid object name: '%s'." msgstr "" #: branch.c:263 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" #: branch.c:268 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" #: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" #: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "" #: bundle.c:139 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 msgid "revision walk setup failed" msgstr "" #: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" #: bundle.c:192 msgid "The bundle records a complete history." msgstr "" #: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" #: bundle.c:251 msgid "Could not spawn pack-objects" msgstr "" #: bundle.c:269 msgid "pack-objects died" msgstr "" #: bundle.c:309 msgid "rev-list died" msgstr "" #: bundle.c:358 #, 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 #, c-format msgid "unrecognized argument: %s" msgstr "" #: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "" #: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "" #: bundle.c:474 msgid "index-pack died" msgstr "" #: color.c:260 #, c-format msgid "invalid color value: %.*s" msgstr "" #: commit.c:40 #, c-format msgid "could not parse %s" msgstr "" #: commit.c:42 #, c-format msgid "%s %s is not a commit!" msgstr "" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "" #: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "" #: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" #: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" #: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" #: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "" #: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "" #: config.c:1216 msgid "unable to parse command-line config" msgstr "" #: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "" #: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" #: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" #: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "" #: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "" #: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "" #: date.c:95 msgid "in the future" msgstr "" #: date.c:101 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" msgstr[0] "" msgstr[1] "" #: date.c:108 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" msgstr[0] "" msgstr[1] "" #: date.c:115 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" msgstr[0] "" msgstr[1] "" #: date.c:122 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" msgstr[0] "" msgstr[1] "" #: date.c:128 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" msgstr[0] "" msgstr[1] "" #: date.c:135 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" msgstr[0] "" msgstr[1] "" #: date.c:146 #, c-format msgid "%lu year" msgid_plural "%lu years" msgstr[0] "" msgstr[1] "" #. TRANSLATORS: "%s" is " years" #: date.c:149 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" msgstr[0] "" msgstr[1] "" #: date.c:154 date.c:159 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" msgstr[0] "" msgstr[1] "" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "" #: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "" #: diff.c:114 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" #: diff.c:119 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" #: diff.c:214 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" #: diff.c:266 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" #: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "" #: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "" #: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" #: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" #: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "" #: gpg-interface.c:141 msgid "gpg did not accept the data" msgstr "" #: gpg-interface.c:152 msgid "gpg failed to sign the data" msgstr "" #: gpg-interface.c:185 #, c-format msgid "could not create temporary file '%s': %s" msgstr "" #: gpg-interface.c:188 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "" #: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "" #: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "" #: help.c:207 #, c-format msgid "available git commands in '%s'" msgstr "" #: help.c:214 msgid "git commands available from elsewhere on your $PATH" msgstr "" #: help.c:230 msgid "The most commonly used git commands are:" msgstr "" #: help.c:289 #, 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 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" #: help.c:368 #, 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 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" #: help.c:380 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" #: help.c:384 help.c:444 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" msgstr[1] "" #: help.c:440 #, c-format msgid "%s: %s - %s" msgstr "" #: lockfile.c:283 msgid "BUG: reopen a lockfile that is still open" msgstr "" #: lockfile.c:285 msgid "BUG: reopen a lockfile that has been committed" 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 msgid "unable to write new index file" msgstr "" #: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "" #: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" #: merge-recursive.c:270 msgid "error building trees" msgstr "" #: merge-recursive.c:688 #, c-format msgid "failed to create path '%s'%s" msgstr "" #: merge-recursive.c:699 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" #: merge-recursive.c:713 merge-recursive.c:734 msgid ": perhaps a D/F conflict?" msgstr "" #: merge-recursive.c:724 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" #: merge-recursive.c:764 #, c-format msgid "cannot read object %s '%s'" msgstr "" #: merge-recursive.c:766 #, c-format msgid "blob expected for %s '%s'" msgstr "" #: merge-recursive.c:789 builtin/clone.c:321 #, c-format msgid "failed to open '%s'" msgstr "" #: merge-recursive.c:797 #, c-format msgid "failed to symlink '%s'" msgstr "" #: merge-recursive.c:800 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" #: merge-recursive.c:938 msgid "Failed to execute internal merge" msgstr "" #: merge-recursive.c:942 #, 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 #, 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 #, 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 msgid "rename" msgstr "" #: merge-recursive.c:1093 msgid "renamed" msgstr "" #: merge-recursive.c:1149 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" #: merge-recursive.c:1171 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" #: merge-recursive.c:1176 msgid " (left unresolved)" msgstr "" #: merge-recursive.c:1230 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" #: merge-recursive.c:1260 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" #: merge-recursive.c:1459 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" #: merge-recursive.c:1469 #, c-format msgid "Adding merged %s" msgstr "" #: merge-recursive.c:1474 merge-recursive.c:1672 #, c-format msgid "Adding as %s instead" msgstr "" #: merge-recursive.c:1525 #, c-format msgid "cannot read object %s" msgstr "" #: merge-recursive.c:1528 #, c-format msgid "object %s is not a blob" msgstr "" #: merge-recursive.c:1576 msgid "modify" msgstr "" #: merge-recursive.c:1576 msgid "modified" msgstr "" #: merge-recursive.c:1586 msgid "content" msgstr "" #: merge-recursive.c:1593 msgid "add/add" msgstr "" #: merge-recursive.c:1627 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" #: merge-recursive.c:1641 #, c-format msgid "Auto-merging %s" msgstr "" #: merge-recursive.c:1645 git-submodule.sh:1150 msgid "submodule" msgstr "" #: merge-recursive.c:1646 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" #: merge-recursive.c:1732 #, c-format msgid "Removing %s" msgstr "" #: merge-recursive.c:1757 msgid "file/directory" msgstr "" #: merge-recursive.c:1763 msgid "directory/file" msgstr "" #: merge-recursive.c:1768 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" #: merge-recursive.c:1778 #, c-format msgid "Adding %s" msgstr "" #: merge-recursive.c:1795 msgid "Fatal merge failure, shouldn't happen." msgstr "" #: merge-recursive.c:1814 msgid "Already up-to-date!" msgstr "" #: merge-recursive.c:1823 #, 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 msgid "Merging:" msgstr "" #: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" #: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "" #: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "" #: merge-recursive.c:2019 builtin/merge.c:667 msgid "Unable to write index." msgstr "" #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" #: notes-utils.c:82 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" #: notes-utils.c:92 #, 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 #, c-format msgid "Bad %s value: '%s'" msgstr "" #: object.c:241 #, c-format msgid "unable to parse object: %s" msgstr "" #: parse-options.c:546 msgid "..." msgstr "" #: parse-options.c:564 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation #: parse-options.c:568 #, c-format msgid " or: %s" msgstr "" #: parse-options.c:571 #, c-format msgid " %s" msgstr "" #: parse-options.c:605 msgid "-NUM" msgstr "" #: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" #: pathspec.c:143 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" #: pathspec.c:177 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" #: pathspec.c:183 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" #: pathspec.c:187 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" #: pathspec.c:205 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" #: pathspec.c:230 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" #: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" msgstr "" #: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" #: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" #: pathspec.c:432 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" #: pathspec.c:441 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" #: pretty.c:968 msgid "unable to parse --pretty format" msgstr "" #: progress.c:225 msgid "done" msgstr "" #: read-cache.c:1275 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" #: read-cache.c:1285 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" #: remote.c:782 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" #: remote.c:786 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" #: remote.c:790 #, c-format msgid "%s tracks both %s and %s" msgstr "" #: remote.c:798 msgid "Internal error" msgstr "" #: remote.c:1980 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" #: remote.c:1984 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" #: remote.c:1987 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" #: remote.c:1991 #, 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 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" #: remote.c:2000 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "" msgstr[1] "" #: remote.c:2008 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" #: remote.c:2011 #, c-format msgid "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commit each, respectively.\n" msgid_plural "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" msgstr[1] "" #: remote.c:2021 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" #: revision.c:2348 msgid "--first-parent is incompatible with --bisect" msgstr "" #: run-command.c:83 msgid "open /dev/null failed" msgstr "" #: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "" #: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "" #: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "" #: send-pack.c:366 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" msgstr "" #: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 #: builtin/merge.c:1010 #, c-format msgid "Could not write to '%s'" msgstr "" #: sequencer.c:195 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" #: sequencer.c:198 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" "and commit the result with 'git commit'" msgstr "" #: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "" #: sequencer.c:214 #, c-format msgid "Error wrapping up %s" msgstr "" #: sequencer.c:229 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" #: sequencer.c:231 msgid "Your local changes would be overwritten by revert." msgstr "" #: sequencer.c:234 msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:321 #, c-format msgid "%s: Unable to write new index file" msgstr "" #: sequencer.c:339 msgid "Could not resolve HEAD commit\n" msgstr "" #: sequencer.c:359 msgid "Unable to update cache tree\n" msgstr "" #: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "" #: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" #: sequencer.c:482 msgid "Your index file is unmerged." msgstr "" #: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" #: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "" #: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 #: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" #: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "" #: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "" #: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "" #: sequencer.c:653 msgid "empty commit set passed" msgstr "" #: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "" #: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "" #: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "" #: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "" #: sequencer.c:752 msgid "No commits parsed." msgstr "" #: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "" #: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "" #: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" #: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "" #: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "" #: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "" #: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "" #: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" #: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "" #: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "" #: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "" #: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "" #: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "" #: sequencer.c:908 builtin/apply.c:4288 #, c-format msgid "cannot open %s: %s" msgstr "" #: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "" #: sequencer.c:912 msgid "unexpected end of file" msgstr "" #: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" #: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "" #: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" #: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "" #: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "" #: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "" #: sha1_name.c:440 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" "may be created by mistake. For example,\n" "\n" " git checkout -b $br $(git rev-parse ...)\n" "\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" msgstr "" #: sha1_name.c:1068 msgid "HEAD does not point to a branch" msgstr "" #: sha1_name.c:1071 #, c-format msgid "No such branch: '%s'" msgstr "" #: sha1_name.c:1073 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" #: sha1_name.c:1077 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" #: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" #: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" #: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" #: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "" #: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "" #: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "" #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 #: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" #: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "" #: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" #: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "" #: trailer.c:704 msgid "could not read from stdin" msgstr "" #: unpack-trees.c:202 msgid "Checking out files" msgstr "" #: urlmatch.c:120 msgid "invalid URL scheme name or missing '://' suffix" msgstr "" #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 #, c-format msgid "invalid %XX escape sequence" msgstr "" #: urlmatch.c:172 msgid "missing host and scheme is not 'file:'" msgstr "" #: urlmatch.c:189 msgid "a 'file:' URL may not have a port number" msgstr "" #: urlmatch.c:199 msgid "invalid characters in host name" msgstr "" #: urlmatch.c:244 urlmatch.c:255 msgid "invalid port number" msgstr "" #: urlmatch.c:322 msgid "invalid '..' path segment" msgstr "" #: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "" #: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "" #: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" #: wrapper.c:556 msgid "no such user" msgstr "" #: wrapper.c:564 msgid "unable to get current working directory" msgstr "" #: wt-status.c:150 msgid "Unmerged paths:" msgstr "" #: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s ...\" to unstage)" msgstr "" #: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached ...\" to unstage)" msgstr "" #: wt-status.c:183 msgid " (use \"git add ...\" to mark resolution)" msgstr "" #: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" #: wt-status.c:187 msgid " (use \"git rm ...\" to mark resolution)" msgstr "" #: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "" #: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "" #: wt-status.c:220 msgid " (use \"git add ...\" to update what will be committed)" msgstr "" #: wt-status.c:222 msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" #: wt-status.c:223 msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" #: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" #: wt-status.c:237 #, c-format msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" #: wt-status.c:252 msgid "both deleted:" msgstr "" #: wt-status.c:254 msgid "added by us:" msgstr "" #: wt-status.c:256 msgid "deleted by them:" msgstr "" #: wt-status.c:258 msgid "added by them:" msgstr "" #: wt-status.c:260 msgid "deleted by us:" msgstr "" #: wt-status.c:262 msgid "both added:" msgstr "" #: wt-status.c:264 msgid "both modified:" msgstr "" #: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "" #: wt-status.c:274 msgid "new file:" msgstr "" #: wt-status.c:276 msgid "copied:" msgstr "" #: wt-status.c:278 msgid "deleted:" msgstr "" #: wt-status.c:280 msgid "modified:" msgstr "" #: wt-status.c:282 msgid "renamed:" msgstr "" #: wt-status.c:284 msgid "typechange:" msgstr "" #: wt-status.c:286 msgid "unknown:" msgstr "" #: wt-status.c:288 msgid "unmerged:" msgstr "" #: wt-status.c:370 msgid "new commits, " msgstr "" #: wt-status.c:372 msgid "modified content, " msgstr "" #: wt-status.c:374 msgid "untracked content, " msgstr "" #: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "" #: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "" #: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "" #: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" #: wt-status.c:946 msgid "You have unmerged paths." msgstr "" #: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr "" #: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "" #: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr "" #: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "" #: wt-status.c:968 msgid "The current patch is empty." msgstr "" #: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" #: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" #: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" #: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" #: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "" #: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" #: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" #: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" #: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" #: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" #: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "" #: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" #: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" #: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "" #: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" #: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" #: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" #: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" #: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" #: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" #: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "" #: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" #: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" #: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" #: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" #: wt-status.c:1141 msgid "You are currently bisecting." msgstr "" #: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" #: wt-status.c:1321 msgid "On branch " msgstr "" #: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "" #: wt-status.c:1333 msgid "HEAD detached at " msgstr "" #: wt-status.c:1335 msgid "HEAD detached from " msgstr "" #: wt-status.c:1338 msgid "Not currently on any branch." msgstr "" #: wt-status.c:1355 msgid "Initial commit" msgstr "" #: wt-status.c:1369 msgid "Untracked files" msgstr "" #: wt-status.c:1371 msgid "Ignored files" msgstr "" #: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" "may speed it up, but you have to be careful not to forget to add\n" "new files yourself (see 'git help status')." msgstr "" #: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "" #: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr "" #: wt-status.c:1389 msgid "No changes" msgstr "" #: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" #: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "" #: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" #: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" #: wt-status.c:1406 #, 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 #, c-format msgid "nothing to commit\n" msgstr "" #: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" #: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" #: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "" #: wt-status.c:1531 msgid "Initial commit on " msgstr "" #: wt-status.c:1563 msgid "gone" msgstr "" #: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "" #: compat/precompose_utf8.c:55 builtin/clone.c:360 #, c-format msgid "failed to unlink '%s'" msgstr "" #: builtin/add.c:22 msgid "git add [] [--] ..." msgstr "" #: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "" #: builtin/add.c:70 builtin/commit.c:277 msgid "updating files failed" msgstr "" #: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "" #: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "" #: builtin/add.c:194 builtin/rev-parse.c:785 msgid "Could not read the index" msgstr "" #: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "" #: builtin/add.c:209 msgid "Could not write patch" msgstr "" #: builtin/add.c:214 #, c-format msgid "Could not stat '%s'" msgstr "" #: builtin/add.c:216 msgid "Empty patch. Aborted." msgstr "" #: builtin/add.c:221 #, c-format msgid "Could not apply '%s'" msgstr "" #: builtin/add.c:231 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 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 msgid "interactive picking" msgstr "" #: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" #: builtin/add.c:253 msgid "edit current diff and apply" msgstr "" #: builtin/add.c:254 msgid "allow adding otherwise ignored files" msgstr "" #: builtin/add.c:255 msgid "update tracked files" msgstr "" #: builtin/add.c:256 msgid "record only the fact that the path will be added later" msgstr "" #: builtin/add.c:257 msgid "add changes from all tracked and untracked files" msgstr "" #: builtin/add.c:260 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" #: builtin/add.c:262 msgid "don't add, only refresh the index" msgstr "" #: builtin/add.c:263 msgid "just skip files which cannot be added because of errors" msgstr "" #: builtin/add.c:264 msgid "check if - even missing - files are ignored in dry run" msgstr "" #: builtin/add.c:286 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" #: builtin/add.c:293 msgid "adding files failed" msgstr "" #: builtin/add.c:329 msgid "-A and -u are mutually incompatible" msgstr "" #: builtin/add.c:336 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" #: builtin/add.c:357 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" #: builtin/add.c:358 #, 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 [] [...]" msgstr "" #: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" #: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" #: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" #: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "" #: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" #: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" #: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" #: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" #: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" #: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" #: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" 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" msgstr "" #: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "" #: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "" #: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "" #: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "" #: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" #: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" #: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "" #: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "" #: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "" #: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" 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" msgstr "" #: builtin/apply.c:2915 #, c-format 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" msgstr "" #: builtin/apply.c:3531 #, c-format msgid "%s has type %o, expected %o" msgstr "" #: builtin/apply.c:3690 builtin/apply.c:3692 #, c-format msgid "invalid path '%s'" msgstr "" #: builtin/apply.c:3747 #, c-format msgid "%s: already exists in index" msgstr "" #: builtin/apply.c:3750 #, c-format msgid "%s: already exists in working directory" msgstr "" #: builtin/apply.c:3770 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" #: builtin/apply.c:3775 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" #: builtin/apply.c:3795 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" #: builtin/apply.c:3799 #, c-format msgid "%s: patch does not apply" msgstr "" #: builtin/apply.c:3813 #, c-format msgid "Checking patch %s..." msgstr "" #: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" #: builtin/apply.c:4049 #, c-format msgid "unable to remove %s from index" msgstr "" #: builtin/apply.c:4078 #, c-format msgid "corrupt patch for submodule %s" msgstr "" #: builtin/apply.c:4082 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" #: builtin/apply.c:4087 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" #: builtin/apply.c:4090 builtin/apply.c:4198 #, c-format msgid "unable to add cache entry for %s" msgstr "" #: builtin/apply.c:4123 #, c-format msgid "closing file '%s'" msgstr "" #: builtin/apply.c:4172 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" #: builtin/apply.c:4259 #, c-format msgid "Applied patch %s cleanly." msgstr "" #: builtin/apply.c:4267 msgid "internal error" 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 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" #: builtin/apply.c:4301 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" #: builtin/apply.c:4304 #, c-format msgid "Rejected hunk #%d." msgstr "" #: builtin/apply.c:4394 msgid "unrecognized input" msgstr "" #: builtin/apply.c:4405 msgid "unable to read index file" msgstr "" #: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92 #: builtin/fetch.c:92 msgid "path" msgstr "" #: builtin/apply.c:4523 msgid "don't apply changes matching the given path" msgstr "" #: builtin/apply.c:4526 msgid "apply changes matching the given path" msgstr "" #: builtin/apply.c:4528 msgid "num" msgstr "" #: builtin/apply.c:4529 msgid "remove leading slashes from traditional diff paths" msgstr "" #: builtin/apply.c:4532 msgid "ignore additions made by the patch" msgstr "" #: builtin/apply.c:4534 msgid "instead of applying the patch, output diffstat for the input" msgstr "" #: builtin/apply.c:4538 msgid "show number of added and deleted lines in decimal notation" msgstr "" #: builtin/apply.c:4540 msgid "instead of applying the patch, output a summary for the input" msgstr "" #: builtin/apply.c:4542 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" #: builtin/apply.c:4544 msgid "make sure the patch is applicable to the current index" 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" msgstr "" #: builtin/apply.c:4554 msgid "build a temporary index based on embedded index information" msgstr "" #: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "" #: builtin/apply.c:4559 msgid "ensure at least lines of context match" msgstr "" #: builtin/apply.c:4560 msgid "action" msgstr "" #: builtin/apply.c:4561 msgid "detect new or modified lines that have whitespace errors" msgstr "" #: builtin/apply.c:4564 builtin/apply.c:4567 msgid "ignore changes in whitespace when finding context" msgstr "" #: builtin/apply.c:4570 msgid "apply the patch in reverse" msgstr "" #: builtin/apply.c:4572 msgid "don't expect at least one line of context" msgstr "" #: builtin/apply.c:4574 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" #: builtin/apply.c:4576 msgid "allow overlapping hunks" msgstr "" #: builtin/apply.c:4579 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" #: builtin/apply.c:4582 msgid "do not trust the line counts in the hunk headers" msgstr "" #: builtin/apply.c:4584 msgid "root" msgstr "" #: builtin/apply.c:4585 msgid "prepend to all filenames" msgstr "" #: builtin/apply.c:4607 msgid "--3way outside a repository" msgstr "" #: builtin/apply.c:4615 msgid "--index outside a repository" msgstr "" #: builtin/apply.c:4618 msgid "--cached outside a repository" msgstr "" #: builtin/apply.c:4637 #, c-format msgid "can't open patch '%s'" 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'" msgstr "" #: builtin/archive.c:20 msgid "could not redirect output" msgstr "" #: builtin/archive.c:37 msgid "git archive: Remote with no URL" msgstr "" #: builtin/archive.c:58 msgid "git archive: expected ACK/NAK, got EOF" msgstr "" #: builtin/archive.c:61 #, c-format msgid "git archive: NACK %s" msgstr "" #: builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "" #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "" #: builtin/archive.c:68 msgid "git archive: expected a flush" msgstr "" #: builtin/bisect--helper.c:7 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "" #: builtin/bisect--helper.c:17 msgid "perform 'git bisect next'" msgstr "" #: builtin/bisect--helper.c:19 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" #: builtin/blame.c:30 msgid "git blame [] [] [] [--] file" msgstr "" #: builtin/blame.c:35 msgid " are documented in git-rev-list(1)" msgstr "" #: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "" #: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" #: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" #: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "" #: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "" #: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "" #: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "" #: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "" #: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "" #: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" #: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "" #: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "" #: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "" #: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "" #: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "" #: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "" #: builtin/blame.c:2516 msgid "Use revisions from instead of calling git-rev-list" msgstr "" #: builtin/blame.c:2517 msgid "Use 's contents as the final image" msgstr "" #: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "" #: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "" #: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "" #: builtin/blame.c:2520 msgid "n,m" msgstr "" #: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" 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 msgid "4 years, 11 months ago" msgstr "" #: builtin/branch.c:24 msgid "git branch [] [-r | -a] [--merged | --no-merged]" msgstr "" #: builtin/branch.c:25 msgid "git branch [] [-l] [-f] []" msgstr "" #: builtin/branch.c:26 msgid "git branch [] [-r] (-d | -D) ..." msgstr "" #: builtin/branch.c:27 msgid "git branch [] (-m | -M) [] " msgstr "" #: builtin/branch.c:152 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" #: builtin/branch.c:156 #, 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 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" #: builtin/branch.c:174 #, 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 msgid "Update of config-file failed" msgstr "" #: builtin/branch.c:215 msgid "cannot use -a with -d" msgstr "" #: builtin/branch.c:221 msgid "Couldn't look up commit object for HEAD" msgstr "" #: builtin/branch.c:229 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" #: builtin/branch.c:245 #, c-format msgid "remote branch '%s' not found." msgstr "" #: builtin/branch.c:246 #, c-format 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'" msgstr "" #: builtin/branch.c:268 #, c-format msgid "Deleted remote branch %s (was %s).\n" 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)" msgstr "" #: builtin/branch.c:596 #, c-format msgid "(HEAD detached at %s)" msgstr "" #: builtin/branch.c:599 #, c-format msgid "(HEAD detached from %s)" msgstr "" #: builtin/branch.c:603 msgid "(no branch)" msgstr "" #: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "" #: builtin/branch.c:698 msgid "some refs could not be read" msgstr "" #: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "" #: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "" #: builtin/branch.c:736 msgid "Branch rename failed" msgstr "" #: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" #: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" #: builtin/branch.c:751 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 #, c-format msgid "could not write branch description template: %s" msgstr "" #: builtin/branch.c:820 msgid "Generic options" msgstr "" #: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "" #: builtin/branch.c:823 msgid "suppress informational messages" msgstr "" #: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "" #: builtin/branch.c:826 msgid "change upstream info" msgstr "" #: builtin/branch.c:830 msgid "use colored output" msgstr "" #: builtin/branch.c:831 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" msgstr "" #: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "" #: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "" #: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "" #: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "" #: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "" #: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "" #: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "" #: builtin/branch.c:854 msgid "list branch names" msgstr "" #: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "" #: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "" #: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "" #: builtin/branch.c:861 msgid "print only not merged branches" msgstr "" #: builtin/branch.c:867 msgid "print only merged branches" msgstr "" #: builtin/branch.c:871 msgid "list branches in columns" msgstr "" #: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "" #: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "" #: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "" #: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "" #: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "" #: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "" #: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "" #: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "" #: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "" #: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "" #: builtin/branch.c:975 #, 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 #, c-format msgid "no such branch '%s'" msgstr "" #: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "" #: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "" #: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" #: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" #: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "" #: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" #: builtin/branch.c:1027 #, 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 #, c-format msgid "" "\n" "If you wanted to make '%s' track '%s', do this:\n" "\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 #, c-format msgid "%s is okay\n" msgstr "" #: builtin/bundle.c:56 msgid "Need a repository to create a bundle." msgstr "" #: builtin/bundle.c:60 msgid "Need a repository to unbundle." msgstr "" #: builtin/cat-file.c:326 msgid "git cat-file (-t | -s | -e | -p | | --textconv) " msgstr "" #: builtin/cat-file.c:327 msgid "git cat-file (--batch | --batch-check) < " msgstr "" #: builtin/cat-file.c:364 msgid " can be one of: blob, tree, commit, tag" msgstr "" #: builtin/cat-file.c:365 msgid "show object type" msgstr "" #: builtin/cat-file.c:366 msgid "show object size" msgstr "" #: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "" #: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "" #: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "" #: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "" #: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "" #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | ...] [--] ..." msgstr "" #: builtin/check-attr.c:12 msgid "git check-attr --stdin [-z] [-a | --all | ...] < " msgstr "" #: builtin/check-attr.c:19 msgid "report all attributes set on file" msgstr "" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" msgstr "" #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "" #: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "terminate input and output records by a NUL character" msgstr "" #: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274 msgid "suppress progress reporting" msgstr "" #: builtin/check-ignore.c:26 msgid "show non-matching input paths" msgstr "" #: builtin/check-ignore.c:28 msgid "ignore index when checking" msgstr "" #: builtin/check-ignore.c:154 msgid "cannot specify pathnames with --stdin" msgstr "" #: builtin/check-ignore.c:157 msgid "-z only makes sense with --stdin" msgstr "" #: builtin/check-ignore.c:159 msgid "no path specified" msgstr "" #: builtin/check-ignore.c:163 msgid "--quiet is only valid with a single pathname" msgstr "" #: builtin/check-ignore.c:165 msgid "cannot have both --quiet and --verbose" msgstr "" #: builtin/check-ignore.c:168 msgid "--non-matching is only valid with --verbose" msgstr "" #: builtin/check-mailmap.c:8 msgid "git check-mailmap [] ..." msgstr "" #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" msgstr "" #: builtin/check-mailmap.c:24 #, c-format msgid "unable to parse contact: %s" msgstr "" #: builtin/check-mailmap.c:47 msgid "no contacts specified" msgstr "" #: builtin/checkout-index.c:126 msgid "git checkout-index [] [--] [...]" msgstr "" #: builtin/checkout-index.c:188 msgid "check out all files in the index" msgstr "" #: builtin/checkout-index.c:189 msgid "force overwrite of existing files" msgstr "" #: builtin/checkout-index.c:191 msgid "no warning for existing files and files not in index" msgstr "" #: builtin/checkout-index.c:193 msgid "don't checkout new files" msgstr "" #: builtin/checkout-index.c:195 msgid "update stat information in the index file" msgstr "" #: builtin/checkout-index.c:201 msgid "read list of paths from the standard input" msgstr "" #: builtin/checkout-index.c:203 msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:204 builtin/column.c:30 msgid "string" msgstr "" #: builtin/checkout-index.c:205 msgid "when creating files, prepend " msgstr "" #: builtin/checkout-index.c:208 msgid "copy out the files from named stage" msgstr "" #: builtin/checkout.c:25 msgid "git checkout [] " msgstr "" #: builtin/checkout.c:26 msgid "git checkout [] [] -- ..." msgstr "" #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format msgid "path '%s' does not have our version" msgstr "" #: builtin/checkout.c:134 builtin/checkout.c:167 #, c-format msgid "path '%s' does not have their version" msgstr "" #: builtin/checkout.c:150 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" #: builtin/checkout.c:194 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" #: builtin/checkout.c:211 #, c-format msgid "path '%s': cannot merge" msgstr "" #: builtin/checkout.c:228 #, 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 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" #: builtin/checkout.c:261 builtin/checkout.c:264 #, c-format msgid "'%s' cannot be used with %s" msgstr "" #: builtin/checkout.c:267 #, 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 #, c-format msgid "path '%s' is unmerged" msgstr "" #: builtin/checkout.c:489 msgid "you need to resolve your current index first" msgstr "" #: builtin/checkout.c:615 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" #: builtin/checkout.c:653 msgid "HEAD is now at" msgstr "" #: builtin/checkout.c:660 #, c-format msgid "Reset branch '%s'\n" msgstr "" #: builtin/checkout.c:663 #, c-format msgid "Already on '%s'\n" msgstr "" #: builtin/checkout.c:667 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" #: builtin/checkout.c:669 builtin/checkout.c:1050 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" #: builtin/checkout.c:671 #, c-format msgid "Switched to branch '%s'\n" msgstr "" #: builtin/checkout.c:723 #, c-format msgid " ... and %d more.\n" msgstr "" #: builtin/checkout.c:729 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" "any of your branches:\n" "\n" "%s\n" msgid_plural "" "Warning: you are leaving %d commits behind, not connected to\n" "any of your branches:\n" "\n" "%s\n" msgstr[0] "" msgstr[1] "" #: builtin/checkout.c:747 #, c-format msgid "" "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 %s\n" "\n" msgstr "" #: builtin/checkout.c:777 msgid "internal error in revision walk" msgstr "" #: builtin/checkout.c:781 msgid "Previous HEAD position was" msgstr "" #: builtin/checkout.c:808 builtin/checkout.c:1045 msgid "You are on a branch yet to be born" msgstr "" #: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "" #: builtin/checkout.c:991 #, c-format msgid "invalid reference: %s" msgstr "" #: builtin/checkout.c:1020 #, c-format msgid "reference is not a tree: %s" msgstr "" #: builtin/checkout.c:1059 msgid "paths cannot be used with switching branches" msgstr "" #: builtin/checkout.c:1062 builtin/checkout.c:1066 #, 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 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" #: builtin/checkout.c:1086 #, 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 msgid "branch" msgstr "" #: builtin/checkout.c:1109 msgid "create and checkout a new branch" msgstr "" #: builtin/checkout.c:1111 msgid "create/reset and checkout a branch" msgstr "" #: builtin/checkout.c:1112 msgid "create reflog for new branch" msgstr "" #: builtin/checkout.c:1113 msgid "detach the HEAD at named commit" msgstr "" #: builtin/checkout.c:1114 msgid "set upstream info for new branch" msgstr "" #: builtin/checkout.c:1116 msgid "new-branch" msgstr "" #: builtin/checkout.c:1116 msgid "new unparented branch" msgstr "" #: builtin/checkout.c:1117 msgid "checkout our version for unmerged files" msgstr "" #: builtin/checkout.c:1119 msgid "checkout their version for unmerged files" msgstr "" #: builtin/checkout.c:1121 msgid "force checkout (throw away local modifications)" msgstr "" #: builtin/checkout.c:1122 msgid "perform a 3-way merge with the new branch" msgstr "" #: builtin/checkout.c:1123 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "" #: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "" #: builtin/checkout.c:1125 msgid "conflict style (merge or diff3)" msgstr "" #: builtin/checkout.c:1128 msgid "do not limit pathspecs to sparse entries only" msgstr "" #: builtin/checkout.c:1130 msgid "second guess 'git checkout '" msgstr "" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" #: builtin/checkout.c:1170 msgid "--track needs a branch name" msgstr "" #: builtin/checkout.c:1175 msgid "Missing branch name; try -b" msgstr "" #: builtin/checkout.c:1212 msgid "invalid path specification" msgstr "" #: builtin/checkout.c:1219 #, 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 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" #: builtin/checkout.c:1228 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" #: builtin/clean.c:26 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." msgstr "" #: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "" #: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "" #: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "" #: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "" #: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "" #: builtin/clean.c:295 msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" " - (empty) select nothing" msgstr "" #: builtin/clean.c:299 msgid "" "Prompt help:\n" "1 - select a single item\n" "3-5 - select a range of items\n" "2-3,6-9 - select multiple ranges\n" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" " - (empty) finish selecting" msgstr "" #: builtin/clean.c:517 #, c-format msgid "Huh (%s)?" msgstr "" #: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "" #: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" #: builtin/clean.c:717 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "" #: builtin/clean.c:783 msgid "Bye." msgstr "" #: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" "select by numbers - select items to be deleted by numbers\n" "ask each - confirm each deletion (like \"rm -i\")\n" "quit - stop cleaning\n" "help - this screen\n" "? - help for prompt selection" msgstr "" #: builtin/clean.c:818 msgid "*** Commands ***" msgstr "" #: builtin/clean.c:819 msgid "What now" msgstr "" #: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" #: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "" #: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "" #: builtin/clean.c:877 msgid "force" msgstr "" #: builtin/clean.c:878 msgid "interactive cleaning" msgstr "" #: builtin/clean.c:880 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 msgid "pattern" msgstr "" #: builtin/clean.c:882 msgid "add to ignore rules" msgstr "" #: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "" #: builtin/clean.c:885 msgid "remove only ignored files" msgstr "" #: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "" #: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" #: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" #: builtin/clone.c:37 msgid "git clone [] [--] []" 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 msgid "don't create a checkout" msgstr "" #: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 msgid "create a bare repository" msgstr "" #: builtin/clone.c:73 msgid "create a mirror repository (implies bare)" msgstr "" #: builtin/clone.c:75 msgid "to clone from a local repository" msgstr "" #: builtin/clone.c:77 msgid "don't use local hardlinks, always copy" msgstr "" #: builtin/clone.c:79 msgid "setup as shared repository" msgstr "" #: builtin/clone.c:81 builtin/clone.c:83 msgid "initialize submodules in the clone" msgstr "" #: builtin/clone.c:84 builtin/init-db.c:493 msgid "template-directory" msgstr "" #: builtin/clone.c:85 builtin/init-db.c:494 msgid "directory from which templates will be used" msgstr "" #: builtin/clone.c:87 msgid "reference repository" msgstr "" #: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "" #: builtin/clone.c:89 msgid "use instead of 'origin' to track upstream" msgstr "" #: builtin/clone.c:91 msgid "checkout instead of the remote's HEAD" msgstr "" #: builtin/clone.c:93 msgid "path to git-upload-pack on the remote" msgstr "" #: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "" #: builtin/clone.c:95 msgid "create a shallow clone of that depth" msgstr "" #: builtin/clone.c:97 msgid "clone only one branch, HEAD or --branch" msgstr "" #: builtin/clone.c:99 msgid "use --reference only while cloning" msgstr "" #: builtin/clone.c:100 builtin/init-db.c:502 msgid "gitdir" msgstr "" #: builtin/clone.c:101 builtin/init-db.c:503 msgid "separate git dir from working tree" msgstr "" #: builtin/clone.c:102 msgid "key=value" msgstr "" #: builtin/clone.c:103 msgid "set config inside the new repository" msgstr "" #: builtin/clone.c:256 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" #: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is shallow" msgstr "" #: builtin/clone.c:263 #, c-format msgid "reference repository '%s' is grafted" msgstr "" #: builtin/clone.c:325 #, c-format msgid "failed to create directory '%s'" msgstr "" #: builtin/clone.c:327 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "" #: builtin/clone.c:329 #, c-format msgid "%s exists and is not a directory" msgstr "" #: builtin/clone.c:343 #, c-format msgid "failed to stat %s\n" msgstr "" #: builtin/clone.c:365 #, c-format msgid "failed to create link '%s'" msgstr "" #: builtin/clone.c:369 #, c-format msgid "failed to copy file to '%s'" msgstr "" #: builtin/clone.c:392 builtin/clone.c:566 #, c-format msgid "done.\n" msgstr "" #: builtin/clone.c:404 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 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" #: builtin/clone.c:561 #, c-format msgid "Checking connectivity... " msgstr "" #: builtin/clone.c:564 msgid "remote did not send all necessary objects" msgstr "" #: builtin/clone.c:628 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" #: builtin/clone.c:659 msgid "unable to checkout working tree" msgstr "" #: builtin/clone.c:746 msgid "cannot repack to clean up" msgstr "" #: builtin/clone.c:748 msgid "cannot unlink temporary alternates file" msgstr "" #: builtin/clone.c:778 msgid "Too many arguments." msgstr "" #: builtin/clone.c:782 msgid "You must specify a repository to clone." msgstr "" #: builtin/clone.c:793 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" #: builtin/clone.c:796 msgid "--bare and --separate-git-dir are incompatible." msgstr "" #: builtin/clone.c:809 #, c-format msgid "repository '%s' does not exist" msgstr "" #: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "" #: builtin/clone.c:825 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" #: builtin/clone.c:835 #, c-format msgid "working tree '%s' already exists." msgstr "" #: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "" #: builtin/clone.c:853 #, c-format msgid "could not create work tree dir '%s'" msgstr "" #: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" #: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "" #: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "" #: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" #: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "" #: builtin/clone.c:921 msgid "--local is ignored" msgstr "" #: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "" #: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" #: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "" #: builtin/column.c:9 msgid "git column []" msgstr "" #: builtin/column.c:26 msgid "lookup config vars" msgstr "" #: builtin/column.c:27 builtin/column.c:28 msgid "layout to use" msgstr "" #: builtin/column.c:29 msgid "Maximum width" msgstr "" #: builtin/column.c:30 msgid "Padding space on left border" msgstr "" #: builtin/column.c:31 msgid "Padding space on right border" msgstr "" #: builtin/column.c:32 msgid "Padding space between columns" msgstr "" #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "" #: builtin/commit.c:37 msgid "git commit [] [--] ..." msgstr "" #: builtin/commit.c:42 msgid "git status [] [--] ..." msgstr "" #: builtin/commit.c:47 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" "You can suppress this message by setting them explicitly. Run the\n" "following command and follow the instructions in your editor to edit\n" "your configuration file:\n" "\n" " git config --global --edit\n" "\n" "After doing this, you may fix the identity used for this commit with:\n" "\n" " git commit --amend --reset-author\n" msgstr "" #: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" "You can suppress this message by setting them explicitly:\n" "\n" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" "After doing this, you may fix the identity used for this commit with:\n" "\n" " git commit --amend --reset-author\n" msgstr "" #: builtin/commit.c:72 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 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" "\n" " git commit --allow-empty\n" "\n" msgstr "" #: builtin/commit.c:84 msgid "Otherwise, please use 'git reset'\n" msgstr "" #: builtin/commit.c:87 msgid "" "If you wish to skip this commit, use:\n" "\n" " git reset\n" "\n" "Then \"git cherry-pick --continue\" will resume cherry-picking\n" "the remaining commits.\n" msgstr "" #: builtin/commit.c:304 msgid "failed to unpack HEAD tree object" msgstr "" #: builtin/commit.c:344 msgid "unable to create temporary index" msgstr "" #: builtin/commit.c:350 msgid "interactive add failed" msgstr "" #: builtin/commit.c:361 msgid "unable to write index file" msgstr "" #: builtin/commit.c:363 msgid "unable to update temporary index" msgstr "" #: builtin/commit.c:365 msgid "Failed to update main cache tree" msgstr "" #: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "" #: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "" #: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "" #: builtin/commit.c:456 msgid "cannot read the index" msgstr "" #: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "" #: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "" #: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "" #: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "" #: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "" #: builtin/commit.c:653 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 #, c-format msgid "could not lookup commit %s" msgstr "" #: builtin/commit.c:702 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "" #: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "" #: builtin/commit.c:708 #, 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 msgid "could not read SQUASH_MSG" msgstr "" #: builtin/commit.c:738 #, c-format msgid "could not read '%s'" msgstr "" #: builtin/commit.c:785 msgid "could not write commit template" msgstr "" #: builtin/commit.c:803 #, c-format msgid "" "\n" "It looks like you may be committing a merge.\n" "If this is not correct, please remove the file\n" "\t%s\n" "and try again.\n" msgstr "" #: builtin/commit.c:808 #, c-format msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" "If this is not correct, please remove the file\n" "\t%s\n" "and try again.\n" msgstr "" #: builtin/commit.c:821 #, 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 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" #: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" #: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "" #: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" #: builtin/commit.c:881 msgid "Cannot read index" msgstr "" #: builtin/commit.c:938 msgid "Error building trees" msgstr "" #: builtin/commit.c:953 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" #: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" #: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" #: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "" #: builtin/commit.c:1137 msgid "Using both --reset-author and --author does not make sense" msgstr "" #: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "" #: builtin/commit.c:1149 msgid "You are in the middle of a merge -- cannot amend." msgstr "" #: builtin/commit.c:1151 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" #: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "" #: builtin/commit.c:1164 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" #: builtin/commit.c:1166 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" #: builtin/commit.c:1174 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" #: builtin/commit.c:1191 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" #: builtin/commit.c:1193 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 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" #: builtin/commit.c:1209 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "" #: builtin/commit.c:1214 msgid "Paths with -a does not make sense." msgstr "" #: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show status concisely" msgstr "" #: builtin/commit.c:1326 builtin/commit.c:1606 msgid "show branch information" msgstr "" #: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509 msgid "machine-readable output" msgstr "" #: builtin/commit.c:1331 builtin/commit.c:1610 msgid "show status in long format (default)" msgstr "" #: builtin/commit.c:1334 builtin/commit.c:1613 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 msgid "mode" msgstr "" #: builtin/commit.c:1337 builtin/commit.c:1616 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" #: builtin/commit.c:1340 msgid "show ignored files" msgstr "" #: builtin/commit.c:1341 parse-options.h:153 msgid "when" msgstr "" #: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" #: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "" #: builtin/commit.c:1431 msgid "couldn't look up newly created commit" msgstr "" #: builtin/commit.c:1433 msgid "could not parse newly created commit" msgstr "" #: builtin/commit.c:1478 msgid "detached HEAD" msgstr "" #: builtin/commit.c:1481 msgid " (root-commit)" msgstr "" #: builtin/commit.c:1574 msgid "suppress summary after successful commit" msgstr "" #: builtin/commit.c:1575 msgid "show diff in commit message template" msgstr "" #: builtin/commit.c:1577 msgid "Commit message options" msgstr "" #: builtin/commit.c:1578 builtin/tag.c:601 msgid "read message from file" msgstr "" #: builtin/commit.c:1579 msgid "author" msgstr "" #: builtin/commit.c:1579 msgid "override author for commit" msgstr "" #: builtin/commit.c:1580 builtin/gc.c:275 msgid "date" msgstr "" #: builtin/commit.c:1580 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 msgid "message" msgstr "" #: builtin/commit.c:1581 msgid "commit message" msgstr "" #: builtin/commit.c:1582 msgid "reuse and edit message from specified commit" msgstr "" #: builtin/commit.c:1583 msgid "reuse message from specified commit" msgstr "" #: builtin/commit.c:1584 msgid "use autosquash formatted message to fixup specified commit" msgstr "" #: builtin/commit.c:1585 msgid "use autosquash formatted message to squash specified commit" msgstr "" #: builtin/commit.c:1586 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 msgid "add Signed-off-by:" msgstr "" #: builtin/commit.c:1588 msgid "use specified template file" msgstr "" #: builtin/commit.c:1589 msgid "force edit of commit" msgstr "" #: builtin/commit.c:1590 msgid "default" msgstr "" #: builtin/commit.c:1590 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "" #: builtin/commit.c:1591 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 msgid "GPG sign commit" msgstr "" #: builtin/commit.c:1596 msgid "Commit contents options" msgstr "" #: builtin/commit.c:1597 msgid "commit all changed files" msgstr "" #: builtin/commit.c:1598 msgid "add specified files to index for commit" msgstr "" #: builtin/commit.c:1599 msgid "interactively add files" msgstr "" #: builtin/commit.c:1600 msgid "interactively add changes" msgstr "" #: builtin/commit.c:1601 msgid "commit only specified files" msgstr "" #: builtin/commit.c:1602 msgid "bypass pre-commit hook" msgstr "" #: builtin/commit.c:1603 msgid "show what would be committed" msgstr "" #: builtin/commit.c:1614 msgid "amend previous commit" msgstr "" #: builtin/commit.c:1615 msgid "bypass post-rewrite hook" msgstr "" #: builtin/commit.c:1620 msgid "ok to record an empty change" msgstr "" #: builtin/commit.c:1622 msgid "ok to record a change with an empty message" msgstr "" #: builtin/commit.c:1651 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 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" #: builtin/commit.c:1704 msgid "could not read MERGE_MODE" msgstr "" #: builtin/commit.c:1723 #, c-format msgid "could not read commit message: %s" msgstr "" #: builtin/commit.c:1734 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" #: builtin/commit.c:1739 #, 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 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 msgid "git config []" msgstr "" #: builtin/config.c:53 msgid "Config file location" msgstr "" #: builtin/config.c:54 msgid "use global config file" msgstr "" #: builtin/config.c:55 msgid "use system config file" msgstr "" #: builtin/config.c:56 msgid "use repository config file" msgstr "" #: builtin/config.c:57 msgid "use given config file" msgstr "" #: builtin/config.c:58 msgid "blob-id" msgstr "" #: builtin/config.c:58 msgid "read config from given blob object" msgstr "" #: builtin/config.c:59 msgid "Action" msgstr "" #: builtin/config.c:60 msgid "get value: name [value-regex]" msgstr "" #: builtin/config.c:61 msgid "get all values: key [value-regex]" msgstr "" #: builtin/config.c:62 msgid "get values for regexp: name-regex [value-regex]" msgstr "" #: builtin/config.c:63 msgid "get value specific for the URL: section[.var] URL" msgstr "" #: builtin/config.c:64 msgid "replace all matching variables: name value [value_regex]" msgstr "" #: builtin/config.c:65 msgid "add a new variable: name value" msgstr "" #: builtin/config.c:66 msgid "remove a variable: name [value-regex]" msgstr "" #: builtin/config.c:67 msgid "remove all matches: name [value-regex]" msgstr "" #: builtin/config.c:68 msgid "rename section: old-name new-name" msgstr "" #: builtin/config.c:69 msgid "remove a section: name" msgstr "" #: builtin/config.c:70 msgid "list all" msgstr "" #: builtin/config.c:71 msgid "open an editor" msgstr "" #: builtin/config.c:72 msgid "find the color configured: slot [default]" msgstr "" #: builtin/config.c:73 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" #: builtin/config.c:74 msgid "Type" msgstr "" #: builtin/config.c:75 msgid "value is \"true\" or \"false\"" msgstr "" #: builtin/config.c:76 msgid "value is decimal number" msgstr "" #: builtin/config.c:77 msgid "value is --bool or --int" msgstr "" #: builtin/config.c:78 msgid "value is a path (file or directory name)" msgstr "" #: builtin/config.c:79 msgid "Other" msgstr "" #: builtin/config.c:80 msgid "terminate values with NUL byte" msgstr "" #: builtin/config.c:81 msgid "respect include directives on lookup" msgstr "" #: builtin/config.c:316 msgid "unable to parse default color value" msgstr "" #: builtin/config.c:457 #, c-format msgid "" "# This is Git's per-user configuration file.\n" "[core]\n" "# Please adapt and uncomment the following lines:\n" "#\tuser = %s\n" "#\temail = %s\n" msgstr "" #: builtin/config.c:589 #, c-format msgid "cannot create configuration file %s" msgstr "" #: builtin/count-objects.c:55 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" #: builtin/count-objects.c:65 msgid "print sizes in human readable format" msgstr "" #: builtin/describe.c:17 msgid "git describe [] [...]" msgstr "" #: builtin/describe.c:18 msgid "git describe [] --dirty" msgstr "" #: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "" #: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" #: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" #: builtin/describe.c:250 builtin/log.c:452 #, c-format msgid "Not a valid object name %s" msgstr "" #: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "" #: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "" #: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "" #: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "" #: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" #: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" #: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "" #: builtin/describe.c:374 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" #: builtin/describe.c:396 msgid "find the tag that comes after the commit" msgstr "" #: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "" #: builtin/describe.c:398 msgid "use any ref" msgstr "" #: builtin/describe.c:399 msgid "use any tag, even unannotated" msgstr "" #: builtin/describe.c:400 msgid "always use long format" msgstr "" #: builtin/describe.c:401 msgid "only follow first parent" msgstr "" #: builtin/describe.c:404 msgid "only output exact matches" msgstr "" #: builtin/describe.c:406 msgid "consider most recent tags (default: 10)" msgstr "" #: builtin/describe.c:408 msgid "only consider tags matching " msgstr "" #: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" msgstr "" #: builtin/describe.c:411 msgid "mark" msgstr "" #: builtin/describe.c:412 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "" #: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "" #: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "" #: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "" #: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" #: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "" #: builtin/diff.c:358 msgid "Not a git repository" msgstr "" #: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "" #: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "" #: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "" #: builtin/fast-export.c:24 msgid "git fast-export [rev-list-opts]" msgstr "" #: builtin/fast-export.c:979 msgid "show progress after objects" msgstr "" #: builtin/fast-export.c:981 msgid "select handling of signed tags" msgstr "" #: builtin/fast-export.c:984 msgid "select handling of tags that tag filtered objects" msgstr "" #: builtin/fast-export.c:987 msgid "Dump marks to this file" msgstr "" #: builtin/fast-export.c:989 msgid "Import marks from this file" msgstr "" #: builtin/fast-export.c:991 msgid "Fake a tagger when tags lack one" msgstr "" #: builtin/fast-export.c:993 msgid "Output full tree for each commit" msgstr "" #: builtin/fast-export.c:995 msgid "Use the done feature to terminate the stream" msgstr "" #: builtin/fast-export.c:996 msgid "Skip output of blob data" msgstr "" #: builtin/fast-export.c:997 msgid "refspec" msgstr "" #: builtin/fast-export.c:998 msgid "Apply refspec to exported refs" msgstr "" #: builtin/fast-export.c:999 msgid "anonymize output" msgstr "" #: builtin/fetch.c:19 msgid "git fetch [] [ [...]]" msgstr "" #: builtin/fetch.c:20 msgid "git fetch [] " msgstr "" #: builtin/fetch.c:21 msgid "git fetch --multiple [] [( | )...]" msgstr "" #: builtin/fetch.c:22 msgid "git fetch --all []" msgstr "" #: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "" #: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" #: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "" #: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "" #: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "" #: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "" #: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "" #: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "" #: builtin/fetch.c:103 msgid "on-demand" msgstr "" #: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "" #: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "" #: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "" #: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "" #: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "" #: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "" #: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "" #: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "" #: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "" #: builtin/fetch.c:124 msgid "refmap" msgstr "" #: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "" #: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "" #: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "" #: builtin/fetch.c:460 msgid "[up to date]" msgstr "" #: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" #: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "" #: builtin/fetch.c:486 msgid "[tag update]" msgstr "" #: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr "" #: builtin/fetch.c:506 msgid "[new tag]" msgstr "" #: builtin/fetch.c:509 msgid "[new branch]" msgstr "" #: builtin/fetch.c:512 msgid "[new ref]" msgstr "" #: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "" #: builtin/fetch.c:557 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" msgstr "" #: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" #: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" #: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "" #: builtin/fetch.c:722 #, 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 #, c-format msgid " (%s will become dangling)" msgstr "" #: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr "" #: builtin/fetch.c:799 msgid "[deleted]" msgstr "" #: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "" #: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" #: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" #: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" #: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "" #: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "" #: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "" #: builtin/fetch.c:1079 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 msgid "You need to specify a tag name." msgstr "" #: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "" #: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "" #: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "" #: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "" #: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "" #: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" #: builtin/fmt-merge-msg.c:13 msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--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 entries from shortlog" msgstr "" #: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "" #: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "" #: builtin/fmt-merge-msg.c:670 msgid "use as start of message" msgstr "" #: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "" #: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "" #: builtin/for-each-ref.c:1063 msgid "git for-each-ref [] []" msgstr "" #: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "" #: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "" #: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "" #: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "" #: builtin/for-each-ref.c:1087 msgid "show only matched refs" msgstr "" #: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "" #: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "" #: builtin/for-each-ref.c:1089 msgid "key" msgstr "" #: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "" #: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "" #: builtin/fsck.c:540 msgid "Checking object directories" msgstr "" #: builtin/fsck.c:603 msgid "git fsck [] [...]" msgstr "" #: builtin/fsck.c:609 msgid "show unreachable objects" msgstr "" #: builtin/fsck.c:610 msgid "show dangling objects" msgstr "" #: builtin/fsck.c:611 msgid "report tags" msgstr "" #: builtin/fsck.c:612 msgid "report root nodes" msgstr "" #: builtin/fsck.c:613 msgid "make index objects head nodes" msgstr "" #: builtin/fsck.c:614 msgid "make reflogs head nodes (default)" msgstr "" #: builtin/fsck.c:615 msgid "also consider packs and alternate objects" msgstr "" #: builtin/fsck.c:616 msgid "enable more strict checking" msgstr "" #: builtin/fsck.c:618 msgid "write dangling objects in .git/lost-found" msgstr "" #: builtin/fsck.c:619 builtin/prune.c:108 msgid "show progress" msgstr "" #: builtin/fsck.c:669 msgid "Checking objects" msgstr "" #: builtin/gc.c:24 msgid "git gc []" msgstr "" #: builtin/gc.c:79 #, c-format msgid "Invalid gc.pruneexpire: '%s'" msgstr "" #: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "" #: builtin/gc.c:276 msgid "prune unreferenced objects" msgstr "" #: builtin/gc.c:278 msgid "be more thorough (increased runtime)" msgstr "" #: builtin/gc.c:279 msgid "enable auto-gc mode" msgstr "" #: builtin/gc.c:280 msgid "force running gc even if there may be another gc running" msgstr "" #: builtin/gc.c:321 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" #: builtin/gc.c:323 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" #: builtin/gc.c:324 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" #: builtin/gc.c:342 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" #: builtin/gc.c:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" #: builtin/grep.c:23 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "" #: builtin/grep.c:218 #, c-format msgid "grep: failed to create thread: %s" msgstr "" #: builtin/grep.c:441 builtin/grep.c:476 #, c-format msgid "unable to read tree (%s)" msgstr "" #: builtin/grep.c:491 #, c-format msgid "unable to grep from object of type %s" msgstr "" #: builtin/grep.c:547 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" #: builtin/grep.c:564 #, c-format msgid "cannot open '%s'" msgstr "" #: builtin/grep.c:638 msgid "search in index instead of in the work tree" msgstr "" #: builtin/grep.c:640 msgid "find in contents not managed by git" msgstr "" #: builtin/grep.c:642 msgid "search in both tracked and untracked files" msgstr "" #: builtin/grep.c:644 msgid "ignore files specified via '.gitignore'" msgstr "" #: builtin/grep.c:647 msgid "show non-matching lines" msgstr "" #: builtin/grep.c:649 msgid "case insensitive matching" msgstr "" #: builtin/grep.c:651 msgid "match patterns only at word boundaries" msgstr "" #: builtin/grep.c:653 msgid "process binary files as text" msgstr "" #: builtin/grep.c:655 msgid "don't match patterns in binary files" msgstr "" #: builtin/grep.c:658 msgid "process binary files with textconv filters" msgstr "" #: builtin/grep.c:660 msgid "descend at most levels" msgstr "" #: builtin/grep.c:664 msgid "use extended POSIX regular expressions" msgstr "" #: builtin/grep.c:667 msgid "use basic POSIX regular expressions (default)" msgstr "" #: builtin/grep.c:670 msgid "interpret patterns as fixed strings" msgstr "" #: builtin/grep.c:673 msgid "use Perl-compatible regular expressions" msgstr "" #: builtin/grep.c:676 msgid "show line numbers" msgstr "" #: builtin/grep.c:677 msgid "don't show filenames" msgstr "" #: builtin/grep.c:678 msgid "show filenames" msgstr "" #: builtin/grep.c:680 msgid "show filenames relative to top directory" msgstr "" #: builtin/grep.c:682 msgid "show only filenames instead of matching lines" msgstr "" #: builtin/grep.c:684 msgid "synonym for --files-with-matches" msgstr "" #: builtin/grep.c:687 msgid "show only the names of files without match" msgstr "" #: builtin/grep.c:689 msgid "print NUL after filenames" msgstr "" #: builtin/grep.c:691 msgid "show the number of matches instead of matching lines" msgstr "" #: builtin/grep.c:692 msgid "highlight matches" msgstr "" #: builtin/grep.c:694 msgid "print empty line between matches from different files" msgstr "" #: builtin/grep.c:696 msgid "show filename only once above matches from same file" msgstr "" #: builtin/grep.c:699 msgid "show context lines before and after matches" msgstr "" #: builtin/grep.c:702 msgid "show context lines before matches" msgstr "" #: builtin/grep.c:704 msgid "show context lines after matches" msgstr "" #: builtin/grep.c:705 msgid "shortcut for -C NUM" msgstr "" #: builtin/grep.c:708 msgid "show a line with the function name before matches" msgstr "" #: builtin/grep.c:710 msgid "show the surrounding function" msgstr "" #: builtin/grep.c:713 msgid "read patterns from file" msgstr "" #: builtin/grep.c:715 msgid "match " msgstr "" #: builtin/grep.c:717 msgid "combine patterns specified with -e" msgstr "" #: builtin/grep.c:729 msgid "indicate hit with exit status without output" msgstr "" #: builtin/grep.c:731 msgid "show only matches from files that match all patterns" msgstr "" #: builtin/grep.c:733 msgid "show parse tree for grep expression" msgstr "" #: builtin/grep.c:737 msgid "pager" msgstr "" #: builtin/grep.c:737 msgid "show matching files in the pager" msgstr "" #: builtin/grep.c:740 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" #: builtin/grep.c:741 builtin/show-ref.c:187 msgid "show usage" msgstr "" #: builtin/grep.c:808 msgid "no pattern given." msgstr "" #: builtin/grep.c:866 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." msgstr "" #: builtin/grep.c:897 msgid "--no-index or --untracked cannot be used with revs." msgstr "" #: builtin/grep.c:900 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" #: builtin/grep.c:908 msgid "both --cached and trees are given." msgstr "" #: builtin/hash-object.c:82 msgid "" "git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] " "[--] ..." msgstr "" #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < " msgstr "" #: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "" #: builtin/hash-object.c:94 msgid "object type" msgstr "" #: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "" #: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "" #: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "" #: builtin/hash-object.c:100 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" #: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "" #: builtin/help.c:41 msgid "print all available commands" msgstr "" #: builtin/help.c:42 msgid "print list of useful guides" msgstr "" #: builtin/help.c:43 msgid "show man page" msgstr "" #: builtin/help.c:44 msgid "show manual in web browser" msgstr "" #: builtin/help.c:46 msgid "show info page" msgstr "" #: builtin/help.c:52 msgid "git help [--all] [--guides] [--man | --web | --info] []" msgstr "" #: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "" #: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "" #: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "" #: builtin/help.c:112 #, 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 #, c-format msgid "failed to exec '%s': %s" msgstr "" #: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" #: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" #: builtin/help.c:354 #, c-format msgid "'%s': unknown man viewer." msgstr "" #: builtin/help.c:371 msgid "no man viewer handled the request" msgstr "" #: builtin/help.c:379 msgid "no info viewer handled the request" msgstr "" #: builtin/help.c:428 msgid "Defining attributes per path" msgstr "" #: builtin/help.c:429 msgid "Everyday Git With 20 Commands Or So" msgstr "" #: builtin/help.c:430 msgid "A Git glossary" msgstr "" #: builtin/help.c:431 msgid "Specifies intentionally untracked files to ignore" msgstr "" #: builtin/help.c:432 msgid "Defining submodule properties" msgstr "" #: builtin/help.c:433 msgid "Specifying revisions and ranges for Git" msgstr "" #: builtin/help.c:434 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" #: builtin/help.c:435 msgid "An overview of recommended workflows with Git" msgstr "" #: builtin/help.c:447 msgid "The common Git guides are:\n" msgstr "" #: builtin/help.c:468 builtin/help.c:485 #, c-format msgid "usage: %s%s" msgstr "" #: builtin/help.c:501 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" #: builtin/index-pack.c:150 #, c-format msgid "unable to open %s" msgstr "" #: builtin/index-pack.c:200 #, c-format msgid "object type mismatch at %s" msgstr "" #: builtin/index-pack.c:220 #, c-format msgid "did not receive expected object %s" msgstr "" #: builtin/index-pack.c:223 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" #: builtin/index-pack.c:265 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:275 msgid "early EOF" msgstr "" #: builtin/index-pack.c:276 msgid "read error on input" msgstr "" #: builtin/index-pack.c:288 msgid "used more bytes than were available" msgstr "" #: builtin/index-pack.c:295 msgid "pack too large for current definition of off_t" msgstr "" #: builtin/index-pack.c:311 #, c-format msgid "unable to create '%s'" msgstr "" #: builtin/index-pack.c:316 #, c-format msgid "cannot open packfile '%s'" msgstr "" #: builtin/index-pack.c:330 msgid "pack signature mismatch" msgstr "" #: builtin/index-pack.c:332 #, c-format msgid "pack version % unsupported" msgstr "" #: builtin/index-pack.c:350 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" #: builtin/index-pack.c:471 #, c-format msgid "inflate returned %d" msgstr "" #: builtin/index-pack.c:520 msgid "offset value overflow for delta base object" msgstr "" #: builtin/index-pack.c:528 msgid "delta base offset is out of bound" msgstr "" #: builtin/index-pack.c:536 #, c-format msgid "unknown object type %d" msgstr "" #: builtin/index-pack.c:567 msgid "cannot pread pack file" msgstr "" #: builtin/index-pack.c:569 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:595 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" #: builtin/index-pack.c:689 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "" #: builtin/index-pack.c:755 #, c-format msgid "cannot read existing object %s" msgstr "" #: builtin/index-pack.c:769 #, c-format msgid "invalid blob object %s" msgstr "" #: builtin/index-pack.c:783 #, c-format msgid "invalid %s" msgstr "" #: builtin/index-pack.c:787 msgid "Error in object" msgstr "" #: builtin/index-pack.c:789 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" #: builtin/index-pack.c:861 builtin/index-pack.c:890 msgid "failed to apply delta" msgstr "" #: builtin/index-pack.c:1055 msgid "Receiving objects" msgstr "" #: builtin/index-pack.c:1055 msgid "Indexing objects" msgstr "" #: builtin/index-pack.c:1081 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" #: builtin/index-pack.c:1086 msgid "cannot fstat packfile" msgstr "" #: builtin/index-pack.c:1089 msgid "pack has junk at the end" msgstr "" #: builtin/index-pack.c:1100 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" #: builtin/index-pack.c:1123 msgid "Resolving deltas" msgstr "" #: builtin/index-pack.c:1133 #, c-format msgid "unable to create thread: %s" msgstr "" #: builtin/index-pack.c:1175 msgid "confusion beyond insanity" msgstr "" #: builtin/index-pack.c:1181 #, c-format msgid "completed with %d local objects" msgstr "" #: builtin/index-pack.c:1191 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" #: builtin/index-pack.c:1195 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" #: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "" #: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "" #: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "" #: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "" #: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "" #: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "" #: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%" 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 #, c-format msgid "no threads support, ignoring %s" msgstr "" #: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" #: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" #: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:1524 #, 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" msgstr "" #: builtin/index-pack.c:1601 builtin/index-pack.c:1604 #: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "" #: builtin/index-pack.c:1634 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'" msgstr "" #: builtin/index-pack.c:1655 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 #, c-format msgid "cannot stat '%s'" msgstr "" #: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" msgstr "" #: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" msgstr "" #: builtin/init-db.c:97 #, 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 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" #: builtin/init-db.c:106 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" #: builtin/init-db.c:110 #, c-format msgid "ignoring template %s" msgstr "" #: builtin/init-db.c:136 #, c-format msgid "insanely long template path %s" msgstr "" #: builtin/init-db.c:144 #, c-format msgid "templates not found %s" msgstr "" #: builtin/init-db.c:157 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "" #: builtin/init-db.c:197 #, c-format msgid "insane git directory %s" msgstr "" #: builtin/init-db.c:331 builtin/init-db.c:334 #, c-format msgid "%s already exists" msgstr "" #: builtin/init-db.c:363 #, c-format msgid "unable to handle file type %d" msgstr "" #: builtin/init-db.c:366 #, c-format msgid "unable to move %s to %s" 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 #, 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" msgstr "" #: builtin/init-db.c:428 msgid " shared" msgstr "" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" msgstr "" #: builtin/init-db.c:498 msgid "permissions" msgstr "" #: builtin/init-db.c:499 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 #, c-format msgid "cannot mkdir %s" msgstr "" #: builtin/init-db.c:542 #, c-format msgid "cannot chdir to %s" msgstr "" #: builtin/init-db.c:563 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "" #: builtin/init-db.c:591 #, c-format msgid "Cannot access work tree '%s'" msgstr "" #: builtin/interpret-trailers.c:15 msgid "" "git interpret-trailers [--trim-empty] [(--trailer [(=|:)])...] " "[...]" msgstr "" #: builtin/interpret-trailers.c:25 msgid "trim empty trailers" msgstr "" #: builtin/interpret-trailers.c:26 msgid "trailer" msgstr "" #: builtin/interpret-trailers.c:27 msgid "trailer(s) to add" msgstr "" #: builtin/log.c:41 msgid "git log [] [] [[--] ...]" msgstr "" #: builtin/log.c:42 msgid "git show [] ..." msgstr "" #: builtin/log.c:81 #, c-format msgid "invalid --decorate option: %s" msgstr "" #: builtin/log.c:127 msgid "suppress diff output" msgstr "" #: builtin/log.c:128 msgid "show source" msgstr "" #: builtin/log.c:129 msgid "Use mail map file" msgstr "" #: builtin/log.c:130 msgid "decorate options" msgstr "" #: builtin/log.c:133 msgid "Process line range n,m in file, counting from 1" msgstr "" #: builtin/log.c:229 #, c-format msgid "Final output: %d %s\n" msgstr "" #: builtin/log.c:458 #, c-format msgid "git show %s: bad file" msgstr "" #: builtin/log.c:472 builtin/log.c:564 #, c-format msgid "Could not read object %s" msgstr "" #: builtin/log.c:588 #, c-format msgid "Unknown type: %d" msgstr "" #: builtin/log.c:689 msgid "format.headers without value" msgstr "" #: builtin/log.c:773 msgid "name of output directory is too long" msgstr "" #: builtin/log.c:789 #, c-format msgid "Cannot open patch file %s" msgstr "" #: builtin/log.c:803 msgid "Need exactly one range." msgstr "" #: builtin/log.c:811 msgid "Not a range." msgstr "" #: builtin/log.c:919 msgid "Cover letter needs email format" msgstr "" #: builtin/log.c:998 #, c-format msgid "insane in-reply-to: %s" msgstr "" #: builtin/log.c:1026 msgid "git format-patch [] [ | ]" msgstr "" #: builtin/log.c:1071 msgid "Two output directories?" msgstr "" #: builtin/log.c:1186 msgid "use [PATCH n/m] even with a single patch" msgstr "" #: builtin/log.c:1189 msgid "use [PATCH] even with multiple patches" msgstr "" #: builtin/log.c:1193 msgid "print patches to standard out" msgstr "" #: builtin/log.c:1195 msgid "generate a cover letter" msgstr "" #: builtin/log.c:1197 msgid "use simple number sequence for output file names" msgstr "" #: builtin/log.c:1198 msgid "sfx" msgstr "" #: builtin/log.c:1199 msgid "use instead of '.patch'" msgstr "" #: builtin/log.c:1201 msgid "start numbering patches at instead of 1" msgstr "" #: builtin/log.c:1203 msgid "mark the series as Nth re-roll" msgstr "" #: builtin/log.c:1205 msgid "Use [] instead of [PATCH]" msgstr "" #: builtin/log.c:1208 msgid "store resulting files in " msgstr "" #: builtin/log.c:1211 msgid "don't strip/add [PATCH]" msgstr "" #: builtin/log.c:1214 msgid "don't output binary diffs" msgstr "" #: builtin/log.c:1216 msgid "don't include a patch matching a commit upstream" msgstr "" #: builtin/log.c:1218 msgid "show patch format instead of default (patch + stat)" msgstr "" #: builtin/log.c:1220 msgid "Messaging" msgstr "" #: builtin/log.c:1221 msgid "header" msgstr "" #: builtin/log.c:1222 msgid "add email header" msgstr "" #: builtin/log.c:1223 builtin/log.c:1225 msgid "email" msgstr "" #: builtin/log.c:1223 msgid "add To: header" msgstr "" #: builtin/log.c:1225 msgid "add Cc: header" msgstr "" #: builtin/log.c:1227 msgid "ident" msgstr "" #: builtin/log.c:1228 msgid "set From address to (or committer ident if absent)" msgstr "" #: builtin/log.c:1230 msgid "message-id" msgstr "" #: builtin/log.c:1231 msgid "make first mail a reply to " msgstr "" #: builtin/log.c:1232 builtin/log.c:1235 msgid "boundary" msgstr "" #: builtin/log.c:1233 msgid "attach the patch" msgstr "" #: builtin/log.c:1236 msgid "inline the patch" msgstr "" #: builtin/log.c:1240 msgid "enable message threading, styles: shallow, deep" msgstr "" #: builtin/log.c:1242 msgid "signature" msgstr "" #: builtin/log.c:1243 msgid "add a signature" msgstr "" #: builtin/log.c:1245 msgid "add a signature from a file" msgstr "" #: builtin/log.c:1246 msgid "don't print the patch filenames" msgstr "" #: builtin/log.c:1320 #, c-format msgid "invalid ident line: %s" msgstr "" #: builtin/log.c:1335 msgid "-n and -k are mutually exclusive." msgstr "" #: builtin/log.c:1337 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" #: builtin/log.c:1345 msgid "--name-only does not make sense" msgstr "" #: builtin/log.c:1347 msgid "--name-status does not make sense" msgstr "" #: builtin/log.c:1349 msgid "--check does not make sense" msgstr "" #: builtin/log.c:1372 msgid "standard output, or directory, which one?" msgstr "" #: builtin/log.c:1374 #, c-format msgid "Could not create directory '%s'" msgstr "" #: builtin/log.c:1472 #, c-format msgid "unable to read signature file '%s'" msgstr "" #: builtin/log.c:1535 msgid "Failed to create output files" msgstr "" #: builtin/log.c:1583 msgid "git cherry [-v] [ [ []]]" msgstr "" #: builtin/log.c:1638 #, c-format msgid "" "Could not find a tracked remote branch, please specify 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 msgid "git ls-files [] [...]" msgstr "" #: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "" #: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" #: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "" #: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "" #: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "" #: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "" #: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "" #: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "" #: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "" #: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "" #: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "" #: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "" #: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "" #: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "" #: builtin/ls-files.c:447 msgid "exclude patterns are read from " msgstr "" #: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in " msgstr "" #: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "" #: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "" #: builtin/ls-files.c:458 msgid "if any is not in the index, treat this as an error" msgstr "" #: builtin/ls-files.c:459 msgid "tree-ish" msgstr "" #: builtin/ls-files.c:460 msgid "pretend that paths removed since are still present" msgstr "" #: builtin/ls-files.c:462 msgid "show debugging data" msgstr "" #: builtin/ls-tree.c:28 msgid "git ls-tree [] [...]" msgstr "" #: builtin/ls-tree.c:127 msgid "only show trees" msgstr "" #: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "" #: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "" #: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "" #: builtin/ls-tree.c:135 msgid "include object size" msgstr "" #: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "" #: builtin/ls-tree.c:142 msgid "use full path names" msgstr "" #: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" #: builtin/merge.c:45 msgid "git merge [] [...]" msgstr "" #: builtin/merge.c:46 msgid "git merge [] HEAD " msgstr "" #: builtin/merge.c:47 msgid "git merge --abort" msgstr "" #: builtin/merge.c:100 msgid "switch `m' requires a value" msgstr "" #: builtin/merge.c:137 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" #: builtin/merge.c:138 #, c-format msgid "Available strategies are:" msgstr "" #: builtin/merge.c:143 #, c-format msgid "Available custom strategies are:" msgstr "" #: builtin/merge.c:193 msgid "do not show a diffstat at the end of the merge" msgstr "" #: builtin/merge.c:196 msgid "show a diffstat at the end of the merge" msgstr "" #: builtin/merge.c:197 msgid "(synonym to --stat)" msgstr "" #: builtin/merge.c:199 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" #: builtin/merge.c:202 msgid "create a single commit instead of doing a merge" msgstr "" #: builtin/merge.c:204 msgid "perform a commit if the merge succeeds (default)" msgstr "" #: builtin/merge.c:206 msgid "edit message before committing" msgstr "" #: builtin/merge.c:207 msgid "allow fast-forward (default)" msgstr "" #: builtin/merge.c:209 msgid "abort if fast-forward is not possible" msgstr "" #: builtin/merge.c:213 msgid "Verify that the named commit has a valid GPG signature" msgstr "" #: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89 msgid "strategy" msgstr "" #: builtin/merge.c:215 msgid "merge strategy to use" msgstr "" #: builtin/merge.c:216 msgid "option=value" msgstr "" #: builtin/merge.c:217 msgid "option for selected merge strategy" msgstr "" #: builtin/merge.c:219 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" #: builtin/merge.c:223 msgid "abort the current in-progress merge" msgstr "" #: builtin/merge.c:251 msgid "could not run stash." msgstr "" #: builtin/merge.c:256 msgid "stash failed" msgstr "" #: builtin/merge.c:261 #, c-format msgid "not a valid object: %s" msgstr "" #: builtin/merge.c:280 builtin/merge.c:297 msgid "read-tree failed" msgstr "" #: builtin/merge.c:327 msgid " (nothing to squash)" msgstr "" #: builtin/merge.c:340 #, 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 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" #: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "" #: builtin/merge.c:559 #, 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 msgid "Not handling anything other than two heads merge." msgstr "" #: builtin/merge.c:692 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" #: builtin/merge.c:705 #, c-format msgid "unable to write %s" msgstr "" #: builtin/merge.c:794 #, c-format msgid "Could not read from '%s'" msgstr "" #: builtin/merge.c:803 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" #: builtin/merge.c:809 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" #: builtin/merge.c:833 msgid "Empty commit message." msgstr "" #: builtin/merge.c:845 #, c-format msgid "Wonderful.\n" msgstr "" #: builtin/merge.c:900 #, 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 msgid "No current branch." msgstr "" #: builtin/merge.c:959 msgid "No remote for the current branch." msgstr "" #: builtin/merge.c:961 msgid "No default upstream defined for the current branch." msgstr "" #: builtin/merge.c:966 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" #: builtin/merge.c:1122 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" #: builtin/merge.c:1138 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 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 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" #: builtin/merge.c:1157 msgid "You cannot combine --squash with --no-ff." msgstr "" #: builtin/merge.c:1166 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 msgid "Squash commit into empty head not supported yet" msgstr "" #: builtin/merge.c:1203 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" #: builtin/merge.c:1208 #, c-format msgid "%s - not something we can merge" msgstr "" #: builtin/merge.c:1259 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" #: builtin/merge.c:1262 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" #: builtin/merge.c:1265 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" #: builtin/merge.c:1268 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" #: builtin/merge.c:1349 #, c-format msgid "Updating %s..%s\n" msgstr "" #: builtin/merge.c:1388 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" #: builtin/merge.c:1395 #, c-format msgid "Nope.\n" msgstr "" #: builtin/merge.c:1427 msgid "Not possible to fast-forward, aborting." msgstr "" #: builtin/merge.c:1450 builtin/merge.c:1529 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" #: builtin/merge.c:1454 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" #: builtin/merge.c:1520 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" #: builtin/merge.c:1522 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" #: builtin/merge.c:1531 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" #: builtin/merge.c:1543 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" #: builtin/merge-base.c:29 msgid "git merge-base [-a | --all] ..." msgstr "" #: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] --octopus ..." msgstr "" #: builtin/merge-base.c:31 msgid "git merge-base --independent ..." msgstr "" #: builtin/merge-base.c:32 msgid "git merge-base --is-ancestor " msgstr "" #: builtin/merge-base.c:33 msgid "git merge-base --fork-point []" msgstr "" #: builtin/merge-base.c:214 msgid "output all common ancestors" msgstr "" #: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" msgstr "" #: builtin/merge-base.c:218 msgid "list revs not reachable from others" msgstr "" #: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" msgstr "" #: builtin/merge-base.c:222 msgid "find where forked from reflog of " msgstr "" #: builtin/merge-file.c:8 msgid "" "git merge-file [] [-L [-L [-L ]]] " " " msgstr "" #: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "" #: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "" #: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "" #: builtin/merge-file.c:45 msgid "set labels for file1/orig-file/file2" msgstr "" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" #: builtin/mktree.c:150 msgid "input is NUL terminated" msgstr "" #: builtin/mktree.c:151 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "" #: builtin/mktree.c:152 msgid "allow creation of more than one tree" msgstr "" #: builtin/mv.c:15 msgid "git mv [] ... " msgstr "" #: builtin/mv.c:69 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "" #: builtin/mv.c:71 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" #: builtin/mv.c:89 #, c-format msgid "%.*s is in index" msgstr "" #: builtin/mv.c:111 msgid "force move/rename even if target exists" msgstr "" #: builtin/mv.c:112 msgid "skip move/rename errors" msgstr "" #: builtin/mv.c:151 #, c-format msgid "destination '%s' is not a directory" msgstr "" #: builtin/mv.c:162 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" #: builtin/mv.c:166 msgid "bad source" msgstr "" #: builtin/mv.c:169 msgid "can not move directory into itself" msgstr "" #: builtin/mv.c:172 msgid "cannot move directory over file" msgstr "" #: builtin/mv.c:181 msgid "source directory is empty" msgstr "" #: builtin/mv.c:206 msgid "not under version control" msgstr "" #: builtin/mv.c:209 msgid "destination exists" msgstr "" #: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "" #: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "" #: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "" #: builtin/mv.c:225 msgid "destination directory does not exist" msgstr "" #: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" #: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "" #: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "" #: builtin/name-rev.c:255 msgid "git name-rev [] ..." msgstr "" #: builtin/name-rev.c:256 msgid "git name-rev [] --all" msgstr "" #: builtin/name-rev.c:257 msgid "git name-rev [] --stdin" msgstr "" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" msgstr "" #: builtin/name-rev.c:310 msgid "only use tags to name the commits" msgstr "" #: builtin/name-rev.c:312 msgid "only use refs matching " msgstr "" #: builtin/name-rev.c:314 msgid "list all commits reachable from all refs" msgstr "" #: builtin/name-rev.c:315 msgid "read from stdin" msgstr "" #: builtin/name-rev.c:316 msgid "allow to print `undefined` names (default)" msgstr "" #: builtin/name-rev.c:322 msgid "dereference tags in the input (internal use)" msgstr "" #: builtin/notes.c:24 msgid "git notes [--ref ] [list []]" msgstr "" #: builtin/notes.c:25 msgid "" "git notes [--ref ] add [-f] [--allow-empty] [-m | -F " "| (-c | -C) ] []" msgstr "" #: builtin/notes.c:26 msgid "git notes [--ref ] copy [-f] " msgstr "" #: builtin/notes.c:27 msgid "" "git notes [--ref ] append [--allow-empty] [-m | -F | " "(-c | -C) ] []" msgstr "" #: builtin/notes.c:28 msgid "git notes [--ref ] edit [--allow-empty] []" msgstr "" #: builtin/notes.c:29 msgid "git notes [--ref ] show []" msgstr "" #: builtin/notes.c:30 msgid "" "git notes [--ref ] merge [-v | -q] [-s ] " msgstr "" #: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" msgstr "" #: builtin/notes.c:32 msgid "git notes merge --abort [-v | -q]" msgstr "" #: builtin/notes.c:33 msgid "git notes [--ref ] remove [...]" msgstr "" #: builtin/notes.c:34 msgid "git notes [--ref ] prune [-n | -v]" msgstr "" #: builtin/notes.c:35 msgid "git notes [--ref ] get-ref" msgstr "" #: builtin/notes.c:40 msgid "git notes [list []]" msgstr "" #: builtin/notes.c:45 msgid "git notes add [] []" msgstr "" #: builtin/notes.c:50 msgid "git notes copy [] " msgstr "" #: builtin/notes.c:51 msgid "git notes copy --stdin [ ]..." msgstr "" #: builtin/notes.c:56 msgid "git notes append [] []" msgstr "" #: builtin/notes.c:61 msgid "git notes edit []" msgstr "" #: builtin/notes.c:66 msgid "git notes show []" msgstr "" #: builtin/notes.c:71 msgid "git notes merge [] " msgstr "" #: builtin/notes.c:72 msgid "git notes merge --commit []" msgstr "" #: builtin/notes.c:73 msgid "git notes merge --abort []" msgstr "" #: builtin/notes.c:78 msgid "git notes remove []" msgstr "" #: builtin/notes.c:83 msgid "git notes prune []" msgstr "" #: builtin/notes.c:88 msgid "git notes get-ref" msgstr "" #: builtin/notes.c:146 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" #: builtin/notes.c:150 msgid "could not read 'show' output" msgstr "" #: builtin/notes.c:158 #, 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" msgstr "" #: builtin/notes.c:201 msgid "unable to write note object" msgstr "" #: builtin/notes.c:203 #, c-format msgid "The note contents have been left in %s" msgstr "" #: builtin/notes.c:231 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "" #: builtin/notes.c:233 builtin/tag.c:696 #, 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 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" #: builtin/notes.c:255 #, c-format msgid "Failed to read object '%s'." msgstr "" #: builtin/notes.c:259 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "" #: builtin/notes.c:299 #, c-format msgid "Malformed input line: '%s'." msgstr "" #: builtin/notes.c:314 #, c-format 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 msgid "too many parameters" msgstr "" #: builtin/notes.c:371 builtin/notes.c:658 #, c-format msgid "No note found for object %s." msgstr "" #: builtin/notes.c:392 builtin/notes.c:555 msgid "note contents as a string" msgstr "" #: builtin/notes.c:395 builtin/notes.c:558 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 msgid "reuse and edit specified note object" msgstr "" #: builtin/notes.c:401 builtin/notes.c:564 msgid "reuse specified note object" msgstr "" #: builtin/notes.c:404 builtin/notes.c:567 msgid "allow storing empty note" msgstr "" #: builtin/notes.c:405 builtin/notes.c:476 msgid "replace existing notes" msgstr "" #: builtin/notes.c:430 #, 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 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" #: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859 #, c-format msgid "Removing note for object %s\n" msgstr "" #: builtin/notes.c:477 msgid "read objects from stdin" msgstr "" #: builtin/notes.c:479 msgid "load rewriting config for (implies --stdin)" msgstr "" #: builtin/notes.c:497 msgid "too few parameters" msgstr "" #: builtin/notes.c:518 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" #: builtin/notes.c:530 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" #: builtin/notes.c:582 #, 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 msgid "General options" msgstr "" #: builtin/notes.c:752 msgid "Merge options" msgstr "" #: builtin/notes.c:754 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" #: builtin/notes.c:756 msgid "Committing unmerged notes" msgstr "" #: builtin/notes.c:758 msgid "finalize notes merge by committing unmerged notes" msgstr "" #: builtin/notes.c:760 msgid "Aborting notes merge resolution" msgstr "" #: builtin/notes.c:762 msgid "abort notes merge" msgstr "" #: builtin/notes.c:857 #, c-format msgid "Object %s has no note\n" msgstr "" #: builtin/notes.c:869 msgid "attempt to remove non-existent note is not an error" msgstr "" #: builtin/notes.c:872 msgid "read object names from the standard input" msgstr "" #: builtin/notes.c:953 msgid "notes-ref" msgstr "" #: builtin/notes.c:954 msgid "use notes from " msgstr "" #: builtin/notes.c:989 builtin/remote.c:1621 #, c-format msgid "Unknown subcommand: %s" msgstr "" #: builtin/pack-objects.c:28 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]" msgstr "" #: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "" #: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "" #: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" #: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "" #: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "" #: builtin/pack-objects.c:2574 #, 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 msgid "do not show progress meter" msgstr "" #: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "" #: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "" #: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "" #: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "" #: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "" #: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "" #: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "" #: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "" #: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "" #: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "" #: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" #: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "" #: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "" #: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "" #: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "" #: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "" #: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "" #: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "" #: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "" #: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "" #: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "" #: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "" #: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "" #: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "" #: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "" #: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than