You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
9219 lines
179 KiB
9219 lines
179 KiB
# 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 <EMAIL@ADDRESS>, YEAR. |
|
# |
|
#, fuzzy |
|
msgid "" |
|
msgstr "" |
|
"Project-Id-Version: PACKAGE VERSION\n" |
|
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" |
|
"POT-Creation-Date: 2013-03-05 12:36+0800\n" |
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
|
"Language-Team: LANGUAGE <LL@li.org>\n" |
|
"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:49 |
|
#, c-format |
|
msgid "hint: %.*s\n" |
|
msgstr "" |
|
|
|
#. |
|
#. * Message used both when 'git commit' fails and when |
|
#. * other commands doing a merge do. |
|
#. |
|
#: advice.c:79 |
|
msgid "" |
|
"Fix them up in the work tree,\n" |
|
"and then use 'git add/rm <file>' as\n" |
|
"appropriate to mark resolution and make a commit,\n" |
|
"or use 'git commit -a'." |
|
msgstr "" |
|
|
|
#: archive.c:10 |
|
msgid "git archive [options] <tree-ish> [<path>...]" |
|
msgstr "" |
|
|
|
#: archive.c:11 |
|
msgid "git archive --list" |
|
msgstr "" |
|
|
|
#: archive.c:12 |
|
msgid "" |
|
"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" |
|
msgstr "" |
|
|
|
#: archive.c:13 |
|
msgid "git archive --remote <repo> [--exec <cmd>] --list" |
|
msgstr "" |
|
|
|
#: archive.c:323 |
|
msgid "fmt" |
|
msgstr "" |
|
|
|
#: archive.c:323 |
|
msgid "archive format" |
|
msgstr "" |
|
|
|
#: archive.c:324 builtin/log.c:1115 |
|
msgid "prefix" |
|
msgstr "" |
|
|
|
#: archive.c:325 |
|
msgid "prepend prefix to each pathname in the archive" |
|
msgstr "" |
|
|
|
#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 |
|
#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 |
|
#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 |
|
#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 |
|
#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 |
|
msgid "file" |
|
msgstr "" |
|
|
|
#: archive.c:327 builtin/archive.c:92 |
|
msgid "write the archive to this file" |
|
msgstr "" |
|
|
|
#: archive.c:329 |
|
msgid "read .gitattributes in working directory" |
|
msgstr "" |
|
|
|
#: archive.c:330 |
|
msgid "report archived files on stderr" |
|
msgstr "" |
|
|
|
#: archive.c:331 |
|
msgid "store only" |
|
msgstr "" |
|
|
|
#: archive.c:332 |
|
msgid "compress faster" |
|
msgstr "" |
|
|
|
#: archive.c:340 |
|
msgid "compress better" |
|
msgstr "" |
|
|
|
#: archive.c:343 |
|
msgid "list supported archive formats" |
|
msgstr "" |
|
|
|
#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 |
|
msgid "repo" |
|
msgstr "" |
|
|
|
#: archive.c:346 builtin/archive.c:94 |
|
msgid "retrieve the archive from remote repository <repo>" |
|
msgstr "" |
|
|
|
#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 |
|
msgid "command" |
|
msgstr "" |
|
|
|
#: archive.c:348 builtin/archive.c:96 |
|
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 "" |
|
|
|
#: bundle.c:36 |
|
#, c-format |
|
msgid "'%s' does not look like a v2 bundle file" |
|
msgstr "" |
|
|
|
#: bundle.c:63 |
|
#, c-format |
|
msgid "unrecognized header: %s%s (%d)" |
|
msgstr "" |
|
|
|
#: bundle.c:89 builtin/commit.c:674 |
|
#, c-format |
|
msgid "could not open '%s'" |
|
msgstr "" |
|
|
|
#: bundle.c:140 |
|
msgid "Repository lacks these prerequisite commits:" |
|
msgstr "" |
|
|
|
#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 |
|
#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 |
|
#: builtin/shortlog.c:157 |
|
msgid "revision walk setup failed" |
|
msgstr "" |
|
|
|
#: bundle.c:186 |
|
#, c-format |
|
msgid "The bundle contains %d ref" |
|
msgid_plural "The bundle contains %d refs" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: bundle.c:192 |
|
msgid "The bundle records a complete history." |
|
msgstr "" |
|
|
|
#: bundle.c:195 |
|
#, c-format |
|
msgid "The bundle requires this ref" |
|
msgid_plural "The bundle requires these %d refs" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: bundle.c:294 |
|
msgid "rev-list died" |
|
msgstr "" |
|
|
|
#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 |
|
#, c-format |
|
msgid "unrecognized argument: %s" |
|
msgstr "" |
|
|
|
#: bundle.c:335 |
|
#, c-format |
|
msgid "ref '%s' is excluded by the rev-list options" |
|
msgstr "" |
|
|
|
#: bundle.c:380 |
|
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:50 |
|
#, c-format |
|
msgid "could not parse %s" |
|
msgstr "" |
|
|
|
#: commit.c:52 |
|
#, c-format |
|
msgid "%s %s is not a commit!" |
|
msgstr "" |
|
|
|
#: compat/obstack.c:406 compat/obstack.c:408 |
|
msgid "memory exhausted" |
|
msgstr "" |
|
|
|
#: connected.c:39 |
|
msgid "Could not run 'git rev-list'" |
|
msgstr "" |
|
|
|
#: connected.c:48 |
|
#, c-format |
|
msgid "failed write to rev-list: %s" |
|
msgstr "" |
|
|
|
#: connected.c:56 |
|
#, 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] "" |
|
|
|
#: diff.c:112 |
|
#, c-format |
|
msgid " Failed to parse dirstat cut-off percentage '%s'\n" |
|
msgstr "" |
|
|
|
#: diff.c:117 |
|
#, c-format |
|
msgid " Unknown dirstat parameter '%s'\n" |
|
msgstr "" |
|
|
|
#: diff.c:210 |
|
#, c-format |
|
msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
|
msgstr "" |
|
|
|
#: diff.c:260 |
|
#, c-format |
|
msgid "" |
|
"Found errors in 'diff.dirstat' config variable:\n" |
|
"%s" |
|
msgstr "" |
|
|
|
#: diff.c:3468 |
|
#, c-format |
|
msgid "" |
|
"Failed to parse --dirstat/-X option parameter:\n" |
|
"%s" |
|
msgstr "" |
|
|
|
#: diff.c:3482 |
|
#, c-format |
|
msgid "Failed to parse --submodule option parameter: '%s'" |
|
msgstr "" |
|
|
|
#: gpg-interface.c:59 gpg-interface.c:127 |
|
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:112 |
|
#, c-format |
|
msgid "could not create temporary file '%s': %s" |
|
msgstr "" |
|
|
|
#: gpg-interface.c:115 |
|
#, c-format |
|
msgid "failed writing detached signature to '%s': %s" |
|
msgstr "" |
|
|
|
#: grep.c:1622 |
|
#, c-format |
|
msgid "'%s': unable to read %s" |
|
msgstr "" |
|
|
|
#: grep.c:1639 |
|
#, c-format |
|
msgid "'%s': %s" |
|
msgstr "" |
|
|
|
#: grep.c:1650 |
|
#, c-format |
|
msgid "'%s': short read %s" |
|
msgstr "" |
|
|
|
#: help.c:212 |
|
#, c-format |
|
msgid "available git commands in '%s'" |
|
msgstr "" |
|
|
|
#: help.c:219 |
|
msgid "git commands available from elsewhere on your $PATH" |
|
msgstr "" |
|
|
|
#: help.c:235 |
|
msgid "The most commonly used git commands are:" |
|
msgstr "" |
|
|
|
#: help.c:292 |
|
#, 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:349 |
|
msgid "Uh oh. Your system reports no Git commands at all." |
|
msgstr "" |
|
|
|
#: help.c:371 |
|
#, 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:376 |
|
#, c-format |
|
msgid "in %0.1f seconds automatically..." |
|
msgstr "" |
|
|
|
#: help.c:383 |
|
#, c-format |
|
msgid "git: '%s' is not a git command. See 'git --help'." |
|
msgstr "" |
|
|
|
#: help.c:387 |
|
msgid "" |
|
"\n" |
|
"Did you mean this?" |
|
msgid_plural "" |
|
"\n" |
|
"Did you mean one of these?" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: merge.c:56 |
|
msgid "failed to read the cache" |
|
msgstr "" |
|
|
|
#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534 |
|
#: builtin/clone.c:586 |
|
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:268 |
|
msgid "error building trees" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:672 |
|
#, c-format |
|
msgid "failed to create path '%s'%s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:683 |
|
#, 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:697 merge-recursive.c:718 |
|
msgid ": perhaps a D/F conflict?" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:708 |
|
#, c-format |
|
msgid "refusing to lose untracked file at '%s'" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:748 |
|
#, c-format |
|
msgid "cannot read object %s '%s'" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:750 |
|
#, c-format |
|
msgid "blob expected for %s '%s'" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:773 builtin/clone.c:302 |
|
#, c-format |
|
msgid "failed to open '%s'" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:781 |
|
#, c-format |
|
msgid "failed to symlink '%s'" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:784 |
|
#, c-format |
|
msgid "do not know what to do with %06o %s '%s'" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:922 |
|
msgid "Failed to execute internal merge" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:926 |
|
#, c-format |
|
msgid "Unable to add %s to database" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:942 |
|
msgid "unsupported object type in the tree" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1021 merge-recursive.c:1035 |
|
#, 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:1027 merge-recursive.c:1040 |
|
#, 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:1081 |
|
msgid "rename" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1081 |
|
msgid "renamed" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1137 |
|
#, c-format |
|
msgid "%s is a directory in %s adding as %s instead" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1159 |
|
#, c-format |
|
msgid "" |
|
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
|
"\"->\"%s\" in \"%s\"%s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1164 |
|
msgid " (left unresolved)" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1218 |
|
#, c-format |
|
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1248 |
|
#, c-format |
|
msgid "Renaming %s to %s and %s to %s instead" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1447 |
|
#, c-format |
|
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1457 |
|
#, c-format |
|
msgid "Adding merged %s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1462 merge-recursive.c:1660 |
|
#, c-format |
|
msgid "Adding as %s instead" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1513 |
|
#, c-format |
|
msgid "cannot read object %s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1516 |
|
#, c-format |
|
msgid "object %s is not a blob" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1564 |
|
msgid "modify" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1564 |
|
msgid "modified" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1574 |
|
msgid "content" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1581 |
|
msgid "add/add" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1615 |
|
#, c-format |
|
msgid "Skipped %s (merged same as existing)" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1629 |
|
#, c-format |
|
msgid "Auto-merging %s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1633 git-submodule.sh:942 |
|
msgid "submodule" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1634 |
|
#, c-format |
|
msgid "CONFLICT (%s): Merge conflict in %s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1724 |
|
#, c-format |
|
msgid "Removing %s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1749 |
|
msgid "file/directory" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1755 |
|
msgid "directory/file" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1760 |
|
#, c-format |
|
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1770 |
|
#, c-format |
|
msgid "Adding %s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1787 |
|
msgid "Fatal merge failure, shouldn't happen." |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1806 |
|
msgid "Already up-to-date!" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1815 |
|
#, c-format |
|
msgid "merging of trees %s and %s failed" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1845 |
|
#, c-format |
|
msgid "Unprocessed path??? %s" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1890 |
|
msgid "Merging:" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1903 |
|
#, c-format |
|
msgid "found %u common ancestor:" |
|
msgid_plural "found %u common ancestors:" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: merge-recursive.c:1940 |
|
msgid "merge returned no commit" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:1997 |
|
#, c-format |
|
msgid "Could not parse object '%s'" |
|
msgstr "" |
|
|
|
#: merge-recursive.c:2009 builtin/merge.c:643 |
|
msgid "Unable to write index." |
|
msgstr "" |
|
|
|
#: parse-options.c:489 |
|
msgid "..." |
|
msgstr "" |
|
|
|
#: parse-options.c:507 |
|
#, c-format |
|
msgid "usage: %s" |
|
msgstr "" |
|
|
|
#. TRANSLATORS: the colon here should align with the |
|
#. one in "usage: %s" translation |
|
#: parse-options.c:511 |
|
#, c-format |
|
msgid " or: %s" |
|
msgstr "" |
|
|
|
#: parse-options.c:514 |
|
#, c-format |
|
msgid " %s" |
|
msgstr "" |
|
|
|
#: parse-options.c:548 |
|
msgid "-NUM" |
|
msgstr "" |
|
|
|
#: pathspec.c:83 |
|
#, c-format |
|
msgid "Path '%s' is in submodule '%.*s'" |
|
msgstr "" |
|
|
|
#: pathspec.c:99 |
|
#, c-format |
|
msgid "'%s' is beyond a symbolic link" |
|
msgstr "" |
|
|
|
#: remote.c:1653 |
|
#, 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:1659 |
|
msgid " (use \"git push\" to publish your local commits)\n" |
|
msgstr "" |
|
|
|
#: remote.c:1662 |
|
#, 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:1670 |
|
msgid " (use \"git pull\" to update your local branch)\n" |
|
msgstr "" |
|
|
|
#: remote.c:1673 |
|
#, 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:1683 |
|
msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
|
msgstr "" |
|
|
|
#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984 |
|
#: builtin/merge.c:994 |
|
#, c-format |
|
msgid "Could not open '%s' for writing" |
|
msgstr "" |
|
|
|
#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986 |
|
#: builtin/merge.c:999 |
|
#, c-format |
|
msgid "Could not write to '%s'" |
|
msgstr "" |
|
|
|
#: sequencer.c:146 |
|
msgid "" |
|
"after resolving the conflicts, mark the corrected paths\n" |
|
"with 'git add <paths>' or 'git rm <paths>'" |
|
msgstr "" |
|
|
|
#: sequencer.c:149 |
|
msgid "" |
|
"after resolving the conflicts, mark the corrected paths\n" |
|
"with 'git add <paths>' or 'git rm <paths>'\n" |
|
"and commit the result with 'git commit'" |
|
msgstr "" |
|
|
|
#: sequencer.c:162 sequencer.c:774 sequencer.c:857 |
|
#, c-format |
|
msgid "Could not write to %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:165 |
|
#, c-format |
|
msgid "Error wrapping up %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:180 |
|
msgid "Your local changes would be overwritten by cherry-pick." |
|
msgstr "" |
|
|
|
#: sequencer.c:182 |
|
msgid "Your local changes would be overwritten by revert." |
|
msgstr "" |
|
|
|
#: sequencer.c:185 |
|
msgid "Commit your changes or stash them to proceed." |
|
msgstr "" |
|
|
|
#. TRANSLATORS: %s will be "revert" or "cherry-pick" |
|
#: sequencer.c:236 |
|
#, c-format |
|
msgid "%s: Unable to write new index file" |
|
msgstr "" |
|
|
|
#: sequencer.c:267 |
|
msgid "Could not resolve HEAD commit\n" |
|
msgstr "" |
|
|
|
#: sequencer.c:288 |
|
msgid "Unable to update cache tree\n" |
|
msgstr "" |
|
|
|
#: sequencer.c:333 |
|
#, c-format |
|
msgid "Could not parse commit %s\n" |
|
msgstr "" |
|
|
|
#: sequencer.c:338 |
|
#, c-format |
|
msgid "Could not parse parent commit %s\n" |
|
msgstr "" |
|
|
|
#: sequencer.c:404 |
|
msgid "Your index file is unmerged." |
|
msgstr "" |
|
|
|
#: sequencer.c:423 |
|
#, c-format |
|
msgid "Commit %s is a merge but no -m option was given." |
|
msgstr "" |
|
|
|
#: sequencer.c:431 |
|
#, c-format |
|
msgid "Commit %s does not have parent %d" |
|
msgstr "" |
|
|
|
#: sequencer.c:435 |
|
#, 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:448 |
|
#, c-format |
|
msgid "%s: cannot parse parent commit %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:452 |
|
#, c-format |
|
msgid "Cannot get commit message for %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:536 |
|
#, c-format |
|
msgid "could not revert %s... %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:537 |
|
#, c-format |
|
msgid "could not apply %s... %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:569 |
|
msgid "empty commit set passed" |
|
msgstr "" |
|
|
|
#: sequencer.c:577 |
|
#, c-format |
|
msgid "git %s: failed to read the index" |
|
msgstr "" |
|
|
|
#: sequencer.c:582 |
|
#, c-format |
|
msgid "git %s: failed to refresh the index" |
|
msgstr "" |
|
|
|
#: sequencer.c:640 |
|
#, c-format |
|
msgid "Cannot %s during a %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:662 |
|
#, c-format |
|
msgid "Could not parse line %d." |
|
msgstr "" |
|
|
|
#: sequencer.c:667 |
|
msgid "No commits parsed." |
|
msgstr "" |
|
|
|
#: sequencer.c:680 |
|
#, c-format |
|
msgid "Could not open %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:684 |
|
#, c-format |
|
msgid "Could not read %s." |
|
msgstr "" |
|
|
|
#: sequencer.c:691 |
|
#, c-format |
|
msgid "Unusable instruction sheet: %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:719 |
|
#, c-format |
|
msgid "Invalid key: %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:722 |
|
#, c-format |
|
msgid "Invalid value for %s: %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:734 |
|
#, c-format |
|
msgid "Malformed options sheet: %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:755 |
|
msgid "a cherry-pick or revert is already in progress" |
|
msgstr "" |
|
|
|
#: sequencer.c:756 |
|
msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
|
msgstr "" |
|
|
|
#: sequencer.c:760 |
|
#, c-format |
|
msgid "Could not create sequencer directory %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:776 sequencer.c:861 |
|
#, c-format |
|
msgid "Error wrapping up %s." |
|
msgstr "" |
|
|
|
#: sequencer.c:795 sequencer.c:929 |
|
msgid "no cherry-pick or revert in progress" |
|
msgstr "" |
|
|
|
#: sequencer.c:797 |
|
msgid "cannot resolve HEAD" |
|
msgstr "" |
|
|
|
#: sequencer.c:799 |
|
msgid "cannot abort from a branch yet to be born" |
|
msgstr "" |
|
|
|
#: sequencer.c:821 builtin/apply.c:4056 |
|
#, c-format |
|
msgid "cannot open %s: %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:824 |
|
#, c-format |
|
msgid "cannot read %s: %s" |
|
msgstr "" |
|
|
|
#: sequencer.c:825 |
|
msgid "unexpected end of file" |
|
msgstr "" |
|
|
|
#: sequencer.c:831 |
|
#, c-format |
|
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" |
|
msgstr "" |
|
|
|
#: sequencer.c:854 |
|
#, c-format |
|
msgid "Could not format %s." |
|
msgstr "" |
|
|
|
#: sequencer.c:1016 |
|
msgid "Can't revert as initial commit" |
|
msgstr "" |
|
|
|
#: sequencer.c:1017 |
|
msgid "Can't cherry-pick into empty head" |
|
msgstr "" |
|
|
|
#: sha1_name.c:1044 |
|
msgid "HEAD does not point to a branch" |
|
msgstr "" |
|
|
|
#: sha1_name.c:1047 |
|
#, c-format |
|
msgid "No such branch: '%s'" |
|
msgstr "" |
|
|
|
#: sha1_name.c:1049 |
|
#, c-format |
|
msgid "No upstream configured for branch '%s'" |
|
msgstr "" |
|
|
|
#: sha1_name.c:1052 |
|
#, c-format |
|
msgid "Upstream branch '%s' not stored as a remote-tracking branch" |
|
msgstr "" |
|
|
|
#: wrapper.c:408 |
|
#, c-format |
|
msgid "unable to access '%s': %s" |
|
msgstr "" |
|
|
|
#: wrapper.c:423 |
|
#, c-format |
|
msgid "unable to access '%s'" |
|
msgstr "" |
|
|
|
#: wrapper.c:434 |
|
#, c-format |
|
msgid "unable to look up current user in the passwd file: %s" |
|
msgstr "" |
|
|
|
#: wrapper.c:435 |
|
msgid "no such user" |
|
msgstr "" |
|
|
|
#: wt-status.c:140 |
|
msgid "Unmerged paths:" |
|
msgstr "" |
|
|
|
#: wt-status.c:167 wt-status.c:194 |
|
#, c-format |
|
msgid " (use \"git reset %s <file>...\" to unstage)" |
|
msgstr "" |
|
|
|
#: wt-status.c:169 wt-status.c:196 |
|
msgid " (use \"git rm --cached <file>...\" to unstage)" |
|
msgstr "" |
|
|
|
#: wt-status.c:173 |
|
msgid " (use \"git add <file>...\" to mark resolution)" |
|
msgstr "" |
|
|
|
#: wt-status.c:175 wt-status.c:179 |
|
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
|
msgstr "" |
|
|
|
#: wt-status.c:177 |
|
msgid " (use \"git rm <file>...\" to mark resolution)" |
|
msgstr "" |
|
|
|
#: wt-status.c:188 |
|
msgid "Changes to be committed:" |
|
msgstr "" |
|
|
|
#: wt-status.c:206 |
|
msgid "Changes not staged for commit:" |
|
msgstr "" |
|
|
|
#: wt-status.c:210 |
|
msgid " (use \"git add <file>...\" to update what will be committed)" |
|
msgstr "" |
|
|
|
#: wt-status.c:212 |
|
msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
|
msgstr "" |
|
|
|
#: wt-status.c:213 |
|
msgid "" |
|
" (use \"git checkout -- <file>...\" to discard changes in working directory)" |
|
msgstr "" |
|
|
|
#: wt-status.c:215 |
|
msgid " (commit or discard the untracked or modified content in submodules)" |
|
msgstr "" |
|
|
|
#: wt-status.c:227 |
|
#, c-format |
|
msgid " (use \"git %s <file>...\" to include in what will be committed)" |
|
msgstr "" |
|
|
|
#: wt-status.c:244 |
|
msgid "bug" |
|
msgstr "" |
|
|
|
#: wt-status.c:249 |
|
msgid "both deleted:" |
|
msgstr "" |
|
|
|
#: wt-status.c:250 |
|
msgid "added by us:" |
|
msgstr "" |
|
|
|
#: wt-status.c:251 |
|
msgid "deleted by them:" |
|
msgstr "" |
|
|
|
#: wt-status.c:252 |
|
msgid "added by them:" |
|
msgstr "" |
|
|
|
#: wt-status.c:253 |
|
msgid "deleted by us:" |
|
msgstr "" |
|
|
|
#: wt-status.c:254 |
|
msgid "both added:" |
|
msgstr "" |
|
|
|
#: wt-status.c:255 |
|
msgid "both modified:" |
|
msgstr "" |
|
|
|
#: wt-status.c:285 |
|
msgid "new commits, " |
|
msgstr "" |
|
|
|
#: wt-status.c:287 |
|
msgid "modified content, " |
|
msgstr "" |
|
|
|
#: wt-status.c:289 |
|
msgid "untracked content, " |
|
msgstr "" |
|
|
|
#: wt-status.c:303 |
|
#, c-format |
|
msgid "new file: %s" |
|
msgstr "" |
|
|
|
#: wt-status.c:306 |
|
#, c-format |
|
msgid "copied: %s -> %s" |
|
msgstr "" |
|
|
|
#: wt-status.c:309 |
|
#, c-format |
|
msgid "deleted: %s" |
|
msgstr "" |
|
|
|
#: wt-status.c:312 |
|
#, c-format |
|
msgid "modified: %s" |
|
msgstr "" |
|
|
|
#: wt-status.c:315 |
|
#, c-format |
|
msgid "renamed: %s -> %s" |
|
msgstr "" |
|
|
|
#: wt-status.c:318 |
|
#, c-format |
|
msgid "typechange: %s" |
|
msgstr "" |
|
|
|
#: wt-status.c:321 |
|
#, c-format |
|
msgid "unknown: %s" |
|
msgstr "" |
|
|
|
#: wt-status.c:324 |
|
#, c-format |
|
msgid "unmerged: %s" |
|
msgstr "" |
|
|
|
#: wt-status.c:327 |
|
#, c-format |
|
msgid "bug: unhandled diff status %c" |
|
msgstr "" |
|
|
|
#: wt-status.c:789 |
|
msgid "You have unmerged paths." |
|
msgstr "" |
|
|
|
#: wt-status.c:792 wt-status.c:944 |
|
msgid " (fix conflicts and run \"git commit\")" |
|
msgstr "" |
|
|
|
#: wt-status.c:795 |
|
msgid "All conflicts fixed but you are still merging." |
|
msgstr "" |
|
|
|
#: wt-status.c:798 |
|
msgid " (use \"git commit\" to conclude merge)" |
|
msgstr "" |
|
|
|
#: wt-status.c:808 |
|
msgid "You are in the middle of an am session." |
|
msgstr "" |
|
|
|
#: wt-status.c:811 |
|
msgid "The current patch is empty." |
|
msgstr "" |
|
|
|
#: wt-status.c:815 |
|
msgid " (fix conflicts and then run \"git am --resolved\")" |
|
msgstr "" |
|
|
|
#: wt-status.c:817 |
|
msgid " (use \"git am --skip\" to skip this patch)" |
|
msgstr "" |
|
|
|
#: wt-status.c:819 |
|
msgid " (use \"git am --abort\" to restore the original branch)" |
|
msgstr "" |
|
|
|
#: wt-status.c:879 wt-status.c:896 |
|
#, c-format |
|
msgid "You are currently rebasing branch '%s' on '%s'." |
|
msgstr "" |
|
|
|
#: wt-status.c:884 wt-status.c:901 |
|
msgid "You are currently rebasing." |
|
msgstr "" |
|
|
|
#: wt-status.c:887 |
|
msgid " (fix conflicts and then run \"git rebase --continue\")" |
|
msgstr "" |
|
|
|
#: wt-status.c:889 |
|
msgid " (use \"git rebase --skip\" to skip this patch)" |
|
msgstr "" |
|
|
|
#: wt-status.c:891 |
|
msgid " (use \"git rebase --abort\" to check out the original branch)" |
|
msgstr "" |
|
|
|
#: wt-status.c:904 |
|
msgid " (all conflicts fixed: run \"git rebase --continue\")" |
|
msgstr "" |
|
|
|
#: wt-status.c:908 |
|
#, c-format |
|
msgid "" |
|
"You are currently splitting a commit while rebasing branch '%s' on '%s'." |
|
msgstr "" |
|
|
|
#: wt-status.c:913 |
|
msgid "You are currently splitting a commit during a rebase." |
|
msgstr "" |
|
|
|
#: wt-status.c:916 |
|
msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
|
msgstr "" |
|
|
|
#: wt-status.c:920 |
|
#, c-format |
|
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." |
|
msgstr "" |
|
|
|
#: wt-status.c:925 |
|
msgid "You are currently editing a commit during a rebase." |
|
msgstr "" |
|
|
|
#: wt-status.c:928 |
|
msgid " (use \"git commit --amend\" to amend the current commit)" |
|
msgstr "" |
|
|
|
#: wt-status.c:930 |
|
msgid "" |
|
" (use \"git rebase --continue\" once you are satisfied with your changes)" |
|
msgstr "" |
|
|
|
#: wt-status.c:940 |
|
msgid "You are currently cherry-picking." |
|
msgstr "" |
|
|
|
#: wt-status.c:947 |
|
msgid " (all conflicts fixed: run \"git commit\")" |
|
msgstr "" |
|
|
|
#: wt-status.c:958 |
|
#, c-format |
|
msgid "You are currently bisecting branch '%s'." |
|
msgstr "" |
|
|
|
#: wt-status.c:962 |
|
msgid "You are currently bisecting." |
|
msgstr "" |
|
|
|
#: wt-status.c:965 |
|
msgid " (use \"git bisect reset\" to get back to the original branch)" |
|
msgstr "" |
|
|
|
#: wt-status.c:1064 |
|
msgid "On branch " |
|
msgstr "" |
|
|
|
#: wt-status.c:1071 |
|
msgid "Not currently on any branch." |
|
msgstr "" |
|
|
|
#: wt-status.c:1083 |
|
msgid "Initial commit" |
|
msgstr "" |
|
|
|
#: wt-status.c:1097 |
|
msgid "Untracked files" |
|
msgstr "" |
|
|
|
#: wt-status.c:1099 |
|
msgid "Ignored files" |
|
msgstr "" |
|
|
|
#: wt-status.c:1101 |
|
#, c-format |
|
msgid "Untracked files not listed%s" |
|
msgstr "" |
|
|
|
#: wt-status.c:1103 |
|
msgid " (use -u option to show untracked files)" |
|
msgstr "" |
|
|
|
#: wt-status.c:1109 |
|
msgid "No changes" |
|
msgstr "" |
|
|
|
#: wt-status.c:1114 |
|
#, c-format |
|
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
|
msgstr "" |
|
|
|
#: wt-status.c:1117 |
|
#, c-format |
|
msgid "no changes added to commit\n" |
|
msgstr "" |
|
|
|
#: wt-status.c:1120 |
|
#, c-format |
|
msgid "" |
|
"nothing added to commit but untracked files present (use \"git add\" to " |
|
"track)\n" |
|
msgstr "" |
|
|
|
#: wt-status.c:1123 |
|
#, c-format |
|
msgid "nothing added to commit but untracked files present\n" |
|
msgstr "" |
|
|
|
#: wt-status.c:1126 |
|
#, c-format |
|
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
|
msgstr "" |
|
|
|
#: wt-status.c:1129 wt-status.c:1134 |
|
#, c-format |
|
msgid "nothing to commit\n" |
|
msgstr "" |
|
|
|
#: wt-status.c:1132 |
|
#, c-format |
|
msgid "nothing to commit (use -u to show untracked files)\n" |
|
msgstr "" |
|
|
|
#: wt-status.c:1136 |
|
#, c-format |
|
msgid "nothing to commit, working directory clean\n" |
|
msgstr "" |
|
|
|
#: wt-status.c:1244 |
|
msgid "HEAD (no branch)" |
|
msgstr "" |
|
|
|
#: wt-status.c:1250 |
|
msgid "Initial commit on " |
|
msgstr "" |
|
|
|
#: wt-status.c:1265 |
|
msgid "behind " |
|
msgstr "" |
|
|
|
#: wt-status.c:1268 wt-status.c:1271 |
|
msgid "ahead " |
|
msgstr "" |
|
|
|
#: wt-status.c:1273 |
|
msgid ", behind " |
|
msgstr "" |
|
|
|
#: compat/precompose_utf8.c:58 builtin/clone.c:341 |
|
#, c-format |
|
msgid "failed to unlink '%s'" |
|
msgstr "" |
|
|
|
#: builtin/add.c:20 |
|
msgid "git add [options] [--] <pathspec>..." |
|
msgstr "" |
|
|
|
#: builtin/add.c:63 |
|
#, c-format |
|
msgid "unexpected diff status %c" |
|
msgstr "" |
|
|
|
#: builtin/add.c:68 builtin/commit.c:231 |
|
msgid "updating files failed" |
|
msgstr "" |
|
|
|
#: builtin/add.c:78 |
|
#, c-format |
|
msgid "remove '%s'\n" |
|
msgstr "" |
|
|
|
#: builtin/add.c:148 |
|
msgid "Unstaged changes after refreshing the index:" |
|
msgstr "" |
|
|
|
#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 |
|
#, c-format |
|
msgid "pathspec '%s' did not match any files" |
|
msgstr "" |
|
|
|
#: builtin/add.c:234 |
|
msgid "Could not read the index" |
|
msgstr "" |
|
|
|
#: builtin/add.c:244 |
|
#, c-format |
|
msgid "Could not open '%s' for writing." |
|
msgstr "" |
|
|
|
#: builtin/add.c:248 |
|
msgid "Could not write patch" |
|
msgstr "" |
|
|
|
#: builtin/add.c:253 |
|
#, c-format |
|
msgid "Could not stat '%s'" |
|
msgstr "" |
|
|
|
#: builtin/add.c:255 |
|
msgid "Empty patch. Aborted." |
|
msgstr "" |
|
|
|
#: builtin/add.c:261 |
|
#, c-format |
|
msgid "Could not apply '%s'" |
|
msgstr "" |
|
|
|
#: builtin/add.c:271 |
|
msgid "The following paths are ignored by one of your .gitignore files:\n" |
|
msgstr "" |
|
|
|
#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 |
|
#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 |
|
#: builtin/rm.c:206 |
|
msgid "dry run" |
|
msgstr "" |
|
|
|
#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 |
|
#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 |
|
#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 |
|
msgid "be verbose" |
|
msgstr "" |
|
|
|
#: builtin/add.c:280 |
|
msgid "interactive picking" |
|
msgstr "" |
|
|
|
#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 |
|
msgid "select hunks interactively" |
|
msgstr "" |
|
|
|
#: builtin/add.c:282 |
|
msgid "edit current diff and apply" |
|
msgstr "" |
|
|
|
#: builtin/add.c:283 |
|
msgid "allow adding otherwise ignored files" |
|
msgstr "" |
|
|
|
#: builtin/add.c:284 |
|
msgid "update tracked files" |
|
msgstr "" |
|
|
|
#: builtin/add.c:285 |
|
msgid "record only the fact that the path will be added later" |
|
msgstr "" |
|
|
|
#: builtin/add.c:286 |
|
msgid "add changes from all tracked and untracked files" |
|
msgstr "" |
|
|
|
#: builtin/add.c:287 |
|
msgid "don't add, only refresh the index" |
|
msgstr "" |
|
|
|
#: builtin/add.c:288 |
|
msgid "just skip files which cannot be added because of errors" |
|
msgstr "" |
|
|
|
#: builtin/add.c:289 |
|
msgid "check if - even missing - files are ignored in dry run" |
|
msgstr "" |
|
|
|
#: builtin/add.c:311 |
|
#, c-format |
|
msgid "Use -f if you really want to add them.\n" |
|
msgstr "" |
|
|
|
#: builtin/add.c:312 |
|
msgid "no files added" |
|
msgstr "" |
|
|
|
#: builtin/add.c:318 |
|
msgid "adding files failed" |
|
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, this warning can be |
|
#. * turned into a die(...), and eventually we may |
|
#. * reallow the command with a new behavior. |
|
#. |
|
#: builtin/add.c:335 |
|
#, 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." |
|
msgstr "" |
|
|
|
#: builtin/add.c:381 |
|
msgid "-A and -u are mutually incompatible" |
|
msgstr "" |
|
|
|
#: builtin/add.c:383 |
|
msgid "Option --ignore-missing can only be used together with --dry-run" |
|
msgstr "" |
|
|
|
#: builtin/add.c:414 |
|
#, c-format |
|
msgid "Nothing specified, nothing added.\n" |
|
msgstr "" |
|
|
|
#: builtin/add.c:415 |
|
#, c-format |
|
msgid "Maybe you wanted to say 'git add .'?\n" |
|
msgstr "" |
|
|
|
#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 |
|
#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 |
|
msgid "index file corrupt" |
|
msgstr "" |
|
|
|
#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 |
|
msgid "Unable to write new index file" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:57 |
|
msgid "git apply [options] [<patch>...]" |
|
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:2684 |
|
#, c-format |
|
msgid "invalid start of line: '%c'" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:2802 |
|
#, 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:2814 |
|
#, c-format |
|
msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:2820 |
|
#, c-format |
|
msgid "" |
|
"while searching for:\n" |
|
"%.*s" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:2839 |
|
#, c-format |
|
msgid "missing binary patch data for '%s'" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:2942 |
|
#, c-format |
|
msgid "binary patch does not apply to '%s'" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:2948 |
|
#, c-format |
|
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:2969 |
|
#, c-format |
|
msgid "patch failed: %s:%ld" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3091 |
|
#, c-format |
|
msgid "cannot checkout %s" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 |
|
#, c-format |
|
msgid "read of %s failed" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3169 builtin/apply.c:3391 |
|
#, c-format |
|
msgid "path %s has been renamed/deleted" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3250 builtin/apply.c:3405 |
|
#, c-format |
|
msgid "%s: does not exist in index" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 |
|
#, c-format |
|
msgid "%s: %s" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3259 builtin/apply.c:3413 |
|
#, c-format |
|
msgid "%s: does not match index" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3361 |
|
msgid "removal patch leaves file contents" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3430 |
|
#, c-format |
|
msgid "%s: wrong type" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3432 |
|
#, c-format |
|
msgid "%s has type %o, expected %o" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3533 |
|
#, c-format |
|
msgid "%s: already exists in index" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3536 |
|
#, c-format |
|
msgid "%s: already exists in working directory" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3556 |
|
#, c-format |
|
msgid "new mode (%o) of %s does not match old mode (%o)" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3561 |
|
#, c-format |
|
msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3569 |
|
#, c-format |
|
msgid "%s: patch does not apply" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3582 |
|
#, c-format |
|
msgid "Checking patch %s..." |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 |
|
#, c-format |
|
msgid "make_cache_entry failed for path '%s'" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3818 |
|
#, c-format |
|
msgid "unable to remove %s from index" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3846 |
|
#, c-format |
|
msgid "corrupt patch for subproject %s" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3850 |
|
#, c-format |
|
msgid "unable to stat newly created file '%s'" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3855 |
|
#, c-format |
|
msgid "unable to create backing store for newly created file %s" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3858 builtin/apply.c:3966 |
|
#, c-format |
|
msgid "unable to add cache entry for %s" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3891 |
|
#, c-format |
|
msgid "closing file '%s'" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:3940 |
|
#, c-format |
|
msgid "unable to write file '%s' mode %o" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4027 |
|
#, c-format |
|
msgid "Applied patch %s cleanly." |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4035 |
|
msgid "internal error" |
|
msgstr "" |
|
|
|
#. Say this even without --verbose |
|
#: builtin/apply.c:4038 |
|
#, c-format |
|
msgid "Applying patch %%s with %d reject..." |
|
msgid_plural "Applying patch %%s with %d rejects..." |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: builtin/apply.c:4048 |
|
#, c-format |
|
msgid "truncating .rej filename to %.*s.rej" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4069 |
|
#, c-format |
|
msgid "Hunk #%d applied cleanly." |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4072 |
|
#, c-format |
|
msgid "Rejected hunk #%d." |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4222 |
|
msgid "unrecognized input" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4233 |
|
msgid "unable to read index file" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 |
|
#: builtin/fetch.c:63 |
|
msgid "path" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4353 |
|
msgid "don't apply changes matching the given path" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4356 |
|
msgid "apply changes matching the given path" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4358 |
|
msgid "num" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4359 |
|
msgid "remove <num> leading slashes from traditional diff paths" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4362 |
|
msgid "ignore additions made by the patch" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4364 |
|
msgid "instead of applying the patch, output diffstat for the input" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4368 |
|
msgid "show number of added and deleted lines in decimal notation" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4370 |
|
msgid "instead of applying the patch, output a summary for the input" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4372 |
|
msgid "instead of applying the patch, see if the patch is applicable" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4374 |
|
msgid "make sure the patch is applicable to the current index" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4376 |
|
msgid "apply a patch without touching the working tree" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4378 |
|
msgid "also apply the patch (use with --stat/--summary/--check)" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4380 |
|
msgid "attempt three-way merge if a patch does not apply" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4382 |
|
msgid "build a temporary index based on embedded index information" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 |
|
msgid "paths are separated with NUL character" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4387 |
|
msgid "ensure at least <n> lines of context match" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4388 |
|
msgid "action" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4389 |
|
msgid "detect new or modified lines that have whitespace errors" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4392 builtin/apply.c:4395 |
|
msgid "ignore changes in whitespace when finding context" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4398 |
|
msgid "apply the patch in reverse" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4400 |
|
msgid "don't expect at least one line of context" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4402 |
|
msgid "leave the rejected hunks in corresponding *.rej files" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4404 |
|
msgid "allow overlapping hunks" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4407 |
|
msgid "tolerate incorrectly detected missing new-line at the end of file" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4410 |
|
msgid "do not trust the line counts in the hunk headers" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4412 |
|
msgid "root" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4413 |
|
msgid "prepend <root> to all filenames" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4435 |
|
msgid "--3way outside a repository" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4443 |
|
msgid "--index outside a repository" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4446 |
|
msgid "--cached outside a repository" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4462 |
|
#, c-format |
|
msgid "can't open patch '%s'" |
|
msgstr "" |
|
|
|
#: builtin/apply.c:4476 |
|
#, c-format |
|
msgid "squelched %d whitespace error" |
|
msgid_plural "squelched %d whitespace errors" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: builtin/apply.c:4482 builtin/apply.c:4492 |
|
#, 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:63 |
|
#, c-format |
|
msgid "git archive: NACK %s" |
|
msgstr "" |
|
|
|
#: builtin/archive.c:65 |
|
#, c-format |
|
msgid "remote error: %s" |
|
msgstr "" |
|
|
|
#: builtin/archive.c:66 |
|
msgid "git archive: protocol error" |
|
msgstr "" |
|
|
|
#: builtin/archive.c:71 |
|
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:25 |
|
msgid "git blame [options] [rev-opts] [rev] [--] file" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:30 builtin/shortlog.c:15 |
|
msgid "[rev-opts] are documented in git-rev-list(1)" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2350 |
|
msgid "Show blame entries as we find them, incrementally" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2351 |
|
msgid "Show blank SHA-1 for boundary commits (Default: off)" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2352 |
|
msgid "Do not treat root commits as boundaries (Default: off)" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2353 |
|
msgid "Show work cost statistics" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2354 |
|
msgid "Show output score for blame entries" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2355 |
|
msgid "Show original filename (Default: auto)" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2356 |
|
msgid "Show original linenumber (Default: off)" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2357 |
|
msgid "Show in a format designed for machine consumption" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2358 |
|
msgid "Show porcelain format with per-line commit information" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2359 |
|
msgid "Use the same output mode as git-annotate (Default: off)" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2360 |
|
msgid "Show raw timestamp (Default: off)" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2361 |
|
msgid "Show long commit SHA1 (Default: off)" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2362 |
|
msgid "Suppress author name and timestamp (Default: off)" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2363 |
|
msgid "Show author email instead of name (Default: off)" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2364 |
|
msgid "Ignore whitespace differences" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2365 |
|
msgid "Spend extra cycles to find better match" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2366 |
|
msgid "Use revisions from <file> instead of calling git-rev-list" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2367 |
|
msgid "Use <file>'s contents as the final image" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2368 builtin/blame.c:2369 |
|
msgid "score" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2368 |
|
msgid "Find line copies within and across files" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2369 |
|
msgid "Find line movements within and across files" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2370 |
|
msgid "n,m" |
|
msgstr "" |
|
|
|
#: builtin/blame.c:2370 |
|
msgid "Process only line range n,m, counting from 1" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:23 |
|
msgid "git branch [options] [-r | -a] [--merged | --no-merged]" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:24 |
|
msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:25 |
|
msgid "git branch [options] [-r] (-d | -D) <branchname>..." |
|
msgstr "" |
|
|
|
#: builtin/branch.c:26 |
|
msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:145 |
|
#, c-format |
|
msgid "" |
|
"deleting branch '%s' that has been merged to\n" |
|
" '%s', but not yet merged to HEAD." |
|
msgstr "" |
|
|
|
#: builtin/branch.c:149 |
|
#, 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:163 |
|
#, c-format |
|
msgid "Couldn't look up commit object for '%s'" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:167 |
|
#, 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:180 |
|
msgid "Update of config-file failed" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:208 |
|
msgid "cannot use -a with -d" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:214 |
|
msgid "Couldn't look up commit object for HEAD" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:222 |
|
#, c-format |
|
msgid "Cannot delete the branch '%s' which you are currently on." |
|
msgstr "" |
|
|
|
#: builtin/branch.c:235 |
|
#, c-format |
|
msgid "remote branch '%s' not found." |
|
msgstr "" |
|
|
|
#: builtin/branch.c:236 |
|
#, c-format |
|
msgid "branch '%s' not found." |
|
msgstr "" |
|
|
|
#: builtin/branch.c:250 |
|
#, c-format |
|
msgid "Error deleting remote branch '%s'" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:251 |
|
#, c-format |
|
msgid "Error deleting branch '%s'" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:258 |
|
#, c-format |
|
msgid "Deleted remote branch %s (was %s).\n" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:259 |
|
#, c-format |
|
msgid "Deleted branch %s (was %s).\n" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:361 |
|
#, c-format |
|
msgid "branch '%s' does not point at a commit" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:433 |
|
#, c-format |
|
msgid "[%s: behind %d]" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:435 |
|
#, c-format |
|
msgid "[behind %d]" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:439 |
|
#, c-format |
|
msgid "[%s: ahead %d]" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:441 |
|
#, c-format |
|
msgid "[ahead %d]" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:444 |
|
#, c-format |
|
msgid "[%s: ahead %d, behind %d]" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:447 |
|
#, c-format |
|
msgid "[ahead %d, behind %d]" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:469 |
|
msgid " **** invalid ref ****" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:560 |
|
msgid "(no branch)" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:593 |
|
#, c-format |
|
msgid "object '%s' does not point to a commit" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:625 |
|
msgid "some refs could not be read" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:638 |
|
msgid "cannot rename the current branch while not on any." |
|
msgstr "" |
|
|
|
#: builtin/branch.c:648 |
|
#, c-format |
|
msgid "Invalid branch name: '%s'" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:663 |
|
msgid "Branch rename failed" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:667 |
|
#, c-format |
|
msgid "Renamed a misnamed branch '%s' away" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:671 |
|
#, c-format |
|
msgid "Branch renamed to %s, but HEAD is not updated!" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:678 |
|
msgid "Branch is renamed, but update of config-file failed" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:693 |
|
#, c-format |
|
msgid "malformed object name %s" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:717 |
|
#, c-format |
|
msgid "could not write branch description template: %s" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:747 |
|
msgid "Generic options" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:749 |
|
msgid "show hash and subject, give twice for upstream branch" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:750 |
|
msgid "suppress informational messages" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:751 |
|
msgid "set up tracking mode (see git-pull(1))" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:753 |
|
msgid "change upstream info" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:757 |
|
msgid "use colored output" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:758 |
|
msgid "act on remote-tracking branches" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 |
|
#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 |
|
#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 |
|
msgid "commit" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:762 builtin/branch.c:768 |
|
msgid "print only branches that contain the commit" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:774 |
|
msgid "Specific git-branch actions:" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:775 |
|
msgid "list both remote-tracking and local branches" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:777 |
|
msgid "delete fully merged branch" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:778 |
|
msgid "delete branch (even if not merged)" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:779 |
|
msgid "move/rename a branch and its reflog" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:780 |
|
msgid "move/rename a branch, even if target exists" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:781 |
|
msgid "list branch names" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:782 |
|
msgid "create the branch's reflog" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:784 |
|
msgid "edit the description for the branch" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:785 |
|
msgid "force creation (when already exists)" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:788 |
|
msgid "print only not merged branches" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:794 |
|
msgid "print only merged branches" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:798 |
|
msgid "list branches in columns" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:811 |
|
msgid "Failed to resolve HEAD as a valid ref." |
|
msgstr "" |
|
|
|
#: builtin/branch.c:816 builtin/clone.c:561 |
|
msgid "HEAD not found below refs/heads!" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:839 |
|
msgid "--column and --verbose are incompatible" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:845 |
|
msgid "branch name required" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:860 |
|
msgid "Cannot give description to detached HEAD" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:865 |
|
msgid "cannot edit description of more than one branch" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:872 |
|
#, c-format |
|
msgid "No commit on branch '%s' yet." |
|
msgstr "" |
|
|
|
#: builtin/branch.c:875 |
|
#, c-format |
|
msgid "No branch named '%s'." |
|
msgstr "" |
|
|
|
#: builtin/branch.c:888 |
|
msgid "too many branches for a rename operation" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:893 |
|
#, c-format |
|
msgid "branch '%s' does not exist" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:905 |
|
#, c-format |
|
msgid "Branch '%s' has no upstream information" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:920 |
|
msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:923 |
|
#, 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:940 |
|
#, c-format |
|
msgid "" |
|
"\n" |
|
"If you wanted to make '%s' track '%s', do this:\n" |
|
"\n" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:941 |
|
#, c-format |
|
msgid " git branch -d %s\n" |
|
msgstr "" |
|
|
|
#: builtin/branch.c:942 |
|
#, 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:247 |
|
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" |
|
msgstr "" |
|
|
|
#: builtin/cat-file.c:248 |
|
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" |
|
msgstr "" |
|
|
|
#: builtin/cat-file.c:266 |
|
msgid "<type> can be one of: blob, tree, commit, tag" |
|
msgstr "" |
|
|
|
#: builtin/cat-file.c:267 |
|
msgid "show object type" |
|
msgstr "" |
|
|
|
#: builtin/cat-file.c:268 |
|
msgid "show object size" |
|
msgstr "" |
|
|
|
#: builtin/cat-file.c:270 |
|
msgid "exit with zero when there's no error" |
|
msgstr "" |
|
|
|
#: builtin/cat-file.c:271 |
|
msgid "pretty-print object's content" |
|
msgstr "" |
|
|
|
#: builtin/cat-file.c:273 |
|
msgid "for blob objects, run textconv on object's content" |
|
msgstr "" |
|
|
|
#: builtin/cat-file.c:275 |
|
msgid "show info and content of objects fed from the standard input" |
|
msgstr "" |
|
|
|
#: builtin/cat-file.c:278 |
|
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...] < <list-of-paths>" |
|
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 "input paths are terminated by a null character" |
|
msgstr "" |
|
|
|
#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 |
|
msgid "suppress progress reporting" |
|
msgstr "" |
|
|
|
#: builtin/check-ignore.c:151 |
|
msgid "cannot specify pathnames with --stdin" |
|
msgstr "" |
|
|
|
#: builtin/check-ignore.c:154 |
|
msgid "-z only makes sense with --stdin" |
|
msgstr "" |
|
|
|
#: builtin/check-ignore.c:156 |
|
msgid "no path specified" |
|
msgstr "" |
|
|
|
#: builtin/check-ignore.c:160 |
|
msgid "--quiet is only valid with a single pathname" |
|
msgstr "" |
|
|
|
#: builtin/check-ignore.c:162 |
|
msgid "cannot have both --quiet and --verbose" |
|
msgstr "" |
|
|
|
#: builtin/checkout-index.c:126 |
|
msgid "git checkout-index [options] [--] [<file>...]" |
|
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 <string>" |
|
msgstr "" |
|
|
|
#: builtin/checkout-index.c:207 |
|
msgid "copy out the files from named stage" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:25 |
|
msgid "git checkout [options] <branch>" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:26 |
|
msgid "git checkout [options] [<branch>] -- <file>..." |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:116 builtin/checkout.c:149 |
|
#, c-format |
|
msgid "path '%s' does not have our version" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:118 builtin/checkout.c:151 |
|
#, c-format |
|
msgid "path '%s' does not have their version" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:134 |
|
#, c-format |
|
msgid "path '%s' does not have all necessary versions" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:178 |
|
#, c-format |
|
msgid "path '%s' does not have necessary versions" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:195 |
|
#, c-format |
|
msgid "path '%s': cannot merge" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:212 |
|
#, c-format |
|
msgid "Unable to add merge result for '%s'" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 |
|
#: builtin/checkout.c:245 |
|
#, c-format |
|
msgid "'%s' cannot be used with updating paths" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:248 builtin/checkout.c:251 |
|
#, c-format |
|
msgid "'%s' cannot be used with %s" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:254 |
|
#, c-format |
|
msgid "Cannot update paths and switch to branch '%s' at the same time." |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:265 builtin/checkout.c:426 |
|
msgid "corrupt index file" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:295 builtin/checkout.c:302 |
|
#, c-format |
|
msgid "path '%s' is unmerged" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:448 |
|
msgid "you need to resolve your current index first" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:569 |
|
#, c-format |
|
msgid "Can not do reflog for '%s'\n" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:602 |
|
msgid "HEAD is now at" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:609 |
|
#, c-format |
|
msgid "Reset branch '%s'\n" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:612 |
|
#, c-format |
|
msgid "Already on '%s'\n" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:616 |
|
#, c-format |
|
msgid "Switched to and reset branch '%s'\n" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:618 builtin/checkout.c:955 |
|
#, c-format |
|
msgid "Switched to a new branch '%s'\n" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:620 |
|
#, c-format |
|
msgid "Switched to branch '%s'\n" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:676 |
|
#, c-format |
|
msgid " ... and %d more.\n" |
|
msgstr "" |
|
|
|
#. The singular version |
|
#: builtin/checkout.c:682 |
|
#, 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:700 |
|
#, 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:730 |
|
msgid "internal error in revision walk" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:734 |
|
msgid "Previous HEAD position was" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:761 builtin/checkout.c:950 |
|
msgid "You are on a branch yet to be born" |
|
msgstr "" |
|
|
|
#. case (1) |
|
#: builtin/checkout.c:886 |
|
#, c-format |
|
msgid "invalid reference: %s" |
|
msgstr "" |
|
|
|
#. case (1): want a tree |
|
#: builtin/checkout.c:925 |
|
#, c-format |
|
msgid "reference is not a tree: %s" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:964 |
|
msgid "paths cannot be used with switching branches" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:967 builtin/checkout.c:971 |
|
#, c-format |
|
msgid "'%s' cannot be used with switching branches" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 |
|
#: builtin/checkout.c:986 |
|
#, c-format |
|
msgid "'%s' cannot be used with '%s'" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:991 |
|
#, c-format |
|
msgid "Cannot switch branch to a non-commit '%s'" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 |
|
#: builtin/remote.c:169 builtin/remote.c:171 |
|
msgid "branch" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1014 |
|
msgid "create and checkout a new branch" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1016 |
|
msgid "create/reset and checkout a branch" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1017 |
|
msgid "create reflog for new branch" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1018 |
|
msgid "detach the HEAD at named commit" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1019 |
|
msgid "set upstream info for new branch" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1021 |
|
msgid "new branch" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1021 |
|
msgid "new unparented branch" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1022 |
|
msgid "checkout our version for unmerged files" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1024 |
|
msgid "checkout their version for unmerged files" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1026 |
|
msgid "force checkout (throw away local modifications)" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1027 |
|
msgid "perform a 3-way merge with the new branch" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1028 builtin/merge.c:215 |
|
msgid "update ignored files (default)" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 |
|
msgid "style" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1030 |
|
msgid "conflict style (merge or diff3)" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1033 |
|
msgid "second guess 'git checkout no-such-branch'" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1057 |
|
msgid "-b, -B and --orphan are mutually exclusive" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1074 |
|
msgid "--track needs a branch name" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1081 |
|
msgid "Missing branch name; try -b" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1116 |
|
msgid "invalid path specification" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1123 |
|
#, 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:1128 |
|
#, c-format |
|
msgid "git checkout: --detach does not take a path argument '%s'" |
|
msgstr "" |
|
|
|
#: builtin/checkout.c:1132 |
|
msgid "" |
|
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" |
|
"checking out of the index." |
|
msgstr "" |
|
|
|
#: builtin/clean.c:20 |
|
msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." |
|
msgstr "" |
|
|
|
#: builtin/clean.c:24 |
|
#, c-format |
|
msgid "Removing %s\n" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:25 |
|
#, c-format |
|
msgid "Would remove %s\n" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:26 |
|
#, c-format |
|
msgid "Skipping repository %s\n" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:27 |
|
#, c-format |
|
msgid "Would skip repository %s\n" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:28 |
|
#, c-format |
|
msgid "failed to remove %s" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:160 |
|
msgid "do not print names of files removed" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:162 |
|
msgid "force" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:164 |
|
msgid "remove whole directories" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 |
|
#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 |
|
msgid "pattern" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:166 |
|
msgid "add <pattern> to ignore rules" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:167 |
|
msgid "remove ignored files, too" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:169 |
|
msgid "remove only ignored files" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:187 |
|
msgid "-x and -X cannot be used together" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:191 |
|
msgid "" |
|
"clean.requireForce set to true and neither -n nor -f given; refusing to clean" |
|
msgstr "" |
|
|
|
#: builtin/clean.c:194 |
|
msgid "" |
|
"clean.requireForce defaults to true and neither -n nor -f given; refusing to " |
|
"clean" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:36 |
|
msgid "git clone [options] [--] <repo> [<dir>]" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 |
|
#: builtin/push.c:436 |
|
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:72 |
|
msgid "create a mirror repository (implies bare)" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:74 |
|
msgid "to clone from a local repository" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:76 |
|
msgid "don't use local hardlinks, always copy" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:78 |
|
msgid "setup as shared repository" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:80 builtin/clone.c:82 |
|
msgid "initialize submodules in the clone" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:83 builtin/init-db.c:485 |
|
msgid "template-directory" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:84 builtin/init-db.c:486 |
|
msgid "directory from which templates will be used" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:86 |
|
msgid "reference repository" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 |
|
msgid "name" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:88 |
|
msgid "use <name> instead of 'origin' to track upstream" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:90 |
|
msgid "checkout <branch> instead of the remote's HEAD" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:92 |
|
msgid "path to git-upload-pack on the remote" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662 |
|
msgid "depth" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:94 |
|
msgid "create a shallow clone of that depth" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:96 |
|
msgid "clone only one branch, HEAD or --branch" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:97 builtin/init-db.c:494 |
|
msgid "gitdir" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:98 builtin/init-db.c:495 |
|
msgid "separate git dir from working tree" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:99 |
|
msgid "key=value" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:100 |
|
msgid "set config inside the new repository" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:243 |
|
#, c-format |
|
msgid "reference repository '%s' is not a local directory." |
|
msgstr "" |
|
|
|
#: builtin/clone.c:306 |
|
#, c-format |
|
msgid "failed to create directory '%s'" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:308 builtin/diff.c:77 |
|
#, c-format |
|
msgid "failed to stat '%s'" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:310 |
|
#, c-format |
|
msgid "%s exists and is not a directory" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:324 |
|
#, c-format |
|
msgid "failed to stat %s\n" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:346 |
|
#, c-format |
|
msgid "failed to create link '%s'" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:350 |
|
#, c-format |
|
msgid "failed to copy file to '%s'" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:373 |
|
#, c-format |
|
msgid "done.\n" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:443 |
|
#, c-format |
|
msgid "Could not find remote branch %s to clone." |
|
msgstr "" |
|
|
|
#: builtin/clone.c:552 |
|
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:690 |
|
msgid "Too many arguments." |
|
msgstr "" |
|
|
|
#: builtin/clone.c:694 |
|
msgid "You must specify a repository to clone." |
|
msgstr "" |
|
|
|
#: builtin/clone.c:705 |
|
#, c-format |
|
msgid "--bare and --origin %s options are incompatible." |
|
msgstr "" |
|
|
|
#: builtin/clone.c:708 |
|
msgid "--bare and --separate-git-dir are incompatible." |
|
msgstr "" |
|
|
|
#: builtin/clone.c:721 |
|
#, c-format |
|
msgid "repository '%s' does not exist" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:726 |
|
msgid "--depth is ignored in local clones; use file:// instead." |
|
msgstr "" |
|
|
|
#: builtin/clone.c:736 |
|
#, c-format |
|
msgid "destination path '%s' already exists and is not an empty directory." |
|
msgstr "" |
|
|
|
#: builtin/clone.c:746 |
|
#, c-format |
|
msgid "working tree '%s' already exists." |
|
msgstr "" |
|
|
|
#: builtin/clone.c:759 builtin/clone.c:771 |
|
#, c-format |
|
msgid "could not create leading directories of '%s'" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:762 |
|
#, c-format |
|
msgid "could not create work tree dir '%s'." |
|
msgstr "" |
|
|
|
#: builtin/clone.c:781 |
|
#, c-format |
|
msgid "Cloning into bare repository '%s'...\n" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:783 |
|
#, c-format |
|
msgid "Cloning into '%s'...\n" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:818 |
|
#, c-format |
|
msgid "Don't know how to clone %s" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:867 |
|
#, c-format |
|
msgid "Remote branch %s not found in upstream %s" |
|
msgstr "" |
|
|
|
#: builtin/clone.c:874 |
|
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:34 |
|
msgid "git commit [options] [--] <pathspec>..." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:39 |
|
msgid "git status [options] [--] <pathspec>..." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:44 |
|
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:56 |
|
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:61 |
|
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" |
|
"Otherwise, please use 'git reset'\n" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:258 |
|
msgid "failed to unpack HEAD tree object" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:300 |
|
msgid "unable to create temporary index" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:306 |
|
msgid "interactive add failed" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 |
|
msgid "unable to write new_index file" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:391 |
|
msgid "cannot do a partial commit during a merge." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:393 |
|
msgid "cannot do a partial commit during a cherry-pick." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:403 |
|
msgid "cannot read the index" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:423 |
|
msgid "unable to write temporary index file" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:511 builtin/commit.c:517 |
|
#, c-format |
|
msgid "invalid commit: %s" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:540 |
|
msgid "malformed --author parameter" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:560 |
|
#, c-format |
|
msgid "Malformed ident string: '%s'" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 |
|
#, c-format |
|
msgid "could not lookup commit %s" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:610 builtin/shortlog.c:272 |
|
#, c-format |
|
msgid "(reading log message from standard input)\n" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:612 |
|
msgid "could not read log from standard input" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:616 |
|
#, c-format |
|
msgid "could not read log file '%s'" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:622 |
|
msgid "commit has empty message" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:638 |
|
msgid "could not read MERGE_MSG" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:642 |
|
msgid "could not read SQUASH_MSG" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:646 |
|
#, c-format |
|
msgid "could not read '%s'" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:707 |
|
msgid "could not write commit template" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:718 |
|
#, 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:723 |
|
#, 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:735 |
|
#, 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:740 |
|
#, 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:753 |
|
#, c-format |
|
msgid "%sAuthor: %s" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:760 |
|
#, c-format |
|
msgid "%sCommitter: %s" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:780 |
|
msgid "Cannot read index" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:817 |
|
msgid "Error building trees" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:832 builtin/tag.c:359 |
|
#, c-format |
|
msgid "Please supply the message using either -m or -F option.\n" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:929 |
|
#, c-format |
|
msgid "No existing author found with '%s'" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:944 builtin/commit.c:1138 |
|
#, c-format |
|
msgid "Invalid untracked files mode '%s'" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:974 |
|
msgid "Using both --reset-author and --author does not make sense" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:985 |
|
msgid "You have nothing to amend." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:988 |
|
msgid "You are in the middle of a merge -- cannot amend." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:990 |
|
msgid "You are in the middle of a cherry-pick -- cannot amend." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:993 |
|
msgid "Options --squash and --fixup cannot be used together" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1003 |
|
msgid "Only one of -c/-C/-F/--fixup can be used." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1005 |
|
msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1013 |
|
msgid "--reset-author can be used only with -C, -c or --amend." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1030 |
|
msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1032 |
|
msgid "No paths with --include/--only does not make sense." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1034 |
|
msgid "Clever... amending the last one with dirty index." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1036 |
|
msgid "Explicit paths specified without -i nor -o; assuming --only paths..." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1046 builtin/tag.c:575 |
|
#, c-format |
|
msgid "Invalid cleanup mode %s" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1051 |
|
msgid "Paths with -a does not make sense." |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1057 builtin/commit.c:1192 |
|
msgid "--long and -z are incompatible" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1152 builtin/commit.c:1388 |
|
msgid "show status concisely" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1154 builtin/commit.c:1390 |
|
msgid "show branch information" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 |
|
msgid "machine-readable output" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1159 builtin/commit.c:1394 |
|
msgid "show status in long format (default)" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1162 builtin/commit.c:1397 |
|
msgid "terminate entries with NUL" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 |
|
#: builtin/fast-export.c:650 builtin/tag.c:459 |
|
msgid "mode" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1165 builtin/commit.c:1400 |
|
msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1168 |
|
msgid "show ignored files" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1169 parse-options.h:151 |
|
msgid "when" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1170 |
|
msgid "" |
|
"ignore changes to submodules, optional when: all, dirty, untracked. " |
|
"(Default: all)" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1172 |
|
msgid "list untracked files in columns" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1246 |
|
msgid "couldn't look up newly created commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1248 |
|
msgid "could not parse newly created commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1289 |
|
msgid "detached HEAD" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1291 |
|
msgid " (root-commit)" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1358 |
|
msgid "suppress summary after successful commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1359 |
|
msgid "show diff in commit message template" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1361 |
|
msgid "Commit message options" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1362 builtin/tag.c:457 |
|
msgid "read message from file" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1363 |
|
msgid "author" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1363 |
|
msgid "override author for commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1364 builtin/gc.c:178 |
|
msgid "date" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1364 |
|
msgid "override date for commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 |
|
#: builtin/notes.c:690 builtin/tag.c:455 |
|
msgid "message" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1365 |
|
msgid "commit message" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1366 |
|
msgid "reuse and edit message from specified commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1367 |
|
msgid "reuse message from specified commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1368 |
|
msgid "use autosquash formatted message to fixup specified commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1369 |
|
msgid "use autosquash formatted message to squash specified commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1370 |
|
msgid "the commit is authored by me now (used with -C/-c/--amend)" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 |
|
msgid "add Signed-off-by:" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1372 |
|
msgid "use specified template file" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1373 |
|
msgid "force edit of commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1374 |
|
msgid "default" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1374 builtin/tag.c:460 |
|
msgid "how to strip spaces and #comments from message" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1375 |
|
msgid "include status in commit message template" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 |
|
msgid "key id" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1377 builtin/merge.c:214 |
|
msgid "GPG sign commit" |
|
msgstr "" |
|
|
|
#. end commit message options |
|
#: builtin/commit.c:1380 |
|
msgid "Commit contents options" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1381 |
|
msgid "commit all changed files" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1382 |
|
msgid "add specified files to index for commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1383 |
|
msgid "interactively add files" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1384 |
|
msgid "interactively add changes" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1385 |
|
msgid "commit only specified files" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1386 |
|
msgid "bypass pre-commit hook" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1387 |
|
msgid "show what would be committed" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1398 |
|
msgid "amend previous commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1399 |
|
msgid "bypass post-rewrite hook" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1404 |
|
msgid "ok to record an empty change" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1407 |
|
msgid "ok to record a change with an empty message" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1439 |
|
msgid "could not parse HEAD commit" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1477 builtin/merge.c:508 |
|
#, c-format |
|
msgid "could not open '%s' for reading" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1484 |
|
#, c-format |
|
msgid "Corrupt MERGE_HEAD file (%s)" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1491 |
|
msgid "could not read MERGE_MODE" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1510 |
|
#, c-format |
|
msgid "could not read commit message: %s" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1524 |
|
#, c-format |
|
msgid "Aborting commit; you did not edit the message.\n" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1529 |
|
#, c-format |
|
msgid "Aborting commit due to empty commit message.\n" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 |
|
msgid "failed to write commit object" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1565 |
|
msgid "cannot lock HEAD ref" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1569 |
|
msgid "cannot update HEAD ref" |
|
msgstr "" |
|
|
|
#: builtin/commit.c:1580 |
|
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:7 |
|
msgid "git config [options]" |
|
msgstr "" |
|
|
|
#: builtin/config.c:51 |
|
msgid "Config file location" |
|
msgstr "" |
|
|
|
#: builtin/config.c:52 |
|
msgid "use global config file" |
|
msgstr "" |
|
|
|
#: builtin/config.c:53 |
|
msgid "use system config file" |
|
msgstr "" |
|
|
|
#: builtin/config.c:54 |
|
msgid "use repository config file" |
|
msgstr "" |
|
|
|
#: builtin/config.c:55 |
|
msgid "use given config file" |
|
msgstr "" |
|
|
|
#: builtin/config.c:56 |
|
msgid "Action" |
|
msgstr "" |
|
|
|
#: builtin/config.c:57 |
|
msgid "get value: name [value-regex]" |
|
msgstr "" |
|
|
|
#: builtin/config.c:58 |
|
msgid "get all values: key [value-regex]" |
|
msgstr "" |
|
|
|
#: builtin/config.c:59 |
|
msgid "get values for regexp: name-regex [value-regex]" |
|
msgstr "" |
|
|
|
#: builtin/config.c:60 |
|
msgid "replace all matching variables: name value [value_regex]" |
|
msgstr "" |
|
|
|
#: builtin/config.c:61 |
|
msgid "add a new variable: name value" |
|
msgstr "" |
|
|
|
#: builtin/config.c:62 |
|
msgid "remove a variable: name [value-regex]" |
|
msgstr "" |
|
|
|
#: builtin/config.c:63 |
|
msgid "remove all matches: name [value-regex]" |
|
msgstr "" |
|
|
|
#: builtin/config.c:64 |
|
msgid "rename section: old-name new-name" |
|
msgstr "" |
|
|
|
#: builtin/config.c:65 |
|
msgid "remove a section: name" |
|
msgstr "" |
|
|
|
#: builtin/config.c:66 |
|
msgid "list all" |
|
msgstr "" |
|
|
|
#: builtin/config.c:67 |
|
msgid "open an editor" |
|
msgstr "" |
|
|
|
#: builtin/config.c:68 builtin/config.c:69 |
|
msgid "slot" |
|
msgstr "" |
|
|
|
#: builtin/config.c:68 |
|
msgid "find the color configured: [default]" |
|
msgstr "" |
|
|
|
#: builtin/config.c:69 |
|
msgid "find the color setting: [stdout-is-tty]" |
|
msgstr "" |
|
|
|
#: builtin/config.c:70 |
|
msgid "Type" |
|
msgstr "" |
|
|
|
#: builtin/config.c:71 |
|
msgid "value is \"true\" or \"false\"" |
|
msgstr "" |
|
|
|
#: builtin/config.c:72 |
|
msgid "value is decimal number" |
|
msgstr "" |
|
|
|
#: builtin/config.c:73 |
|
msgid "value is --bool or --int" |
|
msgstr "" |
|
|
|
#: builtin/config.c:74 |
|
msgid "value is a path (file or directory name)" |
|
msgstr "" |
|
|
|
#: builtin/config.c:75 |
|
msgid "Other" |
|
msgstr "" |
|
|
|
#: builtin/config.c:76 |
|
msgid "terminate values with NUL byte" |
|
msgstr "" |
|
|
|
#: builtin/config.c:77 |
|
msgid "respect include directives on lookup" |
|
msgstr "" |
|
|
|
#: builtin/count-objects.c:69 |
|
msgid "git count-objects [-v]" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:15 |
|
msgid "git describe [options] <committish>*" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:16 |
|
msgid "git describe [options] --dirty" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:234 |
|
#, c-format |
|
msgid "annotated tag %s not available" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:238 |
|
#, c-format |
|
msgid "annotated tag %s has no embedded name" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:240 |
|
#, c-format |
|
msgid "tag '%s' is really '%s' here" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:267 |
|
#, c-format |
|
msgid "Not a valid object name %s" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:270 |
|
#, c-format |
|
msgid "%s is not a valid '%s' object" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:287 |
|
#, c-format |
|
msgid "no tag exactly matches '%s'" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:289 |
|
#, c-format |
|
msgid "searching to describe %s\n" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:329 |
|
#, c-format |
|
msgid "finished search at %s\n" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:353 |
|
#, c-format |
|
msgid "" |
|
"No annotated tags can describe '%s'.\n" |
|
"However, there were unannotated tags: try --tags." |
|
msgstr "" |
|
|
|
#: builtin/describe.c:357 |
|
#, c-format |
|
msgid "" |
|
"No tags can describe '%s'.\n" |
|
"Try --always, or create some tags." |
|
msgstr "" |
|
|
|
#: builtin/describe.c:378 |
|
#, c-format |
|
msgid "traversed %lu commits\n" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:381 |
|
#, c-format |
|
msgid "" |
|
"more than %i tags found; listed %i most recent\n" |
|
"gave up search at %s\n" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:403 |
|
msgid "find the tag that comes after the commit" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:404 |
|
msgid "debug search strategy on stderr" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:405 |
|
msgid "use any ref in .git/refs" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:406 |
|
msgid "use any tag in .git/refs/tags" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:407 |
|
msgid "always use long format" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:410 |
|
msgid "only output exact matches" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:412 |
|
msgid "consider <n> most recent tags (default: 10)" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:414 |
|
msgid "only consider tags matching <pattern>" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:416 builtin/name-rev.c:238 |
|
msgid "show abbreviated commit object as fallback" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:417 |
|
msgid "mark" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:418 |
|
msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:436 |
|
msgid "--long is incompatible with --abbrev=0" |
|
msgstr "" |
|
|
|
#: builtin/describe.c:462 |
|
msgid "No names found, cannot describe anything." |
|
msgstr "" |
|
|
|
#: builtin/describe.c:482 |
|
msgid "--dirty is incompatible with committishes" |
|
msgstr "" |
|
|
|
#: builtin/diff.c:79 |
|
#, c-format |
|
msgid "'%s': not a regular file or symlink" |
|
msgstr "" |
|
|
|
#: builtin/diff.c:228 |
|
#, c-format |
|
msgid "invalid option: %s" |
|
msgstr "" |
|
|
|
#: builtin/diff.c:305 |
|
msgid "Not a git repository" |
|
msgstr "" |
|
|
|
#: builtin/diff.c:348 |
|
#, c-format |
|
msgid "invalid object '%s' given." |
|
msgstr "" |
|
|
|
#: builtin/diff.c:353 |
|
#, c-format |
|
msgid "more than %d trees given: '%s'" |
|
msgstr "" |
|
|
|
#: builtin/diff.c:363 |
|
#, c-format |
|
msgid "more than two blobs given: '%s'" |
|
msgstr "" |
|
|
|
#: builtin/diff.c:371 |
|
#, 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:646 |
|
msgid "show progress after <n> objects" |
|
msgstr "" |
|
|
|
#: builtin/fast-export.c:648 |
|
msgid "select handling of signed tags" |
|
msgstr "" |
|
|
|
#: builtin/fast-export.c:651 |
|
msgid "select handling of tags that tag filtered objects" |
|
msgstr "" |
|
|
|
#: builtin/fast-export.c:654 |
|
msgid "Dump marks to this file" |
|
msgstr "" |
|
|
|
#: builtin/fast-export.c:656 |
|
msgid "Import marks from this file" |
|
msgstr "" |
|
|
|
#: builtin/fast-export.c:658 |
|
msgid "Fake a tagger when tags lack one" |
|
msgstr "" |
|
|
|
#: builtin/fast-export.c:660 |
|
msgid "Output full tree for each commit" |
|
msgstr "" |
|
|
|
#: builtin/fast-export.c:662 |
|
msgid "Use the done feature to terminate the stream" |
|
msgstr "" |
|
|
|
#: builtin/fast-export.c:663 |
|
msgid "Skip output of blob data" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:20 |
|
msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:21 |
|
msgid "git fetch [<options>] <group>" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:22 |
|
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:23 |
|
msgid "git fetch --all [<options>]" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:60 |
|
msgid "fetch from all remotes" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:62 |
|
msgid "append to .git/FETCH_HEAD instead of overwriting" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:64 |
|
msgid "path to upload pack on remote end" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:65 |
|
msgid "force overwrite of local branch" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:67 |
|
msgid "fetch from multiple remotes" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:69 |
|
msgid "fetch all tags and associated objects" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:71 |
|
msgid "do not fetch all tags (--no-tags)" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:73 |
|
msgid "prune remote-tracking branches no longer on remote" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:74 |
|
msgid "on-demand" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:75 |
|
msgid "control recursive fetching of submodules" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:79 |
|
msgid "keep downloaded pack" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:81 |
|
msgid "allow updating of HEAD ref" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:84 |
|
msgid "deepen history of shallow clone" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:86 |
|
msgid "convert to a complete repository" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:88 builtin/log.c:1119 |
|
msgid "dir" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:89 |
|
msgid "prepend this to submodule path output" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:92 |
|
msgid "default mode for recursion" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:204 |
|
msgid "Couldn't find remote ref HEAD" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:257 |
|
#, c-format |
|
msgid "object %s not found" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:262 |
|
msgid "[up to date]" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:276 |
|
#, c-format |
|
msgid "! %-*s %-*s -> %s (can't fetch in current branch)" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:277 builtin/fetch.c:363 |
|
msgid "[rejected]" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:288 |
|
msgid "[tag update]" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 |
|
msgid " (unable to update local ref)" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:308 |
|
msgid "[new tag]" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:311 |
|
msgid "[new branch]" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:314 |
|
msgid "[new ref]" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:359 |
|
msgid "unable to update local ref" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:359 |
|
msgid "forced update" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:365 |
|
msgid "(non-fast-forward)" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:396 builtin/fetch.c:688 |
|
#, c-format |
|
msgid "cannot open %s: %s\n" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:405 |
|
#, c-format |
|
msgid "%s did not send all necessary objects\n" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:491 |
|
#, c-format |
|
msgid "From %.*s\n" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:502 |
|
#, 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:552 |
|
#, c-format |
|
msgid " (%s will become dangling)" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:553 |
|
#, c-format |
|
msgid " (%s has become dangling)" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:560 |
|
msgid "[deleted]" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:561 builtin/remote.c:1055 |
|
msgid "(none)" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:678 |
|
#, c-format |
|
msgid "Refusing to fetch into current branch %s of non-bare repository" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:712 |
|
#, c-format |
|
msgid "Don't know how to fetch from %s" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:789 |
|
#, c-format |
|
msgid "Option \"%s\" value \"%s\" is not valid for %s" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:792 |
|
#, c-format |
|
msgid "Option \"%s\" is ignored for %s\n" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:894 |
|
#, c-format |
|
msgid "Fetching %s\n" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:896 builtin/remote.c:100 |
|
#, c-format |
|
msgid "Could not fetch %s" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:915 |
|
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:935 |
|
msgid "You need to specify a tag name." |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:981 |
|
msgid "--depth and --unshallow cannot be used together" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:983 |
|
msgid "--unshallow on a complete repository does not make sense" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:1002 |
|
msgid "fetch --all does not take a repository argument" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:1004 |
|
msgid "fetch --all does not make sense with refspecs" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:1015 |
|
#, c-format |
|
msgid "No such remote or remote group: %s" |
|
msgstr "" |
|
|
|
#: builtin/fetch.c:1023 |
|
msgid "Fetching a group and specifying refspecs does not make sense" |
|
msgstr "" |
|
|
|
#: builtin/fmt-merge-msg.c:13 |
|
msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" |
|
msgstr "" |
|
|
|
#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 |
|
#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 |
|
#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 |
|
msgid "n" |
|
msgstr "" |
|
|
|
#: builtin/fmt-merge-msg.c:660 |
|
msgid "populate log with at most <n> entries from shortlog" |
|
msgstr "" |
|
|
|
#: builtin/fmt-merge-msg.c:663 |
|
msgid "alias for --log (deprecated)" |
|
msgstr "" |
|
|
|
#: builtin/fmt-merge-msg.c:666 |
|
msgid "text" |
|
msgstr "" |
|
|
|
#: builtin/fmt-merge-msg.c:667 |
|
msgid "use <text> as start of message" |
|
msgstr "" |
|
|
|
#: builtin/fmt-merge-msg.c:668 |
|
msgid "file to read from" |
|
msgstr "" |
|
|
|
#: builtin/for-each-ref.c:979 |
|
msgid "git for-each-ref [options] [<pattern>]" |
|
msgstr "" |
|
|
|
#: builtin/for-each-ref.c:994 |
|
msgid "quote placeholders suitably for shells" |
|
msgstr "" |
|
|
|
#: builtin/for-each-ref.c:996 |
|
msgid "quote placeholders suitably for perl" |
|
msgstr "" |
|
|
|
#: builtin/for-each-ref.c:998 |
|
msgid "quote placeholders suitably for python" |
|
msgstr "" |
|
|
|
#: builtin/for-each-ref.c:1000 |
|
msgid "quote placeholders suitably for tcl" |
|
msgstr "" |
|
|
|
#: builtin/for-each-ref.c:1003 |
|
msgid "show only <n> matched refs" |
|
msgstr "" |
|
|
|
#: builtin/for-each-ref.c:1004 |
|
msgid "format" |
|
msgstr "" |
|
|
|
#: builtin/for-each-ref.c:1004 |
|
msgid "format to use for the output" |
|
msgstr "" |
|
|
|
#: builtin/for-each-ref.c:1005 |
|
msgid "key" |
|
msgstr "" |
|
|
|
#: builtin/for-each-ref.c:1006 |
|
msgid "field name to sort on" |
|
msgstr "" |
|
|
|
#: builtin/fsck.c:608 |
|
msgid "git fsck [options] [<object>...]" |
|
msgstr "" |
|
|
|
#: builtin/fsck.c:614 |
|
msgid "show unreachable objects" |
|
msgstr "" |
|
|
|
#: builtin/fsck.c:615 |
|
msgid "show dangling objects" |
|
msgstr "" |
|
|
|
#: builtin/fsck.c:616 |
|
msgid "report tags" |
|
msgstr "" |
|
|
|
#: builtin/fsck.c:617 |
|
msgid "report root nodes" |
|
msgstr "" |
|
|
|
#: builtin/fsck.c:618 |
|
msgid "make index objects head nodes" |
|
msgstr "" |
|
|
|
#: builtin/fsck.c:619 |
|
msgid "make reflogs head nodes (default)" |
|
msgstr "" |
|
|
|
#: builtin/fsck.c:620 |
|
msgid "also consider packs and alternate objects" |
|
msgstr "" |
|
|
|
#: builtin/fsck.c:621 |
|
msgid "enable more strict checking" |
|
msgstr "" |
|
|
|
#: builtin/fsck.c:623 |
|
msgid "write dangling objects in .git/lost-found" |
|
msgstr "" |
|
|
|
#: builtin/fsck.c:624 builtin/prune.c:134 |
|
msgid "show progress" |
|
msgstr "" |
|
|
|
#: builtin/gc.c:22 |
|
msgid "git gc [options]" |
|
msgstr "" |
|
|
|
#: builtin/gc.c:63 |
|
#, c-format |
|
msgid "Invalid %s: '%s'" |
|
msgstr "" |
|
|
|
#: builtin/gc.c:90 |
|
#, c-format |
|
msgid "insanely long object directory %.*s" |
|
msgstr "" |
|
|
|
#: builtin/gc.c:179 |
|
msgid "prune unreferenced objects" |
|
msgstr "" |
|
|
|
#: builtin/gc.c:181 |
|
msgid "be more thorough (increased runtime)" |
|
msgstr "" |
|
|
|
#: builtin/gc.c:182 |
|
msgid "enable auto-gc mode" |
|
msgstr "" |
|
|
|
#: builtin/gc.c:222 |
|
#, 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 "" |
|
|
|
#: builtin/gc.c:249 |
|
msgid "" |
|
"There are too many unreachable loose objects; run 'git prune' to remove them." |
|
msgstr "" |
|
|
|
#: builtin/grep.c:22 |
|
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:217 |
|
#, 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:643 |
|
msgid "search in index instead of in the work tree" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:645 |
|
msgid "find in contents not managed by git" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:647 |
|
msgid "search in both tracked and untracked files" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:649 |
|
msgid "search also in ignored files" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:652 |
|
msgid "show non-matching lines" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:654 |
|
msgid "case insensitive matching" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:656 |
|
msgid "match patterns only at word boundaries" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:658 |
|
msgid "process binary files as text" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:660 |
|
msgid "don't match patterns in binary files" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:663 |
|
msgid "descend at most <depth> levels" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:667 |
|
msgid "use extended POSIX regular expressions" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:670 |
|
msgid "use basic POSIX regular expressions (default)" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:673 |
|
msgid "interpret patterns as fixed strings" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:676 |
|
msgid "use Perl-compatible regular expressions" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:679 |
|
msgid "show line numbers" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:680 |
|
msgid "don't show filenames" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:681 |
|
msgid "show filenames" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:683 |
|
msgid "show filenames relative to top directory" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:685 |
|
msgid "show only filenames instead of matching lines" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:687 |
|
msgid "synonym for --files-with-matches" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:690 |
|
msgid "show only the names of files without match" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:692 |
|
msgid "print NUL after filenames" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:694 |
|
msgid "show the number of matches instead of matching lines" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:695 |
|
msgid "highlight matches" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:697 |
|
msgid "print empty line between matches from different files" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:699 |
|
msgid "show filename only once above matches from same file" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:702 |
|
msgid "show <n> context lines before and after matches" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:705 |
|
msgid "show <n> context lines before matches" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:707 |
|
msgid "show <n> context lines after matches" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:708 |
|
msgid "shortcut for -C NUM" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:711 |
|
msgid "show a line with the function name before matches" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:713 |
|
msgid "show the surrounding function" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:716 |
|
msgid "read patterns from file" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:718 |
|
msgid "match <pattern>" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:720 |
|
msgid "combine patterns specified with -e" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:732 |
|
msgid "indicate hit with exit status without output" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:734 |
|
msgid "show only matches from files that match all patterns" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:736 |
|
msgid "show parse tree for grep expression" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:740 |
|
msgid "pager" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:740 |
|
msgid "show matching files in the pager" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:743 |
|
msgid "allow calling of grep(1) (ignored by this build)" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:744 builtin/show-ref.c:184 |
|
msgid "show usage" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:811 |
|
msgid "no pattern given." |
|
msgstr "" |
|
|
|
#: builtin/grep.c:825 |
|
#, c-format |
|
msgid "bad object %s" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:868 |
|
msgid "--open-files-in-pager only works on the worktree" |
|
msgstr "" |
|
|
|
#: builtin/grep.c:891 |
|
msgid "--cached or --untracked cannot be used with --no-index." |
|
msgstr "" |
|
|
|
#: builtin/grep.c:896 |
|
msgid "--no-index or --untracked cannot be used with revs." |
|
msgstr "" |
|
|
|
#: builtin/grep.c:899 |
|
msgid "--[no-]exclude-standard cannot be used for tracked contents." |
|
msgstr "" |
|
|
|
#: builtin/grep.c:907 |
|
msgid "both --cached and trees are given." |
|
msgstr "" |
|
|
|
#: builtin/hash-object.c:60 |
|
msgid "" |
|
"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " |
|
"<file>..." |
|
msgstr "" |
|
|
|
#: builtin/hash-object.c:61 |
|
msgid "git hash-object --stdin-paths < <list-of-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:42 |
|
msgid "print all available commands" |
|
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] [--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.<tool>.cmd' instead." |
|
msgstr "" |
|
|
|
#: builtin/help.c:228 |
|
#, c-format |
|
msgid "" |
|
"'%s': cmd for supported man viewer.\n" |
|
"Please consider using 'man.<tool>.path' instead." |
|
msgstr "" |
|
|
|
#: builtin/help.c:349 |
|
#, c-format |
|
msgid "'%s': unknown man viewer." |
|
msgstr "" |
|
|
|
#: builtin/help.c:366 |
|
msgid "no man viewer handled the request" |
|
msgstr "" |
|
|
|
#: builtin/help.c:374 |
|
msgid "no info viewer handled the request" |
|
msgstr "" |
|
|
|
#: builtin/help.c:429 builtin/help.c:436 |
|
#, c-format |
|
msgid "usage: %s%s" |
|
msgstr "" |
|
|
|
#: builtin/help.c:452 |
|
#, c-format |
|
msgid "`git %s' is aliased to `%s'" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:170 |
|
#, c-format |
|
msgid "object type mismatch at %s" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:190 |
|
msgid "object of unexpected type" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:227 |
|
#, c-format |
|
msgid "cannot fill %d byte" |
|
msgid_plural "cannot fill %d bytes" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: builtin/index-pack.c:237 |
|
msgid "early EOF" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:238 |
|
msgid "read error on input" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:250 |
|
msgid "used more bytes than were available" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:257 |
|
msgid "pack too large for current definition of off_t" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:273 |
|
#, c-format |
|
msgid "unable to create '%s'" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:278 |
|
#, c-format |
|
msgid "cannot open packfile '%s'" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:292 |
|
msgid "pack signature mismatch" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:294 |
|
#, c-format |
|
msgid "pack version %<PRIu32> unsupported" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:312 |
|
#, c-format |
|
msgid "pack has bad object at offset %lu: %s" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:434 |
|
#, c-format |
|
msgid "inflate returned %d" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:483 |
|
msgid "offset value overflow for delta base object" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:491 |
|
msgid "delta base offset is out of bound" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:499 |
|
#, c-format |
|
msgid "unknown object type %d" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:530 |
|
msgid "cannot pread pack file" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:532 |
|
#, 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:558 |
|
msgid "serious inflate inconsistency" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678 |
|
#: builtin/index-pack.c:712 builtin/index-pack.c:721 |
|
#, c-format |
|
msgid "SHA1 COLLISION FOUND WITH %s !" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:652 builtin/pack-objects.c:170 |
|
#: builtin/pack-objects.c:262 |
|
#, c-format |
|
msgid "unable to read %s" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:718 |
|
#, c-format |
|
msgid "cannot read existing object %s" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:732 |
|
#, c-format |
|
msgid "invalid blob object %s" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:747 |
|
#, c-format |
|
msgid "invalid %s" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:749 |
|
msgid "Error in object" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:751 |
|
#, c-format |
|
msgid "Not all child objects of %s are reachable" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:821 builtin/index-pack.c:847 |
|
msgid "failed to apply delta" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:986 |
|
msgid "Receiving objects" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:986 |
|
msgid "Indexing objects" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1012 |
|
msgid "pack is corrupted (SHA1 mismatch)" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1017 |
|
msgid "cannot fstat packfile" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1020 |
|
msgid "pack has junk at the end" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1031 |
|
msgid "confusion beyond insanity in parse_pack_objects()" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1054 |
|
msgid "Resolving deltas" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1064 |
|
#, c-format |
|
msgid "unable to create thread: %s" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1106 |
|
msgid "confusion beyond insanity" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1112 |
|
#, c-format |
|
msgid "completed with %d local objects" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1121 |
|
#, c-format |
|
msgid "Unexpected tail checksum for %s (disk corruption?)" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1125 |
|
#, c-format |
|
msgid "pack has %d unresolved delta" |
|
msgid_plural "pack has %d unresolved deltas" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: builtin/index-pack.c:1150 |
|
#, c-format |
|
msgid "unable to deflate appended object (%d)" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1229 |
|
#, c-format |
|
msgid "local object %s is corrupt" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1253 |
|
msgid "error while closing pack file" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1266 |
|
#, c-format |
|
msgid "cannot write keep file '%s'" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1274 |
|
#, c-format |
|
msgid "cannot close written keep file '%s'" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1287 |
|
msgid "cannot store pack file" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1298 |
|
msgid "cannot store index file" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1331 |
|
#, c-format |
|
msgid "bad pack.indexversion=%<PRIu32>" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1337 |
|
#, c-format |
|
msgid "invalid number of threads specified (%d)" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 |
|
#, c-format |
|
msgid "no threads support, ignoring %s" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1399 |
|
#, c-format |
|
msgid "Cannot open existing pack file '%s'" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1401 |
|
#, c-format |
|
msgid "Cannot open existing pack idx file for '%s'" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1448 |
|
#, c-format |
|
msgid "non delta: %d object" |
|
msgid_plural "non delta: %d objects" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: builtin/index-pack.c:1455 |
|
#, c-format |
|
msgid "chain length = %d: %lu object" |
|
msgid_plural "chain length = %d: %lu objects" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: builtin/index-pack.c:1482 |
|
msgid "Cannot come back to cwd" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1526 builtin/index-pack.c:1529 |
|
#: builtin/index-pack.c:1541 builtin/index-pack.c:1545 |
|
#, c-format |
|
msgid "bad %s" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1559 |
|
msgid "--fix-thin cannot be used without --stdin" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 |
|
#, c-format |
|
msgid "packfile name '%s' does not end with '.pack'" |
|
msgstr "" |
|
|
|
#: builtin/index-pack.c:1582 |
|
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 "" |
|
|
|
#: builtin/init-db.c:363 |
|
#, c-format |
|
msgid "Could not create git link %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=<template-directory>] [--" |
|
"shared[=<permissions>]] [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:77 |
|
msgid "be quiet" |
|
msgstr "" |
|
|
|
#: builtin/init-db.c:522 builtin/init-db.c:529 |
|
#, c-format |
|
msgid "cannot mkdir %s" |
|
msgstr "" |
|
|
|
#: builtin/init-db.c:533 |
|
#, c-format |
|
msgid "cannot chdir to %s" |
|
msgstr "" |
|
|
|
#: builtin/init-db.c:555 |
|
#, c-format |
|
msgid "" |
|
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" |
|
"dir=<directory>)" |
|
msgstr "" |
|
|
|
#: builtin/init-db.c:579 |
|
msgid "Cannot access current working directory" |
|
msgstr "" |
|
|
|
#: builtin/init-db.c:586 |
|
#, c-format |
|
msgid "Cannot access work tree '%s'" |
|
msgstr "" |
|
|
|
#: builtin/log.c:39 |
|
msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" |
|
msgstr "" |
|
|
|
#: builtin/log.c:40 |
|
msgid " or: git show [options] <object>..." |
|
msgstr "" |
|
|
|
#: builtin/log.c:102 |
|
msgid "suppress diff output" |
|
msgstr "" |
|
|
|
#: builtin/log.c:103 |
|
msgid "show source" |
|
msgstr "" |
|
|
|
#: builtin/log.c:104 |
|
msgid "Use mail map file" |
|
msgstr "" |
|
|
|
#: builtin/log.c:105 |
|
msgid "decorate options" |
|
msgstr "" |
|
|
|
#: builtin/log.c:198 |
|
#, c-format |
|
msgid "Final output: %d %s\n" |
|
msgstr "" |
|
|
|
#: builtin/log.c:419 builtin/log.c:511 |
|
#, c-format |
|
msgid "Could not read object %s" |
|
msgstr "" |
|
|
|
#: builtin/log.c:535 |
|
#, c-format |
|
msgid "Unknown type: %d" |
|
msgstr "" |
|
|
|
#: builtin/log.c:627 |
|
msgid "format.headers without value" |
|
msgstr "" |
|
|
|
#: builtin/log.c:701 |
|
msgid "name of output directory is too long" |
|
msgstr "" |
|
|
|
#: builtin/log.c:717 |
|
#, c-format |
|
msgid "Cannot open patch file %s" |
|
msgstr "" |
|
|
|
#: builtin/log.c:731 |
|
msgid "Need exactly one range." |
|
msgstr "" |
|
|
|
#: builtin/log.c:739 |
|
msgid "Not a range." |
|
msgstr "" |
|
|
|
#: builtin/log.c:812 |
|
msgid "Cover letter needs email format" |
|
msgstr "" |
|
|
|
#: builtin/log.c:885 |
|
#, c-format |
|
msgid "insane in-reply-to: %s" |
|
msgstr "" |
|
|
|
#: builtin/log.c:913 |
|
msgid "git format-patch [options] [<since> | <revision range>]" |
|
msgstr "" |
|
|
|
#: builtin/log.c:958 |
|
msgid "Two output directories?" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1097 |
|
msgid "use [PATCH n/m] even with a single patch" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1100 |
|
msgid "use [PATCH] even with multiple patches" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1104 |
|
msgid "print patches to standard out" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1106 |
|
msgid "generate a cover letter" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1108 |
|
msgid "use simple number sequence for output file names" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1109 |
|
msgid "sfx" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1110 |
|
msgid "use <sfx> instead of '.patch'" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1112 |
|
msgid "start numbering patches at <n> instead of 1" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1114 |
|
msgid "mark the series as Nth re-roll" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1116 |
|
msgid "Use [<prefix>] instead of [PATCH]" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1119 |
|
msgid "store resulting files in <dir>" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1122 |
|
msgid "don't strip/add [PATCH]" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1125 |
|
msgid "don't output binary diffs" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1127 |
|
msgid "don't include a patch matching a commit upstream" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1129 |
|
msgid "show patch format instead of default (patch + stat)" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1131 |
|
msgid "Messaging" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1132 |
|
msgid "header" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1133 |
|
msgid "add email header" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1134 builtin/log.c:1136 |
|
msgid "email" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1134 |
|
msgid "add To: header" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1136 |
|
msgid "add Cc: header" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1138 |
|
msgid "message-id" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1139 |
|
msgid "make first mail a reply to <message-id>" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1140 builtin/log.c:1143 |
|
msgid "boundary" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1141 |
|
msgid "attach the patch" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1144 |
|
msgid "inline the patch" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1148 |
|
msgid "enable message threading, styles: shallow, deep" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1150 |
|
msgid "signature" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1151 |
|
msgid "add a signature" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1153 |
|
msgid "don't print the patch filenames" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1202 |
|
#, c-format |
|
msgid "bogus committer info %s" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1247 |
|
msgid "-n and -k are mutually exclusive." |
|
msgstr "" |
|
|
|
#: builtin/log.c:1249 |
|
msgid "--subject-prefix and -k are mutually exclusive." |
|
msgstr "" |
|
|
|
#: builtin/log.c:1257 |
|
msgid "--name-only does not make sense" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1259 |
|
msgid "--name-status does not make sense" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1261 |
|
msgid "--check does not make sense" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1284 |
|
msgid "standard output, or directory, which one?" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1286 |
|
#, c-format |
|
msgid "Could not create directory '%s'" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1439 |
|
msgid "Failed to create output files" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1488 |
|
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1543 |
|
#, c-format |
|
msgid "" |
|
"Could not find a tracked remote branch, please specify <upstream> manually.\n" |
|
msgstr "" |
|
|
|
#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 |
|
#, c-format |
|
msgid "Unknown commit %s" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:409 |
|
msgid "git ls-files [options] [<file>...]" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:466 |
|
msgid "identify the file status with tags" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:468 |
|
msgid "use lowercase letters for 'assume unchanged' files" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:470 |
|
msgid "show cached files in the output (default)" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:472 |
|
msgid "show deleted files in the output" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:474 |
|
msgid "show modified files in the output" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:476 |
|
msgid "show other files in the output" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:478 |
|
msgid "show ignored files in the output" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:481 |
|
msgid "show staged contents' object name in the output" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:483 |
|
msgid "show files on the filesystem that need to be removed" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:485 |
|
msgid "show 'other' directories' name only" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:488 |
|
msgid "don't show empty directories" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:491 |
|
msgid "show unmerged files in the output" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:493 |
|
msgid "show resolve-undo information" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:495 |
|
msgid "skip files matching pattern" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:498 |
|
msgid "exclude patterns are read from <file>" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:501 |
|
msgid "read additional per-directory exclude patterns in <file>" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:503 |
|
msgid "add the standard git exclusions" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:506 |
|
msgid "make the output relative to the project top directory" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:509 |
|
msgid "if any <file> is not in the index, treat this as an error" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:510 |
|
msgid "tree-ish" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:511 |
|
msgid "pretend that paths removed since <tree-ish> are still present" |
|
msgstr "" |
|
|
|
#: builtin/ls-files.c:513 |
|
msgid "show debugging data" |
|
msgstr "" |
|
|
|
#: builtin/ls-tree.c:27 |
|
msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
|
msgstr "" |
|
|
|
#: builtin/ls-tree.c:125 |
|
msgid "only show trees" |
|
msgstr "" |
|
|
|
#: builtin/ls-tree.c:127 |
|
msgid "recurse into subtrees" |
|
msgstr "" |
|
|
|
#: builtin/ls-tree.c:129 |
|
msgid "show trees when recursing" |
|
msgstr "" |
|
|
|
#: builtin/ls-tree.c:132 |
|
msgid "terminate entries with NUL byte" |
|
msgstr "" |
|
|
|
#: builtin/ls-tree.c:133 |
|
msgid "include object size" |
|
msgstr "" |
|
|
|
#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 |
|
msgid "list only filenames" |
|
msgstr "" |
|
|
|
#: builtin/ls-tree.c:140 |
|
msgid "use full path names" |
|
msgstr "" |
|
|
|
#: builtin/ls-tree.c:142 |
|
msgid "list entire tree; not just current directory (implies --full-name)" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:43 |
|
msgid "git merge [options] [<commit>...]" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:44 |
|
msgid "git merge [options] <msg> HEAD <commit>" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:45 |
|
msgid "git merge --abort" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:90 |
|
msgid "switch `m' requires a value" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:127 |
|
#, c-format |
|
msgid "Could not find merge strategy '%s'.\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:128 |
|
#, c-format |
|
msgid "Available strategies are:" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:133 |
|
#, c-format |
|
msgid "Available custom strategies are:" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:183 |
|
msgid "do not show a diffstat at the end of the merge" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:186 |
|
msgid "show a diffstat at the end of the merge" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:187 |
|
msgid "(synonym to --stat)" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:189 |
|
msgid "add (at most <n>) entries from shortlog to merge commit message" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:192 |
|
msgid "create a single commit instead of doing a merge" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:194 |
|
msgid "perform a commit if the merge succeeds (default)" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:196 |
|
msgid "edit message before committing" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:198 |
|
msgid "allow fast-forward (default)" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:200 |
|
msgid "abort if fast-forward is not possible" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 |
|
msgid "strategy" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:203 |
|
msgid "merge strategy to use" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:204 |
|
msgid "option=value" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:205 |
|
msgid "option for selected merge strategy" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:207 |
|
msgid "merge commit message (for a non-fast-forward merge)" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:211 |
|
msgid "abort the current in-progress merge" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:240 |
|
msgid "could not run stash." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:245 |
|
msgid "stash failed" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:250 |
|
#, c-format |
|
msgid "not a valid object: %s" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:269 builtin/merge.c:286 |
|
msgid "read-tree failed" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:316 |
|
msgid " (nothing to squash)" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:329 |
|
#, c-format |
|
msgid "Squash commit -- not updating HEAD\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:361 |
|
msgid "Writing SQUASH_MSG" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:363 |
|
msgid "Finishing SQUASH_MSG" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:386 |
|
#, c-format |
|
msgid "No merge message -- not updating HEAD\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:436 |
|
#, c-format |
|
msgid "'%s' does not point to a commit" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:535 |
|
#, c-format |
|
msgid "Bad branch.%s.mergeoptions string: %s" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:628 |
|
msgid "git write-tree failed to write a tree" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:656 |
|
msgid "Not handling anything other than two heads merge." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:670 |
|
#, c-format |
|
msgid "Unknown option for merge-recursive: -X%s" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:684 |
|
#, c-format |
|
msgid "unable to write %s" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:773 |
|
#, c-format |
|
msgid "Could not read from '%s'" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:782 |
|
#, c-format |
|
msgid "Not committing merge; use 'git commit' to complete the merge.\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:788 |
|
#, 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:812 |
|
msgid "Empty commit message." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:824 |
|
#, c-format |
|
msgid "Wonderful.\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:889 |
|
#, c-format |
|
msgid "Automatic merge failed; fix conflicts and then commit the result.\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:905 |
|
#, c-format |
|
msgid "'%s' is not a commit" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:946 |
|
msgid "No current branch." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:948 |
|
msgid "No remote for the current branch." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:950 |
|
msgid "No default upstream defined for the current branch." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:955 |
|
#, c-format |
|
msgid "No remote tracking branch for %s from %s" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1042 builtin/merge.c:1199 |
|
#, c-format |
|
msgid "%s - not something we can merge" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1110 |
|
msgid "There is no merge to abort (MERGE_HEAD missing)." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1126 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:1129 git-pull.sh:34 |
|
msgid "You have not concluded your merge (MERGE_HEAD exists)." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1133 |
|
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:1136 |
|
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1145 |
|
msgid "You cannot combine --squash with --no-ff." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1150 |
|
msgid "You cannot combine --no-ff with --ff-only." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1157 |
|
msgid "No commit specified and merge.defaultToUpstream not set." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1189 |
|
msgid "Can merge only exactly one commit into empty head" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1192 |
|
msgid "Squash commit into empty head not supported yet" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1194 |
|
msgid "Non-fast-forward commit does not make sense into an empty head" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1310 |
|
#, c-format |
|
msgid "Updating %s..%s\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1349 |
|
#, c-format |
|
msgid "Trying really trivial in-index merge...\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1356 |
|
#, c-format |
|
msgid "Nope.\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1388 |
|
msgid "Not possible to fast-forward, aborting." |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1411 builtin/merge.c:1490 |
|
#, c-format |
|
msgid "Rewinding the tree to pristine...\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1415 |
|
#, c-format |
|
msgid "Trying merge strategy %s...\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1481 |
|
#, c-format |
|
msgid "No merge strategy handled the merge.\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1483 |
|
#, c-format |
|
msgid "Merge with strategy %s failed.\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1492 |
|
#, c-format |
|
msgid "Using the %s to prepare resolving by hand.\n" |
|
msgstr "" |
|
|
|
#: builtin/merge.c:1504 |
|
#, c-format |
|
msgid "Automatic merge went well; stopped before committing as requested\n" |
|
msgstr "" |
|
|
|
#: builtin/merge-base.c:26 |
|
msgid "git merge-base [-a|--all] <commit> <commit>..." |
|
msgstr "" |
|
|
|
#: builtin/merge-base.c:27 |
|
msgid "git merge-base [-a|--all] --octopus <commit>..." |
|
msgstr "" |
|
|
|
#: builtin/merge-base.c:28 |
|
msgid "git merge-base --independent <commit>..." |
|
msgstr "" |
|
|
|
#: builtin/merge-base.c:29 |
|
msgid "git merge-base --is-ancestor <commit> <commit>" |
|
msgstr "" |
|
|
|
#: builtin/merge-base.c:98 |
|
msgid "output all common ancestors" |
|
msgstr "" |
|
|
|
#: builtin/merge-base.c:99 |
|
msgid "find ancestors for a single n-way merge" |
|
msgstr "" |
|
|
|
#: builtin/merge-base.c:100 |
|
msgid "list revs not reachable from others" |
|
msgstr "" |
|
|
|
#: builtin/merge-base.c:102 |
|
msgid "is the first one ancestor of the other?" |
|
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:14 |
|
msgid "git mv [options] <source>... <destination>" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:64 |
|
msgid "force move/rename even if target exists" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:65 |
|
msgid "skip move/rename errors" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:108 |
|
#, c-format |
|
msgid "Checking rename of '%s' to '%s'\n" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:112 |
|
msgid "bad source" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:115 |
|
msgid "can not move directory into itself" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:118 |
|
msgid "cannot move directory over file" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:128 |
|
#, c-format |
|
msgid "Huh? %.*s is in index?" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:140 |
|
msgid "source directory is empty" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:171 |
|
msgid "not under version control" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:173 |
|
msgid "destination exists" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:181 |
|
#, c-format |
|
msgid "overwriting '%s'" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:184 |
|
msgid "Cannot overwrite" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:187 |
|
msgid "multiple sources for the same target" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:202 |
|
#, c-format |
|
msgid "%s, source=%s, destination=%s" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:212 |
|
#, c-format |
|
msgid "Renaming %s to %s\n" |
|
msgstr "" |
|
|
|
#: builtin/mv.c:215 builtin/remote.c:731 |
|
#, c-format |
|
msgid "renaming '%s' failed" |
|
msgstr "" |
|
|
|
#: builtin/name-rev.c:175 |
|
msgid "git name-rev [options] <commit>..." |
|
msgstr "" |
|
|
|
#: builtin/name-rev.c:176 |
|
msgid "git name-rev [options] --all" |
|
msgstr "" |
|
|
|
#: builtin/name-rev.c:177 |
|
msgid "git name-rev [options] --stdin" |
|
msgstr "" |
|
|
|
#: builtin/name-rev.c:229 |
|
msgid "print only names (no SHA-1)" |
|
msgstr "" |
|
|
|
#: builtin/name-rev.c:230 |
|
msgid "only use tags to name the commits" |
|
msgstr "" |
|
|
|
#: builtin/name-rev.c:232 |
|
msgid "only use refs matching <pattern>" |
|
msgstr "" |
|
|
|
#: builtin/name-rev.c:234 |
|
msgid "list all commits reachable from all refs" |
|
msgstr "" |
|
|
|
#: builtin/name-rev.c:235 |
|
msgid "read from stdin" |
|
msgstr "" |
|
|
|
#: builtin/name-rev.c:236 |
|
msgid "allow to print `undefined` names" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:26 |
|
msgid "git notes [--ref <notes_ref>] [list [<object>]]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:27 |
|
msgid "" |
|
"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " |
|
"<object>] [<object>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:28 |
|
msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:29 |
|
msgid "" |
|
"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " |
|
"<object>] [<object>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:30 |
|
msgid "git notes [--ref <notes_ref>] edit [<object>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:31 |
|
msgid "git notes [--ref <notes_ref>] show [<object>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:32 |
|
msgid "" |
|
"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:33 |
|
msgid "git notes merge --commit [-v | -q]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:34 |
|
msgid "git notes merge --abort [-v | -q]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:35 |
|
msgid "git notes [--ref <notes_ref>] remove [<object>...]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:36 |
|
msgid "git notes [--ref <notes_ref>] prune [-n | -v]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:37 |
|
msgid "git notes [--ref <notes_ref>] get-ref" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:42 |
|
msgid "git notes [list [<object>]]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:47 |
|
msgid "git notes add [<options>] [<object>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:52 |
|
msgid "git notes copy [<options>] <from-object> <to-object>" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:53 |
|
msgid "git notes copy --stdin [<from-object> <to-object>]..." |
|
msgstr "" |
|
|
|
#: builtin/notes.c:58 |
|
msgid "git notes append [<options>] [<object>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:63 |
|
msgid "git notes edit [<object>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:68 |
|
msgid "git notes show [<object>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:73 |
|
msgid "git notes merge [<options>] <notes_ref>" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:74 |
|
msgid "git notes merge --commit [<options>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:75 |
|
msgid "git notes merge --abort [<options>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:80 |
|
msgid "git notes remove [<object>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:85 |
|
msgid "git notes prune [<options>]" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:90 |
|
msgid "git notes get-ref" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:139 |
|
#, c-format |
|
msgid "unable to start 'show' for object '%s'" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:143 |
|
msgid "could not read 'show' output" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:151 |
|
#, c-format |
|
msgid "failed to finish 'show' for object '%s'" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:169 builtin/tag.c:341 |
|
#, c-format |
|
msgid "could not create file '%s'" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:188 |
|
msgid "Please supply the note contents using either -m or -F option" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:209 builtin/notes.c:972 |
|
#, c-format |
|
msgid "Removing note for object %s\n" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:214 |
|
msgid "unable to write note object" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:216 |
|
#, c-format |
|
msgid "The note contents has been left in %s" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:250 builtin/tag.c:540 |
|
#, c-format |
|
msgid "cannot read '%s'" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:252 builtin/tag.c:543 |
|
#, c-format |
|
msgid "could not open or read '%s'" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 |
|
#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 |
|
#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 |
|
#: builtin/notes.c:967 builtin/tag.c:556 |
|
#, c-format |
|
msgid "Failed to resolve '%s' as a valid ref." |
|
msgstr "" |
|
|
|
#: builtin/notes.c:274 |
|
#, c-format |
|
msgid "Failed to read object '%s'." |
|
msgstr "" |
|
|
|
#: builtin/notes.c:298 |
|
msgid "Cannot commit uninitialized/unreferenced notes tree" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:339 |
|
#, c-format |
|
msgid "Bad notes.rewriteMode value: '%s'" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:349 |
|
#, 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 |
|
#: builtin/notes.c:376 |
|
#, c-format |
|
msgid "Bad %s value: '%s'" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:440 |
|
#, c-format |
|
msgid "Malformed input line: '%s'." |
|
msgstr "" |
|
|
|
#: builtin/notes.c:455 |
|
#, c-format |
|
msgid "Failed to copy notes from '%s' to '%s'" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 |
|
#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 |
|
#: builtin/notes.c:1032 |
|
msgid "too many parameters" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:512 builtin/notes.c:771 |
|
#, c-format |
|
msgid "No note found for object %s." |
|
msgstr "" |
|
|
|
#: builtin/notes.c:534 builtin/notes.c:691 |
|
msgid "note contents as a string" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:537 builtin/notes.c:694 |
|
msgid "note contents in a file" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 |
|
#: builtin/notes.c:699 builtin/tag.c:474 |
|
msgid "object" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:540 builtin/notes.c:697 |
|
msgid "reuse and edit specified note object" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:543 builtin/notes.c:700 |
|
msgid "reuse specified note object" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:545 builtin/notes.c:613 |
|
msgid "replace existing notes" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:579 |
|
#, c-format |
|
msgid "" |
|
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " |
|
"existing notes" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:584 builtin/notes.c:661 |
|
#, c-format |
|
msgid "Overwriting existing notes for object %s\n" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:614 |
|
msgid "read objects from stdin" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:616 |
|
msgid "load rewriting config for <command> (implies --stdin)" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:634 |
|
msgid "too few parameters" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:655 |
|
#, c-format |
|
msgid "" |
|
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " |
|
"existing notes" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:667 |
|
#, c-format |
|
msgid "Missing notes on source object %s. Cannot copy." |
|
msgstr "" |
|
|
|
#: builtin/notes.c:716 |
|
#, 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:863 |
|
msgid "General options" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:865 |
|
msgid "Merge options" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:867 |
|
msgid "" |
|
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" |
|
"cat_sort_uniq)" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:869 |
|
msgid "Committing unmerged notes" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:871 |
|
msgid "finalize notes merge by committing unmerged notes" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:873 |
|
msgid "Aborting notes merge resolution" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:875 |
|
msgid "abort notes merge" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:970 |
|
#, c-format |
|
msgid "Object %s has no note\n" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:982 |
|
msgid "attempt to remove non-existent note is not an error" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:985 |
|
msgid "read object names from the standard input" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:1066 |
|
msgid "notes_ref" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:1067 |
|
msgid "use notes from <notes_ref>" |
|
msgstr "" |
|
|
|
#: builtin/notes.c:1102 builtin/remote.c:1598 |
|
#, 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:183 builtin/pack-objects.c:186 |
|
#, c-format |
|
msgid "deflate error (%d)" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2397 |
|
#, c-format |
|
msgid "unsupported index version %s" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2401 |
|
#, c-format |
|
msgid "bad index version '%s'" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2424 |
|
#, c-format |
|
msgid "option %s does not accept negative form" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2428 |
|
#, c-format |
|
msgid "unable to parse value '%s' for option %s" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2447 |
|
msgid "do not show progress meter" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2449 |
|
msgid "show progress meter" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2451 |
|
msgid "show progress meter during object writing phase" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2454 |
|
msgid "similar to --all-progress when progress meter is shown" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2455 |
|
msgid "version[,offset]" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2456 |
|
msgid "write the pack index file in the specified idx format version" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2459 |
|
msgid "maximum size of each output pack file" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2461 |
|
msgid "ignore borrowed objects from alternate object store" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2463 |
|
msgid "ignore packed objects" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2465 |
|
msgid "limit pack window by objects" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2467 |
|
msgid "limit pack window by memory in addition to object limit" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2469 |
|
msgid "maximum length of delta chain allowed in the resulting pack" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2471 |
|
msgid "reuse existing deltas" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2473 |
|
msgid "reuse existing objects" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2475 |
|
msgid "use OFS_DELTA objects" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2477 |
|
msgid "use threads when searching for best delta matches" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2479 |
|
msgid "do not create an empty pack output" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2481 |
|
msgid "read revision arguments from standard input" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2483 |
|
msgid "limit the objects to those that are not yet packed" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2486 |
|
msgid "include objects reachable from any reference" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2489 |
|
msgid "include objects referred by reflog entries" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2492 |
|
msgid "output pack to stdout" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2494 |
|
msgid "include tag objects that refer to objects to be packed" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2496 |
|
msgid "keep unreachable objects" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2497 parse-options.h:141 |
|
msgid "time" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2498 |
|
msgid "unpack unreachable objects newer than <time>" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2501 |
|
msgid "create thin packs" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2503 |
|
msgid "ignore packs that have companion .keep file" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2505 |
|
msgid "pack compression level" |
|
msgstr "" |
|
|
|
#: builtin/pack-objects.c:2507 |
|
msgid "do not hide commits by grafts" |
|
msgstr "" |
|
|
|
#: builtin/pack-refs.c:6 |
|
msgid "git pack-refs [options]" |
|
msgstr "" |
|
|
|
#: builtin/pack-refs.c:14 |
|
msgid "pack everything" |
|
msgstr "" |
|
|
|
#: builtin/pack-refs.c:15 |
|
msgid "prune loose refs (default)" |
|
msgstr "" |
|
|
|
#: builtin/prune-packed.c:7 |
|
msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" |
|
msgstr "" |
|
|
|
#: builtin/prune.c:12 |
|
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
|
msgstr "" |
|
|
|
#: builtin/prune.c:132 |
|
msgid "do not remove, show only" |
|
msgstr "" |
|
|
|
#: builtin/prune.c:133 |
|
msgid "report pruned objects" |
|
msgstr "" |
|
|
|
#: builtin/prune.c:136 |
|
msgid "expire objects older than <time>" |
|
msgstr "" |
|
|
|
#: builtin/push.c:14 |
|
msgid "git push [<options>] [<repository> [<refspec>...]]" |
|
msgstr "" |
|
|
|
#: builtin/push.c:45 |
|
msgid "tag shorthand without <tag>" |
|
msgstr "" |
|
|
|
#: builtin/push.c:64 |
|
msgid "--delete only accepts plain target ref names" |
|
msgstr "" |
|
|
|
#: builtin/push.c:99 |
|
msgid "" |
|
"\n" |
|
"To choose either option permanently, see push.default in 'git help config'." |
|
msgstr "" |
|
|
|
#: builtin/push.c:102 |
|
#, c-format |
|
msgid "" |
|
"The upstream branch of your current branch does not match\n" |
|
"the name of your current branch. To push to the upstream branch\n" |
|
"on the remote, use\n" |
|
"\n" |
|
" git push %s HEAD:%s\n" |
|
"\n" |
|
"To push to the branch of the same name on the remote, use\n" |
|
"\n" |
|
" git push %s %s\n" |
|
"%s" |
|
msgstr "" |
|
|
|
#: builtin/push.c:121 |
|
#, c-format |
|
msgid "" |
|
"You are not currently on a branch.\n" |
|
"To push the history leading to the current (detached HEAD)\n" |
|
"state now, use\n" |
|
"\n" |
|
" git push %s HEAD:<name-of-remote-branch>\n" |
|
msgstr "" |
|
|
|
#: builtin/push.c:128 |
|
#, c-format |
|
msgid "" |
|
"The current branch %s has no upstream branch.\n" |
|
"To push the current branch and set the remote as upstream, use\n" |
|
"\n" |
|
" git push --set-upstream %s %s\n" |
|
msgstr "" |
|
|
|
#: builtin/push.c:136 |
|
#, c-format |
|
msgid "The current branch %s has multiple upstream branches, refusing to push." |
|
msgstr "" |
|
|
|
#: builtin/push.c:139 |
|
#, c-format |
|
msgid "" |
|
"You are pushing to remote '%s', which is not the upstream of\n" |
|
"your current branch '%s', without telling me what to push\n" |
|
"to update which remote branch." |
|
msgstr "" |
|
|
|
#: builtin/push.c:151 |
|
msgid "" |
|
"push.default is unset; its implicit value is changing in\n" |
|
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" |
|
"and maintain the current behavior after the default changes, use:\n" |
|
"\n" |
|
" git config --global push.default matching\n" |
|
"\n" |
|
"To squelch this message and adopt the new behavior now, use:\n" |
|
"\n" |
|
" git config --global push.default simple\n" |
|
"\n" |
|
"See 'git help config' and search for 'push.default' for further " |
|
"information.\n" |
|
"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" |
|
"'current' instead of 'simple' if you sometimes use older versions of Git)" |
|
msgstr "" |
|
|
|
#: builtin/push.c:199 |
|
msgid "" |
|
"You didn't specify any refspecs to push, and push.default is \"nothing\"." |
|
msgstr "" |
|
|
|
#: builtin/push.c:206 |
|
msgid "" |
|
"Updates were rejected because the tip of your current branch is behind\n" |
|
"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" |
|
"before pushing again.\n" |
|
"See the 'Note about fast-forwards' in 'git push --help' for details." |
|
msgstr "" |
|
|
|
#: builtin/push.c:212 |
|
msgid "" |
|
"Updates were rejected because a pushed branch tip is behind its remote\n" |
|
"counterpart. If you did not intend to push that branch, you may want to\n" |
|
"specify branches to push or set the 'push.default' configuration variable\n" |
|
"to 'simple', 'current' or 'upstream' to push only the current branch." |
|
msgstr "" |
|
|
|
#: builtin/push.c:218 |
|
msgid "" |
|
"Updates were rejected because a pushed branch tip is behind its remote\n" |
|
"counterpart. Check out this branch and merge the remote changes\n" |
|
"(e.g. 'git pull') before pushing again.\n" |
|
"See the 'Note about fast-forwards' in 'git push --help' for details." |
|
msgstr "" |
|
|
|
#: builtin/push.c:224 |
|
msgid "" |
|
"Updates were rejected because the remote contains work that you do\n" |
|
"not have locally. This is usually caused by another repository pushing\n" |
|
"to the same ref. You may want to first merge the remote changes (e.g.,\n" |
|
"'git pull') before pushing again.\n" |
|
"See the 'Note about fast-forwards' in 'git push --help' for details." |
|
msgstr "" |
|
|
|
#: builtin/push.c:231 |
|
msgid "Updates were rejected because the tag already exists in the remote." |
|
msgstr "" |
|
|
|
#: builtin/push.c:234 |
|
msgid "" |
|
"You cannot update a remote ref that points at a non-commit object,\n" |
|
"or update a remote ref to make it point at a non-commit object,\n" |
|
"without using the '--force' option.\n" |
|
msgstr "" |
|
|
|
#: builtin/push.c:294 |
|
#, c-format |
|
msgid "Pushing to %s\n" |
|
msgstr "" |
|
|
|
#: builtin/push.c:298 |
|
#, c-format |
|
msgid "failed to push some refs to '%s'" |
|
msgstr "" |
|
|
|
#: builtin/push.c:331 |
|
#, c-format |
|
msgid "bad repository '%s'" |
|
msgstr "" |
|
|
|
#: builtin/push.c:332 |
|
msgid "" |
|
"No configured push destination.\n" |
|
"Either specify the URL from the command-line or configure a remote " |
|
"repository using\n" |
|
"\n" |
|
" git remote add <name> <url>\n" |
|
"\n" |
|
"and then push using the remote name\n" |
|
"\n" |
|
" git push <name>\n" |
|
msgstr "" |
|
|
|
#: builtin/push.c:347 |
|
msgid "--all and --tags are incompatible" |
|
msgstr "" |
|
|
|
#: builtin/push.c:348 |
|
msgid "--all can't be combined with refspecs" |
|
msgstr "" |
|
|
|
#: builtin/push.c:353 |
|
msgid "--mirror and --tags are incompatible" |
|
msgstr "" |
|
|
|
#: builtin/push.c:354 |
|
msgid "--mirror can't be combined with refspecs" |
|
msgstr "" |
|
|
|
#: builtin/push.c:359 |
|
msgid "--all and --mirror are incompatible" |
|
msgstr "" |
|
|
|
#: builtin/push.c:419 |
|
msgid "repository" |
|
msgstr "" |
|
|
|
#: builtin/push.c:420 |
|
msgid "push all refs" |
|
msgstr "" |
|
|
|
#: builtin/push.c:421 |
|
msgid "mirror all refs" |
|
msgstr "" |
|
|
|
#: builtin/push.c:423 |
|
msgid "delete refs" |
|
msgstr "" |
|
|
|
#: builtin/push.c:424 |
|
msgid "push tags (can't be used with --all or --mirror)" |
|
msgstr "" |
|
|
|
#: builtin/push.c:427 |
|
msgid "force updates" |
|
msgstr "" |
|
|
|
#: builtin/push.c:428 |
|
msgid "check" |
|
msgstr "" |
|
|
|
#: builtin/push.c:429 |
|
msgid "control recursive pushing of submodules" |
|
msgstr "" |
|
|
|
#: builtin/push.c:431 |
|
msgid "use thin pack" |
|
msgstr "" |
|
|
|
#: builtin/push.c:432 builtin/push.c:433 |
|
msgid "receive pack program" |
|
msgstr "" |
|
|
|
#: builtin/push.c:434 |
|
msgid "set upstream for git pull/status" |
|
msgstr "" |
|
|
|
#: builtin/push.c:437 |
|
msgid "prune locally removed refs" |
|
msgstr "" |
|
|
|
#: builtin/push.c:439 |
|
msgid "bypass pre-push hook" |
|
msgstr "" |
|
|
|
#: builtin/push.c:448 |
|
msgid "--delete is incompatible with --all, --mirror and --tags" |
|
msgstr "" |
|
|
|
#: builtin/push.c:450 |
|
msgid "--delete doesn't make sense without any refs" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:36 |
|
msgid "" |
|
"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " |
|
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
|
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:108 |
|
msgid "write resulting index to <file>" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:111 |
|
msgid "only empty the index" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:113 |
|
msgid "Merging" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:115 |
|
msgid "perform a merge in addition to a read" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:117 |
|
msgid "3-way merge if no file level merging required" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:119 |
|
msgid "3-way merge in presence of adds and removes" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:121 |
|
msgid "same as -m, but discard unmerged entries" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:122 |
|
msgid "<subdirectory>/" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:123 |
|
msgid "read the tree into the index under <subdirectory>/" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:126 |
|
msgid "update working tree with merge result" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:128 |
|
msgid "gitignore" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:129 |
|
msgid "allow explicitly ignored files to be overwritten" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:132 |
|
msgid "don't check the working tree after merging" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:133 |
|
msgid "don't update the index or the work tree" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:135 |
|
msgid "skip applying sparse checkout filter" |
|
msgstr "" |
|
|
|
#: builtin/read-tree.c:137 |
|
msgid "debug unpack-trees" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:11 |
|
msgid "git remote [-v | --verbose]" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:12 |
|
msgid "" |
|
"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" |
|
"mirror=<fetch|push>] <name> <url>" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:13 builtin/remote.c:32 |
|
msgid "git remote rename <old> <new>" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:14 builtin/remote.c:37 |
|
msgid "git remote remove <name>" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:15 builtin/remote.c:42 |
|
msgid "git remote set-head <name> (-a | -d | <branch>)" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:16 |
|
msgid "git remote [-v | --verbose] show [-n] <name>" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:17 |
|
msgid "git remote prune [-n | --dry-run] <name>" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:18 |
|
msgid "" |
|
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:19 |
|
msgid "git remote set-branches [--add] <name> <branch>..." |
|
msgstr "" |
|
|
|
#: builtin/remote.c:20 builtin/remote.c:68 |
|
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:21 builtin/remote.c:69 |
|
msgid "git remote set-url --add <name> <newurl>" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:22 builtin/remote.c:70 |
|
msgid "git remote set-url --delete <name> <url>" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:27 |
|
msgid "git remote add [<options>] <name> <url>" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:47 |
|
msgid "git remote set-branches <name> <branch>..." |
|
msgstr "" |
|
|
|
#: builtin/remote.c:48 |
|
msgid "git remote set-branches --add <name> <branch>..." |
|
msgstr "" |
|
|
|
#: builtin/remote.c:53 |
|
msgid "git remote show [<options>] <name>" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:58 |
|
msgid "git remote prune [<options>] <name>" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:63 |
|
msgid "git remote update [<options>] [<group> | <remote>]..." |
|
msgstr "" |
|
|
|
#: builtin/remote.c:98 |
|
#, c-format |
|
msgid "Updating %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:130 |
|
msgid "" |
|
"--mirror is dangerous and deprecated; please\n" |
|
"\t use --mirror=fetch or --mirror=push instead" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:147 |
|
#, c-format |
|
msgid "unknown mirror argument: %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:163 |
|
msgid "fetch the remote branches" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:165 |
|
msgid "import all tags and associated objects when fetching" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:168 |
|
msgid "or do not fetch any tag at all (--no-tags)" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:170 |
|
msgid "branch(es) to track" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:171 |
|
msgid "master branch" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:172 |
|
msgid "push|fetch" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:173 |
|
msgid "set up remote as a mirror to push to or fetch from" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:185 |
|
msgid "specifying a master branch makes no sense with --mirror" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:187 |
|
msgid "specifying branches to track makes sense only with fetch mirrors" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:195 builtin/remote.c:646 |
|
#, c-format |
|
msgid "remote %s already exists." |
|
msgstr "" |
|
|
|
#: builtin/remote.c:199 builtin/remote.c:650 |
|
#, c-format |
|
msgid "'%s' is not a valid remote name" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:243 |
|
#, c-format |
|
msgid "Could not setup master '%s'" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:299 |
|
#, c-format |
|
msgid "more than one %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:339 |
|
#, c-format |
|
msgid "Could not get fetch map for refspec %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:440 builtin/remote.c:448 |
|
msgid "(matching)" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:452 |
|
msgid "(delete)" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 |
|
#, c-format |
|
msgid "Could not append '%s' to '%s'" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 |
|
#, c-format |
|
msgid "No such remote: %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:656 |
|
#, c-format |
|
msgid "Could not rename config section '%s' to '%s'" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:662 builtin/remote.c:799 |
|
#, c-format |
|
msgid "Could not remove config section '%s'" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:677 |
|
#, c-format |
|
msgid "" |
|
"Not updating non-default fetch refspec\n" |
|
"\t%s\n" |
|
"\tPlease update the configuration manually if necessary." |
|
msgstr "" |
|
|
|
#: builtin/remote.c:683 |
|
#, c-format |
|
msgid "Could not append '%s'" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:694 |
|
#, c-format |
|
msgid "Could not set '%s'" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:716 |
|
#, c-format |
|
msgid "deleting '%s' failed" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:750 |
|
#, c-format |
|
msgid "creating '%s' failed" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:764 |
|
#, c-format |
|
msgid "Could not remove branch %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:834 |
|
msgid "" |
|
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" |
|
"to delete it, use:" |
|
msgid_plural "" |
|
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" |
|
"to delete them, use:" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: builtin/remote.c:943 |
|
#, c-format |
|
msgid " new (next fetch will store in remotes/%s)" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:946 |
|
msgid " tracked" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:948 |
|
msgid " stale (use 'git remote prune' to remove)" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:950 |
|
msgid " ???" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:991 |
|
#, c-format |
|
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:998 |
|
#, c-format |
|
msgid "rebases onto remote %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1001 |
|
#, c-format |
|
msgid " merges with remote %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1002 |
|
msgid " and with remote" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1004 |
|
#, c-format |
|
msgid "merges with remote %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1005 |
|
msgid " and with remote" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1051 |
|
msgid "create" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1054 |
|
msgid "delete" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1058 |
|
msgid "up to date" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1061 |
|
msgid "fast-forwardable" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1064 |
|
msgid "local out of date" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1071 |
|
#, c-format |
|
msgid " %-*s forces to %-*s (%s)" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1074 |
|
#, c-format |
|
msgid " %-*s pushes to %-*s (%s)" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1078 |
|
#, c-format |
|
msgid " %-*s forces to %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1081 |
|
#, c-format |
|
msgid " %-*s pushes to %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1091 |
|
msgid "do not query remotes" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1118 |
|
#, c-format |
|
msgid "* remote %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1119 |
|
#, c-format |
|
msgid " Fetch URL: %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1120 builtin/remote.c:1285 |
|
msgid "(no URL)" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1129 builtin/remote.c:1131 |
|
#, c-format |
|
msgid " Push URL: %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 |
|
#, c-format |
|
msgid " HEAD branch: %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1139 |
|
#, c-format |
|
msgid "" |
|
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1151 |
|
#, c-format |
|
msgid " Remote branch:%s" |
|
msgid_plural " Remote branches:%s" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: builtin/remote.c:1154 builtin/remote.c:1181 |
|
msgid " (status not queried)" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1163 |
|
msgid " Local branch configured for 'git pull':" |
|
msgid_plural " Local branches configured for 'git pull':" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: builtin/remote.c:1171 |
|
msgid " Local refs will be mirrored by 'git push'" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1178 |
|
#, c-format |
|
msgid " Local ref configured for 'git push'%s:" |
|
msgid_plural " Local refs configured for 'git push'%s:" |
|
msgstr[0] "" |
|
msgstr[1] "" |
|
|
|
#: builtin/remote.c:1199 |
|
msgid "set refs/remotes/<name>/HEAD according to remote" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1201 |
|
msgid "delete refs/remotes/<name>/HEAD" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1216 |
|
msgid "Cannot determine remote HEAD" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1218 |
|
msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1228 |
|
#, c-format |
|
msgid "Could not delete %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1236 |
|
#, c-format |
|
msgid "Not a valid ref: %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1238 |
|
#, c-format |
|
msgid "Could not setup %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1274 |
|
#, c-format |
|
msgid " %s will become dangling!" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1275 |
|
#, c-format |
|
msgid " %s has become dangling!" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1281 |
|
#, c-format |
|
msgid "Pruning %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1282 |
|
#, c-format |
|
msgid "URL: %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1295 |
|
#, c-format |
|
msgid " * [would prune] %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1298 |
|
#, c-format |
|
msgid " * [pruned] %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1321 |
|
msgid "prune remotes after fetching" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1387 builtin/remote.c:1461 |
|
#, c-format |
|
msgid "No such remote '%s'" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1407 |
|
msgid "add branch" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1414 |
|
msgid "no remote specified" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1436 |
|
msgid "manipulate push URLs" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1438 |
|
msgid "add URL" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1440 |
|
msgid "delete URLs" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1447 |
|
msgid "--add --delete doesn't make sense" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1487 |
|
#, c-format |
|
msgid "Invalid old URL pattern: %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1495 |
|
#, c-format |
|
msgid "No such URL found: %s" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1497 |
|
msgid "Will not delete all non-push URLs" |
|
msgstr "" |
|
|
|
#: builtin/remote.c:1569 |
|
msgid "be verbose; must be placed before a subcommand" |
|
msgstr "" |
|
|
|
#: builtin/replace.c:17 |
|
msgid "git replace [-f] <object> <replacement>" |
|
msgstr "" |
|
|
|
#: builtin/replace.c:18 |
|
msgid "git replace -d <object>..." |
|
msgstr "" |
|
|
|
#: builtin/replace.c:19 |
|
msgid "git replace -l [<pattern>]" |
|
msgstr "" |
|
|
|
#: builtin/replace.c:121 |
|
msgid "list replace refs" |
|
msgstr "" |
|
|
|
#: builtin/replace.c:122 |
|
msgid "delete replace refs" |
|
msgstr "" |
|
|
|
#: builtin/replace.c:123 |
|
msgid "replace the ref if it exists" |
|
msgstr "" |
|
|
|
#: builtin/rerere.c:11 |
|
msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" |
|
msgstr "" |
|
|
|
#: builtin/rerere.c:56 |
|
msgid "register clean resolutions in index" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:25 |
|
msgid "" |
|
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:26 |
|
msgid "git reset [-q] <tree-ish> [--] <paths>..." |
|
msgstr "" |
|
|
|
#: builtin/reset.c:27 |
|
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:33 |
|
msgid "mixed" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:33 |
|
msgid "soft" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:33 |
|
msgid "hard" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:33 |
|
msgid "merge" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:33 |
|
msgid "keep" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:73 |
|
msgid "You do not have a valid HEAD." |
|
msgstr "" |
|
|
|
#: builtin/reset.c:75 |
|
msgid "Failed to find tree of HEAD." |
|
msgstr "" |
|
|
|
#: builtin/reset.c:81 |
|
#, c-format |
|
msgid "Failed to find tree of %s." |
|
msgstr "" |
|
|
|
#: builtin/reset.c:98 |
|
#, c-format |
|
msgid "HEAD is now at %s" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:169 |
|
#, c-format |
|
msgid "Cannot do a %s reset in the middle of a merge." |
|
msgstr "" |
|
|
|
#: builtin/reset.c:248 |
|
msgid "be quiet, only report errors" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:250 |
|
msgid "reset HEAD and index" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:251 |
|
msgid "reset only HEAD" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:253 builtin/reset.c:255 |
|
msgid "reset HEAD, index and working tree" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:257 |
|
msgid "reset HEAD but keep local changes" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:275 |
|
#, c-format |
|
msgid "Failed to resolve '%s' as a valid revision." |
|
msgstr "" |
|
|
|
#: builtin/reset.c:278 builtin/reset.c:286 |
|
#, c-format |
|
msgid "Could not parse object '%s'." |
|
msgstr "" |
|
|
|
#: builtin/reset.c:283 |
|
#, c-format |
|
msgid "Failed to resolve '%s' as a valid tree." |
|
msgstr "" |
|
|
|
#: builtin/reset.c:292 |
|
msgid "--patch is incompatible with --{hard,mixed,soft}" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:301 |
|
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
|
msgstr "" |
|
|
|
#: builtin/reset.c:303 |
|
#, c-format |
|
msgid "Cannot do %s reset with paths." |
|
msgstr "" |
|
|
|
#: builtin/reset.c:313 |
|
#, c-format |
|
msgid "%s reset is not allowed in a bare repository" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:333 |
|
#, c-format |
|
msgid "Could not reset index file to revision '%s'." |
|
msgstr "" |
|
|
|
#: builtin/reset.c:339 |
|
msgid "Unstaged changes after reset:" |
|
msgstr "" |
|
|
|
#: builtin/reset.c:344 |
|
msgid "Could not write new index file." |
|
msgstr "" |
|
|
|
#: builtin/rev-parse.c:339 |
|
msgid "git rev-parse --parseopt [options] -- [<args>...]" |
|
msgstr "" |
|
|
|
#: builtin/rev-parse.c:344 |
|
msgid "keep the `--` passed as an arg" |
|
msgstr "" |
|
|
|
#: builtin/rev-parse.c:346 |
|
msgid "stop parsing after the first non-option argument" |
|
msgstr "" |
|
|
|
#: builtin/rev-parse.c:464 |
|
msgid "" |
|
"git rev-parse --parseopt [options] -- [<args>...]\n" |
|
" or: git rev-parse --sq-quote [<arg>...]\n" |
|
" or: git rev-parse [options] [<arg>...]\n" |
|
"\n" |
|
"Run \"git rev-parse --parseopt -h\" for more information on the first usage." |
|
msgstr "" |
|
|
|
#: builtin/revert.c:22 |
|
msgid "git revert [options] <commit-ish>" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:23 |
|
msgid "git revert <subcommand>" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:28 |
|
msgid "git cherry-pick [options] <commit-ish>" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:29 |
|
msgid "git cherry-pick <subcommand>" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:70 builtin/revert.c:92 |
|
#, c-format |
|
msgid "%s: %s cannot be used with %s" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:103 |
|
msgid "end revert or cherry-pick sequence" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:104 |
|
msgid "resume revert or cherry-pick sequence" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:105 |
|
msgid "cancel revert or cherry-pick sequence" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:106 |
|
msgid "don't automatically commit" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:107 |
|
msgid "edit the commit message" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:110 |
|
msgid "parent number" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:112 |
|
msgid "merge strategy" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:113 |
|
msgid "option" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:114 |
|
msgid "option for merge strategy" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:125 |
|
msgid "append commit name" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:126 |
|
msgid "allow fast-forward" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:127 |
|
msgid "preserve initially empty commits" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:128 |
|
msgid "allow commits with empty messages" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:129 |
|
msgid "keep redundant, empty commits" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:133 |
|
msgid "program error" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:223 |
|
msgid "revert failed" |
|
msgstr "" |
|
|
|
#: builtin/revert.c:238 |
|
msgid "cherry-pick failed" |
|
msgstr "" |
|
|
|
#: builtin/rm.c:15 |
|
msgid "git rm [options] [--] <file>..." |
|
msgstr "" |
|
|
|
#: builtin/rm.c:64 builtin/rm.c:186 |
|
#, c-format |
|
msgid "" |
|
"submodule '%s' (or one of its nested submodules) uses a .git directory\n" |
|
"(use 'rm -rf' if you really want to remove it including all of its history)" |
|
msgstr "" |
|
|
|
#: builtin/rm.c:174 |
|
#, c-format |
|
msgid "" |
|
"'%s' has staged content different from both the file and the HEAD\n" |
|
"(use -f to force removal)" |
|
msgstr "" |
|
|
|
#: builtin/rm.c:180 |
|
#, c-format |
|
msgid "" |
|
"'%s' has changes staged in the index\n" |
|
"(use --cached to keep the file, or -f to force removal)" |
|
msgstr "" |
|
|
|
#: builtin/rm.c:191 |
|
#, c-format |
|
msgid "" |
|
"'%s' has local modifications\n" |
|
"(use --cached to keep the file, or -f to force removal)" |
|
msgstr "" |
|
|
|
#: builtin/rm.c:207 |
|
msgid "do not list removed files" |
|
msgstr "" |
|
|
|
#: builtin/rm.c:208 |
|
msgid "only remove from the index" |
|
msgstr "" |
|
|
|
#: builtin/rm.c:209 |
|
msgid "override the up-to-date check" |
|
msgstr "" |
|
|
|
#: builtin/rm.c:210 |
|
msgid "allow recursive removal" |
|
msgstr "" |
|
|
|
#: builtin/rm.c:212 |
|
msgid "exit with a zero status even if nothing matched" |
|
msgstr "" |
|
|
|
#: builtin/rm.c:283 |
|
#, c-format |
|
msgid "not removing '%s' recursively without -r" |
|
msgstr "" |
|
|
|
#: builtin/rm.c:322 |
|
#, c-format |
|
msgid "git rm: unable to remove %s" |
|
msgstr "" |
|
|
|
#: builtin/shortlog.c:13 |
|
msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" |
|
msgstr "" |
|
|
|
#: builtin/shortlog.c:133 |
|
#, c-format |
|
msgid "Missing author: %s" |
|
msgstr "" |
|
|
|
#: builtin/shortlog.c:229 |
|
msgid "sort output according to the number of commits per author" |
|
msgstr "" |
|
|
|
#: builtin/shortlog.c:231 |
|
msgid "Suppress commit descriptions, only provides commit count" |
|
msgstr "" |
|
|
|
#: builtin/shortlog.c:233 |
|
msgid "Show the email address of each author" |
|
msgstr "" |
|
|
|
#: builtin/shortlog.c:234 |
|
msgid "w[,i1[,i2]]" |
|
msgstr "" |
|
|
|
#: builtin/shortlog.c:235 |
|
msgid "Linewrap output" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:9 |
|
msgid "" |
|
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" |
|
"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" |
|
"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " |
|
"<glob>)...]" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:10 |
|
msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:651 |
|
msgid "show remote-tracking and local branches" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:653 |
|
msgid "show remote-tracking branches" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:655 |
|
msgid "color '*!+-' corresponding to the branch" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:657 |
|
msgid "show <n> more commits after the common ancestor" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:659 |
|
msgid "synonym to more=-1" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:660 |
|
msgid "suppress naming strings" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:662 |
|
msgid "include the current branch" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:664 |
|
msgid "name commits with their object names" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:666 |
|
msgid "show possible merge bases" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:668 |
|
msgid "show refs unreachable from any other ref" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:670 |
|
msgid "show commits in topological order" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:672 |
|
msgid "show only commits not on the first branch" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:674 |
|
msgid "show merges reachable from only one tip" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:676 |
|
msgid "show commits where no parent comes before its children" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:678 |
|
msgid "<n>[,<base>]" |
|
msgstr "" |
|
|
|
#: builtin/show-branch.c:679 |
|
msgid "show <n> most recent ref-log entries starting at base" |
|
msgstr "" |
|
|
|
#: builtin/show-ref.c:10 |
|
msgid "" |
|
"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" |
|
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " |
|
msgstr "" |
|
|
|
#: builtin/show-ref.c:11 |
|
msgid "git show-ref --exclude-existing[=pattern] < ref-list" |
|
msgstr "" |
|
|
|
#: builtin/show-ref.c:165 |
|
msgid "only show tags (can be combined with heads)" |
|
msgstr "" |
|
|
|
#: builtin/show-ref.c:166 |
|
msgid "only show heads (can be combined with tags)" |
|
msgstr "" |
|
|
|
#: builtin/show-ref.c:167 |
|
msgid "stricter reference checking, requires exact ref path" |
|
msgstr "" |
|
|
|
#: builtin/show-ref.c:170 builtin/show-ref.c:172 |
|
msgid "show the HEAD reference" |
|
msgstr "" |
|
|
|
#: builtin/show-ref.c:174 |
|
msgid "dereference tags into object IDs" |
|
msgstr "" |
|
|
|
#: builtin/show-ref.c:176 |
|
msgid "only show SHA1 hash using <n> digits" |
|
msgstr "" |
|
|
|
#: builtin/show-ref.c:180 |
|
msgid "do not print results to stdout (useful with --verify)" |
|
msgstr "" |
|
|
|
#: builtin/show-ref.c:182 |
|
msgid "show refs from stdin that aren't in local repository" |
|
msgstr "" |
|
|
|
#: builtin/symbolic-ref.c:7 |
|
msgid "git symbolic-ref [options] name [ref]" |
|
msgstr "" |
|
|
|
#: builtin/symbolic-ref.c:8 |
|
msgid "git symbolic-ref -d [-q] name" |
|
msgstr "" |
|
|
|
#: builtin/symbolic-ref.c:40 |
|
msgid "suppress error message for non-symbolic (detached) refs" |
|
msgstr "" |
|
|
|
#: builtin/symbolic-ref.c:41 |
|
msgid "delete symbolic ref" |
|
msgstr "" |
|
|
|
#: builtin/symbolic-ref.c:42 |
|
msgid "shorten ref output" |
|
msgstr "" |
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 |
|
msgid "reason" |
|
msgstr "" |
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 |
|
msgid "reason of the update" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:22 |
|
msgid "" |
|
"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:23 |
|
msgid "git tag -d <tagname>..." |
|
msgstr "" |
|
|
|
#: builtin/tag.c:24 |
|
msgid "" |
|
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" |
|
"\t\t[<pattern>...]" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:26 |
|
msgid "git tag -v <tagname>..." |
|
msgstr "" |
|
|
|
#: builtin/tag.c:60 |
|
#, c-format |
|
msgid "malformed object at '%s'" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:207 |
|
#, c-format |
|
msgid "tag name too long: %.*s..." |
|
msgstr "" |
|
|
|
#: builtin/tag.c:212 |
|
#, c-format |
|
msgid "tag '%s' not found." |
|
msgstr "" |
|
|
|
#: builtin/tag.c:227 |
|
#, c-format |
|
msgid "Deleted tag '%s' (was %s)\n" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:239 |
|
#, c-format |
|
msgid "could not verify the tag '%s'" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:249 |
|
#, c-format |
|
msgid "" |
|
"\n" |
|
"Write a tag message\n" |
|
"Lines starting with '%c' will be ignored.\n" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:253 |
|
#, c-format |
|
msgid "" |
|
"\n" |
|
"Write a tag message\n" |
|
"Lines starting with '%c' will be kept; you may remove them yourself if you " |
|
"want to.\n" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:292 |
|
msgid "unable to sign the tag" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:294 |
|
msgid "unable to write tag file" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:319 |
|
msgid "bad object type." |
|
msgstr "" |
|
|
|
#: builtin/tag.c:332 |
|
msgid "tag header too big." |
|
msgstr "" |
|
|
|
#: builtin/tag.c:368 |
|
msgid "no tag message?" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:374 |
|
#, c-format |
|
msgid "The tag message has been left in %s\n" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:423 |
|
msgid "switch 'points-at' requires an object" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:425 |
|
#, c-format |
|
msgid "malformed object name '%s'" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:445 |
|
msgid "list tag names" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:447 |
|
msgid "print <n> lines of each tag message" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:449 |
|
msgid "delete tags" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:450 |
|
msgid "verify tags" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:452 |
|
msgid "Tag creation options" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:454 |
|
msgid "annotated tag, needs a message" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:456 |
|
msgid "tag message" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:458 |
|
msgid "annotated and GPG-signed tag" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:462 |
|
msgid "use another key to sign the tag" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:463 |
|
msgid "replace the tag if exists" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:464 |
|
msgid "show tag list in columns" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:466 |
|
msgid "Tag listing options" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:469 |
|
msgid "print only tags that contain the commit" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:475 |
|
msgid "print only tags of the object" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:504 |
|
msgid "--column and -n are incompatible" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:521 |
|
msgid "-n option is only allowed with -l." |
|
msgstr "" |
|
|
|
#: builtin/tag.c:523 |
|
msgid "--contains option is only allowed with -l." |
|
msgstr "" |
|
|
|
#: builtin/tag.c:525 |
|
msgid "--points-at option is only allowed with -l." |
|
msgstr "" |
|
|
|
#: builtin/tag.c:533 |
|
msgid "only one -F or -m option is allowed." |
|
msgstr "" |
|
|
|
#: builtin/tag.c:553 |
|
msgid "too many params" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:559 |
|
#, c-format |
|
msgid "'%s' is not a valid tag name." |
|
msgstr "" |
|
|
|
#: builtin/tag.c:564 |
|
#, c-format |
|
msgid "tag '%s' already exists" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:582 |
|
#, c-format |
|
msgid "%s: cannot lock the ref" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:584 |
|
#, c-format |
|
msgid "%s: cannot update the ref" |
|
msgstr "" |
|
|
|
#: builtin/tag.c:586 |
|
#, c-format |
|
msgid "Updated tag '%s' (was %s)\n" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:401 |
|
msgid "git update-index [options] [--] [<file>...]" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:718 |
|
msgid "continue refresh even when index needs update" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:721 |
|
msgid "refresh: ignore submodules" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:724 |
|
msgid "do not ignore new files" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:726 |
|
msgid "let files replace directories and vice-versa" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:728 |
|
msgid "notice files missing from worktree" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:730 |
|
msgid "refresh even if index contains unmerged entries" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:733 |
|
msgid "refresh stat information" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:737 |
|
msgid "like --refresh, but ignore assume-unchanged setting" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:741 |
|
msgid "<mode> <object> <path>" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:742 |
|
msgid "add the specified entry to the index" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:746 |
|
msgid "(+/-)x" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:747 |
|
msgid "override the executable bit of the listed files" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:751 |
|
msgid "mark files as \"not changing\"" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:754 |
|
msgid "clear assumed-unchanged bit" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:757 |
|
msgid "mark files as \"index-only\"" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:760 |
|
msgid "clear skip-worktree bit" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:763 |
|
msgid "add to index only; do not add content to object database" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:765 |
|
msgid "remove named paths even if present in worktree" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:767 |
|
msgid "with --stdin: input lines are terminated by null bytes" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:769 |
|
msgid "read list of paths to be updated from standard input" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:773 |
|
msgid "add entries from standard input to the index" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:777 |
|
msgid "repopulate stages #2 and #3 for the listed paths" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:781 |
|
msgid "only update entries that differ from HEAD" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:785 |
|
msgid "ignore files missing from worktree" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:788 |
|
msgid "report actions to standard output" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:790 |
|
msgid "(for porcelains) forget saved unresolved conflicts" |
|
msgstr "" |
|
|
|
#: builtin/update-index.c:794 |
|
msgid "write index in this format" |
|
msgstr "" |
|
|
|
#: builtin/update-ref.c:7 |
|
msgid "git update-ref [options] -d <refname> [<oldval>]" |
|
msgstr "" |
|
|
|
#: builtin/update-ref.c:8 |
|
msgid "git update-ref [options] <refname> <newval> [<oldval>]" |
|
msgstr "" |
|
|
|
#: builtin/update-ref.c:19 |
|
msgid "delete the reference" |
|
msgstr "" |
|
|
|
#: builtin/update-ref.c:21 |
|
msgid "update <refname> not the one it points to" |
|
msgstr "" |
|
|
|
#: builtin/update-server-info.c:6 |
|
msgid "git update-server-info [--force]" |
|
msgstr "" |
|
|
|
#: builtin/update-server-info.c:14 |
|
msgid "update the info files from scratch" |
|
msgstr "" |
|
|
|
#: builtin/verify-pack.c:56 |
|
msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." |
|
msgstr "" |
|
|
|
#: builtin/verify-pack.c:66 |
|
msgid "verbose" |
|
msgstr "" |
|
|
|
#: builtin/verify-pack.c:68 |
|
msgid "show statistics only" |
|
msgstr "" |
|
|
|
#: builtin/verify-tag.c:17 |
|
msgid "git verify-tag [-v|--verbose] <tag>..." |
|
msgstr "" |
|
|
|
#: builtin/verify-tag.c:73 |
|
msgid "print tag contents" |
|
msgstr "" |
|
|
|
#: builtin/write-tree.c:13 |
|
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
|
msgstr "" |
|
|
|
#: builtin/write-tree.c:26 |
|
msgid "<prefix>/" |
|
msgstr "" |
|
|
|
#: builtin/write-tree.c:27 |
|
msgid "write tree object for a subdirectory <prefix>" |
|
msgstr "" |
|
|
|
#: builtin/write-tree.c:30 |
|
msgid "only useful for debugging" |
|
msgstr "" |
|
|
|
#: git.c:16 |
|
msgid "See 'git help <command>' for more information on a specific command." |
|
msgstr "" |
|
|
|
#: parse-options.h:156 |
|
msgid "no-op (backward compatibility)" |
|
msgstr "" |
|
|
|
#: parse-options.h:232 |
|
msgid "be more verbose" |
|
msgstr "" |
|
|
|
#: parse-options.h:234 |
|
msgid "be more quiet" |
|
msgstr "" |
|
|
|
#: parse-options.h:240 |
|
msgid "use <n> digits to display SHA-1s" |
|
msgstr "" |
|
|
|
#: common-cmds.h:8 |
|
msgid "Add file contents to the index" |
|
msgstr "" |
|
|
|
#: common-cmds.h:9 |
|
msgid "Find by binary search the change that introduced a bug" |
|
msgstr "" |
|
|
|
#: common-cmds.h:10 |
|
msgid "List, create, or delete branches" |
|
msgstr "" |
|
|
|
#: common-cmds.h:11 |
|
msgid "Checkout a branch or paths to the working tree" |
|
msgstr "" |
|
|
|
#: common-cmds.h:12 |
|
msgid "Clone a repository into a new directory" |
|
msgstr "" |
|
|
|
#: common-cmds.h:13 |
|
msgid "Record changes to the repository" |
|
msgstr "" |
|
|
|
#: common-cmds.h:14 |
|
msgid "Show changes between commits, commit and working tree, etc" |
|
msgstr "" |
|
|
|
#: common-cmds.h:15 |
|
msgid "Download objects and refs from another repository" |
|
msgstr "" |
|
|
|
#: common-cmds.h:16 |
|
msgid "Print lines matching a pattern" |
|
msgstr "" |
|
|
|
#: common-cmds.h:17 |
|
msgid "Create an empty Git repository or reinitialize an existing one" |
|
msgstr "" |
|
|
|
#: common-cmds.h:18 |
|
msgid "Show commit logs" |
|
msgstr "" |
|
|
|
#: common-cmds.h:19 |
|
msgid "Join two or more development histories together" |
|
msgstr "" |
|
|
|
#: common-cmds.h:20 |
|
msgid "Move or rename a file, a directory, or a symlink" |
|
msgstr "" |
|
|
|
#: common-cmds.h:21 |
|
msgid "Fetch from and merge with another repository or a local branch" |
|
msgstr "" |
|
|
|
#: common-cmds.h:22 |
|
msgid "Update remote refs along with associated objects" |
|
msgstr "" |
|
|
|
#: common-cmds.h:23 |
|
msgid "Forward-port local commits to the updated upstream head" |
|
msgstr "" |
|
|
|
#: common-cmds.h:24 |
|
msgid "Reset current HEAD to the specified state" |
|
msgstr "" |
|
|
|
#: common-cmds.h:25 |
|
msgid "Remove files from the working tree and from the index" |
|
msgstr "" |
|
|
|
#: common-cmds.h:26 |
|
msgid "Show various types of objects" |
|
msgstr "" |
|
|
|
#: common-cmds.h:27 |
|
msgid "Show the working tree status" |
|
msgstr "" |
|
|
|
#: common-cmds.h:28 |
|
msgid "Create, list, delete or verify a tag object signed with GPG" |
|
msgstr "" |
|
|
|
#: git-am.sh:50 |
|
msgid "You need to set your committer info first" |
|
msgstr "" |
|
|
|
#: git-am.sh:95 |
|
msgid "" |
|
"You seem to have moved HEAD since the last 'am' failure.\n" |
|
"Not rewinding to ORIG_HEAD" |
|
msgstr "" |
|
|
|
#: git-am.sh:105 |
|
#, sh-format |
|
msgid "" |
|
"When you have resolved this problem, run \"$cmdline --resolved\".\n" |
|
"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" |
|
"To restore the original branch and stop patching, run \"$cmdline --abort\"." |
|
msgstr "" |
|
|
|
#: git-am.sh:121 |
|
msgid "Cannot fall back to three-way merge." |
|
msgstr "" |
|
|
|
#: git-am.sh:137 |
|
msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
|
msgstr "" |
|
|
|
#: git-am.sh:139 |
|
msgid "Using index info to reconstruct a base tree..." |
|
msgstr "" |
|
|
|
#: git-am.sh:154 |
|
msgid "" |
|
"Did you hand edit your patch?\n" |
|
"It does not apply to blobs recorded in its index." |
|
msgstr "" |
|
|
|
#: git-am.sh:163 |
|
msgid "Falling back to patching base and 3-way merge..." |
|
msgstr "" |
|
|
|
#: git-am.sh:179 |
|
msgid "Failed to merge in the changes." |
|
msgstr "" |
|
|
|
#: git-am.sh:274 |
|
msgid "Only one StGIT patch series can be applied at once" |
|
msgstr "" |
|
|
|
#: git-am.sh:361 |
|
#, sh-format |
|
msgid "Patch format $patch_format is not supported." |
|
msgstr "" |
|
|
|
#: git-am.sh:363 |
|
msgid "Patch format detection failed." |
|
msgstr "" |
|
|
|
#: git-am.sh:389 |
|
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 "" |
|
|
|
#: git-am.sh:477 |
|
#, sh-format |
|
msgid "previous rebase directory $dotest still exists but mbox given." |
|
msgstr "" |
|
|
|
#: git-am.sh:482 |
|
msgid "Please make up your mind. --skip or --abort?" |
|
msgstr "" |
|
|
|
#: git-am.sh:509 |
|
msgid "Resolve operation not in progress, we are not resuming." |
|
msgstr "" |
|
|
|
#: git-am.sh:575 |
|
#, sh-format |
|
msgid "Dirty index: cannot apply patches (dirty: $files)" |
|
msgstr "" |
|
|
|
#: git-am.sh:679 |
|
#, sh-format |
|
msgid "" |
|
"Patch is empty. Was it split wrong?\n" |
|
"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" |
|
"To restore the original branch and stop patching run \"$cmdline --abort\"." |
|
msgstr "" |
|
|
|
#: git-am.sh:706 |
|
msgid "Patch does not have a valid e-mail address." |
|
msgstr "" |
|
|
|
#: git-am.sh:753 |
|
msgid "cannot be interactive without stdin connected to a terminal." |
|
msgstr "" |
|
|
|
#: git-am.sh:757 |
|
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. |
|
#: git-am.sh:764 |
|
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " |
|
msgstr "" |
|
|
|
#: git-am.sh:800 |
|
#, sh-format |
|
msgid "Applying: $FIRSTLINE" |
|
msgstr "" |
|
|
|
#: git-am.sh:821 |
|
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 "" |
|
|
|
#: git-am.sh:829 |
|
msgid "" |
|
"You still have unmerged paths in your index\n" |
|
"did you forget to use 'git add'?" |
|
msgstr "" |
|
|
|
#: git-am.sh:845 |
|
msgid "No changes -- Patch already applied." |
|
msgstr "" |
|
|
|
#: git-am.sh:855 |
|
#, sh-format |
|
msgid "Patch failed at $msgnum $FIRSTLINE" |
|
msgstr "" |
|
|
|
#: git-am.sh:858 |
|
#, sh-format |
|
msgid "" |
|
"The copy of the patch that failed is found in:\n" |
|
" $dotest/patch" |
|
msgstr "" |
|
|
|
#: git-am.sh:876 |
|
msgid "applying to an empty history" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:48 |
|
msgid "You need to start by \"git bisect start\"" |
|
msgstr "" |
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your |
|
#. translation. The program will only accept English input |
|
#. at this point. |
|
#: git-bisect.sh:54 |
|
msgid "Do you want me to do it for you [Y/n]? " |
|
msgstr "" |
|
|
|
#: git-bisect.sh:95 |
|
#, sh-format |
|
msgid "unrecognised option: '$arg'" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:99 |
|
#, sh-format |
|
msgid "'$arg' does not appear to be a valid revision" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:117 |
|
msgid "Bad HEAD - I need a HEAD" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:130 |
|
#, sh-format |
|
msgid "" |
|
"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." |
|
msgstr "" |
|
|
|
#: git-bisect.sh:140 |
|
msgid "won't bisect on seeked tree" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:144 |
|
msgid "Bad HEAD - strange symbolic ref" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:189 |
|
#, sh-format |
|
msgid "Bad bisect_write argument: $state" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:218 |
|
#, sh-format |
|
msgid "Bad rev input: $arg" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:232 |
|
msgid "Please call 'bisect_state' with at least one argument." |
|
msgstr "" |
|
|
|
#: git-bisect.sh:244 |
|
#, sh-format |
|
msgid "Bad rev input: $rev" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:250 |
|
msgid "'git bisect bad' can take only one argument." |
|
msgstr "" |
|
|
|
#. have bad but not good. we could bisect although |
|
#. this is less optimum. |
|
#: git-bisect.sh:273 |
|
msgid "Warning: bisecting only with a bad commit." |
|
msgstr "" |
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your |
|
#. translation. The program will only accept English input |
|
#. at this point. |
|
#: git-bisect.sh:279 |
|
msgid "Are you sure [Y/n]? " |
|
msgstr "" |
|
|
|
#: git-bisect.sh:289 |
|
msgid "" |
|
"You need to give me at least one good and one bad revisions.\n" |
|
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:292 |
|
msgid "" |
|
"You need to start by \"git bisect start\".\n" |
|
"You then need to give me at least one good and one bad revisions.\n" |
|
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:347 git-bisect.sh:474 |
|
msgid "We are not bisecting." |
|
msgstr "" |
|
|
|
#: git-bisect.sh:354 |
|
#, sh-format |
|
msgid "'$invalid' is not a valid commit" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:363 |
|
#, sh-format |
|
msgid "" |
|
"Could not check out original HEAD '$branch'.\n" |
|
"Try 'git bisect reset <commit>'." |
|
msgstr "" |
|
|
|
#: git-bisect.sh:390 |
|
msgid "No logfile given" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:391 |
|
#, sh-format |
|
msgid "cannot read $file for replaying" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:408 |
|
msgid "?? what are you talking about?" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:420 |
|
#, sh-format |
|
msgid "running $command" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:427 |
|
#, sh-format |
|
msgid "" |
|
"bisect run failed:\n" |
|
"exit code $res from '$command' is < 0 or >= 128" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:453 |
|
msgid "bisect run cannot continue any more" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:459 |
|
#, sh-format |
|
msgid "" |
|
"bisect run failed:\n" |
|
"'bisect_state $state' exited with error code $res" |
|
msgstr "" |
|
|
|
#: git-bisect.sh:466 |
|
msgid "bisect run success" |
|
msgstr "" |
|
|
|
#: git-pull.sh:21 |
|
msgid "" |
|
"Pull is not possible because you have unmerged files.\n" |
|
"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" |
|
"as appropriate to mark resolution, or use 'git commit -a'." |
|
msgstr "" |
|
|
|
#: git-pull.sh:25 |
|
msgid "Pull is not possible because you have unmerged files." |
|
msgstr "" |
|
|
|
#: git-pull.sh:197 |
|
msgid "updating an unborn branch with changes added to the index" |
|
msgstr "" |
|
|
|
#. The fetch involved updating the current branch. |
|
#. The working tree and the index file is still based on the |
|
#. $orig_head commit, but we are merging into $curr_head. |
|
#. First update the working tree to match $curr_head. |
|
#: git-pull.sh:229 |
|
#, sh-format |
|
msgid "" |
|
"Warning: fetch updated the current branch head.\n" |
|
"Warning: fast-forwarding your working tree from\n" |
|
"Warning: commit $orig_head." |
|
msgstr "" |
|
|
|
#: git-pull.sh:254 |
|
msgid "Cannot merge multiple branches into empty head" |
|
msgstr "" |
|
|
|
#: git-pull.sh:258 |
|
msgid "Cannot rebase onto multiple branches" |
|
msgstr "" |
|
|
|
#: git-rebase.sh:53 |
|
msgid "" |
|
"When you have resolved this problem, run \"git rebase --continue\".\n" |
|
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" |
|
"To check out the original branch and stop rebasing, run \"git rebase --abort" |
|
"\"." |
|
msgstr "" |
|
|
|
#: git-rebase.sh:160 |
|
msgid "The pre-rebase hook refused to rebase." |
|
msgstr "" |
|
|
|
#: git-rebase.sh:165 |
|
msgid "It looks like git-am is in progress. Cannot rebase." |
|
msgstr "" |
|
|
|
#: git-rebase.sh:296 |
|
msgid "The --exec option must be used with the --interactive option" |
|
msgstr "" |
|
|
|
#: git-rebase.sh:301 |
|
msgid "No rebase in progress?" |
|
msgstr "" |
|
|
|
#: git-rebase.sh:312 |
|
msgid "The --edit-todo action can only be used during interactive rebase." |
|
msgstr "" |
|
|
|
#: git-rebase.sh:319 |
|
msgid "Cannot read HEAD" |
|
msgstr "" |
|
|
|
#: git-rebase.sh:322 |
|
msgid "" |
|
"You must edit all merge conflicts and then\n" |
|
"mark them as resolved using git add" |
|
msgstr "" |
|
|
|
#: git-rebase.sh:340 |
|
#, sh-format |
|
msgid "Could not move back to $head_name" |
|
msgstr "" |
|
|
|
#: git-rebase.sh:359 |
|
#, sh-format |
|
msgid "" |
|
"It seems that there is already a $state_dir_base directory, and\n" |
|
"I wonder if you are in the middle of another rebase. If that is the\n" |
|
"case, please try\n" |
|
"\t$cmd_live_rebase\n" |
|
"If that is not the case, please\n" |
|
"\t$cmd_clear_stale_rebase\n" |
|
"and run me again. I am stopping in case you still have something\n" |
|
"valuable there." |
|
msgstr "" |
|
|
|
#: git-rebase.sh:404 |
|
#, sh-format |
|
msgid "invalid upstream $upstream_name" |
|
msgstr "" |
|
|
|
#: git-rebase.sh:428 |
|
#, sh-format |
|
msgid "$onto_name: there are more than one merge bases" |
|
msgstr "" |
|
|
|
#: git-rebase.sh:431 git-rebase.sh:435 |
|
#, sh-format |
|
msgid "$onto_name: there is no merge base" |
|
msgstr "" |
|
|
|
#: git-rebase.sh:440 |
|
#, sh-format |
|
msgid "Does not point to a valid commit: $onto_name" |
|
msgstr "" |
|
|
|
#: git-rebase.sh:463 |
|
#, sh-format |
|
msgid "fatal: no such branch: $branch_name" |
|
msgstr "" |
|
|
|
#: git-rebase.sh:483 |
|
msgid "Please commit or stash them." |
|
msgstr "" |
|
|
|
#: git-rebase.sh:501 |
|
#, sh-format |
|
msgid "Current branch $branch_name is up to date." |
|
msgstr "" |
|
|
|
#: git-rebase.sh:504 |
|
#, sh-format |
|
msgid "Current branch $branch_name is up to date, rebase forced." |
|
msgstr "" |
|
|
|
#: git-rebase.sh:515 |
|
#, sh-format |
|
msgid "Changes from $mb to $onto:" |
|
msgstr "" |
|
|
|
#. Detach HEAD and reset the tree |
|
#: git-rebase.sh:524 |
|
msgid "First, rewinding head to replay your work on top of it..." |
|
msgstr "" |
|
|
|
#: git-rebase.sh:532 |
|
#, sh-format |
|
msgid "Fast-forwarded $branch_name to $onto_name." |
|
msgstr "" |
|
|
|
#: git-stash.sh:51 |
|
msgid "git stash clear with parameters is unimplemented" |
|
msgstr "" |
|
|
|
#: git-stash.sh:74 |
|
msgid "You do not have the initial commit yet" |
|
msgstr "" |
|
|
|
#: git-stash.sh:89 |
|
msgid "Cannot save the current index state" |
|
msgstr "" |
|
|
|
#: git-stash.sh:123 git-stash.sh:136 |
|
msgid "Cannot save the current worktree state" |
|
msgstr "" |
|
|
|
#: git-stash.sh:140 |
|
msgid "No changes selected" |
|
msgstr "" |
|
|
|
#: git-stash.sh:143 |
|
msgid "Cannot remove temporary index (can't happen)" |
|
msgstr "" |
|
|
|
#: git-stash.sh:156 |
|
msgid "Cannot record working tree state" |
|
msgstr "" |
|
|
|
#. TRANSLATORS: $option is an invalid option, like |
|
#. `--blah-blah'. The 7 spaces at the beginning of the |
|
#. second line correspond to "error: ". So you should line |
|
#. up the second line with however many characters the |
|
#. translation of "error: " takes in your language. E.g. in |
|
#. English this is: |
|
#. |
|
#. $ git stash save --blah-blah 2>&1 | head -n 2 |
|
#. error: unknown option for 'stash save': --blah-blah |
|
#. To provide a message, use git stash save -- '--blah-blah' |
|
#: git-stash.sh:202 |
|
#, sh-format |
|
msgid "" |
|
"error: unknown option for 'stash save': $option\n" |
|
" To provide a message, use git stash save -- '$option'" |
|
msgstr "" |
|
|
|
#: git-stash.sh:223 |
|
msgid "No local changes to save" |
|
msgstr "" |
|
|
|
#: git-stash.sh:227 |
|
msgid "Cannot initialize stash" |
|
msgstr "" |
|
|
|
#: git-stash.sh:235 |
|
msgid "Cannot save the current status" |
|
msgstr "" |
|
|
|
#: git-stash.sh:253 |
|
msgid "Cannot remove worktree changes" |
|
msgstr "" |
|
|
|
#: git-stash.sh:352 |
|
msgid "No stash found." |
|
msgstr "" |
|
|
|
#: git-stash.sh:359 |
|
#, sh-format |
|
msgid "Too many revisions specified: $REV" |
|
msgstr "" |
|
|
|
#: git-stash.sh:365 |
|
#, sh-format |
|
msgid "$reference is not valid reference" |
|
msgstr "" |
|
|
|
#: git-stash.sh:393 |
|
#, sh-format |
|
msgid "'$args' is not a stash-like commit" |
|
msgstr "" |
|
|
|
#: git-stash.sh:404 |
|
#, sh-format |
|
msgid "'$args' is not a stash reference" |
|
msgstr "" |
|
|
|
#: git-stash.sh:412 |
|
msgid "unable to refresh index" |
|
msgstr "" |
|
|
|
#: git-stash.sh:416 |
|
msgid "Cannot apply a stash in the middle of a merge" |
|
msgstr "" |
|
|
|
#: git-stash.sh:424 |
|
msgid "Conflicts in index. Try without --index." |
|
msgstr "" |
|
|
|
#: git-stash.sh:426 |
|
msgid "Could not save index tree" |
|
msgstr "" |
|
|
|
#: git-stash.sh:460 |
|
msgid "Cannot unstage modified files" |
|
msgstr "" |
|
|
|
#: git-stash.sh:475 |
|
msgid "Index was not unstashed." |
|
msgstr "" |
|
|
|
#: git-stash.sh:492 |
|
#, sh-format |
|
msgid "Dropped ${REV} ($s)" |
|
msgstr "" |
|
|
|
#: git-stash.sh:493 |
|
#, sh-format |
|
msgid "${REV}: Could not drop stash entry" |
|
msgstr "" |
|
|
|
#: git-stash.sh:500 |
|
msgid "No branch name specified" |
|
msgstr "" |
|
|
|
#: git-stash.sh:571 |
|
msgid "(To restore them type \"git stash apply\")" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:90 |
|
#, sh-format |
|
msgid "cannot strip one component off url '$remoteurl'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:195 |
|
#, sh-format |
|
msgid "No submodule mapping found in .gitmodules for path '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:238 |
|
#, sh-format |
|
msgid "Clone of '$url' into submodule path '$sm_path' failed" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:250 |
|
#, sh-format |
|
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:343 |
|
#, sh-format |
|
msgid "repo URL: '$repo' must be absolute or begin with ./|../" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:360 |
|
#, sh-format |
|
msgid "'$sm_path' already exists in the index" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:364 |
|
#, sh-format |
|
msgid "" |
|
"The following path is ignored by one of your .gitignore files:\n" |
|
"$sm_path\n" |
|
"Use -f if you really want to add it." |
|
msgstr "" |
|
|
|
#: git-submodule.sh:382 |
|
#, sh-format |
|
msgid "Adding existing repo at '$sm_path' to the index" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:384 |
|
#, sh-format |
|
msgid "'$sm_path' already exists and is not a valid git repo" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:392 |
|
#, sh-format |
|
msgid "A git directory for '$sm_name' is found locally with remote(s):" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:394 |
|
#, sh-format |
|
msgid "" |
|
"If you want to reuse this local git directory instead of cloning again from" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:396 |
|
#, sh-format |
|
msgid "" |
|
"use the '--force' option. If the local git directory is not the correct repo" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:397 |
|
#, sh-format |
|
msgid "" |
|
"or you are unsure what this means choose another name with the '--name' " |
|
"option." |
|
msgstr "" |
|
|
|
#: git-submodule.sh:399 |
|
#, sh-format |
|
msgid "Reactivating local git directory for submodule '$sm_name'." |
|
msgstr "" |
|
|
|
#: git-submodule.sh:411 |
|
#, sh-format |
|
msgid "Unable to checkout submodule '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:416 |
|
#, sh-format |
|
msgid "Failed to add submodule '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:425 |
|
#, sh-format |
|
msgid "Failed to register submodule '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:468 |
|
#, sh-format |
|
msgid "Entering '$prefix$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:482 |
|
#, sh-format |
|
msgid "Stopping at '$sm_path'; script returned non-zero status." |
|
msgstr "" |
|
|
|
#: git-submodule.sh:526 |
|
#, sh-format |
|
msgid "No url found for submodule path '$sm_path' in .gitmodules" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:535 |
|
#, sh-format |
|
msgid "Failed to register url for submodule path '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:537 |
|
#, sh-format |
|
msgid "Submodule '$name' ($url) registered for path '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:545 |
|
#, sh-format |
|
msgid "Failed to register update mode for submodule path '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:649 |
|
#, sh-format |
|
msgid "" |
|
"Submodule path '$sm_path' not initialized\n" |
|
"Maybe you want to use 'update --init'?" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:662 |
|
#, sh-format |
|
msgid "Unable to find current revision in submodule path '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:671 git-submodule.sh:695 |
|
#, sh-format |
|
msgid "Unable to fetch in submodule path '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:709 |
|
#, sh-format |
|
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:710 |
|
#, sh-format |
|
msgid "Submodule path '$sm_path': rebased into '$sha1'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:715 |
|
#, sh-format |
|
msgid "Unable to merge '$sha1' in submodule path '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:716 |
|
#, sh-format |
|
msgid "Submodule path '$sm_path': merged in '$sha1'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:721 |
|
#, sh-format |
|
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:722 |
|
#, sh-format |
|
msgid "Submodule path '$sm_path': checked out '$sha1'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:744 git-submodule.sh:1066 |
|
#, sh-format |
|
msgid "Failed to recurse into submodule path '$sm_path'" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:852 |
|
msgid "The --cached option cannot be used with the --files option" |
|
msgstr "" |
|
|
|
#. unexpected type |
|
#: git-submodule.sh:892 |
|
#, sh-format |
|
msgid "unexpected mode $mod_dst" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:910 |
|
#, sh-format |
|
msgid " Warn: $name doesn't contain commit $sha1_src" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:913 |
|
#, sh-format |
|
msgid " Warn: $name doesn't contain commit $sha1_dst" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:916 |
|
#, sh-format |
|
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:941 |
|
msgid "blob" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:979 |
|
msgid "Submodules changed but not updated:" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:981 |
|
msgid "Submodule changes to be committed:" |
|
msgstr "" |
|
|
|
#: git-submodule.sh:1129 |
|
#, sh-format |
|
msgid "Synchronizing submodule url for '$prefix$sm_path'" |
|
msgstr ""
|
|
|