# 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: 2016-03-16 00:16+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: advice.c:55 #, c-format msgid "hint: %.*s\n" msgstr "" #: advice.c:88 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." msgstr "" #: advice.c:101 builtin/merge.c:1226 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" #: advice.c:103 msgid "Please, commit your changes before merging." msgstr "" #: advice.c:104 msgid "Exiting because of unfinished merge." msgstr "" #: archive.c:12 msgid "git archive [] [...]" msgstr "" #: archive.c:13 msgid "git archive --list" msgstr "" #: archive.c:14 msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" #: archive.c:15 msgid "git archive --remote [--exec ] --list" msgstr "" #: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" #: archive.c:429 msgid "fmt" msgstr "" #: archive.c:429 msgid "archive format" msgstr "" #: archive.c:430 builtin/log.c:1232 msgid "prefix" msgstr "" #: archive.c:431 msgid "prepend prefix to each pathname in the archive" msgstr "" #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 #: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 #: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 msgid "file" msgstr "" #: archive.c:433 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" #: archive.c:435 msgid "read .gitattributes in working directory" msgstr "" #: archive.c:436 msgid "report archived files on stderr" msgstr "" #: archive.c:437 msgid "store only" msgstr "" #: archive.c:438 msgid "compress faster" msgstr "" #: archive.c:446 msgid "compress better" msgstr "" #: archive.c:449 msgid "list supported archive formats" msgstr "" #: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 msgid "repo" msgstr "" #: archive.c:452 builtin/archive.c:91 msgid "retrieve the archive from remote repository " msgstr "" #: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 msgid "command" msgstr "" #: archive.c:454 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" #: attr.c:263 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" #: branch.c:53 #, c-format msgid "" "\n" "After fixing the error cause you may try to fix up\n" "the remote tracking information by invoking\n" "\"git branch --set-upstream-to=%s%s%s\"." msgstr "" #: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "" #: branch.c:93 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "" #: branch.c:94 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "" #: branch.c:98 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "" #: branch.c:99 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "" #: branch.c:104 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "" #: branch.c:105 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "" #: branch.c:109 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "" #: branch.c:110 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "" #: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "" #: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" #: branch.c:185 #, c-format msgid "'%s' is not a valid branch name." msgstr "" #: branch.c:190 #, c-format msgid "A branch named '%s' already exists." msgstr "" #: branch.c:198 msgid "Cannot force update the current branch." msgstr "" #: branch.c:218 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" #: branch.c:220 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" #: branch.c:222 msgid "" "\n" "If you are planning on basing your work on an upstream\n" "branch that already exists at the remote, you may need to\n" "run \"git fetch\" to retrieve it.\n" "\n" "If you are planning to push out a new local branch that\n" "will track its remote counterpart, you may want to use\n" "\"git push -u\" to set the upstream config as you push." msgstr "" #: branch.c:266 #, c-format msgid "Not a valid object name: '%s'." msgstr "" #: branch.c:286 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" #: branch.c:291 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" #: branch.c:344 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" #: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" #: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "" #: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "" #: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 #: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 #: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 #: builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "" #: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" #: bundle.c:192 msgid "The bundle records a complete history." msgstr "" #: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" #: bundle.c:253 msgid "Could not spawn pack-objects" msgstr "" #: bundle.c:264 msgid "pack-objects died" msgstr "" #: bundle.c:304 msgid "rev-list died" msgstr "" #: bundle.c:353 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" #: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "" #: bundle.c:449 msgid "Refusing to create empty bundle." msgstr "" #: bundle.c:459 #, c-format msgid "cannot create '%s'" msgstr "" #: bundle.c:480 msgid "index-pack died" msgstr "" #: color.c:275 #, c-format msgid "invalid color value: %.*s" msgstr "" #: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 #: builtin/am.c:2135 #, c-format msgid "could not parse %s" msgstr "" #: commit.c:42 #, c-format msgid "%s %s is not a commit!" msgstr "" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "" #: config.c:475 config.c:477 #, c-format msgid "bad config line %d in %s %s" msgstr "" #: config.c:593 #, c-format msgid "bad numeric config value '%s' for '%s' in %s %s: %s" msgstr "" #: config.c:595 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" #: config.c:680 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" #: config.c:758 config.c:769 #, c-format msgid "bad zlib compression level %d" msgstr "" #: config.c:891 #, c-format msgid "invalid mode for object creation: %s" msgstr "" #: config.c:1220 msgid "unable to parse command-line config" msgstr "" #: config.c:1281 msgid "unknown error occured while reading the configuration files" msgstr "" #: config.c:1629 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" #: config.c:1631 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" #: config.c:1690 #, c-format msgid "%s has multiple values" msgstr "" #: config.c:2226 #, c-format msgid "Could not set '%s' to '%s'" msgstr "" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "" #: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "" #: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "" #: date.c:95 msgid "in the future" msgstr "" #: date.c:101 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" msgstr[0] "" msgstr[1] "" #: date.c:108 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" msgstr[0] "" msgstr[1] "" #: date.c:115 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" msgstr[0] "" msgstr[1] "" #: date.c:122 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" msgstr[0] "" msgstr[1] "" #: date.c:128 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" msgstr[0] "" msgstr[1] "" #: date.c:135 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" msgstr[0] "" msgstr[1] "" #: date.c:146 #, c-format msgid "%lu year" msgid_plural "%lu years" msgstr[0] "" msgstr[1] "" #. TRANSLATORS: "%s" is " years" #: date.c:149 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" msgstr[0] "" msgstr[1] "" #: date.c:154 date.c:159 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" msgstr[0] "" msgstr[1] "" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "" #: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "" #: diff.c:115 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" #: diff.c:120 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" #: diff.c:215 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" #: diff.c:267 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" #: diff.c:2997 #, c-format msgid "external diff died, stopping at %s" msgstr "" #: diff.c:3393 msgid "--follow requires exactly one pathspec" msgstr "" #: diff.c:3556 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" #: diff.c:3570 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" #: dir.c:2004 msgid "failed to get kernel name and information" msgstr "" #: dir.c:2123 msgid "Untracked cache is disabled on this system or location." msgstr "" #: gpg-interface.c:166 gpg-interface.c:237 msgid "could not run gpg." msgstr "" #: gpg-interface.c:178 msgid "gpg did not accept the data" msgstr "" #: gpg-interface.c:189 msgid "gpg failed to sign the data" msgstr "" #: gpg-interface.c:222 #, c-format msgid "could not create temporary file '%s': %s" msgstr "" #: gpg-interface.c:225 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "" #: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "" #: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "" #: help.c:205 #, c-format msgid "available git commands in '%s'" msgstr "" #: help.c:212 msgid "git commands available from elsewhere on your $PATH" msgstr "" #: help.c:244 msgid "These are common Git commands used in various situations:" msgstr "" #: help.c:309 #, 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:366 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" #: help.c:388 #, 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:393 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" #: help.c:400 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" #: help.c:404 help.c:464 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" msgstr[1] "" #: help.c:460 #, c-format msgid "%s: %s - %s" msgstr "" #: merge.c:41 msgid "failed to read the cache" msgstr "" #: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 #: builtin/checkout.c:587 builtin/clone.c:730 msgid "unable to write new index file" msgstr "" #: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "" #: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" #: merge-recursive.c:270 msgid "error building trees" msgstr "" #: merge-recursive.c:689 #, c-format msgid "failed to create path '%s'%s" msgstr "" #: merge-recursive.c:700 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" #: merge-recursive.c:714 merge-recursive.c:735 msgid ": perhaps a D/F conflict?" msgstr "" #: merge-recursive.c:725 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" #: merge-recursive.c:765 #, c-format msgid "cannot read object %s '%s'" msgstr "" #: merge-recursive.c:767 #, c-format msgid "blob expected for %s '%s'" msgstr "" #: merge-recursive.c:790 builtin/clone.c:374 #, c-format msgid "failed to open '%s'" msgstr "" #: merge-recursive.c:798 #, c-format msgid "failed to symlink '%s'" msgstr "" #: merge-recursive.c:801 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" #: merge-recursive.c:939 msgid "Failed to execute internal merge" msgstr "" #: merge-recursive.c:943 #, c-format msgid "Unable to add %s to database" msgstr "" #: merge-recursive.c:959 msgid "unsupported object type in the tree" msgstr "" #: merge-recursive.c:1034 merge-recursive.c:1048 #, 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:1040 merge-recursive.c:1053 #, 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:1094 msgid "rename" msgstr "" #: merge-recursive.c:1094 msgid "renamed" msgstr "" #: merge-recursive.c:1150 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" #: merge-recursive.c:1172 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" #: merge-recursive.c:1177 msgid " (left unresolved)" msgstr "" #: merge-recursive.c:1231 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" #: merge-recursive.c:1261 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" #: merge-recursive.c:1460 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" #: merge-recursive.c:1470 #, c-format msgid "Adding merged %s" msgstr "" #: merge-recursive.c:1475 merge-recursive.c:1677 #, c-format msgid "Adding as %s instead" msgstr "" #: merge-recursive.c:1526 #, c-format msgid "cannot read object %s" msgstr "" #: merge-recursive.c:1529 #, c-format msgid "object %s is not a blob" msgstr "" #: merge-recursive.c:1581 msgid "modify" msgstr "" #: merge-recursive.c:1581 msgid "modified" msgstr "" #: merge-recursive.c:1591 msgid "content" msgstr "" #: merge-recursive.c:1598 msgid "add/add" msgstr "" #: merge-recursive.c:1632 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" #: merge-recursive.c:1646 #, c-format msgid "Auto-merging %s" msgstr "" #: merge-recursive.c:1650 git-submodule.sh:1048 msgid "submodule" msgstr "" #: merge-recursive.c:1651 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" #: merge-recursive.c:1737 #, c-format msgid "Removing %s" msgstr "" #: merge-recursive.c:1762 msgid "file/directory" msgstr "" #: merge-recursive.c:1768 msgid "directory/file" msgstr "" #: merge-recursive.c:1773 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" #: merge-recursive.c:1783 #, c-format msgid "Adding %s" msgstr "" #: merge-recursive.c:1800 msgid "Fatal merge failure, shouldn't happen." msgstr "" #: merge-recursive.c:1819 msgid "Already up-to-date!" msgstr "" #: merge-recursive.c:1828 #, c-format msgid "merging of trees %s and %s failed" msgstr "" #: merge-recursive.c:1858 #, c-format msgid "Unprocessed path??? %s" msgstr "" #: merge-recursive.c:1906 msgid "Merging:" msgstr "" #: merge-recursive.c:1919 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" #: merge-recursive.c:1956 msgid "merge returned no commit" msgstr "" #: merge-recursive.c:2013 #, c-format msgid "Could not parse object '%s'" msgstr "" #: merge-recursive.c:2024 builtin/merge.c:646 msgid "Unable to write index." msgstr "" #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" #: notes-utils.c:100 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" #: notes-utils.c:110 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value #: notes-utils.c:137 #, c-format msgid "Bad %s value: '%s'" msgstr "" #: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "" #: parse-options.c:570 msgid "..." msgstr "" #: parse-options.c:588 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation #: parse-options.c:592 #, c-format msgid " or: %s" msgstr "" #: parse-options.c:595 #, c-format msgid " %s" msgstr "" #: parse-options.c:629 msgid "-NUM" msgstr "" #: parse-options-cb.c:108 #, c-format msgid "malformed object name '%s'" msgstr "" #: path.c:752 #, c-format msgid "Could not make %s writable by group" msgstr "" #: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" #: pathspec.c:143 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" #: pathspec.c:177 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" #: pathspec.c:183 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" #: pathspec.c:187 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" #: pathspec.c:205 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" #: pathspec.c:230 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" #: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" msgstr "" #: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" #: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" #: pathspec.c: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 "" #: pretty.c:969 msgid "unable to parse --pretty format" msgstr "" #: progress.c:235 msgid "done" msgstr "" #: read-cache.c:1281 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" #: read-cache.c:1291 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" #: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 #: builtin/merge.c:984 #, c-format msgid "Could not open '%s' for writing" msgstr "" #: refs/files-backend.c:2374 #, c-format msgid "could not delete reference %s: %s" msgstr "" #: refs/files-backend.c:2377 #, c-format msgid "could not delete references: %s" msgstr "" #: refs/files-backend.c:2386 #, c-format msgid "could not remove reference %s" msgstr "" #: ref-filter.c:55 #, c-format msgid "expected format: %%(color:)" msgstr "" #: ref-filter.c:57 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" #: ref-filter.c:71 #, c-format msgid "unrecognized format: %%(%s)" msgstr "" #: ref-filter.c:77 #, c-format msgid "%%(body) does not take arguments" msgstr "" #: ref-filter.c:84 #, c-format msgid "%%(subject) does not take arguments" msgstr "" #: ref-filter.c:101 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" #: ref-filter.c:103 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" #: ref-filter.c:113 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" #: ref-filter.c:135 #, c-format msgid "expected format: %%(align:,)" msgstr "" #: ref-filter.c:147 #, c-format msgid "unrecognized position:%s" msgstr "" #: ref-filter.c:151 #, c-format msgid "unrecognized width:%s" msgstr "" #: ref-filter.c:157 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" #: ref-filter.c:161 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" #: ref-filter.c:244 #, c-format msgid "malformed field name: %.*s" msgstr "" #: ref-filter.c:270 #, c-format msgid "unknown field name: %.*s" msgstr "" #: ref-filter.c:372 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" #: ref-filter.c:424 #, c-format msgid "malformed format string %s" msgstr "" #: ref-filter.c:878 msgid ":strip= requires a positive integer argument" msgstr "" #: ref-filter.c:883 #, c-format msgid "ref '%s' does not have %ld components to :strip" msgstr "" #: ref-filter.c:1046 #, c-format msgid "unknown %.*s format %s" msgstr "" #: ref-filter.c:1066 ref-filter.c:1097 #, c-format msgid "missing object %s for %s" msgstr "" #: ref-filter.c:1069 ref-filter.c:1100 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" #: ref-filter.c:1311 #, c-format msgid "malformed object at '%s'" msgstr "" #: ref-filter.c:1373 #, c-format msgid "ignoring ref with broken name %s" msgstr "" #: ref-filter.c:1378 #, c-format msgid "ignoring broken ref %s" msgstr "" #: ref-filter.c:1651 #, c-format msgid "format: %%(end) atom missing" msgstr "" #: ref-filter.c:1705 #, c-format msgid "malformed object name %s" msgstr "" #: remote.c:745 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" #: remote.c:749 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" #: remote.c:753 #, c-format msgid "%s tracks both %s and %s" msgstr "" #: remote.c:761 msgid "Internal error" msgstr "" #: remote.c:1677 remote.c:1720 msgid "HEAD does not point to a branch" msgstr "" #: remote.c:1686 #, c-format msgid "no such branch: '%s'" msgstr "" #: remote.c:1689 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" #: remote.c:1695 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" #: remote.c:1710 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" #: remote.c:1725 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" #: remote.c:1736 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" #: remote.c:1749 msgid "push has no destination (push.default is 'nothing')" msgstr "" #: remote.c:1771 msgid "cannot resolve 'simple' push to a single destination" msgstr "" #: remote.c:2073 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" #: remote.c:2077 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" #: remote.c:2080 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" #: remote.c:2084 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" #: remote.c:2090 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" #: remote.c:2093 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "" msgstr[1] "" #: remote.c:2101 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" #: remote.c:2104 #, c-format msgid "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commit each, respectively.\n" msgid_plural "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" msgstr[1] "" #: remote.c:2114 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" #: revision.c:2131 msgid "your current branch appears to be broken" msgstr "" #: revision.c:2134 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" #: revision.c:2328 msgid "--first-parent is incompatible with --bisect" msgstr "" #: run-command.c:92 msgid "open /dev/null failed" msgstr "" #: run-command.c:94 #, c-format msgid "dup2(%d,%d) failed" msgstr "" #: send-pack.c:295 msgid "failed to sign the push certificate" msgstr "" #: send-pack.c:404 msgid "the receiving end does not support --signed push" msgstr "" #: send-pack.c:406 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" #: send-pack.c:418 msgid "the receiving end does not support --atomic push" msgstr "" #: sequencer.c:174 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" #: sequencer.c:177 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:190 sequencer.c:833 sequencer.c:913 #, c-format msgid "Could not write to %s" msgstr "" #: sequencer.c:193 #, c-format msgid "Error wrapping up %s" msgstr "" #: sequencer.c:208 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" #: sequencer.c:210 msgid "Your local changes would be overwritten by revert." msgstr "" #: sequencer.c:213 msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:300 #, c-format msgid "%s: Unable to write new index file" msgstr "" #: sequencer.c:318 msgid "Could not resolve HEAD commit\n" msgstr "" #: sequencer.c:338 msgid "Unable to update cache tree\n" msgstr "" #: sequencer.c:390 #, c-format msgid "Could not parse commit %s\n" msgstr "" #: sequencer.c:395 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" #: sequencer.c:460 msgid "Your index file is unmerged." msgstr "" #: sequencer.c:479 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" #: sequencer.c:487 #, c-format msgid "Commit %s does not have parent %d" msgstr "" #: sequencer.c:491 #, 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:504 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" #: sequencer.c:508 #, c-format msgid "Cannot get commit message for %s" msgstr "" #: sequencer.c:594 #, c-format msgid "could not revert %s... %s" msgstr "" #: sequencer.c:595 #, c-format msgid "could not apply %s... %s" msgstr "" #: sequencer.c:630 msgid "empty commit set passed" msgstr "" #: sequencer.c:638 #, c-format msgid "git %s: failed to read the index" msgstr "" #: sequencer.c:642 #, c-format msgid "git %s: failed to refresh the index" msgstr "" #: sequencer.c:702 #, c-format msgid "Cannot %s during a %s" msgstr "" #: sequencer.c:724 #, c-format msgid "Could not parse line %d." msgstr "" #: sequencer.c:729 msgid "No commits parsed." msgstr "" #: sequencer.c:741 #, c-format msgid "Could not open %s" msgstr "" #: sequencer.c:745 #, c-format msgid "Could not read %s." msgstr "" #: sequencer.c:752 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" #: sequencer.c:782 #, c-format msgid "Invalid key: %s" msgstr "" #: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 #, c-format msgid "Invalid value for %s: %s" msgstr "" #: sequencer.c:795 #, c-format msgid "Malformed options sheet: %s" msgstr "" #: sequencer.c:814 msgid "a cherry-pick or revert is already in progress" msgstr "" #: sequencer.c:815 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" #: sequencer.c:819 #, c-format msgid "Could not create sequencer directory %s" msgstr "" #: sequencer.c:835 sequencer.c:917 #, c-format msgid "Error wrapping up %s." msgstr "" #: sequencer.c:854 sequencer.c:987 msgid "no cherry-pick or revert in progress" msgstr "" #: sequencer.c:856 msgid "cannot resolve HEAD" msgstr "" #: sequencer.c:858 msgid "cannot abort from a branch yet to be born" msgstr "" #: sequencer.c:878 builtin/apply.c:4287 #, c-format msgid "cannot open %s: %s" msgstr "" #: sequencer.c:881 #, c-format msgid "cannot read %s: %s" msgstr "" #: sequencer.c:882 msgid "unexpected end of file" msgstr "" #: sequencer.c:888 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" #: sequencer.c:910 #, c-format msgid "Could not format %s." msgstr "" #: sequencer.c:1055 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" #: sequencer.c:1058 #, c-format msgid "%s: bad revision" msgstr "" #: sequencer.c:1092 msgid "Can't revert as initial commit" msgstr "" #: sequencer.c:1093 msgid "Can't cherry-pick into empty head" msgstr "" #: setup.c:246 #, c-format msgid "failed to read %s" msgstr "" #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "" #: sha1_file.c:2459 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" #: sha1_file.c:2463 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" #: sha1_name.c:462 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" "may be created by mistake. For example,\n" "\n" " git checkout -b $br $(git rev-parse ...)\n" "\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" msgstr "" #: submodule.c:62 submodule.c:96 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" #: submodule.c:66 submodule.c:100 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" #: submodule.c:74 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" #: submodule.c:107 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" #: submodule.c:118 msgid "staging updated .gitmodules failed" msgstr "" #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" msgstr "" #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 #: trailer.c:562 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" #: trailer.c:544 trailer.c:549 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "" #: trailer.c:582 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" #: trailer.c:702 #, c-format msgid "could not read input file '%s'" msgstr "" #: trailer.c:705 msgid "could not read from stdin" msgstr "" #: trailer.c:857 builtin/am.c:42 #, c-format msgid "could not stat %s" msgstr "" #: trailer.c:859 #, c-format msgid "file %s is not a regular file" msgstr "" #: trailer.c:861 #, c-format msgid "file %s is not writable by user" msgstr "" #: trailer.c:873 msgid "could not open temporary file" msgstr "" #: trailer.c:912 #, c-format msgid "could not rename temporary file to %s" msgstr "" #: transport-helper.c:1041 #, c-format msgid "Could not read ref %s" msgstr "" #: unpack-trees.c:203 msgid "Checking out files" msgstr "" #: urlmatch.c:120 msgid "invalid URL scheme name or missing '://' suffix" msgstr "" #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 #, c-format msgid "invalid %XX escape sequence" msgstr "" #: urlmatch.c:172 msgid "missing host and scheme is not 'file:'" msgstr "" #: urlmatch.c:189 msgid "a 'file:' URL may not have a port number" msgstr "" #: urlmatch.c:199 msgid "invalid characters in host name" msgstr "" #: urlmatch.c:244 urlmatch.c:255 msgid "invalid port number" msgstr "" #: urlmatch.c:322 msgid "invalid '..' path segment" msgstr "" #: wrapper.c:222 wrapper.c:381 #, c-format msgid "could not open '%s' for reading and writing" msgstr "" #: wrapper.c:224 wrapper.c:383 #, c-format msgid "could not open '%s' for writing" msgstr "" #: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 #: builtin/merge.c:1075 builtin/pull.c:387 #, c-format msgid "could not open '%s' for reading" msgstr "" #: wrapper.c:611 #, c-format msgid "unable to access '%s': %s" msgstr "" #: wrapper.c:632 #, c-format msgid "unable to access '%s'" msgstr "" #: wrapper.c:640 msgid "unable to get current working directory" msgstr "" #: wrapper.c:667 #, c-format msgid "could not open %s for writing" msgstr "" #: wrapper.c:678 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "" #: wrapper.c:684 #, c-format msgid "could not close %s" msgstr "" #: wt-status.c:149 msgid "Unmerged paths:" msgstr "" #: wt-status.c:176 wt-status.c:203 #, c-format msgid " (use \"git reset %s ...\" to unstage)" msgstr "" #: wt-status.c:178 wt-status.c:205 msgid " (use \"git rm --cached ...\" to unstage)" msgstr "" #: wt-status.c:182 msgid " (use \"git add ...\" to mark resolution)" msgstr "" #: wt-status.c:184 wt-status.c:188 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" #: wt-status.c:186 msgid " (use \"git rm ...\" to mark resolution)" msgstr "" #: wt-status.c:197 wt-status.c:880 msgid "Changes to be committed:" msgstr "" #: wt-status.c:215 wt-status.c:889 msgid "Changes not staged for commit:" msgstr "" #: wt-status.c:219 msgid " (use \"git add ...\" to update what will be committed)" msgstr "" #: wt-status.c:221 msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" #: wt-status.c:222 msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" #: wt-status.c:224 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" #: wt-status.c:236 #, c-format msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" #: wt-status.c:251 msgid "both deleted:" msgstr "" #: wt-status.c:253 msgid "added by us:" msgstr "" #: wt-status.c:255 msgid "deleted by them:" msgstr "" #: wt-status.c:257 msgid "added by them:" msgstr "" #: wt-status.c:259 msgid "deleted by us:" msgstr "" #: wt-status.c:261 msgid "both added:" msgstr "" #: wt-status.c:263 msgid "both modified:" msgstr "" #: wt-status.c:265 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "" #: wt-status.c:273 msgid "new file:" msgstr "" #: wt-status.c:275 msgid "copied:" msgstr "" #: wt-status.c:277 msgid "deleted:" msgstr "" #: wt-status.c:279 msgid "modified:" msgstr "" #: wt-status.c:281 msgid "renamed:" msgstr "" #: wt-status.c:283 msgid "typechange:" msgstr "" #: wt-status.c:285 msgid "unknown:" msgstr "" #: wt-status.c:287 msgid "unmerged:" msgstr "" #: wt-status.c:369 msgid "new commits, " msgstr "" #: wt-status.c:371 msgid "modified content, " msgstr "" #: wt-status.c:373 msgid "untracked content, " msgstr "" #: wt-status.c:390 #, c-format msgid "bug: unhandled diff status %c" msgstr "" #: wt-status.c:754 msgid "Submodules changed but not updated:" msgstr "" #: wt-status.c:756 msgid "Submodule changes to be committed:" msgstr "" #: wt-status.c:837 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" #: wt-status.c:948 msgid "You have unmerged paths." msgstr "" #: wt-status.c:951 msgid " (fix conflicts and run \"git commit\")" msgstr "" #: wt-status.c:954 msgid "All conflicts fixed but you are still merging." msgstr "" #: wt-status.c:957 msgid " (use \"git commit\" to conclude merge)" msgstr "" #: wt-status.c:967 msgid "You are in the middle of an am session." msgstr "" #: wt-status.c:970 msgid "The current patch is empty." msgstr "" #: wt-status.c:974 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" #: wt-status.c:976 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" #: wt-status.c:978 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" #: wt-status.c:1105 msgid "No commands done." msgstr "" #: wt-status.c:1108 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" #: wt-status.c:1119 #, c-format msgid " (see more in file %s)" msgstr "" #: wt-status.c:1124 msgid "No commands remaining." msgstr "" #: wt-status.c:1127 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" #: wt-status.c:1135 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" #: wt-status.c:1148 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" #: wt-status.c:1153 msgid "You are currently rebasing." msgstr "" #: wt-status.c:1167 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" #: wt-status.c:1169 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" #: wt-status.c:1171 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" #: wt-status.c:1177 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" #: wt-status.c:1181 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" #: wt-status.c:1186 msgid "You are currently splitting a commit during a rebase." msgstr "" #: wt-status.c:1189 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" #: wt-status.c:1193 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" #: wt-status.c:1198 msgid "You are currently editing a commit during a rebase." msgstr "" #: wt-status.c:1201 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" #: wt-status.c:1203 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" #: wt-status.c:1213 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" #: wt-status.c:1218 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" #: wt-status.c:1221 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" #: wt-status.c:1223 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" #: wt-status.c:1232 #, c-format msgid "You are currently reverting commit %s." msgstr "" #: wt-status.c:1237 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" #: wt-status.c:1240 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" #: wt-status.c:1242 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" #: wt-status.c:1253 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" #: wt-status.c:1257 msgid "You are currently bisecting." msgstr "" #: wt-status.c:1260 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" #: wt-status.c:1438 msgid "On branch " msgstr "" #: wt-status.c:1444 msgid "interactive rebase in progress; onto " msgstr "" #: wt-status.c:1446 msgid "rebase in progress; onto " msgstr "" #: wt-status.c:1451 msgid "HEAD detached at " msgstr "" #: wt-status.c:1453 msgid "HEAD detached from " msgstr "" #: wt-status.c:1456 msgid "Not currently on any branch." msgstr "" #: wt-status.c:1474 msgid "Initial commit" msgstr "" #: wt-status.c:1488 msgid "Untracked files" msgstr "" #: wt-status.c:1490 msgid "Ignored files" msgstr "" #: wt-status.c:1494 #, 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:1500 #, c-format msgid "Untracked files not listed%s" msgstr "" #: wt-status.c:1502 msgid " (use -u option to show untracked files)" msgstr "" #: wt-status.c:1508 msgid "No changes" msgstr "" #: wt-status.c:1513 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" #: wt-status.c:1516 #, c-format msgid "no changes added to commit\n" msgstr "" #: wt-status.c:1519 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" #: wt-status.c:1522 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" #: wt-status.c:1525 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" #: wt-status.c:1528 wt-status.c:1533 #, c-format msgid "nothing to commit\n" msgstr "" #: wt-status.c:1531 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" #: wt-status.c:1535 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" #: wt-status.c:1642 msgid "Initial commit on " msgstr "" #: wt-status.c:1646 msgid "HEAD (no branch)" msgstr "" #: wt-status.c:1675 msgid "gone" msgstr "" #: wt-status.c:1677 wt-status.c:1685 msgid "behind " msgstr "" #: wt-status.c:1680 wt-status.c:1683 msgid "ahead " msgstr "" #: compat/precompose_utf8.c:57 builtin/clone.c:413 #, c-format msgid "failed to unlink '%s'" msgstr "" #: builtin/add.c:22 msgid "git add [] [--] ..." msgstr "" #: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "" #: builtin/add.c:70 builtin/commit.c:278 msgid "updating files failed" msgstr "" #: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "" #: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "" #: builtin/add.c:194 builtin/rev-parse.c:797 msgid "Could not read the index" msgstr "" #: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "" #: builtin/add.c:209 msgid "Could not write patch" msgstr "" #: builtin/add.c:212 msgid "editing patch failed" msgstr "" #: builtin/add.c:215 #, c-format msgid "Could not stat '%s'" msgstr "" #: builtin/add.c:217 msgid "Empty patch. Aborted." msgstr "" #: builtin/add.c:222 #, c-format msgid "Could not apply '%s'" msgstr "" #: builtin/add.c:232 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 #: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 #: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "" #: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 #: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "" #: builtin/add.c:252 msgid "interactive picking" msgstr "" #: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" #: builtin/add.c:254 msgid "edit current diff and apply" msgstr "" #: builtin/add.c:255 msgid "allow adding otherwise ignored files" msgstr "" #: builtin/add.c:256 msgid "update tracked files" msgstr "" #: builtin/add.c:257 msgid "record only the fact that the path will be added later" msgstr "" #: builtin/add.c:258 msgid "add changes from all tracked and untracked files" msgstr "" #: builtin/add.c:261 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" #: builtin/add.c:263 msgid "don't add, only refresh the index" msgstr "" #: builtin/add.c:264 msgid "just skip files which cannot be added because of errors" msgstr "" #: builtin/add.c:265 msgid "check if - even missing - files are ignored in dry run" msgstr "" #: builtin/add.c:287 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" #: builtin/add.c:294 msgid "adding files failed" msgstr "" #: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "" #: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" #: builtin/add.c:352 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" #: builtin/add.c:353 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 #: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 #: builtin/submodule--helper.c:35 msgid "index file corrupt" msgstr "" #: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "" #: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 #, c-format msgid "could not read '%s'" msgstr "" #: builtin/am.c:430 msgid "could not parse author script" msgstr "" #: builtin/am.c:507 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" #: builtin/am.c:548 builtin/notes.c:300 #, c-format msgid "Malformed input line: '%s'." msgstr "" #: builtin/am.c:585 builtin/notes.c:315 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" #: builtin/am.c:611 msgid "fseek failed" msgstr "" #: builtin/am.c:772 builtin/am.c:860 #, c-format msgid "could not open '%s' for reading: %s" msgstr "" #: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing: %s" msgstr "" #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" msgstr "" #: builtin/am.c:853 msgid "Only one StGIT patch series can be applied at once" msgstr "" #: builtin/am.c:901 msgid "invalid timestamp" msgstr "" #: builtin/am.c:904 builtin/am.c:912 msgid "invalid Date line" msgstr "" #: builtin/am.c:909 msgid "invalid timezone offset" msgstr "" #: builtin/am.c:996 msgid "Patch format detection failed." msgstr "" #: builtin/am.c:1001 builtin/clone.c:378 #, c-format msgid "failed to create directory '%s'" msgstr "" #: builtin/am.c:1005 msgid "Failed to split patches." msgstr "" #: builtin/am.c:1137 builtin/commit.c:363 msgid "unable to write index file" msgstr "" #: builtin/am.c:1188 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" #: builtin/am.c:1189 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" #: builtin/am.c:1190 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" #: builtin/am.c:1328 msgid "Patch is empty. Was it split wrong?" msgstr "" #: builtin/am.c:1402 builtin/log.c:1350 #, c-format msgid "invalid ident line: %s" msgstr "" #: builtin/am.c:1429 #, c-format msgid "unable to parse commit %s" msgstr "" #: builtin/am.c:1631 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" #: builtin/am.c:1633 msgid "Using index info to reconstruct a base tree..." msgstr "" #: builtin/am.c:1652 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" #: builtin/am.c:1658 msgid "Falling back to patching base and 3-way merge..." msgstr "" #: builtin/am.c:1673 msgid "Failed to merge in the changes." msgstr "" #: builtin/am.c:1697 builtin/merge.c:633 msgid "git write-tree failed to write a tree" msgstr "" #: builtin/am.c:1704 msgid "applying to an empty history" msgstr "" #: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 #: builtin/merge.c:855 msgid "failed to write commit object" msgstr "" #: builtin/am.c:1749 builtin/am.c:1753 #, c-format msgid "cannot resume: %s does not exist." msgstr "" #: builtin/am.c:1769 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" #: builtin/am.c:1774 msgid "Commit Body is:" msgstr "" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. #. #: builtin/am.c:1784 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" #: builtin/am.c:1834 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" #: builtin/am.c:1869 builtin/am.c:1941 #, c-format msgid "Applying: %.*s" msgstr "" #: builtin/am.c:1885 msgid "No changes -- Patch already applied." msgstr "" #: builtin/am.c:1893 #, c-format msgid "Patch failed at %s %.*s" msgstr "" #: builtin/am.c:1899 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "" #: builtin/am.c:1944 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" #: builtin/am.c:1951 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" msgstr "" #: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "" #: builtin/am.c:2111 msgid "failed to clean index" msgstr "" #: builtin/am.c:2145 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" #: builtin/am.c:2206 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" #: builtin/am.c:2239 msgid "git am [] [(|)...]" msgstr "" #: builtin/am.c:2240 msgid "git am [] (--continue | --skip | --abort)" msgstr "" #: builtin/am.c:2246 msgid "run interactively" msgstr "" #: builtin/am.c:2248 msgid "historical option -- no-op" msgstr "" #: builtin/am.c:2250 msgid "allow fall back on 3way merging if needed" msgstr "" #: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "" #: builtin/am.c:2253 msgid "add a Signed-off-by line to the commit message" msgstr "" #: builtin/am.c:2256 msgid "recode into utf8 (default)" msgstr "" #: builtin/am.c:2258 msgid "pass -k flag to git-mailinfo" msgstr "" #: builtin/am.c:2260 msgid "pass -b flag to git-mailinfo" msgstr "" #: builtin/am.c:2262 msgid "pass -m flag to git-mailinfo" msgstr "" #: builtin/am.c:2264 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" #: builtin/am.c:2267 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" #: builtin/am.c:2270 msgid "strip everything before a scissors line" msgstr "" #: builtin/am.c:2271 builtin/apply.c:4544 msgid "action" msgstr "" #: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 #: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 #: builtin/am.c:2299 msgid "pass it through git-apply" msgstr "" #: builtin/am.c:2280 builtin/apply.c:4568 msgid "root" msgstr "" #: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 #: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 #: builtin/pull.c:171 builtin/submodule--helper.c:72 #: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 msgid "path" msgstr "" #: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 #: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 #: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "" #: builtin/am.c:2292 builtin/apply.c:4512 msgid "num" msgstr "" #: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "" #: builtin/am.c:2296 msgid "format the patch(es) are in" msgstr "" #: builtin/am.c:2302 msgid "override error message when patch failure occurs" msgstr "" #: builtin/am.c:2304 msgid "continue applying patches after resolving a conflict" msgstr "" #: builtin/am.c:2307 msgid "synonyms for --continue" msgstr "" #: builtin/am.c:2310 msgid "skip the current patch" msgstr "" #: builtin/am.c:2313 msgid "restore the original branch and abort the patching operation." msgstr "" #: builtin/am.c:2317 msgid "lie about committer date" msgstr "" #: builtin/am.c:2319 msgid "use current timestamp for author date" msgstr "" #: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 #: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "" #: builtin/am.c:2322 msgid "GPG-sign commits" msgstr "" #: builtin/am.c:2325 msgid "(internal use for git-rebase)" msgstr "" #: builtin/am.c:2340 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" #: builtin/am.c:2347 msgid "failed to read the index" msgstr "" #: builtin/am.c:2362 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" #: builtin/am.c:2386 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" #: builtin/am.c:2392 msgid "Resolve operation not in progress, we are not resuming." msgstr "" #: builtin/apply.c:59 msgid "git apply [] [...]" msgstr "" #: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" #: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" #: builtin/apply.c:818 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" #: builtin/apply.c:827 #, c-format msgid "regexec returned %d for input: %s" msgstr "" #: builtin/apply.c:908 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" #: builtin/apply.c:940 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" #: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" #: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" #: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" #: builtin/apply.c:1415 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" #: builtin/apply.c:1472 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" #: builtin/apply.c:1489 #, 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:1655 msgid "new file depends on old contents" msgstr "" #: builtin/apply.c:1657 msgid "deleted file still has contents" msgstr "" #: builtin/apply.c:1683 #, c-format msgid "corrupt patch at line %d" msgstr "" #: builtin/apply.c:1719 #, c-format msgid "new file %s depends on old contents" msgstr "" #: builtin/apply.c:1721 #, c-format msgid "deleted file %s still has contents" msgstr "" #: builtin/apply.c:1724 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" #: builtin/apply.c:1870 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #: builtin/apply.c:1899 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" #: builtin/apply.c:2050 #, c-format msgid "patch with only garbage at line %d" msgstr "" #: builtin/apply.c:2140 #, c-format msgid "unable to read symlink %s" msgstr "" #: builtin/apply.c:2144 #, c-format msgid "unable to open or read %s" msgstr "" #: builtin/apply.c:2777 #, c-format msgid "invalid start of line: '%c'" msgstr "" #: builtin/apply.c:2896 #, 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:2908 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" #: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" #: builtin/apply.c:2934 #, c-format msgid "missing binary patch data for '%s'" msgstr "" #: builtin/apply.c:3035 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" #: builtin/apply.c:3041 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" #: builtin/apply.c:3062 #, c-format msgid "patch failed: %s:%ld" msgstr "" #: builtin/apply.c:3186 #, c-format msgid "cannot checkout %s" msgstr "" #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 #, c-format msgid "read of %s failed" msgstr "" #: builtin/apply.c:3239 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" #: builtin/apply.c:3267 builtin/apply.c:3489 #, c-format msgid "path %s has been renamed/deleted" msgstr "" #: builtin/apply.c:3348 builtin/apply.c:3503 #, c-format msgid "%s: does not exist in index" msgstr "" #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 #, c-format msgid "%s: %s" msgstr "" #: builtin/apply.c:3357 builtin/apply.c:3511 #, c-format msgid "%s: does not match index" msgstr "" #: builtin/apply.c:3459 msgid "removal patch leaves file contents" msgstr "" #: builtin/apply.c:3528 #, c-format msgid "%s: wrong type" msgstr "" #: builtin/apply.c:3530 #, c-format msgid "%s has type %o, expected %o" msgstr "" #: builtin/apply.c:3689 builtin/apply.c:3691 #, c-format msgid "invalid path '%s'" msgstr "" #: builtin/apply.c:3746 #, c-format msgid "%s: already exists in index" msgstr "" #: builtin/apply.c:3749 #, c-format msgid "%s: already exists in working directory" msgstr "" #: builtin/apply.c:3769 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" #: builtin/apply.c:3774 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" #: builtin/apply.c:3794 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" #: builtin/apply.c:3798 #, c-format msgid "%s: patch does not apply" msgstr "" #: builtin/apply.c:3812 #, c-format msgid "Checking patch %s..." msgstr "" #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" #: builtin/apply.c:4048 #, c-format msgid "unable to remove %s from index" msgstr "" #: builtin/apply.c:4077 #, c-format msgid "corrupt patch for submodule %s" msgstr "" #: builtin/apply.c:4081 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" #: builtin/apply.c:4086 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" #: builtin/apply.c:4089 builtin/apply.c:4197 #, c-format msgid "unable to add cache entry for %s" msgstr "" #: builtin/apply.c:4122 #, c-format msgid "closing file '%s'" msgstr "" #: builtin/apply.c:4171 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" #: builtin/apply.c:4258 #, c-format msgid "Applied patch %s cleanly." msgstr "" #: builtin/apply.c:4266 msgid "internal error" msgstr "" #: builtin/apply.c:4269 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" #: builtin/apply.c:4279 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" #: builtin/apply.c:4300 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" #: builtin/apply.c:4303 #, c-format msgid "Rejected hunk #%d." msgstr "" #: builtin/apply.c:4393 msgid "unrecognized input" msgstr "" #: builtin/apply.c:4404 msgid "unable to read index file" msgstr "" #: builtin/apply.c:4507 msgid "don't apply changes matching the given path" msgstr "" #: builtin/apply.c:4510 msgid "apply changes matching the given path" msgstr "" #: builtin/apply.c:4513 msgid "remove leading slashes from traditional diff paths" msgstr "" #: builtin/apply.c:4516 msgid "ignore additions made by the patch" msgstr "" #: builtin/apply.c:4518 msgid "instead of applying the patch, output diffstat for the input" msgstr "" #: builtin/apply.c:4522 msgid "show number of added and deleted lines in decimal notation" msgstr "" #: builtin/apply.c:4524 msgid "instead of applying the patch, output a summary for the input" msgstr "" #: builtin/apply.c:4526 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" #: builtin/apply.c:4528 msgid "make sure the patch is applicable to the current index" msgstr "" #: builtin/apply.c:4530 msgid "apply a patch without touching the working tree" msgstr "" #: builtin/apply.c:4532 msgid "accept a patch that touches outside the working area" msgstr "" #: builtin/apply.c:4534 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" #: builtin/apply.c:4536 msgid "attempt three-way merge if a patch does not apply" msgstr "" #: builtin/apply.c:4538 msgid "build a temporary index based on embedded index information" msgstr "" #: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "" #: builtin/apply.c:4543 msgid "ensure at least lines of context match" msgstr "" #: builtin/apply.c:4545 msgid "detect new or modified lines that have whitespace errors" msgstr "" #: builtin/apply.c:4548 builtin/apply.c:4551 msgid "ignore changes in whitespace when finding context" msgstr "" #: builtin/apply.c:4554 msgid "apply the patch in reverse" msgstr "" #: builtin/apply.c:4556 msgid "don't expect at least one line of context" msgstr "" #: builtin/apply.c:4558 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" #: builtin/apply.c:4560 msgid "allow overlapping hunks" msgstr "" #: builtin/apply.c:4563 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" #: builtin/apply.c:4566 msgid "do not trust the line counts in the hunk headers" msgstr "" #: builtin/apply.c:4569 msgid "prepend to all filenames" msgstr "" #: builtin/apply.c:4591 msgid "--3way outside a repository" msgstr "" #: builtin/apply.c:4599 msgid "--index outside a repository" msgstr "" #: builtin/apply.c:4602 msgid "--cached outside a repository" msgstr "" #: builtin/apply.c:4621 #, c-format msgid "can't open patch '%s'" msgstr "" #: builtin/apply.c:4635 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" #: builtin/apply.c:4641 builtin/apply.c:4651 #, 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:33 msgid "git blame [] [] [] [--] " msgstr "" #: builtin/blame.c:38 msgid " are documented in git-rev-list(1)" msgstr "" #: builtin/blame.c:1782 msgid "Blaming lines" msgstr "" #: builtin/blame.c:2530 msgid "Show blame entries as we find them, incrementally" msgstr "" #: builtin/blame.c:2531 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" #: builtin/blame.c:2532 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" #: builtin/blame.c:2533 msgid "Show work cost statistics" msgstr "" #: builtin/blame.c:2534 msgid "Force progress reporting" msgstr "" #: builtin/blame.c:2535 msgid "Show output score for blame entries" msgstr "" #: builtin/blame.c:2536 msgid "Show original filename (Default: auto)" msgstr "" #: builtin/blame.c:2537 msgid "Show original linenumber (Default: off)" msgstr "" #: builtin/blame.c:2538 msgid "Show in a format designed for machine consumption" msgstr "" #: builtin/blame.c:2539 msgid "Show porcelain format with per-line commit information" msgstr "" #: builtin/blame.c:2540 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" #: builtin/blame.c:2541 msgid "Show raw timestamp (Default: off