# 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: 2014-02-01 08:06+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:57 #, c-format msgid "hint: %.*s\n" msgstr "" #. #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. #: advice.c:87 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm ' as\n" "appropriate to mark resolution and make a commit,\n" "or use 'git commit -a'." msgstr "" #: archive.c:10 msgid "git archive [options] [...]" msgstr "" #: archive.c:11 msgid "git archive --list" msgstr "" #: archive.c:12 msgid "" "git archive --remote [--exec ] [options] [...]" msgstr "" #: archive.c:13 msgid "git archive --remote [--exec ] --list" msgstr "" #: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" #: archive.c:327 msgid "fmt" msgstr "" #: archive.c:327 msgid "archive format" msgstr "" #: archive.c:328 builtin/log.c:1193 msgid "prefix" msgstr "" #: archive.c:329 msgid "prepend prefix to each pathname in the archive" msgstr "" #: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265 #: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 msgid "file" msgstr "" #: archive.c:331 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" #: archive.c:333 msgid "read .gitattributes in working directory" msgstr "" #: archive.c:334 msgid "report archived files on stderr" msgstr "" #: archive.c:335 msgid "store only" msgstr "" #: archive.c:336 msgid "compress faster" msgstr "" #: archive.c:344 msgid "compress better" msgstr "" #: archive.c:347 msgid "list supported archive formats" msgstr "" #: archive.c:349 builtin/archive.c:90 builtin/clone.c:84 msgid "repo" msgstr "" #: archive.c:350 builtin/archive.c:91 msgid "retrieve the archive from remote repository " msgstr "" #: archive.c:351 builtin/archive.c:92 builtin/notes.c:487 msgid "command" msgstr "" #: archive.c:352 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" #: attr.c:259 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:82 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "" #: branch.c:83 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "" #: branch.c:87 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "" #: branch.c:88 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "" #: branch.c:92 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "" #: branch.c:93 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "" #: branch.c:97 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "" #: branch.c:98 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "" #: branch.c:118 #, c-format msgid "Tracking not set up: name too long: %s" msgstr "" #: branch.c:137 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" #: branch.c:182 #, c-format msgid "'%s' is not a valid branch name." msgstr "" #: branch.c:187 #, c-format msgid "A branch named '%s' already exists." msgstr "" #: branch.c:195 msgid "Cannot force update the current branch." msgstr "" #: branch.c:215 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" #: branch.c:217 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" #: branch.c:219 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:264 #, c-format msgid "Not a valid object name: '%s'." msgstr "" #: branch.c:284 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" #: branch.c:289 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" #: branch.c:295 msgid "Failed to lock ref for update" msgstr "" #: branch.c:313 msgid "Failed to write ref" msgstr "" #: bundle.c:37 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" #: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" #: bundle.c:90 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "" #: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "" #: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "" #: bundle.c:187 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" #: bundle.c:194 msgid "The bundle records a complete history." msgstr "" #: bundle.c:196 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" #: bundle.c:296 msgid "rev-list died" msgstr "" #: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "" #: bundle.c:337 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" #: bundle.c:382 msgid "Refusing to create empty bundle." msgstr "" #: bundle.c:398 msgid "Could not spawn pack-objects" msgstr "" #: bundle.c:416 msgid "pack-objects died" msgstr "" #: bundle.c:419 #, c-format msgid "cannot create '%s'" msgstr "" #: bundle.c:441 msgid "index-pack died" msgstr "" #: commit.c:53 #, c-format msgid "could not parse %s" msgstr "" #: commit.c:55 #, c-format msgid "%s %s is not a commit!" msgstr "" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "" #: connected.c:70 msgid "Could not run 'git rev-list'" msgstr "" #: connected.c:90 #, c-format msgid "failed write to rev-list: %s" msgstr "" #: connected.c:98 #, 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] "" #: 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 "" #: diff.c:113 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" #: diff.c:118 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" #: diff.c:213 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" #: diff.c:263 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" #: diff.c:3509 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" #: diff.c:3523 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" #: gpg-interface.c:59 gpg-interface.c:131 msgid "could not run gpg." msgstr "" #: gpg-interface.c:71 msgid "gpg did not accept the data" msgstr "" #: gpg-interface.c:82 msgid "gpg failed to sign the data" msgstr "" #: gpg-interface.c:115 #, c-format msgid "could not create temporary file '%s': %s" msgstr "" #: gpg-interface.c:118 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "" #: grep.c:1695 #, c-format msgid "'%s': unable to read %s" msgstr "" #: grep.c:1712 #, c-format msgid "'%s': %s" msgstr "" #: grep.c:1723 #, c-format msgid "'%s': short read %s" msgstr "" #: help.c:210 #, c-format msgid "available git commands in '%s'" msgstr "" #: help.c:217 msgid "git commands available from elsewhere on your $PATH" msgstr "" #: help.c:233 msgid "The most commonly used git commands are:" msgstr "" #: help.c:290 #, 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:347 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" #: help.c:369 #, 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:374 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" #: help.c:381 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" #: help.c:385 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 "" #: merge.c:56 msgid "failed to read the cache" msgstr "" #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 #: builtin/clone.c:661 msgid "unable to write new index file" msgstr "" #: merge-recursive.c:190 #, c-format msgid "(bad commit)\n" msgstr "" #: merge-recursive.c:206 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" #: merge-recursive.c:269 msgid "error building trees" msgstr "" #: merge-recursive.c:673 #, c-format msgid "failed to create path '%s'%s" msgstr "" #: merge-recursive.c:684 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" #. something else exists #. .. but not some other error (who really cares what?) #: merge-recursive.c:698 merge-recursive.c:719 msgid ": perhaps a D/F conflict?" msgstr "" #: merge-recursive.c:709 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" #: merge-recursive.c:749 #, c-format msgid "cannot read object %s '%s'" msgstr "" #: merge-recursive.c:751 #, c-format msgid "blob expected for %s '%s'" msgstr "" #: merge-recursive.c:774 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "" #: merge-recursive.c:782 #, c-format msgid "failed to symlink '%s'" msgstr "" #: merge-recursive.c:785 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" #: merge-recursive.c:923 msgid "Failed to execute internal merge" msgstr "" #: merge-recursive.c:927 #, c-format msgid "Unable to add %s to database" msgstr "" #: merge-recursive.c:943 msgid "unsupported object type in the tree" msgstr "" #: merge-recursive.c:1022 merge-recursive.c:1036 #, 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:1028 merge-recursive.c:1041 #, 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:1082 msgid "rename" msgstr "" #: merge-recursive.c:1082 wt-status.c:283 msgid "renamed" msgstr "" #: merge-recursive.c:1138 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" #: merge-recursive.c:1160 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" #: merge-recursive.c:1165 msgid " (left unresolved)" msgstr "" #: merge-recursive.c:1219 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" #: merge-recursive.c:1249 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" #: merge-recursive.c:1448 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" #: merge-recursive.c:1458 #, c-format msgid "Adding merged %s" msgstr "" #: merge-recursive.c:1463 merge-recursive.c:1661 #, c-format msgid "Adding as %s instead" msgstr "" #: merge-recursive.c:1514 #, c-format msgid "cannot read object %s" msgstr "" #: merge-recursive.c:1517 #, c-format msgid "object %s is not a blob" msgstr "" #: merge-recursive.c:1565 msgid "modify" msgstr "" #: merge-recursive.c:1565 wt-status.c:281 msgid "modified" msgstr "" #: merge-recursive.c:1575 msgid "content" msgstr "" #: merge-recursive.c:1582 msgid "add/add" msgstr "" #: merge-recursive.c:1616 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" #: merge-recursive.c:1630 #, c-format msgid "Auto-merging %s" msgstr "" #: merge-recursive.c:1634 git-submodule.sh:1148 msgid "submodule" msgstr "" #: merge-recursive.c:1635 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" #: merge-recursive.c:1725 #, c-format msgid "Removing %s" msgstr "" #: merge-recursive.c:1750 msgid "file/directory" msgstr "" #: merge-recursive.c:1756 msgid "directory/file" msgstr "" #: merge-recursive.c:1761 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" #: merge-recursive.c:1771 #, c-format msgid "Adding %s" msgstr "" #: merge-recursive.c:1788 msgid "Fatal merge failure, shouldn't happen." msgstr "" #: merge-recursive.c:1807 msgid "Already up-to-date!" msgstr "" #: merge-recursive.c:1816 #, c-format msgid "merging of trees %s and %s failed" msgstr "" #: merge-recursive.c:1846 #, c-format msgid "Unprocessed path??? %s" msgstr "" #: merge-recursive.c:1891 msgid "Merging:" msgstr "" #: merge-recursive.c:1904 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" #: merge-recursive.c:1941 msgid "merge returned no commit" msgstr "" #: merge-recursive.c:1998 #, c-format msgid "Could not parse object '%s'" msgstr "" #: merge-recursive.c:2010 builtin/merge.c:665 msgid "Unable to write index." msgstr "" #: notes-utils.c:40 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" #: notes-utils.c:81 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" #: notes-utils.c:91 #, 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:118 #, c-format msgid "Bad %s value: '%s'" msgstr "" #: object.c:202 #, c-format msgid "unable to parse object: %s" msgstr "" #: parse-options.c:537 msgid "..." msgstr "" #: parse-options.c:555 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation #: parse-options.c:559 #, c-format msgid " or: %s" msgstr "" #: parse-options.c:562 #, c-format msgid " %s" msgstr "" #: parse-options.c:596 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 "" #. #. * We may want to substitute "this command" with a command #. * name. E.g. when add--interactive dies when running #. * "checkout -p" #. #: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" #: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" #: pathspec.c:442 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" #: remote.c:753 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" #: remote.c:757 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" #: remote.c:761 #, c-format msgid "%s tracks both %s and %s" msgstr "" #. #. * This last possibility doesn't occur because #. * FETCH_HEAD_IGNORE entries always appear at #. * the end of the list. #. #: remote.c:769 msgid "Internal error" msgstr "" #: remote.c:1871 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" #: remote.c:1875 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" #: remote.c:1878 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" #: remote.c:1882 #, 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:1888 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" #: remote.c:1891 #, 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:1899 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" #: remote.c:1902 #, 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:1912 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" #: run-command.c:80 msgid "open /dev/null failed" msgstr "" #: run-command.c:82 #, c-format msgid "dup2(%d,%d) failed" msgstr "" #: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896 #: builtin/merge.c:1006 builtin/merge.c:1016 #, c-format msgid "Could not open '%s' for writing" msgstr "" #: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786 #: builtin/merge.c:1008 builtin/merge.c:1021 #, c-format msgid "Could not write to '%s'" msgstr "" #: sequencer.c:229 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" #: sequencer.c:232 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:245 sequencer.c:870 sequencer.c:953 #, c-format msgid "Could not write to %s" msgstr "" #: sequencer.c:248 #, c-format msgid "Error wrapping up %s" msgstr "" #: sequencer.c:263 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" #: sequencer.c:265 msgid "Your local changes would be overwritten by revert." msgstr "" #: sequencer.c:268 msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:325 #, c-format msgid "%s: Unable to write new index file" msgstr "" #: sequencer.c:356 msgid "Could not resolve HEAD commit\n" msgstr "" #: sequencer.c:378 msgid "Unable to update cache tree\n" msgstr "" #: sequencer.c:423 #, c-format msgid "Could not parse commit %s\n" msgstr "" #: sequencer.c:428 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" #: sequencer.c:494 msgid "Your index file is unmerged." msgstr "" #: sequencer.c:513 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" #: sequencer.c:521 #, c-format msgid "Commit %s does not have parent %d" msgstr "" #: sequencer.c:525 #, 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:538 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" #: sequencer.c:542 #, c-format msgid "Cannot get commit message for %s" msgstr "" #: sequencer.c:628 #, c-format msgid "could not revert %s... %s" msgstr "" #: sequencer.c:629 #, c-format msgid "could not apply %s... %s" msgstr "" #: sequencer.c:665 msgid "empty commit set passed" msgstr "" #: sequencer.c:673 #, c-format msgid "git %s: failed to read the index" msgstr "" #: sequencer.c:678 #, c-format msgid "git %s: failed to refresh the index" msgstr "" #: sequencer.c:736 #, c-format msgid "Cannot %s during a %s" msgstr "" #: sequencer.c:758 #, c-format msgid "Could not parse line %d." msgstr "" #: sequencer.c:763 msgid "No commits parsed." msgstr "" #: sequencer.c:776 #, c-format msgid "Could not open %s" msgstr "" #: sequencer.c:780 #, c-format msgid "Could not read %s." msgstr "" #: sequencer.c:787 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" #: sequencer.c:815 #, c-format msgid "Invalid key: %s" msgstr "" #: sequencer.c:818 #, c-format msgid "Invalid value for %s: %s" msgstr "" #: sequencer.c:830 #, c-format msgid "Malformed options sheet: %s" msgstr "" #: sequencer.c:851 msgid "a cherry-pick or revert is already in progress" msgstr "" #: sequencer.c:852 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" #: sequencer.c:856 #, c-format msgid "Could not create sequencer directory %s" msgstr "" #: sequencer.c:872 sequencer.c:957 #, c-format msgid "Error wrapping up %s." msgstr "" #: sequencer.c:891 sequencer.c:1025 msgid "no cherry-pick or revert in progress" msgstr "" #: sequencer.c:893 msgid "cannot resolve HEAD" msgstr "" #: sequencer.c:895 msgid "cannot abort from a branch yet to be born" msgstr "" #: sequencer.c:917 builtin/apply.c:4061 #, c-format msgid "cannot open %s: %s" msgstr "" #: sequencer.c:920 #, c-format msgid "cannot read %s: %s" msgstr "" #: sequencer.c:921 msgid "unexpected end of file" msgstr "" #: sequencer.c:927 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" #: sequencer.c:950 #, c-format msgid "Could not format %s." msgstr "" #: sequencer.c:1093 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" #: sequencer.c:1096 #, c-format msgid "%s: bad revision" msgstr "" #: sequencer.c:1130 msgid "Can't revert as initial commit" msgstr "" #: sequencer.c:1131 msgid "Can't cherry-pick into empty head" msgstr "" #: sha1_name.c:439 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:1070 msgid "HEAD does not point to a branch" msgstr "" #: sha1_name.c:1073 #, c-format msgid "No such branch: '%s'" msgstr "" #: sha1_name.c:1075 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" #: sha1_name.c:1079 #, 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 "" #. Maybe the user already did that, don't error out here #: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" #. Maybe the user already did that, don't error out here #: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" #: submodule.c:127 msgid "could not find .gitmodules in index" msgstr "" #: submodule.c:133 msgid "reading updated .gitmodules failed" msgstr "" #: submodule.c:135 msgid "unable to stat updated .gitmodules" msgstr "" #: submodule.c:139 msgid "unable to remove .gitmodules from index" msgstr "" #: submodule.c:141 msgid "adding updated .gitmodules failed" msgstr "" #: submodule.c:143 msgid "staging updated .gitmodules failed" msgstr "" #: submodule.c:1144 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "" #: submodule.c:1155 #, c-format msgid "Could not set core.worktree in %s" 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:422 #, c-format msgid "unable to access '%s': %s" msgstr "" #: wrapper.c:443 #, c-format msgid "unable to access '%s'" msgstr "" #: wrapper.c:454 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" #: wrapper.c:455 msgid "no such user" 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 msgid "Changes to be committed:" msgstr "" #: wt-status.c:216 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:254 msgid "bug" msgstr "" #: wt-status.c:259 msgid "both deleted:" msgstr "" #: wt-status.c:260 msgid "added by us:" msgstr "" #: wt-status.c:261 msgid "deleted by them:" msgstr "" #: wt-status.c:262 msgid "added by them:" msgstr "" #: wt-status.c:263 msgid "deleted by us:" msgstr "" #: wt-status.c:264 msgid "both added:" msgstr "" #: wt-status.c:265 msgid "both modified:" msgstr "" #: wt-status.c:275 msgid "new file" msgstr "" #: wt-status.c:277 msgid "copied" msgstr "" #: wt-status.c:279 msgid "deleted" msgstr "" #: wt-status.c:285 msgid "typechange" msgstr "" #: wt-status.c:287 msgid "unknown" msgstr "" #: wt-status.c:289 msgid "unmerged" msgstr "" #: wt-status.c:336 msgid "new commits, " msgstr "" #: wt-status.c:338 msgid "modified content, " msgstr "" #: wt-status.c:340 msgid "untracked content, " msgstr "" #: wt-status.c:357 #, c-format msgid "bug: unhandled diff status %c" msgstr "" #: wt-status.c:732 msgid "Submodules changed but not updated:" msgstr "" #: wt-status.c:734 msgid "Submodule changes to be committed:" msgstr "" #: wt-status.c:836 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" #: wt-status.c:899 msgid "You have unmerged paths." msgstr "" #: wt-status.c:902 msgid " (fix conflicts and run \"git commit\")" msgstr "" #: wt-status.c:905 msgid "All conflicts fixed but you are still merging." msgstr "" #: wt-status.c:908 msgid " (use \"git commit\" to conclude merge)" msgstr "" #: wt-status.c:918 msgid "You are in the middle of an am session." msgstr "" #: wt-status.c:921 msgid "The current patch is empty." msgstr "" #: wt-status.c:925 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" #: wt-status.c:927 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" #: wt-status.c:929 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" #: wt-status.c:989 wt-status.c:1006 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" #: wt-status.c:994 wt-status.c:1011 msgid "You are currently rebasing." msgstr "" #: wt-status.c:997 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" #: wt-status.c:999 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" #: wt-status.c:1001 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" #: wt-status.c:1014 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" #: wt-status.c:1018 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" #: wt-status.c:1023 msgid "You are currently splitting a commit during a rebase." msgstr "" #: wt-status.c:1026 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" #: wt-status.c:1030 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" #: wt-status.c:1035 msgid "You are currently editing a commit during a rebase." msgstr "" #: wt-status.c:1038 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" #: wt-status.c:1040 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" #: wt-status.c:1050 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" #: wt-status.c:1055 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" #: wt-status.c:1058 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" #: wt-status.c:1060 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" #: wt-status.c:1069 #, c-format msgid "You are currently reverting commit %s." msgstr "" #: wt-status.c:1074 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" #: wt-status.c:1077 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" #: wt-status.c:1079 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" #: wt-status.c:1090 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" #: wt-status.c:1094 msgid "You are currently bisecting." msgstr "" #: wt-status.c:1097 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" #: wt-status.c:1272 msgid "On branch " msgstr "" #: wt-status.c:1279 msgid "rebase in progress; onto " msgstr "" #: wt-status.c:1286 msgid "HEAD detached at " msgstr "" #: wt-status.c:1288 msgid "HEAD detached from " msgstr "" #: wt-status.c:1291 msgid "Not currently on any branch." msgstr "" #: wt-status.c:1308 msgid "Initial commit" msgstr "" #: wt-status.c:1322 msgid "Untracked files" msgstr "" #: wt-status.c:1324 msgid "Ignored files" msgstr "" #: wt-status.c:1328 #, 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:1334 #, c-format msgid "Untracked files not listed%s" msgstr "" #: wt-status.c:1336 msgid " (use -u option to show untracked files)" msgstr "" #: wt-status.c:1342 msgid "No changes" msgstr "" #: wt-status.c:1347 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" #: wt-status.c:1350 #, c-format msgid "no changes added to commit\n" msgstr "" #: wt-status.c:1353 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" #: wt-status.c:1356 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" #: wt-status.c:1359 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" #: wt-status.c:1362 wt-status.c:1367 #, c-format msgid "nothing to commit\n" msgstr "" #: wt-status.c:1365 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" #: wt-status.c:1369 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" #: wt-status.c:1478 msgid "HEAD (no branch)" msgstr "" #: wt-status.c:1484 msgid "Initial commit on " msgstr "" #: wt-status.c:1514 msgid "gone" msgstr "" #: wt-status.c:1516 msgid "behind " msgstr "" #: wt-status.c:1519 wt-status.c:1522 msgid "ahead " msgstr "" #: wt-status.c:1524 msgid ", behind " msgstr "" #: compat/precompose_utf8.c:55 builtin/clone.c:356 #, c-format msgid "failed to unlink '%s'" msgstr "" #: builtin/add.c:20 msgid "git add [options] [--] ..." msgstr "" #. #. * To be consistent with "git add -p" and most Git #. * commands, we should default to being tree-wide, but #. * this is not the original behavior and can't be #. * changed until users trained themselves not to type #. * "git add -u" or "git add -A". For now, we warn and #. * keep the old behavior. Later, the behavior can be changed #. * to tree-wide, keeping the warning for a while, and #. * eventually we can drop the warning. #. #: builtin/add.c:58 #, c-format msgid "" "The behavior of 'git add %s (or %s)' with no path argument from a\n" "subdirectory of the tree will change in Git 2.0 and should not be used " "anymore.\n" "To add content for the whole tree, run:\n" "\n" " git add %s :/\n" " (or git add %s :/)\n" "\n" "To restrict the command to the current directory, run:\n" "\n" " git add %s .\n" " (or git add %s .)\n" "\n" "With the current Git version, the command is restricted to the current " "directory.\n" msgstr "" #: builtin/add.c:100 #, c-format msgid "" "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" "whose behaviour will change in Git 2.0 with respect to paths you removed.\n" "Paths like '%s' that are\n" "removed from your working tree are ignored with this version of Git.\n" "\n" "* 'git add --ignore-removal ', which is the current default,\n" " ignores paths you removed from your working tree.\n" "\n" "* 'git add --all ' will let you also record the removals.\n" "\n" "Run 'git status' to check the paths you removed from your working tree.\n" msgstr "" #: builtin/add.c:144 #, c-format msgid "unexpected diff status %c" msgstr "" #: builtin/add.c:149 builtin/commit.c:260 msgid "updating files failed" msgstr "" #: builtin/add.c:163 #, c-format msgid "remove '%s'\n" msgstr "" #: builtin/add.c:237 msgid "Unstaged changes after refreshing the index:" msgstr "" #: builtin/add.c:299 msgid "Could not read the index" msgstr "" #: builtin/add.c:310 #, c-format msgid "Could not open '%s' for writing." msgstr "" #: builtin/add.c:314 msgid "Could not write patch" msgstr "" #: builtin/add.c:319 #, c-format msgid "Could not stat '%s'" msgstr "" #: builtin/add.c:321 msgid "Empty patch. Aborted." msgstr "" #: builtin/add.c:327 #, c-format msgid "Could not apply '%s'" msgstr "" #: builtin/add.c:337 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" #: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70 #: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344 #: builtin/rm.c:269 msgid "dry run" msgstr "" #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 #: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 msgid "be verbose" msgstr "" #: builtin/add.c:357 msgid "interactive picking" msgstr "" #: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272 msgid "select hunks interactively" msgstr "" #: builtin/add.c:359 msgid "edit current diff and apply" msgstr "" #: builtin/add.c:360 msgid "allow adding otherwise ignored files" msgstr "" #: builtin/add.c:361 msgid "update tracked files" msgstr "" #: builtin/add.c:362 msgid "record only the fact that the path will be added later" msgstr "" #: builtin/add.c:363 msgid "add changes from all tracked and untracked files" msgstr "" #. takes no arguments #: builtin/add.c:366 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" #: builtin/add.c:368 msgid "don't add, only refresh the index" msgstr "" #: builtin/add.c:369 msgid "just skip files which cannot be added because of errors" msgstr "" #: builtin/add.c:370 msgid "check if - even missing - files are ignored in dry run" msgstr "" #: builtin/add.c:392 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" #: builtin/add.c:393 msgid "no files added" msgstr "" #: builtin/add.c:399 msgid "adding files failed" msgstr "" #: builtin/add.c:438 msgid "-A and -u are mutually incompatible" msgstr "" #: builtin/add.c:456 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" #: builtin/add.c:486 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" #: builtin/add.c:487 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 #: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299 msgid "index file corrupt" msgstr "" #: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "" #: builtin/apply.c:57 msgid "git apply [options] [...]" msgstr "" #: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" #: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" #: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" #: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "" #: builtin/apply.c:913 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" #: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" #: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" #: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" #: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" #: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" #: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" #: builtin/apply.c:1496 #, 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 "" #. there has to be one hunk (forward hunk) #: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" #: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "" #: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "" #: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "" #: builtin/apply.c:2688 #, c-format msgid "invalid start of line: '%c'" msgstr "" #: builtin/apply.c:2806 #, 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:2818 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" #: builtin/apply.c:2824 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" #: builtin/apply.c:2843 #, c-format msgid "missing binary patch data for '%s'" msgstr "" #: builtin/apply.c:2946 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" #: builtin/apply.c:2952 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" #: builtin/apply.c:2973 #, c-format msgid "patch failed: %s:%ld" msgstr "" #: builtin/apply.c:3095 #, c-format msgid "cannot checkout %s" msgstr "" #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 #, c-format msgid "read of %s failed" msgstr "" #: builtin/apply.c:3174 builtin/apply.c:3396 #, c-format msgid "path %s has been renamed/deleted" msgstr "" #: builtin/apply.c:3255 builtin/apply.c:3410 #, c-format msgid "%s: does not exist in index" msgstr "" #: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 #, c-format msgid "%s: %s" msgstr "" #: builtin/apply.c:3264 builtin/apply.c:3418 #, c-format msgid "%s: does not match index" msgstr "" #: builtin/apply.c:3366 msgid "removal patch leaves file contents" msgstr "" #: builtin/apply.c:3435 #, c-format msgid "%s: wrong type" msgstr "" #: builtin/apply.c:3437 #, c-format msgid "%s has type %o, expected %o" msgstr "" #: builtin/apply.c:3538 #, c-format msgid "%s: already exists in index" msgstr "" #: builtin/apply.c:3541 #, c-format msgid "%s: already exists in working directory" msgstr "" #: builtin/apply.c:3561 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" #: builtin/apply.c:3566 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" #: builtin/apply.c:3574 #, c-format msgid "%s: patch does not apply" msgstr "" #: builtin/apply.c:3587 #, c-format msgid "Checking patch %s..." msgstr "" #: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" #: builtin/apply.c:3823 #, c-format msgid "unable to remove %s from index" msgstr "" #: builtin/apply.c:3851 #, c-format msgid "corrupt patch for submodule %s" msgstr "" #: builtin/apply.c:3855 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" #: builtin/apply.c:3860 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" #: builtin/apply.c:3863 builtin/apply.c:3971 #, c-format msgid "unable to add cache entry for %s" msgstr "" #: builtin/apply.c:3896 #, c-format msgid "closing file '%s'" msgstr "" #: builtin/apply.c:3945 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" #: builtin/apply.c:4032 #, c-format msgid "Applied patch %s cleanly." msgstr "" #: builtin/apply.c:4040 msgid "internal error" msgstr "" #. Say this even without --verbose #: builtin/apply.c:4043 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" #: builtin/apply.c:4053 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" #: builtin/apply.c:4074 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" #: builtin/apply.c:4077 #, c-format msgid "Rejected hunk #%d." msgstr "" #: builtin/apply.c:4227 msgid "unrecognized input" msgstr "" #: builtin/apply.c:4238 msgid "unable to read index file" msgstr "" #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 #: builtin/fetch.c:78 msgid "path" msgstr "" #: builtin/apply.c:4358 msgid "don't apply changes matching the given path" msgstr "" #: builtin/apply.c:4361 msgid "apply changes matching the given path" msgstr "" #: builtin/apply.c:4363 msgid "num" msgstr "" #: builtin/apply.c:4364 msgid "remove leading slashes from traditional diff paths" msgstr "" #: builtin/apply.c:4367 msgid "ignore additions made by the patch" msgstr "" #: builtin/apply.c:4369 msgid "instead of applying the patch, output diffstat for the input" msgstr "" #: builtin/apply.c:4373 msgid "show number of added and deleted lines in decimal notation" msgstr "" #: builtin/apply.c:4375 msgid "instead of applying the patch, output a summary for the input" msgstr "" #: builtin/apply.c:4377 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" #: builtin/apply.c:4379 msgid "make sure the patch is applicable to the current index" msgstr "" #: builtin/apply.c:4381 msgid "apply a patch without touching the working tree" msgstr "" #: builtin/apply.c:4383 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" #: builtin/apply.c:4385 msgid "attempt three-way merge if a patch does not apply" msgstr "" #: builtin/apply.c:4387 msgid "build a temporary index based on embedded index information" msgstr "" #: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452 msgid "paths are separated with NUL character" msgstr "" #: builtin/apply.c:4392 msgid "ensure at least lines of context match" msgstr "" #: builtin/apply.c:4393 msgid "action" msgstr "" #: builtin/apply.c:4394 msgid "detect new or modified lines that have whitespace errors" msgstr "" #: builtin/apply.c:4397 builtin/apply.c:4400 msgid "ignore changes in whitespace when finding context" msgstr "" #: builtin/apply.c:4403 msgid "apply the patch in reverse" msgstr "" #: builtin/apply.c:4405 msgid "don't expect at least one line of context" msgstr "" #: builtin/apply.c:4407 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" #: builtin/apply.c:4409 msgid "allow overlapping hunks" msgstr "" #: builtin/apply.c:4412 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" #: builtin/apply.c:4415 msgid "do not trust the line counts in the hunk headers" msgstr "" #: builtin/apply.c:4417 msgid "root" msgstr "" #: builtin/apply.c:4418 msgid "prepend to all filenames" msgstr "" #: builtin/apply.c:4440 msgid "--3way outside a repository" msgstr "" #: builtin/apply.c:4448 msgid "--index outside a repository" msgstr "" #: builtin/apply.c:4451 msgid "--cached outside a repository" msgstr "" #: builtin/apply.c:4467 #, c-format msgid "can't open patch '%s'" msgstr "" #: builtin/apply.c:4481 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" #: builtin/apply.c:4487 builtin/apply.c:4497 #, 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:27 msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "" #: builtin/blame.c:32 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "" #: builtin/blame.c:2249 msgid "Show blame entries as we find them, incrementally" msgstr "" #: builtin/blame.c:2250 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" #: builtin/blame.c:2251 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" #: builtin/blame.c:2252 msgid "Show work cost statistics" msgstr "" #: builtin/blame.c:2253 msgid "Show output score for blame entries" msgstr "" #: builtin/blame.c:2254 msgid "Show original filename (Default: auto)" msgstr "" #: builtin/blame.c:2255 msgid "Show original linenumber (Default: off)" msgstr "" #: builtin/blame.c:2256 msgid "Show in a format designed for machine consumption" msgstr "" #: builtin/blame.c:2257 msgid "Show porcelain format with per-line commit information" msgstr "" #: builtin/blame.c:2258 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" #: builtin/blame.c:2259 msgid "Show raw timestamp (Default: off)" msgstr "" #: builtin/blame.c:2260 msgid "Show long commit SHA1 (Default: off)" msgstr "" #: builtin/blame.c:2261 msgid "Suppress author name and timestamp (Default: off)" msgstr "" #: builtin/blame.c:2262 msgid "Show author email instead of name (Default: off)" msgstr "" #: builtin/blame.c:2263 msgid "Ignore whitespace differences" msgstr "" #: builtin/blame.c:2264 msgid "Spend extra cycles to find better match" msgstr "" #: builtin/blame.c:2265 msgid "Use revisions from instead of calling git-rev-list" msgstr "" #: builtin/blame.c:2266 msgid "Use 's contents as the final image" msgstr "" #: builtin/blame.c:2267 builtin/blame.c:2268 msgid "score" msgstr "" #: builtin/blame.c:2267 msgid "Find line copies within and across files" msgstr "" #: builtin/blame.c:2268 msgid "Find line movements within and across files" msgstr "" #: builtin/blame.c:2269 msgid "n,m" msgstr "" #: builtin/blame.c:2269 msgid "Process only line range n,m, counting from 1" msgstr "" #: builtin/branch.c:24 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" msgstr "" #: builtin/branch.c:25 msgid "git branch [options] [-l] [-f] []" msgstr "" #: builtin/branch.c:26 msgid "git branch [options] [-r] (-d | -D) ..." msgstr "" #: builtin/branch.c:27 msgid "git branch [options] (-m | -M) [] " msgstr "" #: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" #: builtin/branch.c:154 #, 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:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" #: builtin/branch.c:172 #, 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:185 msgid "Update of config-file failed" msgstr "" #: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "" #: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "" #: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" #: builtin/branch.c:240 #, c-format msgid "remote branch '%s' not found." msgstr "" #: builtin/branch.c:241 #, c-format msgid "branch '%s' not found." msgstr "" #: builtin/branch.c:255 #, c-format msgid "Error deleting remote branch '%s'" msgstr "" #: builtin/branch.c:256 #, c-format msgid "Error deleting branch '%s'" msgstr "" #: builtin/branch.c:263 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "" #: builtin/branch.c:264 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" #: builtin/branch.c:366 #, c-format msgid "branch '%s' does not point at a commit" msgstr "" #: builtin/branch.c:454 #, c-format msgid "[%s: gone]" msgstr "" #: builtin/branch.c:459 #, c-format msgid "[%s]" msgstr "" #: builtin/branch.c:464 #, c-format msgid "[%s: behind %d]" msgstr "" #: builtin/branch.c:466 #, c-format msgid "[behind %d]" msgstr "" #: builtin/branch.c:470 #, c-format msgid "[%s: ahead %d]" msgstr "" #: builtin/branch.c:472 #, c-format msgid "[ahead %d]" msgstr "" #: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" #: builtin/branch.c:478 #, c-format msgid "[ahead %d, behind %d]" msgstr "" #: builtin/branch.c:502 msgid " **** invalid ref ****" msgstr "" #: builtin/branch.c:594 #, c-format msgid "(no branch, rebasing %s)" msgstr "" #: builtin/branch.c:597 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" #: builtin/branch.c:600 #, c-format msgid "(detached from %s)" msgstr "" #: builtin/branch.c:603 msgid "(no branch)" msgstr "" #: builtin/branch.c:649 #, c-format msgid "object '%s' does not point to a commit" msgstr "" #: builtin/branch.c:681 msgid "some refs could not be read" msgstr "" #: builtin/branch.c:694 msgid "cannot rename the current branch while not on any." msgstr "" #: builtin/branch.c:704 #, c-format msgid "Invalid branch name: '%s'" msgstr "" #: builtin/branch.c:719 msgid "Branch rename failed" msgstr "" #: builtin/branch.c:723 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" #: builtin/branch.c:727 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" #: builtin/branch.c:734 msgid "Branch is renamed, but update of config-file failed" msgstr "" #: builtin/branch.c:749 #, c-format msgid "malformed object name %s" msgstr "" #: builtin/branch.c:773 #, c-format msgid "could not write branch description template: %s" msgstr "" #: builtin/branch.c:803 msgid "Generic options" msgstr "" #: builtin/branch.c:805 msgid "show hash and subject, give twice for upstream branch" msgstr "" #: builtin/branch.c:806 msgid "suppress informational messages" msgstr "" #: builtin/branch.c:807 msgid "set up tracking mode (see git-pull(1))" msgstr "" #: builtin/branch.c:809 msgid "change upstream info" msgstr "" #: builtin/branch.c:813 msgid "use colored output" msgstr "" #: builtin/branch.c:814 msgid "act on remote-tracking branches" msgstr "" #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 #: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 msgid "commit" msgstr "" #: builtin/branch.c:818 builtin/branch.c:824 msgid "print only branches that contain the commit" msgstr "" #: builtin/branch.c:830 msgid "Specific git-branch actions:" msgstr "" #: builtin/branch.c:831 msgid "list both remote-tracking and local branches" msgstr "" #: builtin/branch.c:833 msgid "delete fully merged branch" msgstr "" #: builtin/branch.c:834 msgid "delete branch (even if not merged)" msgstr "" #: builtin/branch.c:835 msgid "move/rename a branch and its reflog" msgstr "" #: builtin/branch.c:836 msgid "move/rename a branch, even if target exists" msgstr "" #: builtin/branch.c:837 msgid "list branch names" msgstr "" #: builtin/branch.c:838 msgid "create the branch's reflog" msgstr "" #: builtin/branch.c:840 msgid "edit the description for the branch" msgstr "" #: builtin/branch.c:841 msgid "force creation (when already exists)" msgstr "" #: builtin/branch.c:844 msgid "print only not merged branches" msgstr "" #: builtin/branch.c:850 msgid "print only merged branches" msgstr "" #: builtin/branch.c:854 msgid "list branches in columns" msgstr "" #: builtin/branch.c:867 msgid "Failed to resolve HEAD as a valid ref." msgstr "" #: builtin/branch.c:872 builtin/clone.c:635 msgid "HEAD not found below refs/heads!" msgstr "" #: builtin/branch.c:896 msgid "--column and --verbose are incompatible" msgstr "" #: builtin/branch.c:902 builtin/branch.c:941 msgid "branch name required" msgstr "" #: builtin/branch.c:917 msgid "Cannot give description to detached HEAD" msgstr "" #: builtin/branch.c:922 msgid "cannot edit description of more than one branch" msgstr "" #: builtin/branch.c:929 #, c-format msgid "No commit on branch '%s' yet." msgstr "" #: builtin/branch.c:932 #, c-format msgid "No branch named '%s'." msgstr "" #: builtin/branch.c:947 msgid "too many branches for a rename operation" msgstr "" #: builtin/branch.c:952 msgid "too many branches to set new upstream" msgstr "" #: builtin/branch.c:956 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" #: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 #, c-format msgid "no such branch '%s'" msgstr "" #: builtin/branch.c:963 #, c-format msgid "branch '%s' does not exist" msgstr "" #: builtin/branch.c:975 msgid "too many branches to unset upstream" msgstr "" #: builtin/branch.c:979 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" #: builtin/branch.c:985 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" #: builtin/branch.c:999 msgid "it does not make sense to create 'HEAD' manually" msgstr "" #: builtin/branch.c:1005 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" #: builtin/branch.c:1008 #, 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:1025 #, c-format msgid "" "\n" "If you wanted to make '%s' track '%s', do this:\n" "\n" msgstr "" #: builtin/branch.c:1026 #, c-format msgid " git branch -d %s\n" msgstr "" #: builtin/branch.c:1027 #, 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:328 msgid "git cat-file (-t|-s|-e|-p||--textconv) " msgstr "" #: builtin/cat-file.c:329 msgid "git cat-file (--batch|--batch-check) < " msgstr "" #: builtin/cat-file.c:366 msgid " can be one of: blob, tree, commit, tag" msgstr "" #: builtin/cat-file.c:367 msgid "show object type" msgstr "" #: builtin/cat-file.c:368 msgid "show object size" msgstr "" #: builtin/cat-file.c:370 msgid "exit with zero when there's no error" msgstr "" #: builtin/cat-file.c:371 msgid "pretty-print object's content" msgstr "" #: builtin/cat-file.c:373 msgid "for blob objects, run textconv on object's content" msgstr "" #: builtin/cat-file.c:375 msgid "show info and content of objects fed from the standard input" msgstr "" #: builtin/cat-file.c:378 msgid "show info about objects fed from the standard input" msgstr "" #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | attr...] [--] pathname..." msgstr "" #: builtin/check-attr.c:12 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < " msgstr "" #: builtin/check-attr.c:19 msgid "report all attributes set on file" msgstr "" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" msgstr "" #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 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:1090 builtin/gc.c:260 msgid "suppress progress reporting" msgstr "" #: builtin/check-ignore.c:26 msgid "show non-matching input paths" msgstr "" #: builtin/check-ignore.c:28 msgid "ignore index when checking" msgstr "" #: builtin/check-ignore.c:154 msgid "cannot specify pathnames with --stdin" msgstr "" #: builtin/check-ignore.c:157 msgid "-z only makes sense with --stdin" msgstr "" #: builtin/check-ignore.c:159 msgid "no path specified" msgstr "" #: builtin/check-ignore.c:163 msgid "--quiet is only valid with a single pathname" msgstr "" #: builtin/check-ignore.c:165 msgid "cannot have both --quiet and --verbose" msgstr "" #: builtin/check-ignore.c:168 msgid "--non-matching is only valid with --verbose" msgstr "" #: builtin/check-mailmap.c:8 msgid "git check-mailmap [options] ..." 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 [options] [--] [...]" msgstr "" #: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "" #: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "" #: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "" #: builtin/checkout-index.c:192 msgid "don't checkout new files" msgstr "" #: builtin/checkout-index.c:194 msgid "update stat information in the index file" msgstr "" #: builtin/checkout-index.c:200 msgid "read list of paths from the standard input" msgstr "" #: builtin/checkout-index.c:202 msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:203 builtin/column.c:30 msgid "string" msgstr "" #: builtin/checkout-index.c:204 msgid "when creating files, prepend " msgstr "" #: builtin/checkout-index.c:207 msgid "copy out the files from named stage" msgstr "" #: builtin/checkout.c:25 msgid "git checkout [options] " msgstr "" #: builtin/checkout.c:26 msgid "git checkout [options] [] -- ..." msgstr "" #: builtin/checkout.c:114 builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "" #: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "" #: builtin/checkout.c:132 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" #: builtin/checkout.c:176 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" #: builtin/checkout.c:193 #, c-format msgid "path '%s': cannot merge" msgstr "" #: builtin/checkout.c:210 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" #: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238 #: builtin/checkout.c:241 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" #: builtin/checkout.c:244 builtin/checkout.c:247 #, c-format msgid "'%s' cannot be used with %s" msgstr "" #: builtin/checkout.c:250 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" #: builtin/checkout.c:261 builtin/checkout.c:451 msgid "corrupt index file" msgstr "" #: builtin/checkout.c:322 builtin/checkout.c:329 #, c-format msgid "path '%s' is unmerged" msgstr "" #: builtin/checkout.c:473 msgid "you need to resolve your current index first" msgstr "" #: builtin/checkout.c:594 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" #: builtin/checkout.c:632 msgid "HEAD is now at" msgstr "" #: builtin/checkout.c:639 #, c-format msgid "Reset branch '%s'\n" msgstr "" #: builtin/checkout.c:642 #, c-format msgid "Already on '%s'\n" msgstr "" #: builtin/checkout.c:646 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" #: builtin/checkout.c:648 builtin/checkout.c:1033 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" #: builtin/checkout.c:650 #, c-format msgid "Switched to branch '%s'\n" msgstr "" #: builtin/checkout.c:706 #, c-format msgid " ... and %d more.\n" msgstr "" #. The singular version #: builtin/checkout.c:712 #, 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:730 #, 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 new_branch_name %s\n" "\n" msgstr "" #: builtin/checkout.c:760 msgid "internal error in revision walk" msgstr "" #: builtin/checkout.c:764 msgid "Previous HEAD position was" msgstr "" #: builtin/checkout.c:791 builtin/checkout.c:1028 msgid "You are on a branch yet to be born" msgstr "" #: builtin/checkout.c:935 #, c-format msgid "only one reference expected, %d given." msgstr "" #: builtin/checkout.c:974 #, c-format msgid "invalid reference: %s" msgstr "" #. case (1): want a tree #: builtin/checkout.c:1003 #, c-format msgid "reference is not a tree: %s" msgstr "" #: builtin/checkout.c:1042 msgid "paths cannot be used with switching branches" msgstr "" #: builtin/checkout.c:1045 builtin/checkout.c:1049 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" #: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061 #: builtin/checkout.c:1064 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" #: builtin/checkout.c:1069 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "" #: builtin/checkout.c:1092 msgid "create and checkout a new branch" msgstr "" #: builtin/checkout.c:1094 msgid "create/reset and checkout a branch" msgstr "" #: builtin/checkout.c:1095 msgid "create reflog for new branch" msgstr "" #: builtin/checkout.c:1096 msgid "detach the HEAD at named commit" msgstr "" #: builtin/checkout.c:1097 msgid "set upstream info for new branch" msgstr "" #: builtin/checkout.c:1099 msgid "new branch" msgstr "" #: builtin/checkout.c:1099 msgid "new unparented branch" msgstr "" #: builtin/checkout.c:1100 msgid "checkout our version for unmerged files" msgstr "" #: builtin/checkout.c:1102 msgid "checkout their version for unmerged files" msgstr "" #: builtin/checkout.c:1104 msgid "force checkout (throw away local modifications)" msgstr "" #: builtin/checkout.c:1105 msgid "perform a 3-way merge with the new branch" msgstr "" #: builtin/checkout.c:1106 builtin/merge.c:225 msgid "update ignored files (default)" msgstr "" #: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248 msgid "style" msgstr "" #: builtin/checkout.c:1108 msgid "conflict style (merge or diff3)" msgstr "" #: builtin/checkout.c:1111 msgid "do not limit pathspecs to sparse entries only" msgstr "" #: builtin/checkout.c:1113 msgid "second guess 'git checkout no-such-branch'" msgstr "" #: builtin/checkout.c:1136 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" #: builtin/checkout.c:1153 msgid "--track needs a branch name" msgstr "" #: builtin/checkout.c:1160 msgid "Missing branch name; try -b" msgstr "" #: builtin/checkout.c:1197 msgid "invalid path specification" msgstr "" #: builtin/checkout.c:1204 #, 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:1209 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" #: builtin/checkout.c:1213 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:294 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:298 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:516 #, 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 "" #: builtin/clean.c:757 #, c-format msgid "remove %s? " msgstr "" #: builtin/clean.c:782 msgid "Bye." msgstr "" #: builtin/clean.c:790 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:817 msgid "*** Commands ***" msgstr "" #: builtin/clean.c:818 msgid "What now" msgstr "" #: builtin/clean.c:826 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" #: builtin/clean.c:843 msgid "No more files to clean, exiting." msgstr "" #: builtin/clean.c:874 msgid "do not print names of files removed" msgstr "" #: builtin/clean.c:876 msgid "force" msgstr "" #: builtin/clean.c:877 msgid "interactive cleaning" msgstr "" #: builtin/clean.c:879 msgid "remove whole directories" msgstr "" #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 #: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185 msgid "pattern" msgstr "" #: builtin/clean.c:881 msgid "add to ignore rules" msgstr "" #: builtin/clean.c:882 msgid "remove ignored files, too" msgstr "" #: builtin/clean.c:884 msgid "remove only ignored files" msgstr "" #: builtin/clean.c:902 msgid "-x and -X cannot be used together" msgstr "" #: builtin/clean.c:906 msgid "" "clean.requireForce set to true and neither -i, -n nor -f given; refusing to " "clean" msgstr "" #: builtin/clean.c:909 msgid "" "clean.requireForce defaults to true and neither -i, -n nor -f given; " "refusing to clean" msgstr "" #: builtin/clone.c:36 msgid "git clone [options] [--] []" msgstr "" #: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 #: builtin/push.c:521 msgid "force progress reporting" msgstr "" #: builtin/clone.c:66 msgid "don't create a checkout" msgstr "" #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 msgid "create a bare repository" msgstr "" #: builtin/clone.c:71 msgid "create a mirror repository (implies bare)" msgstr "" #: builtin/clone.c:73 msgid "to clone from a local repository" msgstr "" #: builtin/clone.c:75 msgid "don't use local hardlinks, always copy" msgstr "" #: builtin/clone.c:77 msgid "setup as shared repository" msgstr "" #: builtin/clone.c:79 builtin/clone.c:81 msgid "initialize submodules in the clone" msgstr "" #: builtin/clone.c:82 builtin/init-db.c:485 msgid "template-directory" msgstr "" #: builtin/clone.c:83 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "" #: builtin/clone.c:85 msgid "reference repository" msgstr "" #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "" #: builtin/clone.c:87 msgid "use instead of 'origin' to track upstream" msgstr "" #: builtin/clone.c:89 msgid "checkout instead of the remote's HEAD" msgstr "" #: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "" #: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663 msgid "depth" msgstr "" #: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "" #: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "" #: builtin/clone.c:96 builtin/init-db.c:494 msgid "gitdir" msgstr "" #: builtin/clone.c:97 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "" #: builtin/clone.c:98 msgid "key=value" msgstr "" #: builtin/clone.c:99 msgid "set config inside the new repository" msgstr "" #: builtin/clone.c:252 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" #: builtin/clone.c:256 #, c-format msgid "reference repository '%s' is shallow" msgstr "" #: builtin/clone.c:259 #, c-format msgid "reference repository '%s' is grafted" msgstr "" #: builtin/clone.c:321 #, c-format msgid "failed to create directory '%s'" msgstr "" #: builtin/clone.c:323 builtin/diff.c:83 #, c-format msgid "failed to stat '%s'" msgstr "" #: builtin/clone.c:325 #, c-format msgid "%s exists and is not a directory" msgstr "" #: builtin/clone.c:339 #, c-format msgid "failed to stat %s\n" msgstr "" #: builtin/clone.c:361 #, c-format msgid "failed to create link '%s'" msgstr "" #: builtin/clone.c:365 #, c-format msgid "failed to copy file to '%s'" msgstr "" #: builtin/clone.c:388 builtin/clone.c:565 #, c-format msgid "done.\n" msgstr "" #: builtin/clone.c:401 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:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" #: builtin/clone.c:560 #, c-format msgid "Checking connectivity... " msgstr "" #: builtin/clone.c:563 msgid "remote did not send all necessary objects" msgstr "" #: builtin/clone.c:626 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" #: builtin/clone.c:657 msgid "unable to checkout working tree" msgstr "" #: builtin/clone.c:765 msgid "Too many arguments." msgstr "" #: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "" #: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" #: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "" #: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "" #: builtin/clone.c:802 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" #: builtin/clone.c:805 msgid "source repository is shallow, ignoring --local" msgstr "" #: builtin/clone.c:810 msgid "--local is ignored" msgstr "" #: builtin/clone.c:814 builtin/fetch.c:1119 #, c-format msgid "depth %s is not a positive number" msgstr "" #: builtin/clone.c:824 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" #: builtin/clone.c:834 #, c-format msgid "working tree '%s' already exists." msgstr "" #: builtin/clone.c:847 builtin/clone.c:859 #, c-format msgid "could not create leading directories of '%s'" msgstr "" #: builtin/clone.c:850 #, c-format msgid "could not create work tree dir '%s'." msgstr "" #: builtin/clone.c:869 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" #: builtin/clone.c:871 #, c-format msgid "Cloning into '%s'...\n" msgstr "" #: builtin/clone.c:906 #, c-format msgid "Don't know how to clone %s" msgstr "" #: builtin/clone.c:957 builtin/clone.c:965 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" #: builtin/clone.c:968 msgid "You appear to have cloned an empty repository." msgstr "" #: builtin/column.c:9 msgid "git column [options]" msgstr "" #: builtin/column.c:26 msgid "lookup config vars" msgstr "" #: builtin/column.c:27 builtin/column.c:28 msgid "layout to use" msgstr "" #: builtin/column.c:29 msgid "Maximum width" msgstr "" #: builtin/column.c:30 msgid "Padding space on left border" msgstr "" #: builtin/column.c:31 msgid "Padding space on right border" msgstr "" #: builtin/column.c:32 msgid "Padding space between columns" msgstr "" #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "" #: builtin/commit.c:36 msgid "git commit [options] [--] ..." msgstr "" #: builtin/commit.c:41 msgid "git status [options] [--] ..." msgstr "" #: builtin/commit.c:46 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:58 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:63 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:70 msgid "Otherwise, please use 'git reset'\n" msgstr "" #: builtin/commit.c:73 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:287 msgid "failed to unpack HEAD tree object" msgstr "" #: builtin/commit.c:329 msgid "unable to create temporary index" msgstr "" #: builtin/commit.c:335 msgid "interactive add failed" msgstr "" #: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439 msgid "unable to write new_index file" msgstr "" #: builtin/commit.c:420 msgid "cannot do a partial commit during a merge." msgstr "" #: builtin/commit.c:422 msgid "cannot do a partial commit during a cherry-pick." msgstr "" #: builtin/commit.c:432 msgid "cannot read the index" msgstr "" #: builtin/commit.c:452 msgid "unable to write temporary index file" msgstr "" #: builtin/commit.c:543 builtin/commit.c:549 #, c-format msgid "invalid commit: %s" msgstr "" #: builtin/commit.c:571 msgid "malformed --author parameter" msgstr "" #: builtin/commit.c:591 #, c-format msgid "Malformed ident string: '%s'" msgstr "" #: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007 #, c-format msgid "could not lookup commit %s" msgstr "" #: builtin/commit.c:642 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "" #: builtin/commit.c:644 msgid "could not read log from standard input" msgstr "" #: builtin/commit.c:648 #, c-format msgid "could not read log file '%s'" msgstr "" #: builtin/commit.c:654 msgid "commit has empty message" msgstr "" #: builtin/commit.c:670 msgid "could not read MERGE_MSG" msgstr "" #: builtin/commit.c:674 msgid "could not read SQUASH_MSG" msgstr "" #: builtin/commit.c:678 #, c-format msgid "could not read '%s'" msgstr "" #: builtin/commit.c:749 msgid "could not write commit template" msgstr "" #: builtin/commit.c:760 #, 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:765 #, 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:777 #, 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:782 #, 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:795 #, c-format msgid "%sAuthor: %s" msgstr "" #: builtin/commit.c:802 #, c-format msgid "%sCommitter: %s" msgstr "" #: builtin/commit.c:822 msgid "Cannot read index" msgstr "" #: builtin/commit.c:865 msgid "Error building trees" msgstr "" #: builtin/commit.c:880 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" #: builtin/commit.c:982 #, c-format msgid "No existing author found with '%s'" msgstr "" #: builtin/commit.c:997 builtin/commit.c:1237 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" #: builtin/commit.c:1034 msgid "--long and -z are incompatible" msgstr "" #: builtin/commit.c:1064 msgid "Using both --reset-author and --author does not make sense" msgstr "" #: builtin/commit.c:1075 msgid "You have nothing to amend." msgstr "" #: builtin/commit.c:1078 msgid "You are in the middle of a merge -- cannot amend." msgstr "" #: builtin/commit.c:1080 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" #: builtin/commit.c:1083 msgid "Options --squash and --fixup cannot be used together" msgstr "" #: builtin/commit.c:1093 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" #: builtin/commit.c:1095 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" #: builtin/commit.c:1103 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" #: builtin/commit.c:1120 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" #: builtin/commit.c:1122 msgid "No paths with --include/--only does not make sense." msgstr "" #: builtin/commit.c:1124 msgid "Clever... amending the last one with dirty index." msgstr "" #: builtin/commit.c:1126 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" #: builtin/commit.c:1136 builtin/tag.c:572 #, c-format msgid "Invalid cleanup mode %s" msgstr "" #: builtin/commit.c:1141 msgid "Paths with -a does not make sense." msgstr "" #: builtin/commit.c:1251 builtin/commit.c:1482 msgid "show status concisely" msgstr "" #: builtin/commit.c:1253 builtin/commit.c:1484 msgid "show branch information" msgstr "" #: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 msgid "machine-readable output" msgstr "" #: builtin/commit.c:1258 builtin/commit.c:1488 msgid "show status in long format (default)" msgstr "" #: builtin/commit.c:1261 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "" #: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674 #: builtin/fast-export.c:677 builtin/tag.c:459 msgid "mode" msgstr "" #: builtin/commit.c:1264 builtin/commit.c:1494 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" #: builtin/commit.c:1267 msgid "show ignored files" msgstr "" #: builtin/commit.c:1268 parse-options.h:156 msgid "when" msgstr "" #: builtin/commit.c:1269 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" #: builtin/commit.c:1271 msgid "list untracked files in columns" msgstr "" #: builtin/commit.c:1340 msgid "couldn't look up newly created commit" msgstr "" #: builtin/commit.c:1342 msgid "could not parse newly created commit" msgstr "" #: builtin/commit.c:1383 msgid "detached HEAD" msgstr "" #: builtin/commit.c:1385 msgid " (root-commit)" msgstr "" #: builtin/commit.c:1452 msgid "suppress summary after successful commit" msgstr "" #: builtin/commit.c:1453 msgid "show diff in commit message template" msgstr "" #: builtin/commit.c:1455 msgid "Commit message options" msgstr "" #: builtin/commit.c:1456 builtin/tag.c:457 msgid "read message from file" msgstr "" #: builtin/commit.c:1457 msgid "author" msgstr "" #: builtin/commit.c:1457 msgid "override author for commit" msgstr "" #: builtin/commit.c:1458 builtin/gc.c:261 msgid "date" msgstr "" #: builtin/commit.c:1458 msgid "override date for commit" msgstr "" #: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405 #: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "" #: builtin/commit.c:1459 msgid "commit message" msgstr "" #: builtin/commit.c:1460 msgid "reuse and edit message from specified commit" msgstr "" #: builtin/commit.c:1461 msgid "reuse message from specified commit" msgstr "" #: builtin/commit.c:1462 msgid "use autosquash formatted message to fixup specified commit" msgstr "" #: builtin/commit.c:1463 msgid "use autosquash formatted message to squash specified commit" msgstr "" #: builtin/commit.c:1464 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" #: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" #: builtin/commit.c:1466 msgid "use specified template file" msgstr "" #: builtin/commit.c:1467 msgid "force edit of commit" msgstr "" #: builtin/commit.c:1468 msgid "default" msgstr "" #: builtin/commit.c:1468 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "" #: builtin/commit.c:1469 msgid "include status in commit message template" msgstr "" #: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461 msgid "key id" msgstr "" #: builtin/commit.c:1471 builtin/merge.c:224 msgid "GPG sign commit" msgstr "" #. end commit message options #: builtin/commit.c:1474 msgid "Commit contents options" msgstr "" #: builtin/commit.c:1475 msgid "commit all changed files" msgstr "" #: builtin/commit.c:1476 msgid "add specified files to index for commit" msgstr "" #: builtin/commit.c:1477 msgid "interactively add files" msgstr "" #: builtin/commit.c:1478 msgid "interactively add changes" msgstr "" #: builtin/commit.c:1479 msgid "commit only specified files" msgstr "" #: builtin/commit.c:1480 msgid "bypass pre-commit hook" msgstr "" #: builtin/commit.c:1481 msgid "show what would be committed" msgstr "" #: builtin/commit.c:1492 msgid "amend previous commit" msgstr "" #: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "" #: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "" #: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "" #: builtin/commit.c:1529 msgid "could not parse HEAD commit" msgstr "" #: builtin/commit.c:1567 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "" #: builtin/commit.c:1574 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" #: builtin/commit.c:1581 msgid "could not read MERGE_MODE" msgstr "" #: builtin/commit.c:1600 #, c-format msgid "could not read commit message: %s" msgstr "" #: builtin/commit.c:1611 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" #: builtin/commit.c:1616 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" #: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879 msgid "failed to write commit object" msgstr "" #: builtin/commit.c:1652 msgid "cannot lock HEAD ref" msgstr "" #: builtin/commit.c:1656 msgid "cannot update HEAD ref" msgstr "" #: builtin/commit.c:1667 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" #: builtin/config.c:8 msgid "git config [options]" msgstr "" #: builtin/config.c:54 msgid "Config file location" msgstr "" #: builtin/config.c:55 msgid "use global config file" msgstr "" #: builtin/config.c:56 msgid "use system config file" msgstr "" #: builtin/config.c:57 msgid "use repository config file" msgstr "" #: builtin/config.c:58 msgid "use given config file" msgstr "" #: builtin/config.c:59 msgid "blob-id" msgstr "" #: builtin/config.c:59 msgid "read config from given blob object" msgstr "" #: builtin/config.c:60 msgid "Action" msgstr "" #: builtin/config.c:61 msgid "get value: name [value-regex]" msgstr "" #: builtin/config.c:62 msgid "get all values: key [value-regex]" msgstr "" #: builtin/config.c:63 msgid "get values for regexp: name-regex [value-regex]" msgstr "" #: builtin/config.c:64 msgid "get value specific for the URL: section[.var] URL" msgstr "" #: builtin/config.c:65 msgid "replace all matching variables: name value [value_regex]" msgstr "" #: builtin/config.c:66 msgid "add a new variable: name value" msgstr "" #: builtin/config.c:67 msgid "remove a variable: name [value-regex]" msgstr "" #: builtin/config.c:68 msgid "remove all matches: name [value-regex]" msgstr "" #: builtin/config.c:69 msgid "rename section: old-name new-name" msgstr "" #: builtin/config.c:70 msgid "remove a section: name" msgstr "" #: builtin/config.c:71 msgid "list all" msgstr "" #: builtin/config.c:72 msgid "open an editor" msgstr "" #: builtin/config.c:73 builtin/config.c:74 msgid "slot" msgstr "" #: builtin/config.c:73 msgid "find the color configured: [default]" msgstr "" #: builtin/config.c:74 msgid "find the color setting: [stdout-is-tty]" msgstr "" #: builtin/config.c:75 msgid "Type" msgstr "" #: builtin/config.c:76 msgid "value is \"true\" or \"false\"" msgstr "" #: builtin/config.c:77 msgid "value is decimal number" msgstr "" #: builtin/config.c:78 msgid "value is --bool or --int" msgstr "" #: builtin/config.c:79 msgid "value is a path (file or directory name)" msgstr "" #: builtin/config.c:80 msgid "Other" msgstr "" #: builtin/config.c:81 msgid "terminate values with NUL byte" msgstr "" #: builtin/config.c:82 msgid "respect include directives on lookup" msgstr "" #: builtin/count-objects.c:82 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" #: builtin/count-objects.c:97 msgid "print sizes in human readable format" msgstr "" #: builtin/describe.c:16 msgid "git describe [options] *" msgstr "" #: builtin/describe.c:17 msgid "git describe [options] --dirty" msgstr "" #: builtin/describe.c:237 #, c-format msgid "annotated tag %s not available" msgstr "" #: builtin/describe.c:241 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" #: builtin/describe.c:243 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" #: builtin/describe.c:270 #, c-format msgid "Not a valid object name %s" msgstr "" #: builtin/describe.c:273 #, c-format msgid "%s is not a valid '%s' object" msgstr "" #: builtin/describe.c:290 #, c-format msgid "no tag exactly matches '%s'" msgstr "" #: builtin/describe.c:292 #, c-format msgid "searching to describe %s\n" msgstr "" #: builtin/describe.c:332 #, c-format msgid "finished search at %s\n" msgstr "" #: builtin/describe.c:359 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" #: builtin/describe.c:363 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" #: builtin/describe.c:384 #, c-format msgid "traversed %lu commits\n" msgstr "" #: builtin/describe.c:387 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" #: builtin/describe.c:409 msgid "find the tag that comes after the commit" msgstr "" #: builtin/describe.c:410 msgid "debug search strategy on stderr" msgstr "" #: builtin/describe.c:411 msgid "use any ref" msgstr "" #: builtin/describe.c:412 msgid "use any tag, even unannotated" msgstr "" #: builtin/describe.c:413 msgid "always use long format" msgstr "" #: builtin/describe.c:414 msgid "only follow first parent" msgstr "" #: builtin/describe.c:417 msgid "only output exact matches" msgstr "" #: builtin/describe.c:419 msgid "consider most recent tags (default: 10)" msgstr "" #: builtin/describe.c:421 msgid "only consider tags matching " msgstr "" #: builtin/describe.c:423 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "" #: builtin/describe.c:424 msgid "mark" msgstr "" #: builtin/describe.c:425 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "" #: builtin/describe.c:443 msgid "--long is incompatible with --abbrev=0" msgstr "" #: builtin/describe.c:469 msgid "No names found, cannot describe anything." msgstr "" #: builtin/describe.c:489 msgid "--dirty is incompatible with commit-ishes" msgstr "" #: builtin/diff.c:85 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" #: builtin/diff.c:236 #, c-format msgid "invalid option: %s" msgstr "" #: builtin/diff.c:357 msgid "Not a git repository" msgstr "" #: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "" #: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "" #: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "" #: builtin/fast-export.c:22 msgid "git fast-export [rev-list-opts]" msgstr "" #: builtin/fast-export.c:673 msgid "show progress after objects" msgstr "" #: builtin/fast-export.c:675 msgid "select handling of signed tags" msgstr "" #: builtin/fast-export.c:678 msgid "select handling of tags that tag filtered objects" msgstr "" #: builtin/fast-export.c:681 msgid "Dump marks to this file" msgstr "" #: builtin/fast-export.c:683 msgid "Import marks from this file" msgstr "" #: builtin/fast-export.c:685 msgid "Fake a tagger when tags lack one" msgstr "" #: builtin/fast-export.c:687 msgid "Output full tree for each commit" msgstr "" #: builtin/fast-export.c:689 msgid "Use the done feature to terminate the stream" msgstr "" #: builtin/fast-export.c:690 msgid "Skip output of blob data" msgstr "" #: builtin/fetch.c:20 msgid "git fetch [] [ [...]]" msgstr "" #: builtin/fetch.c:21 msgid "git fetch [] " msgstr "" #: builtin/fetch.c:22 msgid "git fetch --multiple [] [( | )...]" msgstr "" #: builtin/fetch.c:23 msgid "git fetch --all []" msgstr "" #: builtin/fetch.c:75 msgid "fetch from all remotes" msgstr "" #: builtin/fetch.c:77 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" #: builtin/fetch.c:79 msgid "path to upload pack on remote end" msgstr "" #: builtin/fetch.c:80 msgid "force overwrite of local branch" msgstr "" #: builtin/fetch.c:82 msgid "fetch from multiple remotes" msgstr "" #: builtin/fetch.c:84 msgid "fetch all tags and associated objects" msgstr "" #: builtin/fetch.c:86 msgid "do not fetch all tags (--no-tags)" msgstr "" #: builtin/fetch.c:88 msgid "prune remote-tracking branches no longer on remote" msgstr "" #: builtin/fetch.c:89 msgid "on-demand" msgstr "" #: builtin/fetch.c:90 msgid "control recursive fetching of submodules" msgstr "" #: builtin/fetch.c:94 msgid "keep downloaded pack" msgstr "" #: builtin/fetch.c:96 msgid "allow updating of HEAD ref" msgstr "" #: builtin/fetch.c:99 msgid "deepen history of shallow clone" msgstr "" #: builtin/fetch.c:101 msgid "convert to a complete repository" msgstr "" #: builtin/fetch.c:103 builtin/log.c:1197 msgid "dir" msgstr "" #: builtin/fetch.c:104 msgid "prepend this to submodule path output" msgstr "" #: builtin/fetch.c:107 msgid "default mode for recursion" msgstr "" #: builtin/fetch.c:109 msgid "accept refs that update .git/shallow" msgstr "" #: builtin/fetch.c:347 msgid "Couldn't find remote ref HEAD" msgstr "" #: builtin/fetch.c:411 #, c-format msgid "object %s not found" msgstr "" #: builtin/fetch.c:416 msgid "[up to date]" msgstr "" #: builtin/fetch.c:430 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" #: builtin/fetch.c:431 builtin/fetch.c:517 msgid "[rejected]" msgstr "" #: builtin/fetch.c:442 msgid "[tag update]" msgstr "" #: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 msgid " (unable to update local ref)" msgstr "" #: builtin/fetch.c:462 msgid "[new tag]" msgstr "" #: builtin/fetch.c:465 msgid "[new branch]" msgstr "" #: builtin/fetch.c:468 msgid "[new ref]" msgstr "" #: builtin/fetch.c:513 msgid "unable to update local ref" msgstr "" #: builtin/fetch.c:513 msgid "forced update" msgstr "" #: builtin/fetch.c:519 msgid "(non-fast-forward)" msgstr "" #: builtin/fetch.c:552 builtin/fetch.c:785 #, c-format msgid "cannot open %s: %s\n" msgstr "" #: builtin/fetch.c:561 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" #: builtin/fetch.c:579 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" #: builtin/fetch.c:667 builtin/fetch.c:750 #, c-format msgid "From %.*s\n" msgstr "" #: builtin/fetch.c:678 #, 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:730 #, c-format msgid " (%s will become dangling)" msgstr "" #: builtin/fetch.c:731 #, c-format msgid " (%s has become dangling)" msgstr "" #: builtin/fetch.c:755 msgid "[deleted]" msgstr "" #: builtin/fetch.c:756 builtin/remote.c:1050 msgid "(none)" msgstr "" #: builtin/fetch.c:775 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" #: builtin/fetch.c:794 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" #: builtin/fetch.c:797 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" #: builtin/fetch.c:853 #, c-format msgid "Don't know how to fetch from %s" msgstr "" #: builtin/fetch.c:1015 #, c-format msgid "Fetching %s\n" msgstr "" #: builtin/fetch.c:1017 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "" #: builtin/fetch.c:1036 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:1059 msgid "You need to specify a tag name." msgstr "" #: builtin/fetch.c:1107 msgid "--depth and --unshallow cannot be used together" msgstr "" #: builtin/fetch.c:1109 msgid "--unshallow on a complete repository does not make sense" msgstr "" #: builtin/fetch.c:1132 msgid "fetch --all does not take a repository argument" msgstr "" #: builtin/fetch.c:1134 msgid "fetch --all does not make sense with refspecs" msgstr "" #: builtin/fetch.c:1145 #, c-format msgid "No such remote or remote group: %s" msgstr "" #: builtin/fetch.c:1153 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:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 #: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164 #: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446 #: parse-options.h:135 parse-options.h:242 msgid "n" msgstr "" #: builtin/fmt-merge-msg.c:664 msgid "populate log with at most entries from shortlog" msgstr "" #: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "" #: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "" #: builtin/fmt-merge-msg.c:671 msgid "use as start of message" msgstr "" #: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "" #: builtin/for-each-ref.c:1063 msgid "git for-each-ref [options] []" 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:177 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:607 msgid "git fsck [options] [...]" msgstr "" #: builtin/fsck.c:613 msgid "show unreachable objects" msgstr "" #: builtin/fsck.c:614 msgid "show dangling objects" msgstr "" #: builtin/fsck.c:615 msgid "report tags" msgstr "" #: builtin/fsck.c:616 msgid "report root nodes" msgstr "" #: builtin/fsck.c:617 msgid "make index objects head nodes" msgstr "" #: builtin/fsck.c:618 msgid "make reflogs head nodes (default)" msgstr "" #: builtin/fsck.c:619 msgid "also consider packs and alternate objects" msgstr "" #: builtin/fsck.c:620 msgid "enable more strict checking" msgstr "" #: builtin/fsck.c:622 msgid "write dangling objects in .git/lost-found" msgstr "" #: builtin/fsck.c:623 builtin/prune.c:144 msgid "show progress" msgstr "" #: builtin/gc.c:24 msgid "git gc [options]" msgstr "" #: builtin/gc.c:80 #, c-format msgid "Invalid %s: '%s'" msgstr "" #: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "" #: builtin/gc.c:262 msgid "prune unreferenced objects" msgstr "" #: builtin/gc.c:264 msgid "be more thorough (increased runtime)" msgstr "" #: builtin/gc.c:265 msgid "enable auto-gc mode" msgstr "" #: builtin/gc.c:266 msgid "force running gc even if there may be another gc running" msgstr "" #: builtin/gc.c:306 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" "run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" #. be quiet on --auto #: builtin/gc.c:316 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" #: builtin/gc.c:341 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" #: builtin/grep.c:23 msgid "git grep [options] [-e] [...] [[--] ...]" msgstr "" #: builtin/grep.c:218 #, c-format msgid "grep: failed to create thread: %s" msgstr "" #: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "" #: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "" #: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "" #: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" #: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "" #: builtin/grep.c:642 msgid "search in index instead of in the work tree" msgstr "" #: builtin/grep.c:644 msgid "find in contents not managed by git" msgstr "" #: builtin/grep.c:646 msgid "search in both tracked and untracked files" msgstr "" #: builtin/grep.c:648 msgid "search also in ignored files" msgstr "" #: builtin/grep.c:651 msgid "show non-matching lines" msgstr "" #: builtin/grep.c:653 msgid "case insensitive matching" msgstr "" #: builtin/grep.c:655 msgid "match patterns only at word boundaries" msgstr "" #: builtin/grep.c:657 msgid "process binary files as text" msgstr "" #: builtin/grep.c:659 msgid "don't match patterns in binary files" msgstr "" #: builtin/grep.c:662 msgid "process binary files with textconv filters" msgstr "" #: builtin/grep.c:664 msgid "descend at most levels" msgstr "" #: builtin/grep.c:668 msgid "use extended POSIX regular expressions" msgstr "" #: builtin/grep.c:671 msgid "use basic POSIX regular expressions (default)" msgstr "" #: builtin/grep.c:674 msgid "interpret patterns as fixed strings" msgstr "" #: builtin/grep.c:677 msgid "use Perl-compatible regular expressions" msgstr "" #: builtin/grep.c:680 msgid "show line numbers" msgstr "" #: builtin/grep.c:681 msgid "don't show filenames" msgstr "" #: builtin/grep.c:682 msgid "show filenames" msgstr "" #: builtin/grep.c:684 msgid "show filenames relative to top directory" msgstr "" #: builtin/grep.c:686 msgid "show only filenames instead of matching lines" msgstr "" #: builtin/grep.c:688 msgid "synonym for --files-with-matches" msgstr "" #: builtin/grep.c:691 msgid "show only the names of files without match" msgstr "" #: builtin/grep.c:693 msgid "print NUL after filenames" msgstr "" #: builtin/grep.c:695 msgid "show the number of matches instead of matching lines" msgstr "" #: builtin/grep.c:696 msgid "highlight matches" msgstr "" #: builtin/grep.c:698 msgid "print empty line between matches from different files" msgstr "" #: builtin/grep.c:700 msgid "show filename only once above matches from same file" msgstr "" #: builtin/grep.c:703 msgid "show context lines before and after matches" msgstr "" #: builtin/grep.c:706 msgid "show context lines before matches" msgstr "" #: builtin/grep.c:708 msgid "show context lines after matches" msgstr "" #: builtin/grep.c:709 msgid "shortcut for -C NUM" msgstr "" #: builtin/grep.c:712 msgid "show a line with the function name before matches" msgstr "" #: builtin/grep.c:714 msgid "show the surrounding function" msgstr "" #: builtin/grep.c:717 msgid "read patterns from file" msgstr "" #: builtin/grep.c:719 msgid "match " msgstr "" #: builtin/grep.c:721 msgid "combine patterns specified with -e" msgstr "" #: builtin/grep.c:733 msgid "indicate hit with exit status without output" msgstr "" #: builtin/grep.c:735 msgid "show only matches from files that match all patterns" msgstr "" #: builtin/grep.c:737 msgid "show parse tree for grep expression" msgstr "" #: builtin/grep.c:741 msgid "pager" msgstr "" #: builtin/grep.c:741 msgid "show matching files in the pager" msgstr "" #: builtin/grep.c:744 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" #: builtin/grep.c:745 builtin/show-ref.c:187 msgid "show usage" msgstr "" #: builtin/grep.c:812 msgid "no pattern given." msgstr "" #: builtin/grep.c:870 msgid "--open-files-in-pager only works on the worktree" msgstr "" #: builtin/grep.c:893 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" #: builtin/grep.c:898 msgid "--no-index or --untracked cannot be used with revs." msgstr "" #: builtin/grep.c:901 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" #: builtin/grep.c:909 msgid "both --cached and trees are given." msgstr "" #: builtin/hash-object.c:60 msgid "" "git hash-object [-t ] [-w] [--path=|--no-filters] [--stdin] [--] " "..." msgstr "" #: builtin/hash-object.c:61 msgid "git hash-object --stdin-paths < " msgstr "" #: builtin/hash-object.c:72 msgid "type" msgstr "" #: builtin/hash-object.c:72 msgid "object type" msgstr "" #: builtin/hash-object.c:73 msgid "write the object into the object database" msgstr "" #: builtin/hash-object.c:74 msgid "read the object from stdin" msgstr "" #: builtin/hash-object.c:76 msgid "store file as is without filters" msgstr "" #: builtin/hash-object.c:77 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] [command]" msgstr "" #: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "" #: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "" #: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "" #: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "" #: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" #: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" #: builtin/help.c:353 #, c-format msgid "'%s': unknown man viewer." msgstr "" #: builtin/help.c:370 msgid "no man viewer handled the request" msgstr "" #: builtin/help.c:378 msgid "no info viewer handled the request" msgstr "" #: builtin/help.c:424 msgid "Defining attributes per path" msgstr "" #: builtin/help.c:425 msgid "A Git glossary" msgstr "" #: builtin/help.c:426 msgid "Specifies intentionally untracked files to ignore" msgstr "" #: builtin/help.c:427 msgid "Defining submodule properties" msgstr "" #: builtin/help.c:428 msgid "Specifying revisions and ranges for Git" msgstr "" #: builtin/help.c:429 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" #: builtin/help.c:430 msgid "An overview of recommended workflows with Git" msgstr "" #: builtin/help.c:442 msgid "The common Git guides are:\n" msgstr "" #: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "" #: builtin/help.c:496 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" #: builtin/index-pack.c:184 #, c-format msgid "object type mismatch at %s" msgstr "" #: builtin/index-pack.c:204 msgid "object of unexpected type" msgstr "" #: builtin/index-pack.c:244 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:254 msgid "early EOF" msgstr "" #: builtin/index-pack.c:255 msgid "read error on input" msgstr "" #: builtin/index-pack.c:267 msgid "used more bytes than were available" msgstr "" #: builtin/index-pack.c:274 msgid "pack too large for current definition of off_t" msgstr "" #: builtin/index-pack.c:290 #, c-format msgid "unable to create '%s'" msgstr "" #: builtin/index-pack.c:295 #, c-format msgid "cannot open packfile '%s'" msgstr "" #: builtin/index-pack.c:309 msgid "pack signature mismatch" msgstr "" #: builtin/index-pack.c:311 #, c-format msgid "pack version % unsupported" msgstr "" #: builtin/index-pack.c:329 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" #: builtin/index-pack.c:451 #, c-format msgid "inflate returned %d" msgstr "" #: builtin/index-pack.c:500 msgid "offset value overflow for delta base object" msgstr "" #: builtin/index-pack.c:508 msgid "delta base offset is out of bound" msgstr "" #: builtin/index-pack.c:516 #, c-format msgid "unknown object type %d" msgstr "" #: builtin/index-pack.c:547 msgid "cannot pread pack file" msgstr "" #: builtin/index-pack.c:549 #, 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:575 msgid "serious inflate inconsistency" msgstr "" #: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695 #: builtin/index-pack.c:729 builtin/index-pack.c:738 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" #: builtin/index-pack.c:669 builtin/pack-objects.c:171 #: builtin/pack-objects.c:263 #, c-format msgid "unable to read %s" msgstr "" #: builtin/index-pack.c:735 #, c-format msgid "cannot read existing object %s" msgstr "" #: builtin/index-pack.c:749 #, c-format msgid "invalid blob object %s" msgstr "" #: builtin/index-pack.c:763 #, c-format msgid "invalid %s" msgstr "" #: builtin/index-pack.c:766 msgid "Error in object" msgstr "" #: builtin/index-pack.c:768 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" #: builtin/index-pack.c:839 builtin/index-pack.c:869 msgid "failed to apply delta" msgstr "" #: builtin/index-pack.c:1010 msgid "Receiving objects" msgstr "" #: builtin/index-pack.c:1010 msgid "Indexing objects" msgstr "" #: builtin/index-pack.c:1036 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" #: builtin/index-pack.c:1041 msgid "cannot fstat packfile" msgstr "" #: builtin/index-pack.c:1044 msgid "pack has junk at the end" msgstr "" #: builtin/index-pack.c:1055 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" #: builtin/index-pack.c:1078 msgid "Resolving deltas" msgstr "" #: builtin/index-pack.c:1088 #, c-format msgid "unable to create thread: %s" msgstr "" #: builtin/index-pack.c:1130 msgid "confusion beyond insanity" msgstr "" #: builtin/index-pack.c:1138 #, c-format msgid "completed with %d local objects" msgstr "" #: builtin/index-pack.c:1148 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" #: builtin/index-pack.c:1152 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:1177 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" #: builtin/index-pack.c:1256 #, c-format msgid "local object %s is corrupt" msgstr "" #: builtin/index-pack.c:1280 msgid "error while closing pack file" msgstr "" #: builtin/index-pack.c:1293 #, c-format msgid "cannot write keep file '%s'" msgstr "" #: builtin/index-pack.c:1301 #, c-format msgid "cannot close written keep file '%s'" msgstr "" #: builtin/index-pack.c:1314 msgid "cannot store pack file" msgstr "" #: builtin/index-pack.c:1325 msgid "cannot store index file" msgstr "" #: builtin/index-pack.c:1358 #, c-format msgid "bad pack.indexversion=%" msgstr "" #: builtin/index-pack.c:1364 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" #: builtin/index-pack.c:1368 builtin/index-pack.c:1546 #, c-format msgid "no threads support, ignoring %s" msgstr "" #: builtin/index-pack.c:1426 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" #: builtin/index-pack.c:1428 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" #: builtin/index-pack.c:1475 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:1482 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:1510 msgid "Cannot come back to cwd" msgstr "" #: builtin/index-pack.c:1558 builtin/index-pack.c:1561 #: builtin/index-pack.c:1573 builtin/index-pack.c:1577 #, c-format msgid "bad %s" msgstr "" #: builtin/index-pack.c:1591 msgid "--fix-thin cannot be used without --stdin" msgstr "" #: builtin/index-pack.c:1595 builtin/index-pack.c:1605 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" #: builtin/index-pack.c:1614 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:133 #, c-format msgid "insanely long template path %s" msgstr "" #: builtin/init-db.c:141 #, c-format msgid "templates not found %s" msgstr "" #: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "" #: builtin/init-db.c:192 #, c-format msgid "insane git directory %s" msgstr "" #: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "" #: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "" #: builtin/init-db.c:358 #, 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:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "" #: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "" #: builtin/init-db.c:421 msgid "Initialized empty" msgstr "" #: builtin/init-db.c:422 msgid " shared" msgstr "" #: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "" #: builtin/init-db.c:467 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] [directory]" msgstr "" #: builtin/init-db.c:490 msgid "permissions" msgstr "" #: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" msgstr "" #: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155 msgid "be quiet" msgstr "" #: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "" #: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "" #: builtin/init-db.c:556 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "" #: builtin/init-db.c:580 msgid "Cannot access current working directory" msgstr "" #: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "" #: builtin/log.c:41 msgid "git log [] [] [[--] ...]\n" msgstr "" #: builtin/log.c:42 msgid " or: git show [options] ..." msgstr "" #: builtin/log.c:125 msgid "suppress diff output" msgstr "" #: builtin/log.c:126 msgid "show source" msgstr "" #: builtin/log.c:127 msgid "Use mail map file" msgstr "" #: builtin/log.c:128 msgid "decorate options" msgstr "" #: builtin/log.c:231 #, c-format msgid "Final output: %d %s\n" msgstr "" #: builtin/log.c:473 builtin/log.c:565 #, c-format msgid "Could not read object %s" msgstr "" #: builtin/log.c:589 #, c-format msgid "Unknown type: %d" msgstr "" #: builtin/log.c:689 msgid "format.headers without value" msgstr "" #: builtin/log.c:771 msgid "name of output directory is too long" msgstr "" #: builtin/log.c:787 #, c-format msgid "Cannot open patch file %s" msgstr "" #: builtin/log.c:801 msgid "Need exactly one range." msgstr "" #: builtin/log.c:809 msgid "Not a range." msgstr "" #: builtin/log.c:911 msgid "Cover letter needs email format" msgstr "" #: builtin/log.c:987 #, c-format msgid "insane in-reply-to: %s" msgstr "" #: builtin/log.c:1015 msgid "git format-patch [options] [ | ]" msgstr "" #: builtin/log.c:1060 msgid "Two output directories?" msgstr "" #: builtin/log.c:1175 msgid "use [PATCH n/m] even with a single patch" msgstr "" #: builtin/log.c:1178 msgid "use [PATCH] even with multiple patches" msgstr "" #: builtin/log.c:1182 msgid "print patches to standard out" msgstr "" #: builtin/log.c:1184 msgid "generate a cover letter" msgstr "" #: builtin/log.c:1186 msgid "use simple number sequence for output file names" msgstr "" #: builtin/log.c:1187 msgid "sfx" msgstr "" #: builtin/log.c:1188 msgid "use instead of '.patch'" msgstr "" #: builtin/log.c:1190 msgid "start numbering patches at instead of 1" msgstr "" #: builtin/log.c:1192 msgid "mark the series as Nth re-roll" msgstr "" #: builtin/log.c:1194 msgid "Use [] instead of [PATCH]" msgstr "" #: builtin/log.c:1197 msgid "store resulting files in " msgstr "" #: builtin/log.c:1200 msgid "don't strip/add [PATCH]" msgstr "" #: builtin/log.c:1203 msgid "don't output binary diffs" msgstr "" #: builtin/log.c:1205 msgid "don't include a patch matching a commit upstream" msgstr "" #: builtin/log.c:1207 msgid "show patch format instead of default (patch + stat)" msgstr "" #: builtin/log.c:1209 msgid "Messaging" msgstr "" #: builtin/log.c:1210 msgid "header" msgstr "" #: builtin/log.c:1211 msgid "add email header" msgstr "" #: builtin/log.c:1212 builtin/log.c:1214 msgid "email" msgstr "" #: builtin/log.c:1212 msgid "add To: header" msgstr "" #: builtin/log.c:1214 msgid "add Cc: header" msgstr "" #: builtin/log.c:1216 msgid "ident" msgstr "" #: builtin/log.c:1217 msgid "set From address to (or committer ident if absent)" msgstr "" #: builtin/log.c:1219 msgid "message-id" msgstr "" #: builtin/log.c:1220 msgid "make first mail a reply to " msgstr "" #: builtin/log.c:1221 builtin/log.c:1224 msgid "boundary" msgstr "" #: builtin/log.c:1222 msgid "attach the patch" msgstr "" #: builtin/log.c:1225 msgid "inline the patch" msgstr "" #: builtin/log.c:1229 msgid "enable message threading, styles: shallow, deep" msgstr "" #: builtin/log.c:1231 msgid "signature" msgstr "" #: builtin/log.c:1232 msgid "add a signature" msgstr "" #: builtin/log.c:1233 msgid "don't print the patch filenames" msgstr "" #: builtin/log.c:1307 #, c-format msgid "invalid ident line: %s" msgstr "" #: builtin/log.c:1322 msgid "-n and -k are mutually exclusive." msgstr "" #: builtin/log.c:1324 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" #: builtin/log.c:1332 msgid "--name-only does not make sense" msgstr "" #: builtin/log.c:1334 msgid "--name-status does not make sense" msgstr "" #: builtin/log.c:1336 msgid "--check does not make sense" msgstr "" #: builtin/log.c:1359 msgid "standard output, or directory, which one?" msgstr "" #: builtin/log.c:1361 #, c-format msgid "Could not create directory '%s'" msgstr "" #: builtin/log.c:1509 msgid "Failed to create output files" msgstr "" #: builtin/log.c:1558 msgid "git cherry [-v] [ [ []]]" msgstr "" #: builtin/log.c:1613 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" #: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640 #, c-format msgid "Unknown commit %s" msgstr "" #: builtin/ls-files.c:398 msgid "git ls-files [options] [...]" msgstr "" #: builtin/ls-files.c:455 msgid "identify the file status with tags" msgstr "" #: builtin/ls-files.c:457 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" #: builtin/ls-files.c:459 msgid "show cached files in the output (default)" msgstr "" #: builtin/ls-files.c:461 msgid "show deleted files in the output" msgstr "" #: builtin/ls-files.c:463 msgid "show modified files in the output" msgstr "" #: builtin/ls-files.c:465 msgid "show other files in the output" msgstr "" #: builtin/ls-files.c:467 msgid "show ignored files in the output" msgstr "" #: builtin/ls-files.c:470 msgid "show staged contents' object name in the output" msgstr "" #: builtin/ls-files.c:472 msgid "show files on the filesystem that need to be removed" msgstr "" #: builtin/ls-files.c:474 msgid "show 'other' directories' name only" msgstr "" #: builtin/ls-files.c:477 msgid "don't show empty directories" msgstr "" #: builtin/ls-files.c:480 msgid "show unmerged files in the output" msgstr "" #: builtin/ls-files.c:482 msgid "show resolve-undo information" msgstr "" #: builtin/ls-files.c:484 msgid "skip files matching pattern" msgstr "" #: builtin/ls-files.c:487 msgid "exclude patterns are read from " msgstr "" #: builtin/ls-files.c:490 msgid "read additional per-directory exclude patterns in " msgstr "" #: builtin/ls-files.c:492 msgid "add the standard git exclusions" msgstr "" #: builtin/ls-files.c:495 msgid "make the output relative to the project top directory" msgstr "" #: builtin/ls-files.c:498 msgid "if any is not in the index, treat this as an error" msgstr "" #: builtin/ls-files.c:499 msgid "tree-ish" msgstr "" #: builtin/ls-files.c:500 msgid "pretend that paths removed since are still present" msgstr "" #: builtin/ls-files.c:502 msgid "show debugging data" msgstr "" #: builtin/ls-tree.c:28 msgid "git ls-tree [] [...]" msgstr "" #: builtin/ls-tree.c:126 msgid "only show trees" msgstr "" #: builtin/ls-tree.c:128 msgid "recurse into subtrees" msgstr "" #: builtin/ls-tree.c:130 msgid "show trees when recursing" msgstr "" #: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" msgstr "" #: builtin/ls-tree.c:134 msgid "include object size" msgstr "" #: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" msgstr "" #: builtin/ls-tree.c:141 msgid "use full path names" msgstr "" #: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" #: builtin/merge.c:43 msgid "git merge [options] [...]" msgstr "" #: builtin/merge.c:44 msgid "git merge [options] HEAD " msgstr "" #: builtin/merge.c:45 msgid "git merge --abort" msgstr "" #: builtin/merge.c:98 msgid "switch `m' requires a value" msgstr "" #: builtin/merge.c:135 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" #: builtin/merge.c:136 #, c-format msgid "Available strategies are:" msgstr "" #: builtin/merge.c:141 #, c-format msgid "Available custom strategies are:" msgstr "" #: builtin/merge.c:191 msgid "do not show a diffstat at the end of the merge" msgstr "" #: builtin/merge.c:194 msgid "show a diffstat at the end of the merge" msgstr "" #: builtin/merge.c:195 msgid "(synonym to --stat)" msgstr "" #: builtin/merge.c:197 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" #: builtin/merge.c:200 msgid "create a single commit instead of doing a merge" msgstr "" #: builtin/merge.c:202 msgid "perform a commit if the merge succeeds (default)" msgstr "" #: builtin/merge.c:204 msgid "edit message before committing" msgstr "" #: builtin/merge.c:205 msgid "allow fast-forward (default)" msgstr "" #: builtin/merge.c:207 msgid "abort if fast-forward is not possible" msgstr "" #: builtin/merge.c:211 msgid "Verify that the named commit has a valid GPG signature" msgstr "" #: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89 msgid "strategy" msgstr "" #: builtin/merge.c:213 msgid "merge strategy to use" msgstr "" #: builtin/merge.c:214 msgid "option=value" msgstr "" #: builtin/merge.c:215 msgid "option for selected merge strategy" msgstr "" #: builtin/merge.c:217 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" #: builtin/merge.c:221 msgid "abort the current in-progress merge" msgstr "" #: builtin/merge.c:250 msgid "could not run stash." msgstr "" #: builtin/merge.c:255 msgid "stash failed" msgstr "" #: builtin/merge.c:260 #, c-format msgid "not a valid object: %s" msgstr "" #: builtin/merge.c:279 builtin/merge.c:296 msgid "read-tree failed" msgstr "" #: builtin/merge.c:326 msgid " (nothing to squash)" msgstr "" #: builtin/merge.c:339 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" #: builtin/merge.c:371 msgid "Writing SQUASH_MSG" msgstr "" #: builtin/merge.c:373 msgid "Finishing SQUASH_MSG" msgstr "" #: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" #: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "" #: builtin/merge.c:558 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" #: builtin/merge.c:650 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:706 #, c-format msgid "unable to write %s" msgstr "" #: builtin/merge.c:795 #, c-format msgid "Could not read from '%s'" msgstr "" #: builtin/merge.c:804 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" #: builtin/merge.c:810 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" #: builtin/merge.c:834 msgid "Empty commit message." msgstr "" #: builtin/merge.c:846 #, c-format msgid "Wonderful.\n" msgstr "" #: builtin/merge.c:911 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" #: builtin/merge.c:927 #, c-format msgid "'%s' is not a commit" msgstr "" #: builtin/merge.c:968 msgid "No current branch." msgstr "" #: builtin/merge.c:970 msgid "No remote for the current branch." msgstr "" #: builtin/merge.c:972 msgid "No default upstream defined for the current branch." msgstr "" #: builtin/merge.c:977 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" #: builtin/merge.c:1133 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" #: builtin/merge.c:1149 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" #: builtin/merge.c:1152 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" #: builtin/merge.c:1156 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" #: builtin/merge.c:1159 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" #: builtin/merge.c:1168 msgid "You cannot combine --squash with --no-ff." msgstr "" #: builtin/merge.c:1177 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" #: builtin/merge.c:1209 msgid "Can merge only exactly one commit into empty head" msgstr "" #: builtin/merge.c:1212 msgid "Squash commit into empty head not supported yet" msgstr "" #: builtin/merge.c:1214 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" #: builtin/merge.c:1219 #, c-format msgid "%s - not something we can merge" msgstr "" #: builtin/merge.c:1270 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" #: builtin/merge.c:1273 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" #. 'N' #: builtin/merge.c:1276 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" #: builtin/merge.c:1279 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" #: builtin/merge.c:1363 #, c-format msgid "Updating %s..%s\n" msgstr "" #: builtin/merge.c:1402 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" #: builtin/merge.c:1409 #, c-format msgid "Nope.\n" msgstr "" #: builtin/merge.c:1441 msgid "Not possible to fast-forward, aborting." msgstr "" #: builtin/merge.c:1464 builtin/merge.c:1543 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" #: builtin/merge.c:1468 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" #: builtin/merge.c:1534 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" #: builtin/merge.c:1536 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" #: builtin/merge.c:1545 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" #: builtin/merge.c:1557 #, 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 [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " "file2" msgstr "" #: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "" #: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "" #: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "" #: builtin/merge-file.c:45 msgid "set labels for file1/orig_file/file2" msgstr "" #: builtin/mktree.c:67 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" #: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "" #: builtin/mktree.c:154 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "" #: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "" #: builtin/mv.c:15 msgid "git mv [options] ... " msgstr "" #: builtin/mv.c:71 msgid "force move/rename even if target exists" msgstr "" #: builtin/mv.c:72 msgid "skip move/rename errors" msgstr "" #: builtin/mv.c:122 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" #: builtin/mv.c:126 msgid "bad source" msgstr "" #: builtin/mv.c:129 msgid "can not move directory into itself" msgstr "" #: builtin/mv.c:132 msgid "cannot move directory over file" msgstr "" #: builtin/mv.c:138 #, c-format msgid "Huh? Directory %s is in index and no submodule?" msgstr "" #: builtin/mv.c:140 builtin/rm.c:318 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "" #: builtin/mv.c:156 #, c-format msgid "Huh? %.*s is in index?" msgstr "" #: builtin/mv.c:168 msgid "source directory is empty" msgstr "" #: builtin/mv.c:200 msgid "not under version control" msgstr "" #: builtin/mv.c:202 msgid "destination exists" msgstr "" #: builtin/mv.c:210 #, c-format msgid "overwriting '%s'" msgstr "" #: builtin/mv.c:213 msgid "Cannot overwrite" msgstr "" #: builtin/mv.c:216 msgid "multiple sources for the same target" msgstr "" #: builtin/mv.c:218 msgid "destination directory does not exist" msgstr "" #: builtin/mv.c:233 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" #: builtin/mv.c:243 #, c-format msgid "Renaming %s to %s\n" msgstr "" #: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 #, c-format msgid "renaming '%s' failed" msgstr "" #: builtin/name-rev.c:258 msgid "git name-rev [options] ..." msgstr "" #: builtin/name-rev.c:259 msgid "git name-rev [options] --all" msgstr "" #: builtin/name-rev.c:260 msgid "git name-rev [options] --stdin" msgstr "" #: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "" #: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "" #: builtin/name-rev.c:315 msgid "only use refs matching " msgstr "" #: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" #: builtin/name-rev.c:318 msgid "read from stdin" msgstr "" #: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "" #: builtin/name-rev.c:325 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] [-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 [-m | -F | (-c | -C) " "] []" msgstr "" #: builtin/notes.c:28 msgid "git notes [--ref ] edit []" 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:137 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" #: builtin/notes.c:141 msgid "could not read 'show' output" msgstr "" #: builtin/notes.c:149 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" #: builtin/notes.c:167 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "" #: builtin/notes.c:186 msgid "Please supply the note contents using either -m or -F option" msgstr "" #: builtin/notes.c:207 builtin/notes.c:844 #, c-format msgid "Removing note for object %s\n" msgstr "" #: builtin/notes.c:212 msgid "unable to write note object" msgstr "" #: builtin/notes.c:214 #, c-format msgid "The note contents has been left in %s" msgstr "" #: builtin/notes.c:248 builtin/tag.c:537 #, c-format msgid "cannot read '%s'" msgstr "" #: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "could not open or read '%s'" msgstr "" #: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318 #: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515 #: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637 #: builtin/notes.c:839 builtin/tag.c:553 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" #: builtin/notes.c:272 #, c-format msgid "Failed to read object '%s'." msgstr "" #: builtin/notes.c:312 #, c-format msgid "Malformed input line: '%s'." msgstr "" #: builtin/notes.c:327 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" #: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498 #: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630 #: builtin/notes.c:904 msgid "too many parameters" msgstr "" #: builtin/notes.c:384 builtin/notes.c:643 #, c-format msgid "No note found for object %s." msgstr "" #: builtin/notes.c:406 builtin/notes.c:563 msgid "note contents as a string" msgstr "" #: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents in a file" msgstr "" #: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568 #: builtin/notes.c:571 builtin/tag.c:474 msgid "object" msgstr "" #: builtin/notes.c:412 builtin/notes.c:569 msgid "reuse and edit specified note object" msgstr "" #: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse specified note object" msgstr "" #: builtin/notes.c:417 builtin/notes.c:485 msgid "replace existing notes" msgstr "" #: builtin/notes.c:451 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" #: builtin/notes.c:456 builtin/notes.c:533 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" #: builtin/notes.c:486 msgid "read objects from stdin" msgstr "" #: builtin/notes.c:488 msgid "load rewriting config for (implies --stdin)" msgstr "" #: builtin/notes.c:506 msgid "too few parameters" msgstr "" #: builtin/notes.c:527 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" #: builtin/notes.c:539 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" #: builtin/notes.c:588 #, 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:735 msgid "General options" msgstr "" #: builtin/notes.c:737 msgid "Merge options" msgstr "" #: builtin/notes.c:739 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" #: builtin/notes.c:741 msgid "Committing unmerged notes" msgstr "" #: builtin/notes.c:743 msgid "finalize notes merge by committing unmerged notes" msgstr "" #: builtin/notes.c:745 msgid "Aborting notes merge resolution" msgstr "" #: builtin/notes.c:747 msgid "abort notes merge" msgstr "" #: builtin/notes.c:842 #, c-format msgid "Object %s has no note\n" msgstr "" #: builtin/notes.c:854 msgid "attempt to remove non-existent note is not an error" msgstr "" #: builtin/notes.c:857 msgid "read object names from the standard input" msgstr "" #: builtin/notes.c:938 msgid "notes_ref" msgstr "" #: builtin/notes.c:939 msgid "use notes from " msgstr "" #: builtin/notes.c:974 builtin/remote.c:1593 #, c-format msgid "Unknown subcommand: %s" msgstr "" #: builtin/pack-objects.c:23 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" #: builtin/pack-objects.c:24 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" #: builtin/pack-objects.c:184 builtin/pack-objects.c:187 #, c-format msgid "deflate error (%d)" msgstr "" #: builtin/pack-objects.c:2396 #, c-format msgid "unsupported index version %s" msgstr "" #: builtin/pack-objects.c:2400 #, c-format msgid "bad index version '%s'" msgstr "" #: builtin/pack-objects.c:2423 #, c-format msgid "option %s does not accept negative form" msgstr "" #: builtin/pack-objects.c:2427 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" #: builtin/pack-objects.c:2446 msgid "do not show progress meter" msgstr "" #: builtin/pack-objects.c:2448 msgid "show progress meter" msgstr "" #: builtin/pack-objects.c:2450 msgid "show progress meter during object writing phase" msgstr "" #: builtin/pack-objects.c:2453 msgid "similar to --all-progress when progress meter is shown" msgstr "" #: builtin/pack-objects.c:2454 msgid "version[,offset]" msgstr "" #: builtin/pack-objects.c:2455 msgid "write the pack index file in the specified idx format version" msgstr "" #: builtin/pack-objects.c:2458 msgid "maximum size of each output pack file" msgstr "" #: builtin/pack-objects.c:2460 msgid "ignore borrowed objects from alternate object store" msgstr "" #: builtin/pack-objects.c:2462 msgid "ignore packed objects" msgstr "" #: builtin/pack-objects.c:2464 msgid "limit pack window by objects" msgstr "" #: builtin/pack-objects.c:2466 msgid "limit pack window by memory in addition to object limit" msgstr "" #: builtin/pack-objects.c:2468 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" #: builtin/pack-objects.c:2470 msgid "reuse existing deltas" msgstr "" #: builtin/pack-objects.c:2472 msgid "reuse existing objects" msgstr "" #: builtin/pack-objects.c:2474 msgid "use OFS_DELTA objects" msgstr "" #: builtin/pack-objects.c:2476 msgid "use threads when searching for best delta matches" msgstr "" #: builtin/pack-objects.c:2478 msgid "do not create an empty pack output" msgstr "" #: builtin/pack-objects.c:2480 msgid "read revision arguments from standard input" msgstr "" #: builtin/pack-objects.c:2482 msgid "limit the objects to those that are not yet packed" msgstr "" #: builtin/pack-objects.c:2485 msgid "include objects reachable from any reference" msgstr "" #: builtin/pack-objects.c:2488 msgid "include objects referred by reflog entries" msgstr "" #: builtin/pack-objects.c:2491 msgid "output pack to stdout" msgstr "" #: builtin/pack-objects.c:2493 msgid "include tag objects that refer to objects to be packed" msgstr "" #: builtin/pack-objects.c:2495 msgid "keep unreachable objects" msgstr "" #: builtin/pack-objects.c:2496 parse-options.h:143 msgid "time" msgstr "" #: builtin/pack-objects.c:2497 msgid "unpack unreachable objects newer than