diff options
Diffstat (limited to 'po')
-rw-r--r-- | po/.gitignore | 3 | ||||
-rw-r--r-- | po/README | 543 | ||||
-rw-r--r-- | po/TEAMS | 48 | ||||
-rw-r--r-- | po/da.po | 3503 | ||||
-rw-r--r-- | po/de.po | 8052 | ||||
-rw-r--r-- | po/el.po | 2005 | ||||
-rw-r--r-- | po/fr.po | 2604 | ||||
-rw-r--r-- | po/git-gui.pot | 2394 | ||||
-rw-r--r-- | po/git.pot | 8976 | ||||
-rw-r--r-- | po/glossary/Makefile | 9 | ||||
-rw-r--r-- | po/glossary/de.po | 189 | ||||
-rw-r--r-- | po/glossary/el.po | 171 | ||||
-rw-r--r-- | po/glossary/fr.po | 166 | ||||
-rw-r--r-- | po/glossary/git-gui-glossary.pot | 168 | ||||
-rw-r--r-- | po/glossary/git-gui-glossary.txt | 38 | ||||
-rw-r--r-- | po/glossary/it.po | 184 | ||||
-rw-r--r-- | po/glossary/pt_br.po | 169 | ||||
-rwxr-xr-x | po/glossary/txt-to-pot.sh | 48 | ||||
-rw-r--r-- | po/glossary/zh_cn.po | 170 | ||||
-rw-r--r-- | po/hu.po | 2602 | ||||
-rw-r--r-- | po/is.po | 93 | ||||
-rw-r--r-- | po/it.po | 7134 | ||||
-rw-r--r-- | po/ja.po | 2555 | ||||
-rw-r--r-- | po/nb.po | 2474 | ||||
-rw-r--r-- | po/nl.po | 3493 | ||||
-rw-r--r-- | po/po2msg.sh | 152 | ||||
-rw-r--r-- | po/pt_PT.po | 4980 | ||||
-rw-r--r-- | po/pt_br.po | 2568 | ||||
-rw-r--r-- | po/ru.po | 2564 | ||||
-rw-r--r-- | po/sv.po | 11127 | ||||
-rw-r--r-- | po/vi.po | 9613 | ||||
-rw-r--r-- | po/zh_CN.po | 9520 | ||||
-rw-r--r-- | po/zh_cn.po | 1967 |
33 files changed, 60341 insertions, 29941 deletions
diff --git a/po/.gitignore b/po/.gitignore index a89cf44..796b96d 100644 --- a/po/.gitignore +++ b/po/.gitignore @@ -1,2 +1 @@ -*.msg -*~ +/build @@ -1,251 +1,292 @@ -Localizing git-gui for your language -==================================== - -This short note is to help you, who reads and writes English and your -own language, help us getting git-gui localized for more languages. It -does not try to be a comprehensive manual of GNU gettext, which is the -i18n framework we use, but tries to help you get started by covering the -basics and how it is used in this project. - -1. Getting started. - -You would first need to have a working "git". Your distribution may -have it as "git-core" package (do not get "GNU Interactive Tools" -- -that is a different "git"). You would also need GNU gettext toolchain -to test the resulting translation out. Although you can work on message -translation files with a regular text editor, it is a good idea to have -specialized so-called "po file editors" (e.g. emacs po-mode, KBabel, -poedit, GTranslator --- any of them would work well). Please install -them. - -You would then need to clone the git-gui project repository and create -a feature branch to begin working: - - $ git clone git://repo.or.cz/git-gui.git - $ cd git-gui.git - $ git checkout -b my-translation - -The "git checkout" command creates a new branch to keep your work -isolated and to make it simple to post your patch series when -completed. You will be working on this branch. - - -2. Starting a new language. - -In the git-gui directory is a po/ subdirectory. It has a handful of -files whose names end with ".po". Is there a file that has messages -in your language? - -If you do not know what your language should be named, you need to find -it. This currently follows ISO 639-1 two letter codes: - - http://www.loc.gov/standards/iso639-2/php/code_list.php - -For example, if you are preparing a translation for Afrikaans, the -language code is "af". If there already is a translation for your -language, you do not have to perform any step in this section, but keep -reading, because we are covering the basics. - -If you did not find your language, you would need to start one yourself. -Copy po/git-gui.pot file to po/af.po (replace "af" with the code for -your language). Edit the first several lines to match existing *.po -files to make it clear this is a translation table for git-gui project, -and you are the primary translator. The result of your editing would -look something like this: - - # Translation of git-gui to Afrikaans - # Copyright (C) 2007 Shawn Pearce - # This file is distributed under the same license as the git-gui package. - # YOUR NAME <YOUR@E-MAIL.ADDRESS>, 2007. - # - #, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: git-gui\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-24 22:19+0300\n" - "PO-Revision-Date: 2007-07-25 18:00+0900\n" - "Last-Translator: YOUR NAME <YOUR@E-MAIL.ADDRESS>\n" - "Language-Team: Afrikaans\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - -You will find many pairs of a "msgid" line followed by a "msgstr" line. -These pairs define how messages in git-gui application are translated to -your language. Your primarily job is to fill in the empty double quote -pairs on msgstr lines with the translation of the strings on their -matching msgid lines. A few tips: - - - Control characters, such as newlines, are written in backslash - sequence similar to string literals in the C programming language. - When the string given on a msgid line has such a backslash sequence, - you would typically want to have corresponding ones in the string on - your msgstr line. - - - Some messages contain an optional context indicator at the end, - for example "@@noun" or "@@verb". This indicator allows the - software to select the correct translation depending upon the use. - The indicator is not actually part of the message and will not - be shown to the end-user. - - If your language does not require a different translation you - will still need to translate both messages. - - - Often the messages being translated are format strings given to - "printf()"-like functions. Make sure "%s", "%d", and "%%" in your - translated messages match the original. - - When you have to change the order of words, you can add "<number>$" - between '%' and the conversion ('s', 'd', etc.) to say "<number>-th - parameter to the format string is used at this point". For example, - if the original message is like this: - - "Length is %d, Weight is %d" - - and if for whatever reason your translation needs to say weight first - and then length, you can say something like: - - "WEIGHT IS %2$d, LENGTH IS %1$d" - - A format specification with a '*' (asterisk) refers to *two* arguments - instead of one, hence the succeeding argument number is two higher - instead of one. So, a message like this - - "%s ... %*i of %*i %s (%3i%%)" - - is equivalent to - - "%1$s ... %2$*i of %4$*i %6$s (%7$3i%%)" - - - A long message can be split across multiple lines by ending the - string with a double quote, and starting another string on the next - line with another double quote. They will be concatenated in the - result. For example: - - #: lib/remote_branch_delete.tcl:189 - #, tcl-format - msgid "" - "One or more of the merge tests failed because you have not fetched the " - "necessary commits. Try fetching from %s first." - msgstr "" - "HERE YOU WILL WRITE YOUR TRANSLATION OF THE ABOVE LONG " - "MESSAGE IN YOUR LANGUAGE." - -You can test your translation by running "make install", which would -create po/af.msg file and installs the result, and then running the -resulting git-gui under your locale: - - $ make install - $ LANG=af git-gui - -There is a trick to test your translation without first installing: - - $ make - $ LANG=af ./git-gui.sh - -When you are satisfied with your translation, commit your changes then submit -your patch series to the maintainer and the Git mailing list: - - $ edit po/af.po - ... be sure to update Last-Translator: and - ... PO-Revision-Date: lines. - $ git add po/af.po - $ git commit -s -m 'git-gui: added Afrikaans translation.' - $ git send-email --to 'git@vger.kernel.org' \ - --cc 'Pat Thoyts <patthoyts@users.sourceforge.net>' \ - --subject 'git-gui: Afrikaans translation' \ - master.. - - -3. Updating your translation. - -There may already be a translation for your language, and you may want -to contribute an update. This may be because you would want to improve -the translation of existing messages, or because the git-gui software -itself was updated and there are new messages that need translation. - -In any case, make sure you are up-to-date before starting your work: - - $ git checkout master - $ git pull - -In the former case, you will edit po/af.po (again, replace "af" with -your language code), and after testing and updating the Last-Translator: -and PO-Revision-Date: lines, "add/commit/push" as in the previous -section. - -By comparing "POT-Creation-Date:" line in po/git-gui.pot file and -po/af.po file, you can tell if there are new messages that need to be -translated. You would need the GNU gettext package to perform this -step. - - $ msgmerge -U po/af.po po/git-gui.pot - -This updates po/af.po (again, replace "af" with your language -code) so that it contains msgid lines (i.e. the original) that -your translation did not have before. There are a few things to -watch out for: - - - The original text in English of an older message you already - translated might have been changed. You will notice a comment line - that begins with "#, fuzzy" in front of such a message. msgmerge - tool made its best effort to match your old translation with the - message from the updated software, but you may find cases that it - matched your old translated message to a new msgid and the pairing - does not make any sense -- you would need to fix them, and then - remove the "#, fuzzy" line from the message (your fixed translation - of the message will not be used before you remove the marker). - - - New messages added to the software will have msgstr lines with empty - strings. You would need to translate them. - -The po/git-gui.pot file is updated by the internationalization -coordinator from time to time. You _could_ update it yourself, but -translators are discouraged from doing so because we would want all -language teams to be working off of the same version of git-gui.pot. - -**************************************************************** - -This section is a note to the internationalization coordinator, and -translators do not have to worry about it too much. - -The message template file po/git-gui.pot needs to be kept up to date -relative to the software the translations apply to, and it is the -responsibility of the internationalization coordinator. - -When updating po/git-gui.pot file, however, _never_ run "msgmerge -U -po/xx.po" for individual language translations, unless you are absolutely -sure that there is no outstanding work on translation for language xx. -Doing so will create unnecessary merge conflicts and force needless -re-translation on translators. The translator however may not have access -to the msgmerge tool, in which case the coordinator may run it for the -translator as a service. - -But mistakes do happen. Suppose a translation was based on an older -version X, the POT file was updated at version Y and then msgmerge was run -at version Z for the language, and the translator sent in a patch based on -version X: - - ? translated - / - ---X---Y---Z (master) - -The coordinator could recover from such a mistake by first applying the -patch to X, replace the translated file in Z, and then running msgmerge -again based on the updated POT file and commit the result. The sequence -would look like this: - - $ git checkout X - $ git am -s xx.patch - $ git checkout master - $ git checkout HEAD@{1} po/xx.po - $ msgmerge -U po/xx.po po/git-gui.pot - $ git commit -c HEAD@{1} po/xx.po - -State in the message that the translated messages are based on a slightly -older version, and msgmerge was run to incorporate changes to message -templates from the updated POT file. The result needs to be further -translated, but at least the messages that were updated by the patch that -were not changed by the POT update will survive the process and do not -need to be re-translated. +Core GIT Translations +===================== + +This directory holds the translations for the core of Git. This document +describes how you can contribute to the effort of enhancing the language +coverage and maintaining the translation. + +The localization (l10n) coordinator, Jiang Xin <worldhello.net@gmail.com>, +coordinates our localization effort in the l10 coordinator repository: + + https://github.com/git-l10n/git-po/ + +As a contributor for a language XX, you should first check TEAMS file in +this directory to see whether a dedicated repository for your language XX +exists. Fork the dedicated repository and start to work if it exists. + +If you are the first contributor for the language XX, please fork this +repository, prepare and/or update the translated message file po/XX.po +(described later), and ask the l10n coordinator to pull your work. + +If there are multiple contributors for the same language, please first +coordinate among yourselves and nominate the team leader for your +language, so that the l10n coordinator only needs to interact with one +person per language. + +The overall data-flow looks like this: + + +-------------------+ +------------------+ + | Git source code | ---(1)---> | L10n coordinator | + | repository | <---(4)--- | repository | + +-------------------+ +------------------+ + | ^ + (2) (3) + V | + +------------------+ + | Language Team XX | + +------------------+ + + * Translatable strings are marked in the source file. + * L10n coordinator pulls from the source (1) + * L10n coordinator updates the message template po/git.pot + * Language team pulls from L10n coordinator (2) + * Language team updates the message file po/XX.po + * L10n coordinator pulls from Language team (3) + * L10n coordinator asks the result to be pulled (4). + + +Maintaining the po/git.pot file +------------------------------- + +(This is done by the l10n coordinator). + +The po/git.pot file contains a message catalog extracted from Git's +sources. The l10n coordinator maintains it by adding new translations with +msginit(1), or update existing ones with msgmerge(1). In order to update +the Git sources to extract the messages from, the l10n coordinator is +expected to pull from the main git repository at strategic point in +history (e.g. when a major release and release candidates are tagged), +and then run "make pot" at the top-level directory. + +Language contributors use this file to prepare translations for their +language, but they are not expected to modify it. + + +Initializing a XX.po file +------------------------- + +(This is done by the language teams). + +If your language XX does not have translated message file po/XX.po yet, +you add a translation for the first time by running: + + msginit --locale=XX + +in the po/ directory, where XX is the locale, e.g. "de", "is", "pt_BR", +"zh_CN", etc. + +Then edit the automatically generated copyright info in your new XX.po +to be correct, e.g. for Icelandic: + + @@ -1,6 +1,6 @@ + -# Icelandic translations for PACKAGE package. + -# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER + -# This file is distributed under the same license as the PACKAGE package. + +# Icelandic translations for Git. + +# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <avarab@gmail.com> + +# This file is distributed under the same license as the Git package. + # Ævar Arnfjörð Bjarmason <avarab@gmail.com>, 2010. + +And change references to PACKAGE VERSION in the PO Header Entry to +just "Git": + + perl -pi -e 's/(?<="Project-Id-Version: )PACKAGE VERSION/Git/' XX.po + +Once you are done testing the translation (see below), commit the result +and ask the l10n coordinator to pull from you. + + +Updating a XX.po file +--------------------- + +(This is done by the language teams). + +If you are replacing translation strings in an existing XX.po file to +improve the translation, just edit the file. + +If there's an existing XX.po file for your language, but the repository +of the l10n coordinator has newer po/git.pot file, you would need to first +pull from the l10n coordinator (see the beginning of this document for its +URL), and then update the existing translation by running: + + msgmerge --add-location --backup=off -U XX.po git.pot + +in the po/ directory, where XX.po is the file you want to update. + +Once you are done testing the translation (see below), commit the result +and ask the l10n coordinator to pull from you. + + +Testing your changes +-------------------- + +(This is done by the language teams, after creating or updating XX.po file). + +Before you submit your changes go back to the top-level and do: + + make + +On systems with GNU gettext (i.e. not Solaris) this will compile your +changed PO file with `msgfmt --check`, the --check option flags many +common errors, e.g. missing printf format strings, or translated +messages that deviate from the originals in whether they begin/end +with a newline or not. + + +Marking strings for translation +------------------------------- + +(This is done by the core developers). + +Before strings can be translated they first have to be marked for +translation. + +Git uses an internationalization interface that wraps the system's +gettext library, so most of the advice in your gettext documentation +(on GNU systems `info gettext` in a terminal) applies. + +General advice: + + - Don't mark everything for translation, only strings which will be + read by humans (the porcelain interface) should be translated. + + The output from Git's plumbing utilities will primarily be read by + programs and would break scripts under non-C locales if it was + translated. Plumbing strings should not be translated, since + they're part of Git's API. + + - Adjust the strings so that they're easy to translate. Most of the + advice in `info '(gettext)Preparing Strings'` applies here. + + - If something is unclear or ambiguous you can use a "TRANSLATORS" + comment to tell the translators what to make of it. These will be + extracted by xgettext(1) and put in the po/*.po files, e.g. from + git-am.sh: + + # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] + # in your translation. The program will only accept English + # input at this point. + gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " + + Or in C, from builtin/revert.c: + + /* TRANSLATORS: %s will be "revert" or "cherry-pick" */ + die(_("%s: Unable to write new index file"), action_name(opts)); + +We provide wrappers for C, Shell and Perl programs. Here's how they're +used: + +C: + + - Include builtin.h at the top, it'll pull in gettext.h, which + defines the gettext interface. Consult with the list if you need to + use gettext.h directly. + + - The C interface is a subset of the normal GNU gettext + interface. We currently export these functions: + + - _() + + Mark and translate a string. E.g.: + + printf(_("HEAD is now at %s"), hex); + + - Q_() + + Mark and translate a plural string. E.g.: + + printf(Q_("%d commit", "%d commits", number_of_commits)); + + This is just a wrapper for the ngettext() function. + + - N_() + + A no-op pass-through macro for marking strings inside static + initializations, e.g.: + + static const char *reset_type_names[] = { + N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL + }; + + And then, later: + + die(_("%s reset is not allowed in a bare repository"), + _(reset_type_names[reset_type])); + + Here _() couldn't have statically determined what the translation + string will be, but since it was already marked for translation + with N_() the look-up in the message catalog will succeed. + +Shell: + + - The Git gettext shell interface is just a wrapper for + gettext.sh. Import it right after git-sh-setup like this: + + . git-sh-setup + . git-sh-i18n + + And then use the gettext or eval_gettext functions: + + # For constant interface messages: + gettext "A message for the user"; echo + + # To interpolate variables: + details="oh noes" + eval_gettext "An error occured: \$details"; echo + + In addition we have wrappers for messages that end with a trailing + newline. I.e. you could write the above as: + + # For constant interface messages: + gettextln "A message for the user" + + # To interpolate variables: + details="oh noes" + eval_gettextln "An error occured: \$details" + + More documentation about the interface is available in the GNU info + page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell + command to be translated) for examples is also useful: + + git log --reverse -p --grep=i18n git-am.sh + +Perl: + + - The Git::I18N module provides a limited subset of the + Locale::Messages functionality, e.g.: + + use Git::I18N; + print __("Welcome to Git!\n"); + printf __("The following error occured: %s\n"), $error; + + Run `perldoc perl/Git/I18N.pm` for more info. + + +Testing marked strings +---------------------- + +Even if you've correctly marked porcelain strings for translation +something in the test suite might still depend on the US English +version of the strings, e.g. to grep some error message or other +output. + +To smoke out issues like these Git can be compiled with gettext poison +support, at the top-level: + + make GETTEXT_POISON=YesPlease + +That'll give you a git which emits gibberish on every call to +gettext. It's obviously not meant to be installed, but you should run +the test suite with it: + + cd t && prove -j 9 ./t[0-9]*.sh + +If tests break with it you should inspect them manually and see if +what you're translating is sane, i.e. that you're not translating +plumbing output. + +If not you should replace calls to grep with test_i18ngrep, or +test_cmp calls with test_i18ncmp. If that's not enough you can skip +the whole test by making it depend on the C_LOCALE_OUTPUT +prerequisite. See existing test files with this prerequisite for +examples. diff --git a/po/TEAMS b/po/TEAMS new file mode 100644 index 0000000..1b9e994 --- /dev/null +++ b/po/TEAMS @@ -0,0 +1,48 @@ +Core Git translation language teams +(please keep the list sorted alphabetically on language field) + +Language: da (Danish) +Repository: https://github.com/git-da/git-po/ +Leader: Byrial Jensen <byrial@vip.cybercity.dk> + +Language: de (German) +Repository: https://github.com/ralfth/git-po-de +Leader: Ralf Thielow <ralf.thielow@googlemail.com> +Members: Thomas Rast <trast@student.ethz.ch> + Jan Krüger <jk@jk.gs> + Christian Stimming <stimming@tuhh.de> + +Language: is (Icelandic) +Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com> + +Language: it (Italian) +Repository: https://github.com/quizzlo/git-po-it/ +Leader: Marco Paolone <marcopaolone AT gmail.com> +Members: Stefano Lattarini <stefano.lattarini AT gmail.com> + +Language: nl (Dutch) +Repository: https://github.com/vfr-nl/git-po/ +Leader: Vincent van Ravesteijn <vfr@lyx.org> + +Language: pt_PT (Portuguese - Portugal) +Repository: https://github.com/marcomsousa/git-l10n-pt_PT/ +Leader: Marco Sousa <marcomsousa AT gmail.com> + +Language: sv (Swedish) +Repository: https://github.com/nafmo/git-l10n-sv/ +Leader: Peter Krefting <peter@softwolves.pp.se> + +Language: vi (Vietnamese) +Repository: https://github.com/vnwildman/git/ +Leader: Trần Ngọc Quân <vnwildman AT gmail.com> +Members: Nguyễn Thái Ngọc Duy <pclouds AT gmail.com> + +Language: zh_CN (Simplified Chinese) +Repository: https://github.com/gotgit/git-po-zh_CN/ +Leader: Jiang Xin <worldhello.net@gmail.com> +Members: Riku <lu.riku AT gmail.com> + Zhuang Ya <zhuangya AT me.com> + Lian Cheng <rhythm.mail AT gmail.com> + Yichao Yu <yyc1992 AT gmail.com> + ws3389 <willsmith3389 AT gmail.com> + Thynson <lanxingcan AT gmail.com> diff --git a/po/da.po b/po/da.po new file mode 100644 index 0000000..20a88ea --- /dev/null +++ b/po/da.po @@ -0,0 +1,3503 @@ +# Danish translations for Git. +# This file is distributed under the same license as the PACKAGE package. +# Byrial Jensen <byrial@vip.cybercity.dk>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2012-03-16 20:18+0800\n" +"PO-Revision-Date: 2012-04-10 18:41+0200\n" +"Last-Translator: Byrial Jensen <byrial@vip.cybercity.dk>\n" +"Language-Team: Danish <dansk@dansk-gruppen.dk>\n" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: advice.c:34 +#, c-format +msgid "hint: %.*s\n" +msgstr "" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:64 +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 "" + +#: commit.c:47 +#, c-format +msgid "could not parse %s" +msgstr "" + +#: commit.c:49 +#, 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 "" + +#: diff.c:105 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" + +#: diff.c:110 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr "" + +#: diff.c:210 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" + +#: diff.c:1336 +msgid " 0 files changed\n" +msgstr "" + +#: diff.c:1340 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] "" +msgstr[1] "" + +#: diff.c:1357 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] "" +msgstr[1] "" + +#: diff.c:1368 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] "" +msgstr[1] "" + +#: diff.c:3424 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#: gpg-interface.c:59 +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 "" + +#: grep.c:1280 +#, c-format +msgid "'%s': unable to read %s" +msgstr "" + +#: grep.c:1297 +#, c-format +msgid "'%s': %s" +msgstr "" + +#: grep.c:1308 +#, c-format +msgid "'%s': short read %s" +msgstr "" + +#: help.c:287 +#, 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 "" + +#: remote.c:1607 +#, 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:1613 +#, 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:1621 +#, 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] "" + +#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985 +#: builtin/merge.c:1095 builtin/merge.c:1105 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "" + +#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867 +#: builtin/merge.c:1097 builtin/merge.c:1110 +#, c-format +msgid "Could not write to '%s'" +msgstr "" + +#: sequencer.c:143 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" + +#: sequencer.c:146 +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:159 sequencer.c:685 sequencer.c:768 +#, c-format +msgid "Could not write to %s" +msgstr "" + +#: sequencer.c:162 +#, c-format +msgid "Error wrapping up %s" +msgstr "" + +#: sequencer.c:177 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "" + +#: sequencer.c:179 +msgid "Your local changes would be overwritten by revert." +msgstr "" + +#: sequencer.c:182 +msgid "Commit your changes or stash them to proceed." +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:232 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "" + +#: sequencer.c:298 +msgid "Your index file is unmerged." +msgstr "" + +#: sequencer.c:301 +msgid "You do not have a valid HEAD" +msgstr "" + +#: sequencer.c:316 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" + +#: sequencer.c:324 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "" + +#: sequencer.c:328 +#, 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:339 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "" + +#: sequencer.c:343 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "" + +#: sequencer.c:427 +#, c-format +msgid "could not revert %s... %s" +msgstr "" + +#: sequencer.c:428 +#, c-format +msgid "could not apply %s... %s" +msgstr "" + +#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713 +#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "" + +#: sequencer.c:453 +msgid "empty commit set passed" +msgstr "" + +#: sequencer.c:461 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: sequencer.c:466 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "" + +#: sequencer.c:551 +#, c-format +msgid "Cannot %s during a %s" +msgstr "" + +#: sequencer.c:573 +#, c-format +msgid "Could not parse line %d." +msgstr "" + +#: sequencer.c:578 +msgid "No commits parsed." +msgstr "" + +#: sequencer.c:591 +#, c-format +msgid "Could not open %s" +msgstr "" + +#: sequencer.c:595 +#, c-format +msgid "Could not read %s." +msgstr "" + +#: sequencer.c:602 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "" + +#: sequencer.c:630 +#, c-format +msgid "Invalid key: %s" +msgstr "" + +#: sequencer.c:633 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "" + +#: sequencer.c:645 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "" + +#: sequencer.c:666 +msgid "a cherry-pick or revert is already in progress" +msgstr "" + +#: sequencer.c:667 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "" + +#: sequencer.c:671 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "" + +#: sequencer.c:687 sequencer.c:772 +#, c-format +msgid "Error wrapping up %s." +msgstr "" + +#: sequencer.c:706 sequencer.c:840 +msgid "no cherry-pick or revert in progress" +msgstr "" + +#: sequencer.c:708 +msgid "cannot resolve HEAD" +msgstr "" + +#: sequencer.c:710 +msgid "cannot abort from a branch yet to be born" +msgstr "" + +#: sequencer.c:732 +#, c-format +msgid "cannot open %s: %s" +msgstr "" + +#: sequencer.c:735 +#, c-format +msgid "cannot read %s: %s" +msgstr "" + +#: sequencer.c:736 +msgid "unexpected end of file" +msgstr "" + +#: sequencer.c:742 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "" + +#: sequencer.c:765 +#, c-format +msgid "Could not format %s." +msgstr "" + +#: sequencer.c:927 +msgid "Can't revert as initial commit" +msgstr "" + +#: sequencer.c:928 +msgid "Can't cherry-pick into empty head" +msgstr "" + +#: wt-status.c:134 +msgid "Unmerged paths:" +msgstr "" + +#: wt-status.c:140 wt-status.c:157 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr "" + +#: wt-status.c:142 wt-status.c:159 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr "" + +#: wt-status.c:143 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr "" + +#: wt-status.c:151 +msgid "Changes to be committed:" +msgstr "" + +#: wt-status.c:169 +msgid "Changes not staged for commit:" +msgstr "" + +#: wt-status.c:173 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:175 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:176 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr "" + +#: wt-status.c:178 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr "" + +#: wt-status.c:187 +#, c-format +msgid "%s files:" +msgstr "" + +#: wt-status.c:190 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr "" + +#: wt-status.c:207 +msgid "bug" +msgstr "" + +#: wt-status.c:212 +msgid "both deleted:" +msgstr "" + +#: wt-status.c:213 +msgid "added by us:" +msgstr "" + +#: wt-status.c:214 +msgid "deleted by them:" +msgstr "" + +#: wt-status.c:215 +msgid "added by them:" +msgstr "" + +#: wt-status.c:216 +msgid "deleted by us:" +msgstr "" + +#: wt-status.c:217 +msgid "both added:" +msgstr "" + +#: wt-status.c:218 +msgid "both modified:" +msgstr "" + +#: wt-status.c:248 +msgid "new commits, " +msgstr "" + +#: wt-status.c:250 +msgid "modified content, " +msgstr "" + +#: wt-status.c:252 +msgid "untracked content, " +msgstr "" + +#: wt-status.c:266 +#, c-format +msgid "new file: %s" +msgstr "" + +#: wt-status.c:269 +#, c-format +msgid "copied: %s -> %s" +msgstr "" + +#: wt-status.c:272 +#, c-format +msgid "deleted: %s" +msgstr "" + +#: wt-status.c:275 +#, c-format +msgid "modified: %s" +msgstr "" + +#: wt-status.c:278 +#, c-format +msgid "renamed: %s -> %s" +msgstr "" + +#: wt-status.c:281 +#, c-format +msgid "typechange: %s" +msgstr "" + +#: wt-status.c:284 +#, c-format +msgid "unknown: %s" +msgstr "" + +#: wt-status.c:287 +#, c-format +msgid "unmerged: %s" +msgstr "" + +#: wt-status.c:290 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "" + +#: wt-status.c:713 +msgid "On branch " +msgstr "" + +#: wt-status.c:720 +msgid "Not currently on any branch." +msgstr "" + +#: wt-status.c:731 +msgid "Initial commit" +msgstr "" + +#: wt-status.c:745 +msgid "Untracked" +msgstr "" + +#: wt-status.c:747 +msgid "Ignored" +msgstr "" + +#: wt-status.c:749 +#, c-format +msgid "Untracked files not listed%s" +msgstr "" + +#: wt-status.c:751 +msgid " (use -u option to show untracked files)" +msgstr "" + +#: wt-status.c:757 +msgid "No changes" +msgstr "" + +#: wt-status.c:761 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "" + +#: wt-status.c:763 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr "" + +#: wt-status.c:765 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "" + +#: wt-status.c:767 +msgid " (use \"git add\" to track)" +msgstr "" + +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 +#, c-format +msgid "nothing to commit%s\n" +msgstr "" + +#: wt-status.c:770 +msgid " (create/copy files and use \"git add\" to track)" +msgstr "" + +#: wt-status.c:773 +msgid " (use -u to show untracked files)" +msgstr "" + +#: wt-status.c:776 +msgid " (working directory clean)" +msgstr "" + +#: wt-status.c:884 +msgid "HEAD (no branch)" +msgstr "" + +#: wt-status.c:890 +msgid "Initial commit on " +msgstr "" + +#: wt-status.c:905 +msgid "behind " +msgstr "" + +#: wt-status.c:908 wt-status.c:911 +msgid "ahead " +msgstr "" + +#: wt-status.c:913 +msgid ", behind " +msgstr "" + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "" + +#: builtin/add.c:67 builtin/commit.c:298 +msgid "updating files failed" +msgstr "" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "" + +#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "" + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "" + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "" + +#: builtin/add.c:312 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" + +#: builtin/add.c:352 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "" + +#: builtin/add.c:353 +msgid "no files added" +msgstr "" + +#: builtin/add.c:359 +msgid "adding files failed" +msgstr "" + +#: builtin/add.c:391 +msgid "-A and -u are mutually incompatible" +msgstr "" + +#: builtin/add.c:393 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "" + +#: builtin/add.c:413 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "" + +#: builtin/add.c:414 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "" + +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "" + +#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "" + +#: 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/branch.c:137 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" + +#: builtin/branch.c:141 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" + +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" +#: builtin/branch.c:163 +msgid "remote " +msgstr "" + +#: builtin/branch.c:171 +msgid "cannot use -a with -d" +msgstr "" + +#: builtin/branch.c:177 +msgid "Couldn't look up commit object for HEAD" +msgstr "" + +#: builtin/branch.c:182 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "" + +#: builtin/branch.c:192 +#, c-format +msgid "%sbranch '%s' not found." +msgstr "" + +#: builtin/branch.c:200 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: builtin/branch.c:206 +#, 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:214 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "" + +#: builtin/branch.c:219 +#, c-format +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "" + +#: builtin/branch.c:224 +msgid "Update of config-file failed" +msgstr "" + +#: builtin/branch.c:322 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "" + +#: builtin/branch.c:394 +#, c-format +msgid "behind %d] " +msgstr "" + +#: builtin/branch.c:396 +#, c-format +msgid "ahead %d] " +msgstr "" + +#: builtin/branch.c:398 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "" + +#: builtin/branch.c:501 +msgid "(no branch)" +msgstr "" + +#: builtin/branch.c:566 +msgid "some refs could not be read" +msgstr "" + +#: builtin/branch.c:579 +msgid "cannot rename the current branch while not on any." +msgstr "" + +#: builtin/branch.c:589 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "" + +#: builtin/branch.c:604 +msgid "Branch rename failed" +msgstr "" + +#: builtin/branch.c:608 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "" + +#: builtin/branch.c:612 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "" + +#: builtin/branch.c:619 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:634 +#, c-format +msgid "malformed object name %s" +msgstr "" + +#: builtin/branch.c:658 +#, c-format +msgid "could not write branch description template: %s\n" +msgstr "" + +#: builtin/branch.c:746 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:751 builtin/clone.c:558 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:809 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +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/checkout.c:113 builtin/checkout.c:146 +#, c-format +msgid "path '%s' does not have our version" +msgstr "" + +#: builtin/checkout.c:115 builtin/checkout.c:148 +#, c-format +msgid "path '%s' does not have their version" +msgstr "" + +#: builtin/checkout.c:131 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "" + +#: builtin/checkout.c:175 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "" + +#: builtin/checkout.c:192 +#, c-format +msgid "path '%s': cannot merge" +msgstr "" + +#: builtin/checkout.c:209 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "" + +#: builtin/checkout.c:212 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: builtin/checkout.c:234 builtin/checkout.c:392 +msgid "corrupt index file" +msgstr "" + +#: builtin/checkout.c:264 builtin/checkout.c:271 +#, c-format +msgid "path '%s' is unmerged" +msgstr "" + +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/merge.c:811 +msgid "unable to write new index file" +msgstr "" + +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 +msgid "diff_setup_done failed" +msgstr "" + +#: builtin/checkout.c:414 +msgid "you need to resolve your current index first" +msgstr "" + +#: builtin/checkout.c:533 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "" + +#: builtin/checkout.c:565 +msgid "HEAD is now at" +msgstr "" + +#: builtin/checkout.c:572 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:575 +#, c-format +msgid "Already on '%s'\n" +msgstr "" + +#: builtin/checkout.c:579 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:581 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:583 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:639 +#, c-format +msgid " ... and %d more.\n" +msgstr "" + +#. The singular version +#: builtin/checkout.c:645 +#, 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:663 +#, 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:692 +msgid "internal error in revision walk" +msgstr "" + +#: builtin/checkout.c:696 +msgid "Previous HEAD position was" +msgstr "" + +#: builtin/checkout.c:722 +msgid "You are on a branch yet to be born" +msgstr "" + +#. case (1) +#: builtin/checkout.c:853 +#, c-format +msgid "invalid reference: %s" +msgstr "" + +#. case (1): want a tree +#: builtin/checkout.c:892 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:972 +msgid "-B cannot be used with -b" +msgstr "" + +#: builtin/checkout.c:981 +msgid "--patch is incompatible with all other options" +msgstr "" + +#: builtin/checkout.c:984 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "" + +#: builtin/checkout.c:986 +msgid "--detach cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:992 +msgid "--track needs a branch name" +msgstr "" + +#: builtin/checkout.c:999 +msgid "Missing branch name; try -b" +msgstr "" + +#: builtin/checkout.c:1005 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "" + +#: builtin/checkout.c:1007 +msgid "--orphan cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:1017 +msgid "git checkout: -f and -m are incompatible" +msgstr "" + +#: builtin/checkout.c:1051 +msgid "invalid path specification" +msgstr "" + +#: builtin/checkout.c:1059 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" + +#: builtin/checkout.c:1061 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "" + +#: builtin/checkout.c:1066 +msgid "git checkout: --detach does not take a path argument" +msgstr "" + +#: builtin/checkout.c:1069 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" + +#: builtin/checkout.c:1088 +msgid "Cannot switch branch to a non-commit." +msgstr "" + +#: builtin/checkout.c:1091 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "" + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" + +#: builtin/clean.c:155 builtin/clean.c:176 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:159 builtin/clean.c:179 +#, c-format +msgid "Removing %s\n" +msgstr "" + +#: builtin/clean.c:162 builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" +msgstr "" + +#: builtin/clean.c:166 +#, c-format +msgid "Would not remove %s\n" +msgstr "" + +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" +msgstr "" + +#: builtin/clone.c:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "" + +#: builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "" + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "" + +#: builtin/clone.c:308 builtin/diff.c:75 +#, 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:341 +#, c-format +msgid "failed to unlink '%s'" +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:440 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "" + +#: builtin/clone.c:549 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" + +#: builtin/clone.c:639 +msgid "Too many arguments." +msgstr "" + +#: builtin/clone.c:643 +msgid "You must specify a repository to clone." +msgstr "" + +#: builtin/clone.c:654 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "" + +#: builtin/clone.c:668 +#, c-format +msgid "repository '%s' does not exist" +msgstr "" + +#: builtin/clone.c:673 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:683 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:693 +#, c-format +msgid "working tree '%s' already exists." +msgstr "" + +#: builtin/clone.c:706 builtin/clone.c:720 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" + +#: builtin/clone.c:709 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "" + +#: builtin/clone.c:728 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "" + +#: builtin/clone.c:730 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "" + +#: builtin/clone.c:786 +#, c-format +msgid "Don't know how to clone %s" +msgstr "" + +#: builtin/clone.c:835 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "" + +#: builtin/clone.c:842 +msgid "You appear to have cloned an empty repository." +msgstr "" + +#: builtin/commit.c:42 +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:54 +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:59 +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:205 builtin/reset.c:33 +msgid "merge" +msgstr "" + +#: builtin/commit.c:208 +msgid "cherry-pick" +msgstr "" + +#: builtin/commit.c:325 +msgid "failed to unpack HEAD tree object" +msgstr "" + +#: builtin/commit.c:367 +msgid "unable to create temporary index" +msgstr "" + +#: builtin/commit.c:373 +msgid "interactive add failed" +msgstr "" + +#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 +msgid "unable to write new_index file" +msgstr "" + +#: builtin/commit.c:457 +#, c-format +msgid "cannot do a partial commit during a %s." +msgstr "" + +#: builtin/commit.c:466 +msgid "cannot read the index" +msgstr "" + +#: builtin/commit.c:486 +msgid "unable to write temporary index file" +msgstr "" + +#: builtin/commit.c:550 builtin/commit.c:556 +#, c-format +msgid "invalid commit: %s" +msgstr "" + +#: builtin/commit.c:579 +msgid "malformed --author parameter" +msgstr "" + +#: builtin/commit.c:635 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "" + +#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:682 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "" + +#: builtin/commit.c:684 +msgid "could not read log from standard input" +msgstr "" + +#: builtin/commit.c:688 +#, c-format +msgid "could not read log file '%s'" +msgstr "" + +#: builtin/commit.c:694 +msgid "commit has empty message" +msgstr "" + +#: builtin/commit.c:710 +msgid "could not read MERGE_MSG" +msgstr "" + +#: builtin/commit.c:714 +msgid "could not read SQUASH_MSG" +msgstr "" + +#: builtin/commit.c:718 +#, c-format +msgid "could not read '%s'" +msgstr "" + +#: builtin/commit.c:746 +#, c-format +msgid "could not open '%s'" +msgstr "" + +#: builtin/commit.c:770 +msgid "could not write commit template" +msgstr "" + +#: builtin/commit.c:783 +#, c-format +msgid "" +"\n" +"It looks like you may be committing a %s.\n" +"If this is not correct, please remove the file\n" +"\t%s\n" +"and try again.\n" +msgstr "" + +#: builtin/commit.c:796 +msgid "Please enter the commit message for your changes." +msgstr "" + +#: builtin/commit.c:799 +msgid "" +" Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:804 +msgid "" +" Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:816 +#, c-format +msgid "%sAuthor: %s" +msgstr "" + +#: builtin/commit.c:823 +#, c-format +msgid "%sCommitter: %s" +msgstr "" + +#: builtin/commit.c:843 +msgid "Cannot read index" +msgstr "" + +#: builtin/commit.c:880 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:895 builtin/tag.c:357 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "" + +#: builtin/commit.c:975 +#, c-format +msgid "No existing author found with '%s'" +msgstr "" + +#: builtin/commit.c:990 builtin/commit.c:1182 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "" + +#: builtin/commit.c:1030 +msgid "Using both --reset-author and --author does not make sense" +msgstr "" + +#: builtin/commit.c:1041 +msgid "You have nothing to amend." +msgstr "" + +#: builtin/commit.c:1043 +#, c-format +msgid "You are in the middle of a %s -- cannot amend." +msgstr "" + +#: builtin/commit.c:1045 +msgid "Options --squash and --fixup cannot be used together" +msgstr "" + +#: builtin/commit.c:1055 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "" + +#: builtin/commit.c:1057 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "" + +#: builtin/commit.c:1063 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "" + +#: builtin/commit.c:1080 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" + +#: builtin/commit.c:1082 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:1084 +msgid "Clever... amending the last one with dirty index." +msgstr "" + +#: builtin/commit.c:1086 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" + +#: builtin/commit.c:1096 builtin/tag.c:556 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "" + +#: builtin/commit.c:1101 +msgid "Paths with -a does not make sense." +msgstr "" + +#: builtin/commit.c:1280 +msgid "couldn't look up newly created commit" +msgstr "" + +#: builtin/commit.c:1282 +msgid "could not parse newly created commit" +msgstr "" + +#: builtin/commit.c:1323 +msgid "detached HEAD" +msgstr "" + +#: builtin/commit.c:1325 +msgid " (root-commit)" +msgstr "" + +#: builtin/commit.c:1415 +msgid "could not parse HEAD commit" +msgstr "" + +#: builtin/commit.c:1452 builtin/merge.c:509 +#, c-format +msgid "could not open '%s' for reading" +msgstr "" + +#: builtin/commit.c:1459 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "" + +#: builtin/commit.c:1466 +msgid "could not read MERGE_MODE" +msgstr "" + +#: builtin/commit.c:1485 +#, c-format +msgid "could not read commit message: %s" +msgstr "" + +#: builtin/commit.c:1499 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "" + +#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968 +msgid "failed to write commit object" +msgstr "" + +#: builtin/commit.c:1535 +msgid "cannot lock HEAD ref" +msgstr "" + +#: builtin/commit.c:1539 +msgid "cannot update HEAD ref" +msgstr "" + +#: builtin/commit.c:1550 +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/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: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:77 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "" + +#: builtin/diff.c:220 +#, c-format +msgid "invalid option: %s" +msgstr "" + +#: builtin/diff.c:297 +msgid "Not a git repository" +msgstr "" + +#: builtin/diff.c:347 +#, c-format +msgid "invalid object '%s' given." +msgstr "" + +#: builtin/diff.c:352 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "" + +#: builtin/diff.c:362 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "" + +#: builtin/diff.c:370 +#, c-format +msgid "unhandled object '%s' given." +msgstr "" + +#: builtin/fetch.c:200 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:252 +#, c-format +msgid "object %s not found" +msgstr "" + +#: builtin/fetch.c:258 +msgid "[up to date]" +msgstr "" + +#: builtin/fetch.c:272 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "" + +#: builtin/fetch.c:273 builtin/fetch.c:351 +msgid "[rejected]" +msgstr "" + +#: builtin/fetch.c:284 +msgid "[tag update]" +msgstr "" + +#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331 +msgid " (unable to update local ref)" +msgstr "" + +#: builtin/fetch.c:298 +msgid "[new tag]" +msgstr "" + +#: builtin/fetch.c:302 +msgid "[new branch]" +msgstr "" + +#: builtin/fetch.c:347 +msgid "unable to update local ref" +msgstr "" + +#: builtin/fetch.c:347 +msgid "forced update" +msgstr "" + +#: builtin/fetch.c:353 +msgid "(non-fast-forward)" +msgstr "" + +#: builtin/fetch.c:384 builtin/fetch.c:676 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "" + +#: builtin/fetch.c:393 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "" + +#: builtin/fetch.c:479 +#, c-format +msgid "From %.*s\n" +msgstr "" + +#: builtin/fetch.c:490 +#, 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:540 +#, c-format +msgid " (%s will become dangling)\n" +msgstr "" + +#: builtin/fetch.c:541 +#, c-format +msgid " (%s has become dangling)\n" +msgstr "" + +#: builtin/fetch.c:548 +msgid "[deleted]" +msgstr "" + +#: builtin/fetch.c:549 +msgid "(none)" +msgstr "" + +#: builtin/fetch.c:666 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" + +#: builtin/fetch.c:700 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:777 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:780 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "" + +#: builtin/fetch.c:879 +#, c-format +msgid "Fetching %s\n" +msgstr "" + +#: builtin/fetch.c:881 +#, c-format +msgid "Could not fetch %s" +msgstr "" + +#: builtin/fetch.c:898 +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:918 +msgid "You need to specify a tag name." +msgstr "" + +#: builtin/fetch.c:970 +msgid "fetch --all does not take a repository argument" +msgstr "" + +#: builtin/fetch.c:972 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:983 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:991 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "" + +#: builtin/gc.c:103 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "" + +#: builtin/gc.c:223 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:226 +#, 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:256 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +#: builtin/grep.c:216 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "" + +#: builtin/grep.c:402 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:478 builtin/grep.c:512 +#, c-format +msgid "unable to read tree (%s)" +msgstr "" + +#: builtin/grep.c:526 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" + +#: builtin/grep.c:584 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "" + +#: builtin/grep.c:601 +#, c-format +msgid "cannot open '%s'" +msgstr "" + +#: builtin/grep.c:888 +msgid "no pattern given." +msgstr "" + +#: builtin/grep.c:902 +#, c-format +msgid "bad object %s" +msgstr "" + +#: builtin/grep.c:943 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:966 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "" + +#: builtin/grep.c:971 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "" + +#: builtin/grep.c:974 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "" + +#: builtin/grep.c:982 +msgid "both --cached and trees are 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:322 builtin/init-db.c:325 +#, c-format +msgid "%s already exists" +msgstr "" + +#: builtin/init-db.c:354 +#, c-format +msgid "unable to handle file type %d" +msgstr "" + +#: builtin/init-db.c:357 +#, c-format +msgid "unable to move %s to %s" +msgstr "" + +#: builtin/init-db.c:362 +#, 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:419 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "" + +#: builtin/init-db.c:420 +msgid "Reinitialized existing" +msgstr "" + +#: builtin/init-db.c:420 +msgid "Initialized empty" +msgstr "" + +#: builtin/init-db.c:421 +msgid " shared" +msgstr "" + +#: builtin/init-db.c:440 +msgid "cannot tell cwd" +msgstr "" + +#: builtin/init-db.c:521 builtin/init-db.c:528 +#, c-format +msgid "cannot mkdir %s" +msgstr "" + +#: builtin/init-db.c:532 +#, c-format +msgid "cannot chdir to %s" +msgstr "" + +#: builtin/init-db.c:554 +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" + +#: builtin/init-db.c:578 +msgid "Cannot access current working directory" +msgstr "" + +#: builtin/init-db.c:585 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "" + +#: builtin/log.c:187 +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +#: builtin/log.c:395 builtin/log.c:483 +#, c-format +msgid "Could not read object %s" +msgstr "" + +#: builtin/log.c:507 +#, c-format +msgid "Unknown type: %d" +msgstr "" + +#: builtin/log.c:596 +msgid "format.headers without value" +msgstr "" + +#: builtin/log.c:669 +msgid "name of output directory is too long" +msgstr "" + +#: builtin/log.c:680 +#, c-format +msgid "Cannot open patch file %s" +msgstr "" + +#: builtin/log.c:694 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:702 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:739 +msgid "Could not extract email from committer identity." +msgstr "" + +#: builtin/log.c:785 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:879 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "" + +#: builtin/log.c:952 +msgid "Two output directories?" +msgstr "" + +#: builtin/log.c:1173 +#, c-format +msgid "bogus committer info %s" +msgstr "" + +#: builtin/log.c:1218 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1220 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1225 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "" + +#: builtin/log.c:1228 +msgid "--name-only does not make sense" +msgstr "" + +#: builtin/log.c:1230 +msgid "--name-status does not make sense" +msgstr "" + +#: builtin/log.c:1232 +msgid "--check does not make sense" +msgstr "" + +#: builtin/log.c:1255 +msgid "standard output, or directory, which one?" +msgstr "" + +#: builtin/log.c:1257 +#, c-format +msgid "Could not create directory '%s'" +msgstr "" + +#: builtin/log.c:1410 +msgid "Failed to create output files" +msgstr "" + +#: builtin/log.c:1514 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" + +#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/merge.c:91 +msgid "switch `m' requires a value" +msgstr "" + +#: builtin/merge.c:128 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "" + +#: builtin/merge.c:129 +#, c-format +msgid "Available strategies are:" +msgstr "" + +#: builtin/merge.c:134 +#, c-format +msgid "Available custom strategies are:" +msgstr "" + +#: builtin/merge.c:241 +msgid "could not run stash." +msgstr "" + +#: builtin/merge.c:246 +msgid "stash failed" +msgstr "" + +#: builtin/merge.c:251 +#, c-format +msgid "not a valid object: %s" +msgstr "" + +#: builtin/merge.c:270 builtin/merge.c:287 +msgid "read-tree failed" +msgstr "" + +#: builtin/merge.c:317 +msgid " (nothing to squash)" +msgstr "" + +#: builtin/merge.c:330 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:362 +msgid "Writing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:364 +msgid "Finishing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:437 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "" + +#: builtin/merge.c:536 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "" + +#: builtin/merge.c:629 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:679 +msgid "failed to read the cache" +msgstr "" + +#: builtin/merge.c:696 +msgid "Unable to write index." +msgstr "" + +#: builtin/merge.c:709 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:723 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "" + +#: builtin/merge.c:737 +#, c-format +msgid "unable to write %s" +msgstr "" + +#: builtin/merge.c:876 +#, c-format +msgid "Could not read from '%s'" +msgstr "" + +#: builtin/merge.c:885 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" + +#: builtin/merge.c:891 +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 '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" + +#: builtin/merge.c:915 +msgid "Empty commit message." +msgstr "" + +#: builtin/merge.c:927 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:1000 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +#: builtin/merge.c:1016 +#, c-format +msgid "'%s' is not a commit" +msgstr "" + +#: builtin/merge.c:1057 +msgid "No current branch." +msgstr "" + +#: builtin/merge.c:1059 +msgid "No remote for the current branch." +msgstr "" + +#: builtin/merge.c:1061 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1066 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1188 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1204 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:1207 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1211 +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:1214 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1223 +msgid "You cannot combine --squash with --no-ff." +msgstr "" + +#: builtin/merge.c:1228 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "" + +#: builtin/merge.c:1235 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "" + +#: builtin/merge.c:1266 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1269 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:1271 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:1275 builtin/merge.c:1319 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1385 +#, c-format +msgid "Updating %s..%s\n" +msgstr "" + +#: builtin/merge.c:1423 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1430 +#, c-format +msgid "Nope.\n" +msgstr "" + +#: builtin/merge.c:1462 +msgid "Not possible to fast-forward, aborting." +msgstr "" + +#: builtin/merge.c:1485 builtin/merge.c:1562 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1489 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#: builtin/merge.c:1553 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "" + +#: builtin/merge.c:1555 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "" + +#: builtin/merge.c:1564 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1575 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +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 +#, c-format +msgid "renaming '%s' failed" +msgstr "" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:155 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:175 builtin/tag.c:343 +#, c-format +msgid "could not create file '%s'" +msgstr "" + +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" + +#: builtin/notes.c:210 builtin/notes.c:973 +#, c-format +msgid "Removing note for object %s\n" +msgstr "" + +#: builtin/notes.c:215 +msgid "unable to write note object" +msgstr "" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "" + +#: builtin/notes.c:251 builtin/tag.c:521 +#, c-format +msgid "cannot read '%s'" +msgstr "" + +#: builtin/notes.c:253 builtin/tag.c:524 +#, c-format +msgid "could not open or read '%s'" +msgstr "" + +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "" + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: builtin/notes.c:350 +#, 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:377 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "" + +#: builtin/notes.c:456 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "" + +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 +#: builtin/notes.c:1033 +msgid "too many parameters" +msgstr "" + +#: builtin/notes.c:513 builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "" + +#: builtin/notes.c:580 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:585 builtin/notes.c:662 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#: builtin/notes.c:635 +msgid "too few parameters" +msgstr "" + +#: builtin/notes.c:656 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:668 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "" + +#: builtin/notes.c:717 +#, 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:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +#: builtin/notes.c:1103 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/pack-objects.c:2310 +#, c-format +msgid "unsupported index version %s" +msgstr "" + +#: builtin/pack-objects.c:2314 +#, c-format +msgid "bad index version '%s'" +msgstr "" + +#: builtin/pack-objects.c:2322 +#, c-format +msgid "option %s does not accept negative form" +msgstr "" + +#: builtin/pack-objects.c:2326 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "" + +#: builtin/push.c:44 +msgid "tag shorthand without <tag>" +msgstr "" + +#: builtin/push.c:63 +msgid "--delete only accepts plain target ref names" +msgstr "" + +#: builtin/push.c:73 +#, 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:80 +#, 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:88 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "" + +#: builtin/push.c:111 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" + +#: builtin/push.c:131 +#, c-format +msgid "Pushing to %s\n" +msgstr "" + +#: builtin/push.c:135 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:143 +#, c-format +msgid "" +"To prevent you from losing history, non-fast-forward updates were rejected\n" +"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n" +"'Note about fast-forwards' section of 'git push --help' for details.\n" +msgstr "" + +#: builtin/push.c:160 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:161 +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:176 +msgid "--all and --tags are incompatible" +msgstr "" + +#: builtin/push.c:177 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:182 +msgid "--mirror and --tags are incompatible" +msgstr "" + +#: builtin/push.c:183 +msgid "--mirror can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:188 +msgid "--all and --mirror are incompatible" +msgstr "" + +#: builtin/push.c:274 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "" + +#: builtin/push.c:276 +msgid "--delete doesn't make sense without any refs" +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 "keep" +msgstr "" + +#: builtin/reset.c:77 +msgid "You do not have a valid HEAD." +msgstr "" + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "" + +#: builtin/reset.c:85 +#, c-format +msgid "Failed to find tree of %s." +msgstr "" + +#: builtin/reset.c:96 +msgid "Could not write new index file." +msgstr "" + +#: builtin/reset.c:106 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + +#: builtin/reset.c:130 +msgid "Could not read index" +msgstr "" + +#: builtin/reset.c:133 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:223 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "" + +#: builtin/reset.c:297 +#, c-format +msgid "Could not parse object '%s'." +msgstr "" + +#: builtin/reset.c:302 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "" + +#: builtin/reset.c:311 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "" + +#: builtin/reset.c:313 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "" + +#: builtin/reset.c:325 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "" + +#: builtin/reset.c:341 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "" + +#: builtin/revert.c:70 builtin/revert.c:91 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "" + +#: builtin/revert.c:126 +msgid "program error" +msgstr "" + +#: builtin/revert.c:209 +msgid "revert failed" +msgstr "" + +#: builtin/revert.c:224 +msgid "cherry-pick failed" +msgstr "" + +#: builtin/rm.c:109 +#, 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:115 +#, 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:119 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "" + +#: builtin/rm.c:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "" + +#: builtin/tag.c:58 +#, c-format +msgid "malformed object at '%s'" +msgstr "" + +#: builtin/tag.c:205 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "" + +#: builtin/tag.c:210 +#, c-format +msgid "tag '%s' not found." +msgstr "" + +#: builtin/tag.c:225 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "" + +#: builtin/tag.c:237 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "" + +#: builtin/tag.c:247 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" + +#: builtin/tag.c:254 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" +"#\n" +msgstr "" + +#: builtin/tag.c:294 +msgid "unable to sign the tag" +msgstr "" + +#: builtin/tag.c:296 +msgid "unable to write tag file" +msgstr "" + +#: builtin/tag.c:321 +msgid "bad object type." +msgstr "" + +#: builtin/tag.c:334 +msgid "tag header too big." +msgstr "" + +#: builtin/tag.c:366 +msgid "no tag message?" +msgstr "" + +#: builtin/tag.c:372 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "" + +#: builtin/tag.c:421 +msgid "switch 'points-at' requires an object" +msgstr "" + +#: builtin/tag.c:423 +#, c-format +msgid "malformed object name '%s'" +msgstr "" + +#: builtin/tag.c:502 +msgid "-n option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:504 +msgid "--contains option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:506 +msgid "--points-at option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:514 +msgid "only one -F or -m option is allowed." +msgstr "" + +#: builtin/tag.c:534 +msgid "too many params" +msgstr "" + +#: builtin/tag.c:540 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "" + +#: builtin/tag.c:545 +#, c-format +msgid "tag '%s' already exists" +msgstr "" + +#: builtin/tag.c:563 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "" + +#: builtin/tag.c:565 +#, c-format +msgid "%s: cannot update the ref" +msgstr "" + +#: builtin/tag.c:567 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "" + +#: git-am.sh:49 +msgid "You need to set your committer info first" +msgstr "" + +#: git-am.sh:136 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" + +#: git-am.sh:147 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" + +#: git-am.sh:156 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" + +#: git-am.sh:268 +msgid "Only one StGIT patch series can be applied at once" +msgstr "" + +#: git-am.sh:355 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "" + +#: git-am.sh:357 +msgid "Patch format detection failed." +msgstr "" + +#: git-am.sh:411 +msgid "-d option is no longer supported. Do not use." +msgstr "" + +#: git-am.sh:474 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" + +#: git-am.sh:479 +msgid "Please make up your mind. --skip or --abort?" +msgstr "" + +#: git-am.sh:506 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" + +#: git-am.sh:572 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" + +#: git-am.sh:748 +msgid "cannot be interactive without stdin connected to a terminal." +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:759 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "" + +#: git-am.sh:795 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "" + +#: git-am.sh:840 +msgid "No changes -- Patch already applied." +msgstr "" + +#: git-am.sh:866 +msgid "applying to an empty history" +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 "" + +#. 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: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:474 +msgid "We are not bisecting." +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 "" + +#: git-pull.sh:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "" + +#: git-pull.sh:257 +msgid "Cannot rebase onto multiple branches" +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 "" + +#: 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:491 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "" + +#: git-stash.sh:492 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "" + +#: git-stash.sh:499 +msgid "No branch name specified" +msgstr "" + +#: git-stash.sh:570 +msgid "(To restore them type \"git stash apply\")" +msgstr "" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "" + +#: git-submodule.sh:108 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "" + +#: git-submodule.sh:149 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "" + +#: git-submodule.sh:159 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "" + +#: git-submodule.sh:247 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" + +#: git-submodule.sh:264 +#, sh-format +msgid "'$path' already exists in the index" +msgstr "" + +#: git-submodule.sh:281 +#, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "" + +#: git-submodule.sh:295 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "" + +#: git-submodule.sh:300 +#, sh-format +msgid "Failed to add submodule '$path'" +msgstr "" + +#: git-submodule.sh:305 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "" + +#: git-submodule.sh:347 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "" + +#: git-submodule.sh:359 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:401 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:410 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:418 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:420 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "" + +#: git-submodule.sh:519 +#, sh-format +msgid "" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:532 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:551 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:565 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:566 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:571 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:572 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:577 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:578 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:600 git-submodule.sh:923 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "" + +#: git-submodule.sh:708 +msgid "--" +msgstr "" + +#: git-submodule.sh:766 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr "" + +#: git-submodule.sh:769 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr "" + +#: git-submodule.sh:772 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" + +#: git-submodule.sh:797 +msgid "blob" +msgstr "" + +#: git-submodule.sh:798 +msgid "submodule" +msgstr "" + +#: git-submodule.sh:969 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" @@ -1,2592 +1,6216 @@ -# Translation of git-gui to German. -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Christian Stimming <stimming@tuhh.de>, 2007 +# German translations for Git. +# Copyright (C) 2010-2012 Ralf Thielow <ralf.thielow@googlemail.com> +# This file is distributed under the same license as the Git package. +# Ralf Thielow <ralf.thielow@googlemail.com>, 2010, 2011, 2012. # msgid "" msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 22:22+0100\n" -"PO-Revision-Date: 2010-01-26 22:25+0100\n" -"Last-Translator: Christian Stimming <stimming@tuhh.de>\n" +"Project-Id-Version: git 1.7.12\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2012-09-05 06:20+0800\n" +"PO-Revision-Date: 2012-03-28 18:46+0200\n" +"Last-Translator: Ralf Thielow <ralf.thielow@googlemail.com>\n" "Language-Team: German\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: advice.c:40 +#, c-format +msgid "hint: %.*s\n" +msgstr "Hinweis: %.*s\n" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:70 +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 "" +"Korrigiere dies im Arbeitsbaum,\n" +"und benutze dann 'git add/rm <Datei>'\n" +"um die Auflösung entsprechend zu markieren und einzutragen,\n" +"oder benutze 'git commit -a'." + +#: bundle.c:36 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" + +#: bundle.c:63 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "nicht erkannter Kopfbereich: %s%s (%d)" + +#: bundle.c:89 builtin/commit.c:699 +#, c-format +msgid "could not open '%s'" +msgstr "Konnte '%s' nicht öffnen" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "Dem Projektarchiv fehlen folgende vorausgesetzte Versionen:" + +#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" + +#: bundle.c:186 +#, c-format +msgid "The bundle contains %d ref" +msgid_plural "The bundle contains %d refs" +msgstr[0] "Das Paket enthält %d Referenz" +msgstr[1] "Das Paket enthält %d Referenzen" + +#: bundle.c:192 +msgid "The bundle records a complete history." +msgstr "Das Paket speichert eine komplette Historie." + +#: bundle.c:195 +#, c-format +msgid "The bundle requires this ref" +msgid_plural "The bundle requires these %d refs" +msgstr[0] "Das Paket benötigt diese Referenz" +msgstr[1] "Das Paket benötigt diese %d Referenzen" + +#: bundle.c:294 +msgid "rev-list died" +msgstr "\"rev-list\" abgebrochen" + +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "nicht erkanntes Argument: %s" + +#: bundle.c:335 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" + +#: bundle.c:380 +msgid "Refusing to create empty bundle." +msgstr "Erstellung eines leeren Pakets zurückgewiesen." + +#: bundle.c:398 +msgid "Could not spawn pack-objects" +msgstr "Konnte Paketobjekte nicht erstellen" + +#: bundle.c:416 +msgid "pack-objects died" +msgstr "Erstellung der Paketobjekte abgebrochen" + +#: bundle.c:419 +#, c-format +msgid "cannot create '%s'" +msgstr "kann '%s' nicht erstellen" + +#: bundle.c:441 +msgid "index-pack died" +msgstr "Erstellung der Paketindexdatei abgebrochen" + +#: commit.c:48 +#, c-format +msgid "could not parse %s" +msgstr "konnte %s nicht parsen" + +#: commit.c:50 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s ist keine Version!" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "Speicher verbraucht" + +#: connected.c:39 +msgid "Could not run 'git rev-list'" +msgstr "Konnte 'git rev-list' nicht ausführen" + +#: connected.c:48 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "Fehler beim Schreiben nach rev-list: %s" + +#: connected.c:56 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe: %s" + +#: date.c:95 +msgid "in the future" +msgstr "in der Zukunft" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "vor %lu Sekunde" +msgstr[1] "vor %lu Sekunden" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "vor %lu Minute" +msgstr[1] "vor %lu Minuten" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "vor %lu Stunde" +msgstr[1] "vor %lu Stunden" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "vor %lu Tag" +msgstr[1] "vor %lu Tagen" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "vor %lu Woche" +msgstr[1] "vor %lu Wochen" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "vor %lu Monat" +msgstr[1] "vor %lu Monaten" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "vor %lu Jahr" +msgstr[1] "vor %lu Jahren" + +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "%s, und %lu Monat" +msgstr[1] "%s, und %lu Monaten" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "vor %lu Jahr" +msgstr[1] "vor %lu Jahren" + +#: diff.c:105 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" +" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%.*s'\n" + +#: diff.c:110 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr " Unbekannter \"dirstat\" Parameter '%.*s'\n" -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "git-gui: Programmfehler" +#: diff.c:210 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" +"%s" + +#: diff.c:1401 +msgid " 0 files changed" +msgstr " 0 Dateien geändert" + +#: diff.c:1405 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] " %d Datei geändert" +msgstr[1] " %d Dateien geändert" + +#: diff.c:1422 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] ", %d Zeile hinzugefügt(+)" +msgstr[1] ", %d Zeilen hinzugefügt(+)" + +#: diff.c:1433 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] ", %d Zeile entfernt(-)" +msgstr[1] ", %d Zeilen entfernt(-)" + +#: diff.c:3460 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" +"%s" -#: git-gui.sh:743 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Ungültige Zeichensatz-Angabe in %s:" +#: gpg-interface.c:59 +msgid "could not run gpg." +msgstr "konnte gpg nicht ausführen" -#: git-gui.sh:779 -msgid "Main Font" -msgstr "Programmschriftart" +#: gpg-interface.c:71 +msgid "gpg did not accept the data" +msgstr "gpg hat die Daten nicht akzeptiert" -#: git-gui.sh:780 -msgid "Diff/Console Font" -msgstr "Vergleich-Schriftart" +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "gpg beim Signieren der Daten fehlgeschlagen" -#: git-gui.sh:794 -msgid "Cannot find git in PATH." -msgstr "Git kann im PATH nicht gefunden werden." +#: grep.c:1320 +#, c-format +msgid "'%s': unable to read %s" +msgstr "'%s': konnte nicht lesen %s" -#: git-gui.sh:821 -msgid "Cannot parse Git version string:" -msgstr "Git Versionsangabe kann nicht erkannt werden:" +#: grep.c:1337 +#, c-format +msgid "'%s': %s" +msgstr "'%s': %s" -#: git-gui.sh:839 -#, tcl-format +#: grep.c:1348 +#, c-format +msgid "'%s': short read %s" +msgstr "'%s': read() zu kurz %s" + +#: help.c:212 +#, c-format +msgid "available git commands in '%s'" +msgstr "Vorhandene Git-Kommandos in '%s'" + +#: help.c:219 +msgid "git commands available from elsewhere on your $PATH" +msgstr "Vorhandene Git-Kommandos irgendwo in deinem $PATH" + +#: help.c:275 +#, c-format msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" +"'%s' appears to be a git command, but we were not\n" +"able to execute it. Maybe git-%s is broken?" msgstr "" -"Die Version von Git kann nicht bestimmt werden.\n" +"'%s' scheint ein git-Kommando zu sein, konnte aber\n" +"nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?" + +#: help.c:332 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Uh oh. Keine Git-Kommandos auf deinem System vorhanden." + +#: help.c:354 +#, 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 "" +"Warnung: Du hast das nicht existierende Git-Kommando '%s' ausgeführt.\n" +"Setze fort unter der Annahme das du '%s' gemeint hast" + +#: help.c:359 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "automatisch in %0.1f Sekunden..." + +#: help.c:366 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: '%s' ist kein Git-Kommando. Siehe 'git --help'." + +#: help.c:370 +msgid "" "\n" -"»%s« behauptet, es sei Version »%s«.\n" +"Did you mean this?" +msgid_plural "" "\n" -"%s benötigt mindestens Git 1.5.0 oder höher.\n" +"Did you mean one of these?" +msgstr[0] "" "\n" -"Soll angenommen werden, »%s« sei Version 1.5.0?\n" +"Hast du das gemeint?" +msgstr[1] "" +"\n" +"Hast du eines von diesen gemeint?" + +#: merge-recursive.c:190 +#, c-format +msgid "(bad commit)\n" +msgstr "(ungültige Version)\n" + +#: merge-recursive.c:206 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen" + +#: merge-recursive.c:268 +msgid "error building trees" +msgstr "Fehler beim Erstellen der Bäume" + +#: merge-recursive.c:672 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "Fehler beim Erstellen des Pfades '%s'%s" + +#: merge-recursive.c:683 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "Entferne %s um Platz für Unterverzeichnis zu schaffen\n" + +#. 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 ": vielleicht ein Verzeichnis/Datei-Konflikt?" + +#: merge-recursive.c:708 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "verweigere, da unbeobachtete Dateien in '%s' verloren gehen würden" + +#: merge-recursive.c:748 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "kann Objekt %s '%s' nicht lesen" + +#: merge-recursive.c:750 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "Blob erwartet für %s '%s'" + +#: merge-recursive.c:773 builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "Fehler beim Öffnen von '%s'" + +#: merge-recursive.c:781 +#, c-format +msgid "failed to symlink '%s'" +msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s'" + +#: merge-recursive.c:784 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "weiß nicht was mit %06o %s '%s' zu machen ist" + +#: merge-recursive.c:921 +msgid "Failed to execute internal merge" +msgstr "Fehler bei Ausführung der internen Zusammenführung" + +#: merge-recursive.c:925 +#, c-format +msgid "Unable to add %s to database" +msgstr "Konnte %s nicht zur Datenbank hinzufügen" + +#: merge-recursive.c:941 +msgid "unsupported object type in the tree" +msgstr "nicht unterstützter Objekttyp im Baum" + +#: merge-recursive.c:1020 merge-recursive.c:1034 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "" +"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " +"im Arbeitsbereich gelassen." -#: git-gui.sh:1128 -msgid "Git directory not found:" -msgstr "Git-Verzeichnis nicht gefunden:" +#: merge-recursive.c:1026 merge-recursive.c:1039 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "" +"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " +"im Arbeitsbereich bei %s gelassen." -#: git-gui.sh:1146 -msgid "Cannot move to top of working directory:" +#: merge-recursive.c:1080 +msgid "rename" +msgstr "umbenennen" + +#: merge-recursive.c:1080 +msgid "renamed" +msgstr "umbenannt" + +#: merge-recursive.c:1136 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu" + +#: merge-recursive.c:1158 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" msgstr "" -"Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt " -"werden:" +"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Zweig \"%s\" " +"und \"%s\"->\"%s\" in Zweig \"%s\"%s" -#: git-gui.sh:1154 -msgid "Cannot use bare repository:" -msgstr "Bloßes Projektarchiv kann nicht benutzt werden:" +#: merge-recursive.c:1163 +msgid " (left unresolved)" +msgstr " (bleibt unaufgelöst)" -#: git-gui.sh:1162 -msgid "No working directory" -msgstr "Kein Arbeitsverzeichnis" +#: merge-recursive.c:1217 +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgstr "" +"KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s " +"in %s" -#: git-gui.sh:1334 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Dateistatus aktualisieren..." +#: merge-recursive.c:1247 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "Benenne stattdessen %s nach %s und %s nach %s um" -#: git-gui.sh:1390 -msgid "Scanning for modified files ..." -msgstr "Nach geänderten Dateien suchen..." +#: merge-recursive.c:1446 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "" +"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in " +"%s" + +#: merge-recursive.c:1456 +#, c-format +msgid "Adding merged %s" +msgstr "Füge zusammengeführte Datei %s hinzu" + +#: merge-recursive.c:1461 merge-recursive.c:1659 +#, c-format +msgid "Adding as %s instead" +msgstr "Füge stattdessen als %s hinzu" + +#: merge-recursive.c:1512 +#, c-format +msgid "cannot read object %s" +msgstr "kann Objekt %s nicht lesen" + +#: merge-recursive.c:1515 +#, c-format +msgid "object %s is not a blob" +msgstr "Objekt %s ist kein Blob" + +#: merge-recursive.c:1563 +msgid "modify" +msgstr "ändern" + +#: merge-recursive.c:1563 +msgid "modified" +msgstr "geändert" + +#: merge-recursive.c:1573 +msgid "content" +msgstr "Inhalt" + +#: merge-recursive.c:1580 +msgid "add/add" +msgstr "hinzufügen/hinzufügen" + +#: merge-recursive.c:1614 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "%s ausgelassen (Ergebnis der Zusammenführung existiert bereits)" + +#: merge-recursive.c:1628 +#, c-format +msgid "Auto-merging %s" +msgstr "automatische Zusammenführung von %s" + +#: merge-recursive.c:1632 git-submodule.sh:869 +msgid "submodule" +msgstr "Unterprojekt" + +#: merge-recursive.c:1633 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "KONFLIKT (%s): Zusammenführungskonflikt in %s" + +#: merge-recursive.c:1723 +#, c-format +msgid "Removing %s" +msgstr "Entferne %s" + +#: merge-recursive.c:1748 +msgid "file/directory" +msgstr "Datei/Verzeichnis" + +#: merge-recursive.c:1754 +msgid "directory/file" +msgstr "Verzeichnis/Datei" + +#: merge-recursive.c:1759 +#, c-format +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +msgstr "" +"KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s " +"hinzu." -#: git-gui.sh:1454 -msgid "Calling prepare-commit-msg hook..." -msgstr "Aufrufen der Eintragen-Vorbereiten-Kontrolle (»prepare-commit hook«)..." +#: merge-recursive.c:1769 +#, c-format +msgid "Adding %s" +msgstr "Füge %s hinzu" + +#: merge-recursive.c:1786 +msgid "Fatal merge failure, shouldn't happen." +msgstr "Fataler Fehler bei der Zusammenführung. Sollte nicht passieren." + +#: merge-recursive.c:1805 +msgid "Already up-to-date!" +msgstr "Bereits aktuell!" + +#: merge-recursive.c:1814 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "Zusammenführen der Bäume %s und %s fehlgeschlagen" + +#: merge-recursive.c:1844 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "unverarbeiteter Pfad??? %s" + +#: merge-recursive.c:1889 +msgid "Merging:" +msgstr "Zusammenführung:" + +#: merge-recursive.c:1902 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "%u gemeinsamen Vorfahren gefunden" +msgstr[1] "%u gemeinsame Vorfahren gefunden" + +#: merge-recursive.c:1939 +msgid "merge returned no commit" +msgstr "Zusammenführung hat keine Version zurückgegeben" + +#: merge-recursive.c:1996 +#, c-format +msgid "Could not parse object '%s'" +msgstr "Konnte Objekt '%s' nicht parsen." + +#: merge-recursive.c:2008 builtin/merge.c:696 +msgid "Unable to write index." +msgstr "Konnte Bereitstellung nicht schreiben." + +#: parse-options.c:494 +msgid "..." +msgstr "..." + +#: parse-options.c:512 +#, c-format +msgid "usage: %s" +msgstr "Verwendung: %s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:516 +#, c-format +msgid " or: %s" +msgstr " oder: %s" + +#: parse-options.c:519 +#, c-format +msgid " %s" +msgstr " %s" + +#: remote.c:1632 +#, 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] "Dein Zweig ist vor '%s' um %d Version.\n" +msgstr[1] "Dein Zweig ist vor '%s' um %d Versionen.\n" + +#: remote.c:1638 +#, 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] "" +"Dein Zweig ist zu '%s' um %d Version hinterher, und kann vorgespult werden.\n" +msgstr[1] "" +"Dein Zweig ist zu '%s' um %d Versionen hinterher, und kann vorgespult " +"werden.\n" -#: git-gui.sh:1471 -msgid "Commit declined by prepare-commit-msg hook." +#: remote.c:1646 +#, 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] "" +"Dein Zweig und '%s' sind divergiert,\n" +"und haben jeweils %d und %d unterschiedliche Versionen.\n" +msgstr[1] "" +"Dein Zweig und '%s' sind divergiert,\n" +"und haben jeweils %d und %d unterschiedliche Versionen.\n" + +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Konnte '%s' nicht zum Schreiben öffnen." + +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 +#: builtin/merge.c:1089 builtin/merge.c:1102 +#, c-format +msgid "Could not write to '%s'" +msgstr "Konnte nicht nach '%s' schreiben." + +#: sequencer.c:144 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" msgstr "" -"Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (»prepare-commit " -"hook«)." +"nach Auflösung der Konflikte, markiere die korrigierten Pfade\n" +"mit 'git add <Pfade>' oder 'git rm <Pfade>'" -#: git-gui.sh:1629 lib/browser.tcl:246 -msgid "Ready." -msgstr "Bereit." +#: sequencer.c:147 +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 "" +"nach Auflösung der Konflikte, markiere die korrigierten Pfade\n" +"mit 'git add <Pfade>' oder 'git rm <Pfade>'und trage das Ergebnis ein mit " +"'git commit'" + +#: sequencer.c:160 sequencer.c:758 sequencer.c:841 +#, c-format +msgid "Could not write to %s" +msgstr "Konnte nicht nach %s schreiben" + +#: sequencer.c:163 +#, c-format +msgid "Error wrapping up %s" +msgstr "Fehler bei Nachbereitung von %s" + +#: sequencer.c:178 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "" +"Deine lokalen Änderungen würden von \"cherry-pick\" überschrieben werden." + +#: sequencer.c:180 +msgid "Your local changes would be overwritten by revert." +msgstr "Deine lokalen Änderungen würden von \"revert\" überschrieben werden." + +#: sequencer.c:183 +msgid "Commit your changes or stash them to proceed." +msgstr "Trage deine Änderungen ein oder benutze \"stash\" um fortzufahren." + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:233 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Konnte neue Bereitstellungsdatei nicht schreiben" + +#: sequencer.c:261 +msgid "Could not resolve HEAD commit\n" +msgstr "Konnte Version der Zweigspitze (HEAD) nicht auflösen\n" + +#: sequencer.c:282 +msgid "Unable to update cache tree\n" +msgstr "Konnte zwischengespeicherten Baum nicht aktualisieren\n" + +#: sequencer.c:324 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "Konnte Version %s nicht parsen\n" + +#: sequencer.c:329 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "Konnte Elternversion %s nicht parsen\n" + +#: sequencer.c:395 +msgid "Your index file is unmerged." +msgstr "Deine Bereitstellungsdatei ist nicht zusammengeführt." + +#: sequencer.c:398 +msgid "You do not have a valid HEAD" +msgstr "Du hast keine gültige Zweigspitze (HEAD)" + +#: sequencer.c:413 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" +"Version %s ist eine Zusammenführung, aber die Option -m wurde nicht " +"angegeben." -#: git-gui.sh:1787 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Nur %s von %s Dateien werden angezeigt." +#: sequencer.c:421 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "Version %s hat keinen Elternteil %d" -#: git-gui.sh:1913 -msgid "Unmodified" -msgstr "Unverändert" +#: sequencer.c:425 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "" +"Hauptlinie wurde spezifiziert, aber Version %s ist keine Zusammenführung." + +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: sequencer.c:436 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: kann Elternversion %s nicht parsen" + +#: sequencer.c:440 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Kann keine Versionsbeschreibung für %s bekommen" + +#: sequencer.c:524 +#, c-format +msgid "could not revert %s... %s" +msgstr "Konnte %s nicht zurücksetzen... %s" + +#: sequencer.c:525 +#, c-format +msgid "could not apply %s... %s" +msgstr "Konnte %s nicht anwenden... %s" + +#: sequencer.c:553 +msgid "empty commit set passed" +msgstr "leere Menge von Versionen übergeben" + +#: sequencer.c:561 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: Fehler beim Lesen der Bereitstellung" + +#: sequencer.c:566 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: Fehler beim Aktualisieren der Bereitstellung" + +#: sequencer.c:624 +#, c-format +msgid "Cannot %s during a %s" +msgstr "Kann %s nicht während eines %s durchführen" + +#: sequencer.c:646 +#, c-format +msgid "Could not parse line %d." +msgstr "Konnte Zeile %d nicht parsen." + +#: sequencer.c:651 +msgid "No commits parsed." +msgstr "Keine Versionen geparst." + +#: sequencer.c:664 +#, c-format +msgid "Could not open %s" +msgstr "Konnte %s nicht öffnen" + +#: sequencer.c:668 +#, c-format +msgid "Could not read %s." +msgstr "Konnte %s nicht lesen." + +#: sequencer.c:675 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "Unbenutzbares Instruktionsblatt: %s" + +#: sequencer.c:703 +#, c-format +msgid "Invalid key: %s" +msgstr "Ungültiger Schlüssel: %s" + +#: sequencer.c:706 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Ungültiger Wert für %s: %s" + +#: sequencer.c:718 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "Fehlerhaftes Optionsblatt: %s" + +#: sequencer.c:739 +msgid "a cherry-pick or revert is already in progress" +msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" + +#: sequencer.c:740 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "versuche \"git cherry-pick (--continue | --quit | --abort)\"" + +#: sequencer.c:744 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen" + +#: sequencer.c:760 sequencer.c:845 +#, c-format +msgid "Error wrapping up %s." +msgstr "Fehler beim Einpacken von %s." + +#: sequencer.c:779 sequencer.c:913 +msgid "no cherry-pick or revert in progress" +msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" + +#: sequencer.c:781 +msgid "cannot resolve HEAD" +msgstr "kann Zweigspitze (HEAD) nicht auflösen" + +#: sequencer.c:783 +msgid "cannot abort from a branch yet to be born" +msgstr "kann nicht abbrechen: bin auf einem Zweig, der noch geboren wird" + +#: sequencer.c:805 builtin/apply.c:3987 +#, c-format +msgid "cannot open %s: %s" +msgstr "Kann %s nicht öffnen: %s" + +#: sequencer.c:808 +#, c-format +msgid "cannot read %s: %s" +msgstr "Kann %s nicht lesen: %s" + +#: sequencer.c:809 +msgid "unexpected end of file" +msgstr "Unerwartetes Dateiende" + +#: sequencer.c:815 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "" +"gespeicherte \"pre-cherry-pick\" Datei der Zweigspitze (HEAD) '%s' ist " +"beschädigt" + +#: sequencer.c:838 +#, c-format +msgid "Could not format %s." +msgstr "Konnte %s nicht formatieren." + +#: sequencer.c:1000 +msgid "Can't revert as initial commit" +msgstr "Kann nicht zu initialer Version zurücksetzen." + +#: sequencer.c:1001 +msgid "Can't cherry-pick into empty head" +msgstr "Kann \"cherry-pick\" nicht in einem leerem Kopf ausführen." + +#: sha1_name.c:1044 +msgid "HEAD does not point to a branch" +msgstr "Zweigspitze (HEAD) zeigt auf keinen Zweig" + +#: sha1_name.c:1047 +#, c-format +msgid "No such branch: '%s'" +msgstr "Kein solcher Zweig '%s'" + +#: sha1_name.c:1049 +#, c-format +msgid "No upstream configured for branch '%s'" +msgstr "Kein entferntes Projektarchiv für Zweig '%s' konfiguriert." + +#: sha1_name.c:1052 +#, c-format +msgid "Upstream branch '%s' not stored as a remote-tracking branch" +msgstr "" +"Zweig '%s' des entfernten Projektarchivs ist kein gefolgter Übernahmezweig" -#: git-gui.sh:1915 -msgid "Modified, not staged" -msgstr "Verändert, nicht bereitgestellt" +#: wrapper.c:413 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s" -#: git-gui.sh:1916 git-gui.sh:1924 -msgid "Staged for commit" -msgstr "Bereitgestellt zum Eintragen" +#: wrapper.c:414 +msgid "no such user" +msgstr "kein solcher Benutzer" -#: git-gui.sh:1917 git-gui.sh:1925 -msgid "Portions staged for commit" -msgstr "Teilweise bereitgestellt zum Eintragen" +#: wt-status.c:140 +msgid "Unmerged paths:" +msgstr "Nicht zusammengeführte Pfade:" -#: git-gui.sh:1918 git-gui.sh:1926 -msgid "Staged for commit, missing" -msgstr "Bereitgestellt zum Eintragen, fehlend" +#: wt-status.c:167 wt-status.c:194 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr "" +" (benutze \"git reset %s <Datei>...\" zum Herausnehmen aus der " +"Bereitstellung)" -#: git-gui.sh:1920 -msgid "File type changed, not staged" -msgstr "Dateityp geändert, nicht bereitgestellt" +#: wt-status.c:169 wt-status.c:196 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr "" +" (benutze \"git rm --cached <Datei>...\" zum Herausnehmen aus der " +"Bereitstellung)" -#: git-gui.sh:1921 -msgid "File type changed, staged" -msgstr "Dateityp geändert, bereitgestellt" +#: wt-status.c:173 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " (benutze \"git add/rm <Datei>...\" um die Auflösung zu markieren)" -#: git-gui.sh:1923 -msgid "Untracked, not staged" -msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt" +#: wt-status.c:175 wt-status.c:179 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr "" +" (benutze \"git add/rm <Datei>...\" um die Auflösung entsprechend zu " +"markieren)" -#: git-gui.sh:1928 -msgid "Missing" -msgstr "Fehlend" +#: wt-status.c:177 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " (benutze \"git add/rm <Datei>...\" um die Auflösung zu markieren)" -#: git-gui.sh:1929 -msgid "Staged for removal" -msgstr "Bereitgestellt zum Löschen" +#: wt-status.c:188 +msgid "Changes to be committed:" +msgstr "zum Eintragen bereitgestellte Änderungen:" -#: git-gui.sh:1930 -msgid "Staged for removal, still present" -msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden" +#: wt-status.c:206 +msgid "Changes not staged for commit:" +msgstr "Änderungen, die nicht zum Eintragen bereitgestellt sind:" -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 -msgid "Requires merge resolution" -msgstr "Konfliktauflösung nötig" +#: wt-status.c:210 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr " (benutze \"git add <Datei>...\" zum Bereitstellen)" -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "Gitk wird gestartet... bitte warten." +#: wt-status.c:212 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr " (benutze \"git add/rm <Datei>...\" zum Bereitstellen)" -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" -msgstr "Gitk kann im PATH nicht gefunden werden." +#: wt-status.c:213 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr "" +" (benutze \"git checkout -- <Datei>...\" um die Änderungen im " +"Arbeitsverzeichnis zu verwerfen)" -#: git-gui.sh:2043 -msgid "Couldn't find git gui in PATH" -msgstr "»Git gui« kann im PATH nicht gefunden werden." +#: wt-status.c:215 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr "" +" (trage ein oder verwerfe den unbeobachteten oder geänderten Inhalt in den " +"Unterprojekten)" + +#: wt-status.c:224 +#, c-format +msgid "%s files:" +msgstr "%s Dateien:" + +#: wt-status.c:227 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr " (benutze \"git %s <Datei>...\" zum Einfügen in die Eintragung)" -#: git-gui.sh:2455 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Projektarchiv" - -#: git-gui.sh:2456 -msgid "Edit" -msgstr "Bearbeiten" - -#: git-gui.sh:2458 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Zweig" - -#: git-gui.sh:2461 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Version" - -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Zusammenführen" - -#: git-gui.sh:2465 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Externe Archive" - -#: git-gui.sh:2468 -msgid "Tools" -msgstr "Werkzeuge" - -#: git-gui.sh:2477 -msgid "Explore Working Copy" -msgstr "Arbeitskopie im Dateimanager" - -#: git-gui.sh:2483 -msgid "Browse Current Branch's Files" -msgstr "Aktuellen Zweig durchblättern" - -#: git-gui.sh:2487 -msgid "Browse Branch Files..." -msgstr "Einen Zweig durchblättern..." - -#: git-gui.sh:2492 -msgid "Visualize Current Branch's History" -msgstr "Aktuellen Zweig darstellen" - -#: git-gui.sh:2496 -msgid "Visualize All Branch History" -msgstr "Alle Zweige darstellen" - -#: git-gui.sh:2503 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Zweig »%s« durchblättern" - -#: git-gui.sh:2505 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Historie von »%s« darstellen" - -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Datenbankstatistik" - -#: git-gui.sh:2513 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Datenbank komprimieren" - -#: git-gui.sh:2516 -msgid "Verify Database" -msgstr "Datenbank überprüfen" - -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Desktop-Icon erstellen" - -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Beenden" - -#: git-gui.sh:2547 -msgid "Undo" -msgstr "Rückgängig" - -#: git-gui.sh:2550 -msgid "Redo" -msgstr "Wiederholen" - -#: git-gui.sh:2554 git-gui.sh:3109 -msgid "Cut" -msgstr "Ausschneiden" - -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Kopieren" - -#: git-gui.sh:2560 git-gui.sh:3115 -msgid "Paste" -msgstr "Einfügen" - -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Löschen" - -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 -msgid "Select All" -msgstr "Alle auswählen" - -#: git-gui.sh:2576 -msgid "Create..." -msgstr "Erstellen..." - -#: git-gui.sh:2582 -msgid "Checkout..." -msgstr "Umstellen..." - -#: git-gui.sh:2588 -msgid "Rename..." -msgstr "Umbenennen..." - -#: git-gui.sh:2593 -msgid "Delete..." -msgstr "Löschen..." - -#: git-gui.sh:2598 -msgid "Reset..." -msgstr "Zurücksetzen..." - -#: git-gui.sh:2608 -msgid "Done" -msgstr "Fertig" - -#: git-gui.sh:2610 -msgid "Commit@@verb" -msgstr "Eintragen" - -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "Neue Version" - -#: git-gui.sh:2627 git-gui.sh:3057 -msgid "Amend Last Commit" -msgstr "Letzte nachbessern" - -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Neu laden" - -#: git-gui.sh:2643 -msgid "Stage To Commit" -msgstr "Zum Eintragen bereitstellen" - -#: git-gui.sh:2649 -msgid "Stage Changed Files To Commit" -msgstr "Geänderte Dateien bereitstellen" - -#: git-gui.sh:2655 -msgid "Unstage From Commit" -msgstr "Aus der Bereitstellung herausnehmen" - -#: git-gui.sh:2661 lib/index.tcl:412 -msgid "Revert Changes" -msgstr "Änderungen verwerfen" - -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 -msgid "Show Less Context" -msgstr "Weniger Zeilen anzeigen" - -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 -msgid "Show More Context" -msgstr "Mehr Zeilen anzeigen" - -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 -msgid "Sign Off" -msgstr "Abzeichnen" - -#: git-gui.sh:2696 -msgid "Local Merge..." -msgstr "Lokales Zusammenführen..." - -#: git-gui.sh:2701 -msgid "Abort Merge..." -msgstr "Zusammenführen abbrechen..." - -#: git-gui.sh:2713 git-gui.sh:2741 -msgid "Add..." -msgstr "Hinzufügen..." - -#: git-gui.sh:2717 -msgid "Push..." -msgstr "Versenden..." - -#: git-gui.sh:2721 -msgid "Delete Branch..." -msgstr "Zweig löschen..." - -#: git-gui.sh:2731 git-gui.sh:3292 -msgid "Options..." -msgstr "Optionen..." - -#: git-gui.sh:2742 -msgid "Remove..." -msgstr "Entfernen..." +#: wt-status.c:244 +msgid "bug" +msgstr "Fehler" + +#: wt-status.c:249 +msgid "both deleted:" +msgstr "beide gelöscht:" + +#: wt-status.c:250 +msgid "added by us:" +msgstr "von uns hinzugefügt:" + +#: wt-status.c:251 +msgid "deleted by them:" +msgstr "von denen gelöscht:" + +#: wt-status.c:252 +msgid "added by them:" +msgstr "von denen hinzugefügt:" + +#: wt-status.c:253 +msgid "deleted by us:" +msgstr "von uns gelöscht:" + +#: wt-status.c:254 +msgid "both added:" +msgstr "von beiden hinzugefügt:" + +#: wt-status.c:255 +msgid "both modified:" +msgstr "von beiden geändert:" + +#: wt-status.c:285 +msgid "new commits, " +msgstr "neue Versionen, " + +#: wt-status.c:287 +msgid "modified content, " +msgstr "geänderter Inhalt, " + +#: wt-status.c:289 +msgid "untracked content, " +msgstr "unbeobachteter Inhalt, " + +#: wt-status.c:303 +#, c-format +msgid "new file: %s" +msgstr "neue Datei: %s" + +#: wt-status.c:306 +#, c-format +msgid "copied: %s -> %s" +msgstr "kopiert: %s -> %s" + +#: wt-status.c:309 +#, c-format +msgid "deleted: %s" +msgstr "gelöscht: %s" + +#: wt-status.c:312 +#, c-format +msgid "modified: %s" +msgstr "geändert: %s" + +#: wt-status.c:315 +#, c-format +msgid "renamed: %s -> %s" +msgstr "umbenannt: %s -> %s" + +#: wt-status.c:318 +#, c-format +msgid "typechange: %s" +msgstr "Typänderung: %s" + +#: wt-status.c:321 +#, c-format +msgid "unknown: %s" +msgstr "unbekannt: %s" + +#: wt-status.c:324 +#, c-format +msgid "unmerged: %s" +msgstr "nicht zusammengeführt: %s" + +#: wt-status.c:327 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "Fehler: unbehandelter Differenz-Status %c" + +#: wt-status.c:785 +msgid "You have unmerged paths." +msgstr "Du hast nicht zusammengeführte Pfade." + +#: wt-status.c:788 wt-status.c:912 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (behebe die Konflikte und führe \"git commit\" aus)" + +#: wt-status.c:791 +msgid "All conflicts fixed but you are still merging." +msgstr "" +"Alle Konflikte sind behoben, aber du bist immer noch beim Zusammenführen." -#: git-gui.sh:2751 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Hilfe" +#: wt-status.c:794 +msgid " (use \"git commit\" to conclude merge)" +msgstr " (benutze \"git commit\" um die Zusammenführung abzuschließen)" -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "Über %s" +#: wt-status.c:804 +msgid "You are in the middle of an am session." +msgstr "Eine \"am\"-Sitzung ist im Gange." -#: git-gui.sh:2783 -msgid "Online Documentation" -msgstr "Online-Dokumentation" +#: wt-status.c:807 +msgid "The current patch is empty." +msgstr "Der aktuelle Patch ist leer." -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "SSH-Schlüssel anzeigen" +#: wt-status.c:811 +msgid " (fix conflicts and then run \"git am --resolved\")" +msgstr " (behebe die Konflikte und führe dann \"git am --resolved\" aus)" -#: git-gui.sh:2893 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" +#: wt-status.c:813 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (benutze \"git am --skip\" um diesen Patch auszulassen)" + +#: wt-status.c:815 +msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -"Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis " -"nicht gefunden" +" (benutze \"git am --abort\" um den ursprünglichen Zweig wiederherzustellen)" -#: git-gui.sh:2926 -msgid "Current Branch:" -msgstr "Aktueller Zweig:" +#: wt-status.c:873 wt-status.c:883 +msgid "You are currently rebasing." +msgstr "Du bist gerade beim Neuaufbau." -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "Bereitstellung (zum Eintragen)" +#: wt-status.c:876 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " (behebe die Konflikte und führe dann \"git rebase --continue\" aus)" -#: git-gui.sh:2967 -msgid "Unstaged Changes" -msgstr "Nicht bereitgestellte Änderungen" +#: wt-status.c:878 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (benutze \"git rebase --skip\" um diesen Patch auszulassen)" -#: git-gui.sh:3017 -msgid "Stage Changed" -msgstr "Alles bereitstellen" +#: wt-status.c:880 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr "" +" (benutze \"git rebase --abort\" um den ursprünglichen Zweig auszuchecken)" -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "Versenden" +#: wt-status.c:886 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " (alle Konflikte behoben: führe \"git rebase --continue\" aus)" -#: git-gui.sh:3071 -msgid "Initial Commit Message:" -msgstr "Erste Versionsbeschreibung:" +#: wt-status.c:888 +msgid "You are currently splitting a commit during a rebase." +msgstr "Du teilst gerade eine Version während eines Neuaufbaus auf." -#: git-gui.sh:3072 -msgid "Amended Commit Message:" -msgstr "Nachgebesserte Beschreibung:" +#: wt-status.c:891 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr "" +" (Sobald dein Arbeitsverzeichnis sauber ist, führe \"git rebase --continue" +"\" aus)" -#: git-gui.sh:3073 -msgid "Amended Initial Commit Message:" -msgstr "Nachgebesserte erste Beschreibung:" +#: wt-status.c:893 +msgid "You are currently editing a commit during a rebase." +msgstr "Du editierst gerade eine Version während eines Neuaufbaus." -#: git-gui.sh:3074 -msgid "Amended Merge Commit Message:" -msgstr "Nachgebesserte Zusammenführungs-Beschreibung:" +#: wt-status.c:896 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr "" +" (benutze \"git commit --amend\" um die aktuelle Version nachzubessern)" -#: git-gui.sh:3075 -msgid "Merge Commit Message:" -msgstr "Zusammenführungs-Beschreibung:" +#: wt-status.c:898 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr "" +" (benutze \"git rebase --continue\" sobald deine Änderungen abgeschlossen " +"sind)" -#: git-gui.sh:3076 -msgid "Commit Message:" -msgstr "Versionsbeschreibung:" +#: wt-status.c:908 +msgid "You are currently cherry-picking." +msgstr "Du führst gerade \"cherry-pick\" aus." -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 -msgid "Copy All" -msgstr "Alle kopieren" +#: wt-status.c:915 +msgid " (all conflicts fixed: run \"git commit\")" +msgstr " (alle Konflikte behoben: führe \"git commit\" aus)" -#: git-gui.sh:3149 lib/blame.tcl:104 -msgid "File:" -msgstr "Datei:" +#: wt-status.c:924 +msgid "You are currently bisecting." +msgstr "Du bist gerade beim Halbieren." -#: git-gui.sh:3255 -msgid "Refresh" -msgstr "Aktualisieren" +#: wt-status.c:927 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr "" +" (benutze \"git bisect reset\" um zum ursprünglichen Zweig zurückzukehren)" -#: git-gui.sh:3276 -msgid "Decrease Font Size" -msgstr "Schriftgröße verkleinern" +#: wt-status.c:978 +msgid "On branch " +msgstr "Auf Zweig " -#: git-gui.sh:3280 -msgid "Increase Font Size" -msgstr "Schriftgröße vergrößern" +#: wt-status.c:985 +msgid "Not currently on any branch." +msgstr "Im Moment auf keinem Zweig." -#: git-gui.sh:3288 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Zeichenkodierung" +#: wt-status.c:997 +msgid "Initial commit" +msgstr "Initiale Version" -#: git-gui.sh:3299 -msgid "Apply/Reverse Hunk" -msgstr "Kontext anwenden/umkehren" +#: wt-status.c:1011 +msgid "Untracked" +msgstr "Unbeobachtete" -#: git-gui.sh:3304 -msgid "Apply/Reverse Line" -msgstr "Zeile anwenden/umkehren" +#: wt-status.c:1013 +msgid "Ignored" +msgstr "Ignorierte" -#: git-gui.sh:3323 -msgid "Run Merge Tool" -msgstr "Zusammenführungswerkzeug" +#: wt-status.c:1015 +#, c-format +msgid "Untracked files not listed%s" +msgstr "Unbeobachtete Dateien nicht aufgelistet%s" -#: git-gui.sh:3328 -msgid "Use Remote Version" -msgstr "Externe Version benutzen" +#: wt-status.c:1017 +msgid " (use -u option to show untracked files)" +msgstr " (benutze die Option -u um unbeobachteten Dateien anzuzeigen)" -#: git-gui.sh:3332 -msgid "Use Local Version" -msgstr "Lokale Version benutzen" +#: wt-status.c:1023 +msgid "No changes" +msgstr "Keine Änderungen" -#: git-gui.sh:3336 -msgid "Revert To Base" -msgstr "Ursprüngliche Version benutzen" +#: wt-status.c:1027 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "keine Änderungen zum Eintragen hinzugefügt%s\n" -#: git-gui.sh:3354 -msgid "Visualize These Changes In The Submodule" -msgstr "Diese Änderungen im Untermodul darstellen" +#: wt-status.c:1029 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr " (benutze \"git add\" und/oder \"git commit -a\")" -#: git-gui.sh:3358 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Aktuellen Zweig im Untermodul darstellen" +#: wt-status.c:1031 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "" +"nichts zum Eintragen hinzugefügt, aber es gibt unbeobachtete Dateien%s\n" + +#: wt-status.c:1033 +msgid " (use \"git add\" to track)" +msgstr " (benutze \"git add\" zum Beobachten)" + +#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 +#, c-format +msgid "nothing to commit%s\n" +msgstr "nichts zum Eintragen%s\n" + +#: wt-status.c:1036 +msgid " (create/copy files and use \"git add\" to track)" +msgstr " (Erstelle/Kopiere Dateien und benutze \"git add\" zum Beobachten)" + +#: wt-status.c:1039 +msgid " (use -u to show untracked files)" +msgstr " (benutze die Option -u um unbeobachtete Dateien anzuzeigen)" + +#: wt-status.c:1042 +msgid " (working directory clean)" +msgstr " (Arbeitsverzeichnis sauber)" + +#: wt-status.c:1150 +msgid "HEAD (no branch)" +msgstr "HEAD (kein Zweig)" + +#: wt-status.c:1156 +msgid "Initial commit on " +msgstr "Initiale Version auf " + +#: wt-status.c:1171 +msgid "behind " +msgstr "hinterher " + +#: wt-status.c:1174 wt-status.c:1177 +msgid "ahead " +msgstr "voraus " + +#: wt-status.c:1179 +msgid ", behind " +msgstr ", hinterher " + +#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "Konnte '%s' nicht entfernen" + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "unerwarteter Differenz-Status %c" + +#: builtin/add.c:67 builtin/commit.c:229 +msgid "updating files failed" +msgstr "Aktualisierung der Dateien fehlgeschlagen" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "entferne '%s'\n" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Pfad '%s' befindet sich in Unterprojekt '%.*s'" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "" +"Nicht bereitgestellte Änderungen nach Aktualisierung der Bereitstellung:" + +#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "'%s' ist über einem symbolischen Link" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "Konnte die Bereitstellung nicht lesen" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Konnte '%s' nicht zum Schreiben öffnen." + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "Konnte Patch nicht schreiben" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "Konnte Verzeichnis '%s' nicht lesen" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "Leerer Patch. Abgebrochen." + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "Konnte '%s' nicht anwenden." + +#: builtin/add.c:312 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" +"Die folgenden Pfade werden durch eine deiner \".gitignore\" Dateien " +"ignoriert:\n" -#: git-gui.sh:3362 -msgid "Visualize All Branch History In The Submodule" -msgstr "Alle Zweige im Untermodul darstellen" +#: builtin/add.c:352 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Verwende -f wenn du diese wirklich hinzufügen möchtest.\n" -#: git-gui.sh:3367 -msgid "Start git gui In The Submodule" -msgstr "Git gui im Untermodul starten" +#: builtin/add.c:353 +msgid "no files added" +msgstr "keine Dateien hinzugefügt" -#: git-gui.sh:3389 -msgid "Unstage Hunk From Commit" -msgstr "Kontext aus Bereitstellung herausnehmen" +#: builtin/add.c:359 +msgid "adding files failed" +msgstr "Hinzufügen von Dateien fehlgeschlagen" -#: git-gui.sh:3391 -msgid "Unstage Lines From Commit" -msgstr "Zeilen aus der Bereitstellung herausnehmen" +#: builtin/add.c:391 +msgid "-A and -u are mutually incompatible" +msgstr "-A und -u sind zueinander inkompatibel" -#: git-gui.sh:3393 -msgid "Unstage Line From Commit" -msgstr "Zeile aus der Bereitstellung herausnehmen" +#: builtin/add.c:393 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "" +"Die Option --ignore-missing kann nur zusammen mit --dry-run benutzt werden." + +#: builtin/add.c:413 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" + +#: builtin/add.c:414 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Wolltest du vielleicht 'git add .' sagen?\n" + +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "Bereitstellungsdatei beschädigt" + +#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." + +#: builtin/apply.c:57 +msgid "git apply [options] [<patch>...]" +msgstr "git apply [Optionen] [<Patch>...]" + +#: builtin/apply.c:110 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "nicht erkannte Option für Leerzeichen: '%s'" + +#: builtin/apply.c:125 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "nicht erkannte Option zum Ignorieren von Leerzeichen: '%s'" + +#: builtin/apply.c:823 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten" + +#: builtin/apply.c:832 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" + +#: builtin/apply.c:913 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." + +#: builtin/apply.c:945 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "" +"git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile " +"%d" -#: git-gui.sh:3396 -msgid "Stage Hunk For Commit" -msgstr "Kontext zur Bereitstellung hinzufügen" +#: builtin/apply.c:949 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "" +"git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d" + +#: builtin/apply.c:950 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "" +"git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d" -#: git-gui.sh:3398 -msgid "Stage Lines For Commit" -msgstr "Zeilen zur Bereitstellung hinzufügen" +#: builtin/apply.c:957 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d" -#: git-gui.sh:3400 -msgid "Stage Line For Commit" -msgstr "Zeile zur Bereitstellung hinzufügen" +#: builtin/apply.c:1402 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: unerwartete Zeile: %.*s" -#: git-gui.sh:3424 -msgid "Initializing..." -msgstr "Initialisieren..." +#: builtin/apply.c:1459 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: git-gui.sh:3541 -#, tcl-format +#: builtin/apply.c:1476 +#, c-format msgid "" -"Possible environment issues exist.\n" -"\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" -"\n" +"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] "" +"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " +"%d vorangestellter Teil des Pfades entfernt wird (Zeile %d)" +msgstr[1] "" +"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " +"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" + +#: builtin/apply.c:1636 +msgid "new file depends on old contents" +msgstr "neue Datei hängt von alten Inhalten ab" + +#: builtin/apply.c:1638 +msgid "deleted file still has contents" +msgstr "entfernte Datei hat noch Inhalte" + +#: builtin/apply.c:1664 +#, c-format +msgid "corrupt patch at line %d" +msgstr "fehlerhafter Patch bei Zeile %d" + +#: builtin/apply.c:1700 +#, c-format +msgid "new file %s depends on old contents" +msgstr "neue Datei %s hängt von alten Inhalten ab" + +#: builtin/apply.c:1702 +#, c-format +msgid "deleted file %s still has contents" +msgstr "entfernte Datei %s hat noch Inhalte" + +#: builtin/apply.c:1705 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." + +#: builtin/apply.c:1851 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1880 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "nicht erkannter Binär-Patch bei Zeile %d" + +#: builtin/apply.c:1966 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "Patch mit nutzlosen Informationen bei Zeile %d" + +#: builtin/apply.c:2056 +#, c-format +msgid "unable to read symlink %s" +msgstr "konnte symbolische Verknüpfung %s nicht lesen" + +#: builtin/apply.c:2060 +#, c-format +msgid "unable to open or read %s" +msgstr "konnte %s nicht öffnen oder lesen" + +#: builtin/apply.c:2131 +msgid "oops" +msgstr "Ups" + +#: builtin/apply.c:2653 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "Ungültiger Zeilenanfang: '%c'" + +#: builtin/apply.c:2771 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)" +msgstr[1] "" +"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)" + +#: builtin/apply.c:2783 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "Kontext reduziert zu (%ld/%ld) um Patch-Bereich bei %d anzuwenden" + +#: builtin/apply.c:2789 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" msgstr "" -"Möglicherweise gibt es Probleme mit manchen Umgebungsvariablen.\n" -"\n" -"Die folgenden Umgebungsvariablen können vermutlich nicht \n" -"von %s an Git weitergegeben werden:\n" -"\n" +"bei der Suche nach:\n" +"%.*s" + +#: builtin/apply.c:2808 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "keine Daten in Binär-Patch für '%s'" + +#: builtin/apply.c:2911 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" + +#: builtin/apply.c:2917 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" +"Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)" + +#: builtin/apply.c:2938 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" + +#: builtin/apply.c:3060 +#, c-format +msgid "cannot checkout %s" +msgstr "kann %s nicht auschecken" + +#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 +#, c-format +msgid "read of %s failed" +msgstr "Konnte %s nicht lesen" + +#: builtin/apply.c:3138 builtin/apply.c:3360 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "Pfad %s wurde umbenannt/gelöscht" + +#: builtin/apply.c:3219 builtin/apply.c:3374 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s ist nicht bereitgestellt" + +#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: builtin/apply.c:3228 builtin/apply.c:3382 +#, c-format +msgid "%s: does not match index" +msgstr "%s entspricht nicht der Bereitstellung" + +#: builtin/apply.c:3330 +msgid "removal patch leaves file contents" +msgstr "Lösch-Patch hinterlässt Dateiinhalte" + +#: builtin/apply.c:3399 +#, c-format +msgid "%s: wrong type" +msgstr "%s: falscher Typ" + +#: builtin/apply.c:3401 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s ist vom Typ %o, erwartete %o" + +#: builtin/apply.c:3502 +#, c-format +msgid "%s: already exists in index" +msgstr "%s ist bereits bereitgestellt" + +#: builtin/apply.c:3505 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s existiert bereits im Arbeitsverzeichnis" + +#: builtin/apply.c:3525 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)" + +#: builtin/apply.c:3530 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s" + +#: builtin/apply.c:3538 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: Patch konnte nicht angewendet werden" + +#: builtin/apply.c:3551 +#, c-format +msgid "Checking patch %s..." +msgstr "Prüfe Patch %s..." + +#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" + +#: builtin/apply.c:3749 +#, c-format +msgid "unable to remove %s from index" +msgstr "konnte %s nicht aus der Bereitstellung entfernen" + +#: builtin/apply.c:3777 +#, c-format +msgid "corrupt patch for subproject %s" +msgstr "fehlerhafter Patch für Unterprojekt %s" + +#: builtin/apply.c:3781 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "konnte neu erstellte Datei '%s' nicht lesen" + +#: builtin/apply.c:3786 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen" + +#: builtin/apply.c:3789 builtin/apply.c:3897 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen" + +#: builtin/apply.c:3822 +#, c-format +msgid "closing file '%s'" +msgstr "schließe Datei '%s'" + +#: builtin/apply.c:3871 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" + +#: builtin/apply.c:3958 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Patch %s sauber angewendet" + +#: builtin/apply.c:3966 +msgid "internal error" +msgstr "interner Fehler" + +#. Say this even without --verbose +#: builtin/apply.c:3969 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..." +msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." + +#: builtin/apply.c:3979 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "Verkürze Name von .rej Datei zu %.*s.rej" + +#: builtin/apply.c:4000 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Patch-Bereich #%d sauber angewendet." + +#: builtin/apply.c:4003 +#, c-format +msgid "Rejected hunk #%d." +msgstr "Patch-Bereich #%d zurückgewiesen." + +#: builtin/apply.c:4153 +msgid "unrecognized input" +msgstr "nicht erkannte Eingabe" + +#: builtin/apply.c:4164 +msgid "unable to read index file" +msgstr "Konnte Bereitstellungsdatei nicht lesen" + +#: builtin/apply.c:4283 builtin/apply.c:4286 +msgid "path" +msgstr "Pfad" + +#: builtin/apply.c:4284 +msgid "don't apply changes matching the given path" +msgstr "wendet keine Änderungen im angegebenen Pfad an" + +#: builtin/apply.c:4287 +msgid "apply changes matching the given path" +msgstr "wendet Änderungen nur im angegebenen Pfad an" + +#: builtin/apply.c:4289 +msgid "num" +msgstr "Anzahl" + +#: builtin/apply.c:4290 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "" +"entfernt <Anzahl> vorangestellte Schrägstriche von herkömmlichen " +"Differenzpfaden" -#: git-gui.sh:3570 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." +#: builtin/apply.c:4293 +msgid "ignore additions made by the patch" +msgstr "ignoriert hinzugefügte Zeilen des Patches" + +#: builtin/apply.c:4295 +msgid "instead of applying the patch, output diffstat for the input" msgstr "" -"\n" -"Dies ist ein bekanntes Problem der Tcl-Version, die\n" -"in Cygwin mitgeliefert wird." +"anstatt der Anwendung des Patches, wird der \"diffstat\" für die Eingabe " +"ausgegeben" -#: git-gui.sh:3575 -#, tcl-format -msgid "" -"\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\n" +#: builtin/apply.c:4299 +msgid "shows number of added and deleted lines in decimal notation" msgstr "" -"\n" -"\n" -"Um den Namen »%s« zu ändern, sollten Sie die \n" -"gewünschten Werte für die Einstellung user.name und \n" -"user.email in Ihre Datei ~/.gitconfig einfügen.\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - eine grafische Oberfläche für Git." - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Datei-Browser" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Version:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Version kopieren" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Text suchen..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Volle Kopie-Erkennung" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Historien-Kontext anzeigen" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Elternversion annotieren" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "%s lesen..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "Annotierungen für Kopieren/Verschieben werden geladen..." - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "Zeilen annotiert" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Annotierungen für ursprünglichen Ort werden geladen..." - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Annotierung vollständig." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Verarbeitung läuft" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "Annotierung läuft bereits." - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Intensive Kopie-Erkennung läuft..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Annotierung laden..." - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Autor:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Eintragender:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "Ursprüngliche Datei:" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Zweigspitze (»HEAD«) kann nicht gefunden werden:" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Elternversion kann nicht gefunden werden:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Elternversion kann nicht angezeigt werden" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "Fehler beim Laden des Vergleichs:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "Ursprünglich von:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "In Datei:" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "Kopiert oder verschoben durch:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Auf Zweig umstellen" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "Umstellen" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "Abbrechen" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Version" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "Optionen" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Übernahmezweig anfordern" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Verbindung zu lokalem Zweig lösen" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Zweig erstellen" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Neuen Zweig erstellen" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 -msgid "Create" -msgstr "Erstellen" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Zweigname" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "Name:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Passend zu Übernahmezweig-Name" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Anfangsversion" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Existierenden Zweig aktualisieren:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Nein" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Nur Schnellzusammenführung" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Zurücksetzen" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Arbeitskopie umstellen nach Erstellen" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Bitte wählen Sie einen Übernahmezweig." - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Übernahmezweig »%s« ist kein Zweig im externen Projektarchiv." - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Bitte geben Sie einen Zweignamen an." - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "»%s« ist kein zulässiger Zweigname." - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Zweig löschen" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Lokalen Zweig löschen" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Lokale Zweige" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Nur löschen, wenn zusammengeführt nach" +"zeigt die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation" -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Immer (Keine Zusammenführungsprüfung)" +#: builtin/apply.c:4301 +msgid "instead of applying the patch, output a summary for the input" +msgstr "" +"anstatt der Anwendung des Patches, wird eine Zusammenfassung für die Eingabe " +"ausgegeben" -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:" +#: builtin/apply.c:4303 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "" +"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" +#: builtin/apply.c:4305 +msgid "make sure the patch is applicable to the current index" msgstr "" -"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand " -"möglich.\n" -"\n" -"Sollen die ausgewählten Zweige gelöscht werden?" +"stellt sicher, dass der Patch in der aktuellen Bereitstellung angewendet " +"werden kann" -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" +#: builtin/apply.c:4307 +msgid "apply a patch without touching the working tree" +msgstr "wendet einen Patch an, ohne Änderungen im Arbeitszweig vorzunehmen" + +#: builtin/apply.c:4309 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "wendet den Patch an (Benutzung mit --stat/--summary/--check)" + +#: builtin/apply.c:4311 +msgid "attempt three-way merge if a patch does not apply" msgstr "" -"Fehler beim Löschen der Zweige:\n" -"%s" +"versucht 3-Wege-Zusammenführung, wenn der Patch nicht angewendet werden " +"konnte" -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Zweig umbenennen" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Umbenennen" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Zweig:" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Neuer Name:" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Bitte wählen Sie einen Zweig zum umbenennen." - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Zweig »%s« existiert bereits." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Fehler beim Umbenennen von »%s«." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Starten..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "Datei-Browser" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "%s laden..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Nach oben]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Dateien des Zweigs durchblättern" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "Blättern" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Änderungen »%s« von »%s« anfordern" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Schließen" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Zweig »%s« existiert nicht." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Fehler beim Einrichten der vereinfachten git-pull für »%s«." - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." +#: builtin/apply.c:4313 +msgid "build a temporary index based on embedded index information" msgstr "" -"Zweig »%s« existiert bereits.\n" -"\n" -"Zweig kann nicht mit »%s« schnellzusammengeführt werden. Reguläres " -"Zusammenführen ist notwendig." +"erstellt eine temporäre Bereitstellung basierend auf den integrierten " +"Bereitstellungsinformationen" -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Zusammenführungsmethode »%s« nicht unterstützt." +#: builtin/apply.c:4315 +msgid "paths are separated with NUL character" +msgstr "Pfade sind getrennt durch NUL Zeichen" -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Aktualisieren von »%s« fehlgeschlagen." +#: builtin/apply.c:4318 +msgid "ensure at least <n> lines of context match" +msgstr "" +"stellt sicher, dass mindestens <Anzahl> Zeilen des Kontextes übereinstimmen" + +#: builtin/apply.c:4319 +msgid "action" +msgstr "Aktion" + +#: builtin/apply.c:4320 +msgid "detect new or modified lines that have whitespace errors" +msgstr "ermittelt neue oder geänderte Zeilen die Fehler in Leerzeichen haben" -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "Bereitstellung (»index«) ist zur Bearbeitung gesperrt (»locked«)." +#: builtin/apply.c:4323 builtin/apply.c:4326 +msgid "ignore changes in whitespace when finding context" +msgstr "ignoriert Änderungen in Leerzeichen bei der Suche des Kontextes" -#: lib/checkout_op.tcl:289 +#: builtin/apply.c:4329 +msgid "apply the patch in reverse" +msgstr "wendet den Patch in umgekehrter Reihenfolge an" + +#: builtin/apply.c:4331 +msgid "don't expect at least one line of context" +msgstr "erwartet keinen Kontext" + +#: builtin/apply.c:4333 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "" +"hinterlässt zurückgewiesene Patch-Bereiche in den entsprechenden *.rej " +"Dateien" + +#: builtin/apply.c:4335 +msgid "allow overlapping hunks" +msgstr "erlaubt sich überlappende Patch-Bereiche" + +#: builtin/apply.c:4336 +msgid "be verbose" +msgstr "erweiterte Ausgaben" + +#: builtin/apply.c:4338 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "toleriert fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende" + +#: builtin/apply.c:4341 +msgid "do not trust the line counts in the hunk headers" +msgstr "vertraut nicht den Zeilennummern im Kopf des Patch-Bereiches" + +#: builtin/apply.c:4343 +msgid "root" +msgstr "Wurzelverzeichnis" + +#: builtin/apply.c:4344 +msgid "prepend <root> to all filenames" +msgstr "stellt <Wurzelverzeichnis> vor alle Dateinamen" + +#: builtin/apply.c:4366 +msgid "--3way outside a repository" +msgstr "--3way außerhalb eines Projektarchivs" + +#: builtin/apply.c:4374 +msgid "--index outside a repository" +msgstr "--index außerhalb eines Projektarchivs" + +#: builtin/apply.c:4377 +msgid "--cached outside a repository" +msgstr "--cached außerhalb eines Projektarchivs" + +#: builtin/apply.c:4393 +#, c-format +msgid "can't open patch '%s'" +msgstr "kann Patch '%s' nicht öffnen" + +#: builtin/apply.c:4407 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "unterdrückte %d Fehler in Leerzeichen" +msgstr[1] "unterdrückte %d Fehler in Leerzeichen" + +#: builtin/apply.c:4413 builtin/apply.c:4423 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d Zeile fügt Fehler in Leerzeichen hinzu." +msgstr[1] "%d Zeilen fügen Fehler in Leerzeichen hinzu." + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "Konnte Archiv-Datei '%s' nicht erstellen." + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "Konnte Ausgabe nicht umleiten." + +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" +msgstr "git archive: Externes Archiv ohne URL" + +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive: habe ACK/NAK erwartet, aber EOF bekommen" + +#: builtin/archive.c:63 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:65 +#, c-format +msgid "remote error: %s" +msgstr "Fehler am anderen Ende: %s" + +#: builtin/archive.c:66 +msgid "git archive: protocol error" +msgstr "git archive: Protokollfehler" + +#: builtin/archive.c:71 +msgid "git archive: expected a flush" +msgstr "git archive: erwartete eine Spülung (flush)" + +#: builtin/branch.c:144 +#, c-format msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." msgstr "" -"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" -"\n" -"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " -"geändert. Vor dem Wechseln des lokalen Zweigs muss neu geladen werden.\n" -"\n" -"Es wird gleich neu geladen.\n" +"entferne Zweig '%s', der zusammengeführt wurde mit\n" +" '%s', aber noch nicht mit der Zweigspitze (HEAD) zusammengeführt " +"wurde." + +#: builtin/branch.c:148 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" +"entferne Zweig '%s' nicht, der noch nicht zusammengeführt wurde mit\n" +" '%s', obwohl er mit der Zweigspitze (HEAD) zusammengeführt wurde." -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Arbeitskopie umstellen auf »%s«..." +#: builtin/branch.c:180 +msgid "cannot use -a with -d" +msgstr "kann -a nicht mit -d benutzen" -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "Dateien aktualisiert" +#: builtin/branch.c:186 +msgid "Couldn't look up commit object for HEAD" +msgstr "Konnte Versionsobjekt für Zweigspitze (HEAD) nicht nachschlagen." -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." +#: builtin/branch.c:191 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -"Auf Zweig »%s« umstellen abgebrochen (Zusammenführen der Dateien ist " -"notwendig)." +"Kann Zweig '%s' nicht entfernen, da du dich gerade auf diesem befindest." + +#: builtin/branch.c:202 +#, c-format +msgid "remote branch '%s' not found." +msgstr "externer Zweig '%s' nicht gefunden" -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Zusammenführen der Dateien ist notwendig." +#: builtin/branch.c:203 +#, c-format +msgid "branch '%s' not found." +msgstr "Zweig '%s' nicht gefunden." -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Es wird auf Zweig »%s« verblieben." +#: builtin/branch.c:210 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Konnte Versionsobjekt für '%s' nicht nachschlagen." -#: lib/checkout_op.tcl:452 +#: builtin/branch.c:216 +#, c-format msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n" -"\n" -"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen " -"Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«." +"Der Zweig '%s' ist nicht vollständig zusammengeführt.\n" +"Wenn du sicher bist diesen Zweig zu entfernen, führe 'git branch -D %s' aus." + +#: builtin/branch.c:225 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "Fehler beim Entfernen des externen Zweiges '%s'" + +#: builtin/branch.c:226 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "Fehler beim Entfernen des Zweiges '%s'" + +#: builtin/branch.c:233 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "Externer Zweig %s entfernt (war %s).\n" + +#: builtin/branch.c:234 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Zweig %s entfernt (war %s).\n" + +#: builtin/branch.c:239 +msgid "Update of config-file failed" +msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." + +#: builtin/branch.c:337 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "Zweig '%s' zeigt auf keine Version" + +#: builtin/branch.c:409 +#, c-format +msgid "[%s: behind %d]" +msgstr "[%s: %d hinterher]" + +#: builtin/branch.c:411 +#, c-format +msgid "[behind %d]" +msgstr "[%d hinterher]" + +#: builtin/branch.c:415 +#, c-format +msgid "[%s: ahead %d]" +msgstr "[%s: %d voraus]" + +#: builtin/branch.c:417 +#, c-format +msgid "[ahead %d]" +msgstr "[%d voraus]" + +#: builtin/branch.c:420 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "[%s: %d voraus, %d hinterher]" + +#: builtin/branch.c:423 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "[%d voraus, %d hinterher]" + +#: builtin/branch.c:535 +msgid "(no branch)" +msgstr "(kein Zweig)" + +#: builtin/branch.c:600 +msgid "some refs could not be read" +msgstr "Konnte einige Referenzen nicht lesen" + +#: builtin/branch.c:613 +msgid "cannot rename the current branch while not on any." +msgstr "" +"Kann aktuellen Zweig nicht umbenennen, solange du dich auf keinem befindest." + +#: builtin/branch.c:623 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Ungültiger Zweig-Name: '%s'" -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Umgestellt auf »%s«." +#: builtin/branch.c:638 +msgid "Branch rename failed" +msgstr "Umbenennung des Zweiges fehlgeschlagen" -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Zurücksetzen von »%s« nach »%s« wird folgende Versionen verwerfen:" +#: builtin/branch.c:642 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "falsch benannten Zweig '%s' umbenannt" -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." +#: builtin/branch.c:646 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "Zweig umbenannt zu %s, aber Zweigspitze (HEAD) ist nicht aktualisiert!" + +#: builtin/branch.c:653 +msgid "Branch is renamed, but update of config-file failed" msgstr "" -"Verworfene Versionen können nur mit größerem Aufwand wiederhergestellt " -"werden." +"Zweig ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " +"fehlgeschlagen." + +#: builtin/branch.c:668 +#, c-format +msgid "malformed object name %s" +msgstr "Missgebildeter Objektname %s" + +#: builtin/branch.c:692 +#, c-format +msgid "could not write branch description template: %s" +msgstr "Konnte Beschreibungsvorlage für Zweig nicht schreiben: %s" + +#: builtin/branch.c:783 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Konnte Zweigspitze (HEAD) nicht als gültige Referenz auflösen." + +#: builtin/branch.c:788 builtin/clone.c:561 +msgid "HEAD not found below refs/heads!" +msgstr "Zweigspitze (HEAD) wurde nicht unter \"refs/heads\" gefunden!" -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "»%s« zurücksetzen?" +#: builtin/branch.c:808 +msgid "--column and --verbose are incompatible" +msgstr "--column und --verbose sind inkompatibel" -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Darstellen" +#: builtin/branch.c:857 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" +"Die Optionen -a und -r bei 'git branch' machen mit einem Zweignamen keinen " +"Sinn." + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s ist in Ordnung\n" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "Um ein Paket zu erstellen wird ein Projektarchiv benötigt." + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "Zum Entpacken wird ein Projektarchiv benötigt." + +#: builtin/checkout.c:114 builtin/checkout.c:147 +#, c-format +msgid "path '%s' does not have our version" +msgstr "Pfad '%s' hat nicht unsere Version." + +#: builtin/checkout.c:116 builtin/checkout.c:149 +#, c-format +msgid "path '%s' does not have their version" +msgstr "Pfad '%s' hat nicht deren Version." + +#: builtin/checkout.c:132 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "Pfad '%s' hat nicht alle notwendigen Versionen." + +#: builtin/checkout.c:176 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "Pfad '%s' hat nicht die notwendigen Versionen." + +#: builtin/checkout.c:193 +#, c-format +msgid "path '%s': cannot merge" +msgstr "Pfad '%s': kann nicht zusammenführen" + +#: builtin/checkout.c:210 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "Konnte Ergebnis der Zusammenführung von '%s' nicht hinzufügen." + +#: builtin/checkout.c:235 builtin/checkout.c:392 +msgid "corrupt index file" +msgstr "beschädigte Bereitstellungsdatei" + +#: builtin/checkout.c:265 builtin/checkout.c:272 +#, c-format +msgid "path '%s' is unmerged" +msgstr "Pfad '%s' ist nicht zusammengeführt." + +#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 +#: builtin/merge.c:811 +msgid "unable to write new index file" +msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." + +#: builtin/checkout.c:414 +msgid "you need to resolve your current index first" +msgstr "Du musst zuerst deine aktuelle Bereitstellung auflösen." + +#: builtin/checkout.c:533 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "Konnte \"reflog\" für '%s' nicht durchführen\n" + +#: builtin/checkout.c:566 +msgid "HEAD is now at" +msgstr "Zweigspitze (HEAD) ist jetzt bei" + +#: builtin/checkout.c:573 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Setze Zweig '%s' zurück\n" + +#: builtin/checkout.c:576 +#, c-format +msgid "Already on '%s'\n" +msgstr "Bereits auf '%s'\n" + +#: builtin/checkout.c:580 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Gewechselt zu zurückgesetztem Zweig '%s'\n" + +#: builtin/checkout.c:582 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Gewechselt zu einem neuen Zweig '%s'\n" + +#: builtin/checkout.c:584 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Gewechselt zu Zweig '%s'\n" + +#: builtin/checkout.c:640 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... und %d weitere.\n" + +#. The singular version +#: builtin/checkout.c:646 +#, 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] "" +"Warnung: Du bist um %d Version hinterher, nicht verbunden zu\n" +"einem deiner Zweige:\n" +"\n" +"%s\n" +msgstr[1] "" +"Warnung: Du bist um %d Versionen hinterher, nicht verbunden zu\n" +"einem deiner Zweige:\n" +"\n" +"%s\n" -#: lib/checkout_op.tcl:635 -#, tcl-format +#: builtin/checkout.c:664 +#, c-format msgid "" -"Failed to set current branch.\n" +"If you want to keep them by creating a new branch, this may be a good time\n" +"to do so with:\n" "\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" +" git branch new_branch_name %s\n" "\n" -"This should not have occurred. %s will now close and give up." msgstr "" -"Lokaler Zweig kann nicht gesetzt werden.\n" +"Wenn du diese durch einen neuen Zweig behalten möchtest, dann könnte jetzt\n" +"ein guter Zeitpunkt sein dies zu tun mit:\n" "\n" -"Diese Arbeitskopie ist nur teilweise umgestellt. Die Dateien sind korrekt " -"aktualisiert, aber einige interne Git-Dateien konnten nicht geändert " -"werden.\n" +" git branch neuer_zweig_name %s\n" "\n" -"Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen." -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Auswählen" +#: builtin/checkout.c:694 +msgid "internal error in revision walk" +msgstr "interner Fehler im Revisionsgang" -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Schriftfamilie" +#: builtin/checkout.c:698 +msgid "Previous HEAD position was" +msgstr "Vorherige Position der Zweigspitze (HEAD) war" -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Schriftgröße" +#: builtin/checkout.c:724 builtin/checkout.c:919 +msgid "You are on a branch yet to be born" +msgstr "du bist auf einem Zweig, der noch geboren wird" -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Schriftbeispiel" +#. case (1) +#: builtin/checkout.c:855 +#, c-format +msgid "invalid reference: %s" +msgstr "Ungültige Referenz: %s" -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Dies ist ein Beispieltext.\n" -"Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen." +#. case (1): want a tree +#: builtin/checkout.c:894 +#, c-format +msgid "reference is not a tree: %s" +msgstr "Referenz ist kein Baum: %s" -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" +#: builtin/checkout.c:976 +msgid "-B cannot be used with -b" +msgstr "-B kann nicht mit -b benutzt werden" -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" -msgstr "Neues Projektarchiv" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Neu..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" -msgstr "Projektarchiv klonen" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Klonen..." - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" -msgstr "Projektarchiv öffnen" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Öffnen..." - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Zuletzt benutzte Projektarchive" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Zuletzt benutztes Projektarchiv öffnen:" - -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Projektarchiv »%s« konnte nicht erstellt werden:" - -#: lib/choose_repository.tcl:391 -msgid "Directory:" -msgstr "Verzeichnis:" - -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" -msgstr "Git Projektarchiv" - -#: lib/choose_repository.tcl:448 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Verzeichnis »%s« existiert bereits." - -#: lib/choose_repository.tcl:452 -#, tcl-format -msgid "File %s already exists." -msgstr "Datei »%s« existiert bereits." - -#: lib/choose_repository.tcl:466 -msgid "Clone" -msgstr "Klonen" - -#: lib/choose_repository.tcl:479 -msgid "Source Location:" -msgstr "Herkunft:" - -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" -msgstr "Zielverzeichnis:" - -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" -msgstr "Art des Klonens:" - -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Standard (schnell, teilweise redundant, Hardlinks)" - -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Alles kopieren (langsamer, volle Redundanz)" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)" - -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Kein Git-Projektarchiv in »%s« gefunden." - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "Standard ist nur für lokale Projektarchive verfügbar." - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar." - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "Projektarchiv »%s« existiert bereits." - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "Der Ursprungsort konnte nicht eingerichtet werden" - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "Objekte werden gezählt" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "Buckets" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Von »%s« konnte nichts geklont werden." - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "Der »master«-Zweig wurde noch nicht initialisiert." - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert." - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "Kopieren von »%s«" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "Objektdatenbank kopieren" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "KB" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Objekt kann nicht kopiert werden: %s" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "Objekte verlinken" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "Objekte" - -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s" - -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Zweige und Objekte konnten nicht angefordert werden. Kontrollieren Sie die " -"Ausgaben auf der Konsole für weitere Angaben." - -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "" -"Markierungen konnten nicht angefordert werden. Kontrollieren Sie die " -"Ausgaben auf der Konsole für weitere Angaben." - -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Die Zweigspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die " -"Ausgaben auf der Konsole für weitere Angaben." - -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden." - -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "Klonen fehlgeschlagen." - -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "Kein voreingestellter Zweig gefunden." - -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "»%s« wurde nicht als Version gefunden." - -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "Arbeitskopie erstellen" - -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "Dateien" - -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "Erstellen der Arbeitskopie fehlgeschlagen." - -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "Öffnen" - -#: lib/choose_repository.tcl:1021 -msgid "Repository:" -msgstr "Projektarchiv:" - -#: lib/choose_repository.tcl:1072 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Projektarchiv »%s« konnte nicht geöffnet werden." - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "Abgetrennte Arbeitskopie-Version" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Version Regexp-Ausdruck:" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "Lokaler Zweig" +#: builtin/checkout.c:985 +msgid "--patch is incompatible with all other options" +msgstr "--patch ist inkompatibel mit allen anderen Optionen" -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "Übernahmezweig" +#: builtin/checkout.c:988 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "--detach kann nicht mit -b/-B/--orphan benutzt werden" -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "Markierung" +#: builtin/checkout.c:990 +msgid "--detach cannot be used with -t" +msgstr "--detach kann nicht mit -t benutzt werden" -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Ungültige Version: %s" +#: builtin/checkout.c:996 +msgid "--track needs a branch name" +msgstr "--track benötigt einen Zweignamen" -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "Keine Version ausgewählt." +#: builtin/checkout.c:1003 +msgid "Missing branch name; try -b" +msgstr "Vermisse Zweignamen; versuche -b" -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "Versions-Ausdruck ist leer." +#: builtin/checkout.c:1009 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "--orphan und -b|-B sind gegenseitig exklusiv" -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "Aktualisiert" +#: builtin/checkout.c:1011 +msgid "--orphan cannot be used with -t" +msgstr "--orphan kann nicht mit -t benutzt werden" -#: lib/choose_rev.tcl:559 -msgid "URL" -msgstr "URL" +#: builtin/checkout.c:1021 +msgid "git checkout: -f and -m are incompatible" +msgstr "git checkout: -f und -m sind inkompatibel" -#: lib/commit.tcl:9 +#: builtin/checkout.c:1055 +msgid "invalid path specification" +msgstr "ungültige Pfadspezifikation" + +#: builtin/checkout.c:1063 +#, c-format msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -"Keine Version zur Nachbesserung vorhanden.\n" -"\n" -"Sie sind dabei, die erste Version zu übertragen. Es gibt keine existierende " -"Version, die Sie nachbessern könnten.\n" +"git checkout: Die Aktualisierung von Pfaden ist inkompatibel mit dem Wechsel " +"von Zweigen.\n" +"Hast du beabsichtigt '%s' auszuchecken, welcher nicht als Version aufgelöst " +"werden kann?" -#: lib/commit.tcl:18 +#: builtin/checkout.c:1065 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "" +"git checkout: Die Aktualisierung von Pfaden ist inkompatibel mit dem Wechsel " +"von Zweigen." + +#: builtin/checkout.c:1070 +msgid "git checkout: --detach does not take a path argument" +msgstr "git checkout: --detach nimmt kein Pfad-Argument" + +#: builtin/checkout.c:1073 msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." msgstr "" -"Nachbesserung währen Zusammenführung nicht möglich.\n" -"\n" -"Sie haben das Zusammenführen von Versionen angefangen, aber noch nicht " -"beendet. Sie können keine vorige Übertragung nachbessern, solange eine " -"unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung " -"beenden oder abbrechen.\n" +"git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" +"du aus der Bereitstellung auscheckst." -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Fehler beim Laden der Versionsdaten für Nachbessern:" +#: builtin/checkout.c:1092 +msgid "Cannot switch branch to a non-commit." +msgstr "Kann Zweig nur zu einer Version wechseln." -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Benutzername konnte nicht bestimmt werden:" +#: builtin/checkout.c:1095 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "--ours/--theirs ist inkompatibel mit den Wechseln von Zweigen." -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:" +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "-x und -X können nicht zusammen benutzt werden" -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht." +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" +"clean.requireForce auf \"true\" gesetzt und weder -n noch -f gegeben; " +"Säuberung verweigert" -#: lib/commit.tcl:149 +#: builtin/clean.c:85 msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" -"\n" -"The rescan will be automatically started now.\n" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" +"clean.requireForce standardmäßig auf \"true\" gesetzt und weder -n noch -f " +"gegeben; Säuberung verweigert" + +#: builtin/clean.c:155 builtin/clean.c:176 +#, c-format +msgid "Would remove %s\n" +msgstr "Würde %s entfernen\n" + +#: builtin/clean.c:159 builtin/clean.c:179 +#, c-format +msgid "Removing %s\n" +msgstr "Entferne %s\n" + +#: builtin/clean.c:162 builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" +msgstr "Fehler beim Entfernen von %s" + +#: builtin/clean.c:166 +#, c-format +msgid "Would not remove %s\n" +msgstr "Würde nicht entfernen %s\n" + +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" +msgstr "Entferne nicht %s\n" + +#: builtin/clone.c:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "Referenziertes Projektarchiv '%s' ist kein lokales Verzeichnis." + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "Fehler beim Erstellen von Verzeichnis '%s'" + +#: builtin/clone.c:308 builtin/diff.c:77 +#, c-format +msgid "failed to stat '%s'" +msgstr "Konnte '%s' nicht lesen" + +#: builtin/clone.c:310 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s existiert und ist kein Verzeichnis" + +#: builtin/clone.c:324 +#, c-format +msgid "failed to stat %s\n" +msgstr "Konnte %s nicht lesen\n" + +#: builtin/clone.c:346 +#, c-format +msgid "failed to create link '%s'" +msgstr "Konnte Verknüpfung '%s' nicht erstellen" + +#: builtin/clone.c:350 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "Konnte Datei nicht nach '%s' kopieren" + +#: builtin/clone.c:373 +#, c-format +msgid "done.\n" +msgstr "Fertig.\n" + +#: builtin/clone.c:443 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "Konnte zu klonenden externer Zweig %s nicht finden." + +#: builtin/clone.c:552 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" +"Externe Zweigspitze (HEAD) bezieht sich auf eine nicht existierende Referenz " +"und kann nicht ausgecheckt werden.\n" + +#: builtin/clone.c:642 +msgid "Too many arguments." +msgstr "Zu viele Argumente." + +#: builtin/clone.c:646 +msgid "You must specify a repository to clone." +msgstr "Du musst ein Projektarchiv zum Klonen angeben." + +#: builtin/clone.c:657 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "--bare und --origin %s Optionen sind inkompatibel." + +#: builtin/clone.c:671 +#, c-format +msgid "repository '%s' does not exist" +msgstr "Projektarchiv '%s' existiert nicht." + +#: builtin/clone.c:676 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth wird in lokalen Klonen ignoriert; benutze stattdessen file://." + +#: builtin/clone.c:686 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." + +#: builtin/clone.c:696 +#, c-format +msgid "working tree '%s' already exists." +msgstr "Arbeitsbaum '%s' existiert bereits." + +#: builtin/clone.c:709 builtin/clone.c:723 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." + +#: builtin/clone.c:712 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen." + +#: builtin/clone.c:731 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "Klone in bloßes Projektarchiv '%s'...\n" + +#: builtin/clone.c:733 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "Klone nach '%s'...\n" + +#: builtin/clone.c:789 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Weiß nicht wie %s zu klonen ist." + +#: builtin/clone.c:838 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "externer Zweig %s nicht im anderen Projektarchiv %s gefunden" + +#: builtin/clone.c:845 +msgid "You appear to have cloned an empty repository." +msgstr "Du scheinst ein leeres Projektarchiv geklont zu haben." + +#: builtin/column.c:51 +msgid "--command must be the first argument" +msgstr "Option --command muss zuerst angegeben werden" + +#: builtin/commit.c:43 +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" -"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " -"geändert. Vor dem Eintragen einer neuen Version muss neu geladen werden.\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" "\n" -"Es wird gleich neu geladen.\n" - -#: lib/commit.tcl:172 -#, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" +"After doing this, you may fix the identity used for this commit with:\n" "\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" +" git commit --amend --reset-author\n" msgstr "" -"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n" +"Dein Name und E-Mail Adresse wurden automatisch auf Basis\n" +"deines Benutzer- und Rechnernamens konfiguriert. Bitte prüfe, dass diese\n" +"zutreffend sind. Du kannst diese Meldung unterdrücken, indem du diese\n" +"explizit setzt:\n" "\n" -"Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie " -"müssen diese Konflikte auflösen, bevor Sie eintragen können.\n" - -#: lib/commit.tcl:180 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" +" git config --global user.name \"Dein Name\"\n" +" git config --global user.email deine@emailadresse.de\n" "\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Unbekannter Dateizustand »%s«.\n" +"Nachdem du das getan hast, kannst du deine Identität für diese Version " +"ändern mit:\n" "\n" -"Datei »%s« kann nicht eingetragen werden.\n" +" git commit --amend --reset-author\n" -#: lib/commit.tcl:188 +#: builtin/commit.c:55 msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" +"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 "" -"Keine Änderungen vorhanden, die eingetragen werden könnten.\n" -"\n" -"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n" +"Du fragtest die jüngste Version nachzubessern, aber das würde diese leer\n" +"machen. Du kannst Dein Kommando mit --allow-empty wiederholen, oder die\n" +"Version mit \"git reset HEAD^\" vollständig entfernen.\n" -#: lib/commit.tcl:203 +#: builtin/commit.c:60 msgid "" -"Please supply a commit message.\n" +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" +"If you wish to commit it anyway, use:\n" "\n" -"A good commit message has the following format:\n" +" git commit --allow-empty\n" "\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" +"Otherwise, please use 'git reset'\n" msgstr "" -"Bitte geben Sie eine Versionsbeschreibung ein.\n" -"\n" -"Eine gute Versionsbeschreibung enthält folgende Abschnitte:\n" +"Der letzte \"cherry-pick\" ist jetzt leer, möglicherweise durch eine " +"Konfliktauflösung.\n" +"Wenn du dies trotzdem eintragen willst, benutze:\n" "\n" -"- Erste Zeile: Eine Zusammenfassung, was man gemacht hat.\n" +" git commit --allow-empty\n" "\n" -"- Zweite Zeile: Leerzeile\n" -"\n" -"- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n" +"Andernfalls benutze bitte 'git reset'\n" + +#: builtin/commit.c:256 +msgid "failed to unpack HEAD tree object" +msgstr "Fehler beim Entpacken des Baum-Objektes der Zweigspitze (HEAD)." -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." -msgstr "Aufrufen der Vor-Eintragen-Kontrolle (»pre-commit hook«)..." +#: builtin/commit.c:298 +msgid "unable to create temporary index" +msgstr "Konnte temporäre Bereitstellung nicht erstellen." -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«)." +#: builtin/commit.c:304 +msgid "interactive add failed" +msgstr "interaktives Hinzufügen fehlgeschlagen" -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle (»commit-message hook«)..." +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 +msgid "unable to write new_index file" +msgstr "Konnte new_index Datei nicht schreiben" -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." +#: builtin/commit.c:389 +msgid "cannot do a partial commit during a merge." msgstr "" -"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message " -"hook«)." +"Kann keine partielle Eintragung durchführen, während eine Zusammenführung im " +"Gange ist." -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "Änderungen eintragen..." +#: builtin/commit.c:391 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "" +"Kann keine partielle Eintragung durchführen, während \"cherry-pick\" im " +"Gange ist." -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "write-tree fehlgeschlagen:" +#: builtin/commit.c:401 +msgid "cannot read the index" +msgstr "Kann Bereitstellung nicht lesen" -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "Eintragen fehlgeschlagen." +#: builtin/commit.c:421 +msgid "unable to write temporary index file" +msgstr "Konnte temporäre Bereitstellungsdatei nicht schreiben." -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Version »%s« scheint beschädigt zu sein" +#: builtin/commit.c:496 builtin/commit.c:502 +#, c-format +msgid "invalid commit: %s" +msgstr "Ungültige Version: %s" -#: lib/commit.tcl:339 +#: builtin/commit.c:525 +msgid "malformed --author parameter" +msgstr "Fehlerhafter --author Parameter" + +#: builtin/commit.c:585 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "Fehlerhafte Identifikations-String: '%s'" + +#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 +#, c-format +msgid "could not lookup commit %s" +msgstr "Konnte Version %s nicht nachschlagen" + +#: builtin/commit.c:635 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" + +#: builtin/commit.c:637 +msgid "could not read log from standard input" +msgstr "Konnte Log nicht von Standard-Eingabe lesen." + +#: builtin/commit.c:641 +#, c-format +msgid "could not read log file '%s'" +msgstr "Konnte Log-Datei '%s' nicht lesen" + +#: builtin/commit.c:647 +msgid "commit has empty message" +msgstr "Version hat eine leere Beschreibung" + +#: builtin/commit.c:663 +msgid "could not read MERGE_MSG" +msgstr "Konnte MERGE_MSG nicht lesen" + +#: builtin/commit.c:667 +msgid "could not read SQUASH_MSG" +msgstr "Konnte SQUASH_MSG nicht lesen" + +#: builtin/commit.c:671 +#, c-format +msgid "could not read '%s'" +msgstr "Konnte '%s' nicht lesen" + +#: builtin/commit.c:723 +msgid "could not write commit template" +msgstr "Konnte Versionsvorlage nicht schreiben" + +#: builtin/commit.c:734 +#, c-format msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" "\n" -"A rescan will be automatically started now.\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 "" -"Keine Änderungen einzutragen.\n" "\n" -"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts " -"zusammengeführt.\n" +"Es sieht so aus, als trägst du eine Zusammenführung ein.\n" +"Falls das nicht korrekt ist, entferne bitte die Datei\n" +"\t%s\n" +"und versuche es erneut.\n" + +#: builtin/commit.c:739 +#, 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 "" "\n" -"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n" +"Es sieht so aus, als trägst du ein \"cherry-pick\" ein.\n" +"Falls das nicht korrekt ist, entferne bitte die Datei\n" +"\t%s\n" +"und versuche es erneut.\n" -#: lib/commit.tcl:346 -msgid "No changes to commit." -msgstr "Keine Änderungen, die eingetragen werden können." +#: builtin/commit.c:751 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Bitte gebe eine Versionsbeschreibung für deine Änderungen ein. Zeilen,\n" +"die mit '#' beginnen, werden ignoriert, und eine leere Versionsbeschreibung\n" +"bricht die Eintragung ab.\n" -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "commit-tree fehlgeschlagen:" +#: builtin/commit.c:756 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Bitte gebe eine Versionsbeschreibung für deine Änderungen ein. Zeilen, die\n" +"mit '#' beginnen, werden beibehalten; wenn du möchtest, kannst du diese " +"entfernen.\n" +"Eine leere Versionsbeschreibung bricht die Eintragung ab.\n" + +#: builtin/commit.c:769 +#, c-format +msgid "%sAuthor: %s" +msgstr "%sAutor: %s" + +#: builtin/commit.c:776 +#, c-format +msgid "%sCommitter: %s" +msgstr "%sEintragender: %s" + +#: builtin/commit.c:796 +msgid "Cannot read index" +msgstr "Kann Bereitstellung nicht lesen" + +#: builtin/commit.c:833 +msgid "Error building trees" +msgstr "Fehler beim Erzeugen der Zweige" + +#: builtin/commit.c:848 builtin/tag.c:361 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "Bitte liefere eine Beschreibung entweder mit der Option -m oder -F.\n" + +#: builtin/commit.c:945 +#, c-format +msgid "No existing author found with '%s'" +msgstr "Kein existierender Autor mit '%s' gefunden." + +#: builtin/commit.c:960 builtin/commit.c:1160 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien" + +#: builtin/commit.c:1000 +msgid "Using both --reset-author and --author does not make sense" +msgstr "Verwendung von --reset-author und --author macht keinen Sinn." + +#: builtin/commit.c:1011 +msgid "You have nothing to amend." +msgstr "Du hast nichts zum nachbessern." + +#: builtin/commit.c:1014 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "Eine Zusammenführung ist im Gange -- kann nicht nachbessern." + +#: builtin/commit.c:1016 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "\"cherry-pick\" ist im Gange -- kann nicht nachbessern." + +#: builtin/commit.c:1019 +msgid "Options --squash and --fixup cannot be used together" +msgstr "" +"Die Optionen --squash und --fixup können nicht gemeinsam benutzt werden." -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "update-ref fehlgeschlagen:" +#: builtin/commit.c:1029 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "Nur eines von -c/-C/-F/--fixup kann benutzt werden." -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Version %s übertragen: %s" +#: builtin/commit.c:1031 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden" -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Verarbeitung. Bitte warten..." +#: builtin/commit.c:1039 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset--author kann nur mit -C, -c oder --amend benutzt werden" -#: lib/console.tcl:186 -msgid "Success" -msgstr "Erfolgreich" +#: builtin/commit.c:1056 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" +"Nur eines von --include/--only/--all/--interactive/--patch kann benutzt " +"werden." -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Fehler: Kommando fehlgeschlagen" +#: builtin/commit.c:1058 +msgid "No paths with --include/--only does not make sense." +msgstr "--include/--only machen ohne Pfade keinen Sinn." -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "Anzahl unverknüpfter Objekte" +#: builtin/commit.c:1060 +msgid "Clever... amending the last one with dirty index." +msgstr "" +"Klug... die letzte Version mit einer unsauberen Bereitstellung nachbessern." -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "Festplattenplatz von unverknüpften Objekten" +#: builtin/commit.c:1062 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" +"Explizite Pfade ohne -i oder -o angegeben; unter der Annahme von --only " +"Pfaden..." + +#: builtin/commit.c:1072 builtin/tag.c:577 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Ungültiger \"cleanup\" Modus %s" + +#: builtin/commit.c:1077 +msgid "Paths with -a does not make sense." +msgstr "Pfade mit -a machen keinen Sinn." + +#: builtin/commit.c:1260 +msgid "couldn't look up newly created commit" +msgstr "Konnte neu erstellte Version nicht nachschlagen." + +#: builtin/commit.c:1262 +msgid "could not parse newly created commit" +msgstr "Konnte neulich erstellte Version nicht analysieren." + +#: builtin/commit.c:1303 +msgid "detached HEAD" +msgstr "losgelöste Zweigspitze (HEAD)" + +#: builtin/commit.c:1305 +msgid " (root-commit)" +msgstr " (Basis-Version)" + +#: builtin/commit.c:1449 +msgid "could not parse HEAD commit" +msgstr "Konnte Version der Zweigspitze (HEAD) nicht analysieren." + +#: builtin/commit.c:1487 builtin/merge.c:508 +#, c-format +msgid "could not open '%s' for reading" +msgstr "Konnte '%s' nicht zum Lesen öffnen." + +#: builtin/commit.c:1494 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Beschädigte MERGE_HEAD-Datei (%s)" + +#: builtin/commit.c:1501 +msgid "could not read MERGE_MODE" +msgstr "Konnte MERGE_MODE nicht lesen" + +#: builtin/commit.c:1520 +#, c-format +msgid "could not read commit message: %s" +msgstr "Konnte Versionsbeschreibung nicht lesen: %s" + +#: builtin/commit.c:1534 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Eintragung abgebrochen; du hast die Beschreibung nicht editiert.\n" + +#: builtin/commit.c:1539 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Eintragung aufgrund leerer Versionsbeschreibung abgebrochen.\n" + +#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960 +msgid "failed to write commit object" +msgstr "Fehler beim Schreiben des Versionsobjektes." + +#: builtin/commit.c:1575 +msgid "cannot lock HEAD ref" +msgstr "Kann Referenz der Zweigspitze (HEAD) nicht sperren." + +#: builtin/commit.c:1579 +msgid "cannot update HEAD ref" +msgstr "Kann Referenz der Zweigspitze (HEAD) nicht aktualisieren." + +#: builtin/commit.c:1590 +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 "" +"Das Projektarchiv wurde aktualisiert, aber die \"new_index\"-Datei\n" +"konnte nicht geschrieben werden. Prüfe, dass deine Festplatte nicht\n" +"voll und Dein Kontingent nicht aufgebraucht ist und führe\n" +"anschließend \"git reset HEAD\" zu Wiederherstellung aus." + +#: builtin/describe.c:234 +#, c-format +msgid "annotated tag %s not available" +msgstr "annotierte Markierung %s ist nicht verfügbar" + +#: builtin/describe.c:238 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "annotierte Markierung %s hat keinen eingebetteten Namen" + +#: builtin/describe.c:240 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "Markierung '%s' ist eigentlich '%s' hier" + +#: builtin/describe.c:267 +#, c-format +msgid "Not a valid object name %s" +msgstr "%s ist kein gültiger Objekt-Name" + +#: builtin/describe.c:270 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s ist kein gültiges '%s' Objekt" + +#: builtin/describe.c:287 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "kein Markierung entspricht exakt '%s'" + +#: builtin/describe.c:289 +#, c-format +msgid "searching to describe %s\n" +msgstr "suche zur Beschreibung von %s\n" + +#: builtin/describe.c:329 +#, c-format +msgid "finished search at %s\n" +msgstr "beendete Suche bei %s\n" + +#: builtin/describe.c:353 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"Keine annotierten Markierungen können '%s' beschreiben.\n" +"Jedoch gab es nicht annotierte Markierungen: versuche --tags." -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "Anzahl komprimierter Objekte" +#: builtin/describe.c:357 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"Keine Markierungen können '%s' beschreiben.\n" +"Versuche --always oder erstelle einige Markierungen." -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "Anzahl Komprimierungseinheiten" +#: builtin/describe.c:378 +#, c-format +msgid "traversed %lu commits\n" +msgstr "%lu Versionen durchlaufen\n" -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "Festplattenplatz von komprimierten Objekten" +#: builtin/describe.c:381 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" +"mehr als %i Markierungen gefunden; Führe die ersten %i auf\n" +"Suche bei %s aufgegeben\n" + +#: builtin/describe.c:436 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long ist inkompatibel mit --abbrev=0" + +#: builtin/describe.c:462 +msgid "No names found, cannot describe anything." +msgstr "Keine Namen gefunden, kann nichts beschreiben." + +#: builtin/describe.c:482 +msgid "--dirty is incompatible with committishes" +msgstr "--dirty ist inkompatibel mit Versionen" + +#: builtin/diff.c:79 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "'%s': keine reguläre Datei oder symbolischer Link" + +#: builtin/diff.c:224 +#, c-format +msgid "invalid option: %s" +msgstr "Ungültige Option: %s" + +#: builtin/diff.c:301 +msgid "Not a git repository" +msgstr "Kein Git-Projektarchiv" + +#: builtin/diff.c:344 +#, c-format +msgid "invalid object '%s' given." +msgstr "Objekt '%s' ist ungültig." + +#: builtin/diff.c:349 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "Mehr als %d Zweige angegeben: '%s'" + +#: builtin/diff.c:359 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "Mehr als zwei Blobs angegeben: '%s'" + +#: builtin/diff.c:367 +#, c-format +msgid "unhandled object '%s' given." +msgstr "unbehandeltes Objekt '%s' angegeben" + +#: builtin/fetch.c:200 +msgid "Couldn't find remote ref HEAD" +msgstr "Konnte externe Referenz der Zweigspitze (HEAD) nicht finden." + +#: builtin/fetch.c:253 +#, c-format +msgid "object %s not found" +msgstr "Objekt %s nicht gefunden" + +#: builtin/fetch.c:259 +msgid "[up to date]" +msgstr "[aktuell]" + +#: builtin/fetch.c:273 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "! %-*s %-*s -> %s (kann nicht im aktuellen Zweig anfordern)" + +#: builtin/fetch.c:274 builtin/fetch.c:360 +msgid "[rejected]" +msgstr "[zurückgewiesen]" + +#: builtin/fetch.c:285 +msgid "[tag update]" +msgstr "[Markierungsaktualisierung]" + +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +msgid " (unable to update local ref)" +msgstr " (kann lokale Referenz nicht aktualisieren)" + +#: builtin/fetch.c:305 +msgid "[new tag]" +msgstr "[neue Markierung]" + +#: builtin/fetch.c:308 +msgid "[new branch]" +msgstr "[neuer Zweig]" + +#: builtin/fetch.c:311 +msgid "[new ref]" +msgstr "[neue Referenz]" + +#: builtin/fetch.c:356 +msgid "unable to update local ref" +msgstr "kann lokale Referenz nicht aktualisieren" + +#: builtin/fetch.c:356 +msgid "forced update" +msgstr "Aktualisierung erzwungen" + +#: builtin/fetch.c:362 +msgid "(non-fast-forward)" +msgstr "(kein Vorspulen)" + +#: builtin/fetch.c:393 builtin/fetch.c:685 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "kann %s nicht öffnen: %s\n" + +#: builtin/fetch.c:402 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" + +#: builtin/fetch.c:488 +#, c-format +msgid "From %.*s\n" +msgstr "Von %.*s\n" + +#: builtin/fetch.c:499 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"Einige lokale Referenzen konnten nicht aktualisiert werden; versuche\n" +"'git remote prune %s' um jeden älteren, widersprüchlichen Zweig zu entfernen." + +#: builtin/fetch.c:549 +#, c-format +msgid " (%s will become dangling)" +msgstr " (%s wird unreferenziert)" + +#: builtin/fetch.c:550 +#, c-format +msgid " (%s has become dangling)" +msgstr " (%s wurde unreferenziert)" + +#: builtin/fetch.c:557 +msgid "[deleted]" +msgstr "[gelöscht]" + +#: builtin/fetch.c:558 builtin/remote.c:1055 +msgid "(none)" +msgstr "(nichts)" + +#: builtin/fetch.c:675 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" +"Das Anfordern in den aktuellen Zweig %s von einem nicht-bloßen Projektarchiv " +"wurde verweigert." + +#: builtin/fetch.c:709 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "Weiß nicht wie von %s angefordert wird." + +#: builtin/fetch.c:786 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s" + +#: builtin/fetch.c:789 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "Option \"%s\" wird ignoriert für %s\n" + +#: builtin/fetch.c:888 +#, c-format +msgid "Fetching %s\n" +msgstr "Fordere an von %s\n" + +#: builtin/fetch.c:890 builtin/remote.c:100 +#, c-format +msgid "Could not fetch %s" +msgstr "Konnte nicht von %s anfordern" + +#: builtin/fetch.c:907 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" +"Kein externes Projektarchiv angegeben. Bitte gebe entweder eine URL\n" +"oder den Namen des externen Archivs an, von welchem neue\n" +"Versionen angefordert werden sollen." -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "Komprimierte Objekte, die zum Aufräumen vorgesehen sind" +#: builtin/fetch.c:927 +msgid "You need to specify a tag name." +msgstr "Du musst den Namen der Markierung angeben." -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "Dateien im Mülleimer" +#: builtin/fetch.c:979 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all akzeptiert kein Projektarchiv als Argument" -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Objektdatenbank komprimieren" +#: builtin/fetch.c:981 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all macht keinen Sinn mit Referenzspezifikationen" -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Die Objektdatenbank durch »fsck-objects« überprüfen lassen" +#: builtin/fetch.c:992 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "Kein externes Archiv (einzeln oder Gruppe): %s" -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" +#: builtin/fetch.c:1000 +msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n" -"\n" -"Für eine optimale Performance wird empfohlen, die Datenbank des Projektarchivs zu komprimieren.\n" -"\n" -"Soll die Datenbank jetzt komprimiert werden?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Ungültiges Datum von Git: %s" - -#: lib/diff.tcl:64 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." +"Abholen einer Gruppe mit Angabe von Referenzspezifikationen macht keinen " +"Sinn." + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "Ungültiger %s: '%s'" + +#: builtin/gc.c:90 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "zu langes Objekt-Verzeichnis %.*s" + +#: builtin/gc.c:221 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" msgstr "" -"Keine Änderungen feststellbar.\n" -"\n" -"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei von " -"einem anderen Programm modifiziert, aber der Inhalt der Datei ist " -"unverändert.\n" -"\n" -"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen " -"Dateien zu prüfen." - -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Vergleich von »%s« laden..." +"Die Datenbank des Projektarchivs wird für eine optimale Performance " +"komprimiert.\n" -#: lib/diff.tcl:125 +#: builtin/gc.c:224 +#, c-format msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" +"Auto packing the repository for optimum performance. You may also\n" +"run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" -"LOKAL: gelöscht\n" -"ANDERES:\n" +"Die Datenbank des Projektarchivs wird für eine optimale Performance\n" +"komprimiert. Du kannst auch \"git gc\" manuell ausführen.\n" +"Siehe \"git help gc\" für weitere Informationen.\n" -#: lib/diff.tcl:130 +#: builtin/gc.c:251 msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" +"Es gibt zu viele unerreichbare lose Objekte; führe 'git prune' aus, um diese " +"zu entfernen." + +#: builtin/grep.c:216 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: Fehler beim Erzeugen eines Thread: %s" + +#: builtin/grep.c:454 +#, c-format +msgid "Failed to chdir: %s" +msgstr "Fehler beim Verzeichniswechsel: %s" + +#: builtin/grep.c:530 builtin/grep.c:564 +#, c-format +msgid "unable to read tree (%s)" +msgstr "konnte Zweig (%s) nicht lesen" + +#: builtin/grep.c:578 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" + +#: builtin/grep.c:636 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "Schalter '%c' erwartet einen numerischen Wert" + +#: builtin/grep.c:653 +#, c-format +msgid "cannot open '%s'" +msgstr "kann '%s' nicht öffnen" + +#: builtin/grep.c:917 +msgid "no pattern given." +msgstr "keine Muster angegeben" + +#: builtin/grep.c:931 +#, c-format +msgid "bad object %s" +msgstr "ungültiges Objekt %s" + +#: builtin/grep.c:972 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager arbeitet nur innerhalb des Arbeitsbaums" + +#: builtin/grep.c:995 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached oder --untracked kann nicht mit --no-index benutzt werden" + +#: builtin/grep.c:1000 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "--no-index oder --untracked kann nicht mit Versionen benutzt werden" + +#: builtin/grep.c:1003 +msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -"ANDERES: gelöscht\n" -"LOKAL:\n" +"--[no-]exlude-standard kann nicht mit beobachteten Inhalten benutzt werden" -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "LOKAL:\n" +#: builtin/grep.c:1011 +msgid "both --cached and trees are given." +msgstr "sowohl --cached als auch Zweige gegeben" -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "ANDERES:\n" +#: builtin/help.c:65 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "nicht erkanntes Hilfeformat: %s" -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" -msgstr "Datei »%s« kann nicht angezeigt werden" +#: builtin/help.c:93 +msgid "Failed to start emacsclient." +msgstr "Konnte emacsclient nicht starten." -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "Fehler beim Laden der Datei:" +#: builtin/help.c:106 +msgid "Failed to parse emacsclient version." +msgstr "Konnte Version des emacsclient nicht parsen." -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Git-Projektarchiv (Unterprojekt)" +#: builtin/help.c:114 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "Version des emacsclient '%d' ist zu alt (< 22)." -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* Binärdatei (Inhalt wird nicht angezeigt)" +#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "Fehler beim Ausführen von '%s': %s" -#: lib/diff.tcl:227 -#, tcl-format +#: builtin/help.c:217 +#, c-format msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." msgstr "" -"* Datei nicht unter Versionskontrolle, Dateigröße %d Bytes.\n" -"* Nur erste %d Bytes werden angezeigt.\n" +"'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n" +"Du könntest stattdessen 'man.<Werkzeug>.cmd' benutzen." -#: lib/diff.tcl:233 -#, tcl-format +#: builtin/help.c:229 +#, c-format msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." msgstr "" -"\n" -"* Datei nicht unter Versionskontrolle, hier abgeschnitten durch %s.\n" -"* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n" - -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." +"'%s': Kommando für unterstützten Handbuchbetrachter.\n" +"Du könntest stattdessen 'man.<Werkzeug>.path' benutzen." + +#: builtin/help.c:299 +msgid "The most commonly used git commands are:" +msgstr "Die allgemein verwendeten Git-Kommandos sind:" + +#: builtin/help.c:367 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "'%s': unbekannter Handbuch-Betrachter." + +#: builtin/help.c:384 +msgid "no man viewer handled the request" +msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen" + +#: builtin/help.c:392 +msgid "no info viewer handled the request" +msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen" + +#: builtin/help.c:447 builtin/help.c:454 +#, c-format +msgid "usage: %s%s" +msgstr "Verwendung: %s%s" + +#: builtin/help.c:470 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "für `git %s' wurde der Alias `%s' angelegt" + +#: builtin/index-pack.c:170 +#, c-format +msgid "object type mismatch at %s" +msgstr "Objekt-Typen passen bei %s nicht zusammen" + +#: builtin/index-pack.c:190 +msgid "object of unexpected type" +msgstr "Objekt hat unerwarteten Typ" + +#: builtin/index-pack.c:227 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "kann %d Byte nicht lesen" +msgstr[1] "kann %d Bytes nicht lesen" + +#: builtin/index-pack.c:237 +msgid "early EOF" +msgstr "zu frühes Dateiende" + +#: builtin/index-pack.c:238 +msgid "read error on input" +msgstr "Fehler beim Lesen der Eingabe" + +#: builtin/index-pack.c:250 +msgid "used more bytes than were available" +msgstr "verwendete mehr Bytes als verfügbar waren" + +#: builtin/index-pack.c:257 +msgid "pack too large for current definition of off_t" +msgstr "Paket ist zu groß für die aktuelle Definition von off_t" + +#: builtin/index-pack.c:273 +#, c-format +msgid "unable to create '%s'" +msgstr "konnte '%s' nicht erstellen" + +#: builtin/index-pack.c:278 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "Kann Paketdatei '%s' nicht öffnen" + +#: builtin/index-pack.c:292 +msgid "pack signature mismatch" +msgstr "Paketsignatur stimmt nicht überein" + +#: builtin/index-pack.c:312 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "Paket hat ein ungültiges Objekt bei Versatz %lu: %s" + +#: builtin/index-pack.c:434 +#, c-format +msgid "inflate returned %d" +msgstr "Dekomprimierung gab %d zurück" + +#: builtin/index-pack.c:483 +msgid "offset value overflow for delta base object" +msgstr "Wert für Versatz bei Differenzobjekt übergelaufen" + +#: builtin/index-pack.c:491 +msgid "delta base offset is out of bound" msgstr "" -"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung." - -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "Fehler beim Bereitstellen des gewählten Kontexts." +"Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs" + +#: builtin/index-pack.c:499 +#, c-format +msgid "unknown object type %d" +msgstr "Unbekannter Objekt-Typ %d" + +#: builtin/index-pack.c:530 +msgid "cannot pread pack file" +msgstr "Kann Paketdatei %s nicht lesen" + +#: 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] "frühzeitiges Ende der Paketdatei, vermisse %lu Byte" +msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %lu Bytes" + +#: builtin/index-pack.c:558 +msgid "serious inflate inconsistency" +msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" + +#: 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 "SHA1 KOLLISION MIT %s GEFUNDEN !" + +#: builtin/index-pack.c:652 builtin/pack-objects.c:170 +#: builtin/pack-objects.c:262 +#, c-format +msgid "unable to read %s" +msgstr "kann %s nicht lesen" + +#: builtin/index-pack.c:718 +#, c-format +msgid "cannot read existing object %s" +msgstr "Kann existierendes Objekt %s nicht lesen." + +#: builtin/index-pack.c:732 +#, c-format +msgid "invalid blob object %s" +msgstr "ungültiges Blob-Objekt %s" + +#: builtin/index-pack.c:747 +#, c-format +msgid "invalid %s" +msgstr "Ungültiger Objekt-Typ %s" + +#: builtin/index-pack.c:749 +msgid "Error in object" +msgstr "Fehler in Objekt" + +#: builtin/index-pack.c:751 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "Nicht alle Kind-Objekte von %s sind erreichbar" + +#: builtin/index-pack.c:821 builtin/index-pack.c:847 +msgid "failed to apply delta" +msgstr "Konnte Dateiunterschied nicht anwenden" + +#: builtin/index-pack.c:986 +msgid "Receiving objects" +msgstr "Empfange Objekte" + +#: builtin/index-pack.c:986 +msgid "Indexing objects" +msgstr "Indiziere Objekte" + +#: builtin/index-pack.c:1012 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "Paket ist beschädigt (SHA1 unterschiedlich)" + +#: builtin/index-pack.c:1017 +msgid "cannot fstat packfile" +msgstr "kann Paketdatei nicht lesen" + +#: builtin/index-pack.c:1020 +msgid "pack has junk at the end" +msgstr "Paketende enthält nicht verwendbaren Inhalt" + +#: builtin/index-pack.c:1031 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" + +#: builtin/index-pack.c:1054 +msgid "Resolving deltas" +msgstr "Löse Unterschiede auf" + +#: builtin/index-pack.c:1105 +msgid "confusion beyond insanity" +msgstr "Fehler beim Auflösen der Unterschiede" + +#: builtin/index-pack.c:1124 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "Paket hat %d unaufgelöste Unterschied" +msgstr[1] "Paket hat %d unaufgelöste Unterschiede" + +#: builtin/index-pack.c:1149 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" + +#: builtin/index-pack.c:1228 +#, c-format +msgid "local object %s is corrupt" +msgstr "lokales Objekt %s ist beschädigt" + +#: builtin/index-pack.c:1252 +msgid "error while closing pack file" +msgstr "Fehler beim Schließen der Paketdatei" + +#: builtin/index-pack.c:1265 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" + +#: builtin/index-pack.c:1273 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen" + +#: builtin/index-pack.c:1286 +msgid "cannot store pack file" +msgstr "Kann Paketdatei nicht speichern" + +#: builtin/index-pack.c:1297 +msgid "cannot store index file" +msgstr "Kann Indexdatei nicht speichern" + +#: builtin/index-pack.c:1398 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Kann existierende Paketdatei '%s' nicht öffnen" + +#: builtin/index-pack.c:1400 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen" + +#: builtin/index-pack.c:1447 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "kein Unterschied: %d Objekt" +msgstr[1] "kein Unterschied: %d Objekte" + +#: builtin/index-pack.c:1454 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt" +msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte" + +#: builtin/index-pack.c:1481 +msgid "Cannot come back to cwd" +msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln" + +#: builtin/index-pack.c:1525 builtin/index-pack.c:1528 +#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 +#, c-format +msgid "bad %s" +msgstr "%s ist ungültig" + +#: builtin/index-pack.c:1558 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin kann nicht ohne --stdin benutzt werden" + +#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" + +#: builtin/index-pack.c:1581 +msgid "--verify with no packfile name given" +msgstr "--verify ohne Name der Paketdatei angegeben" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Konnte Gruppenschreibrecht für %s nicht setzen." + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "zu langer Vorlagen-Name %s" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "Kann '%s' nicht lesen" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "kann Vorlage '%s' nicht lesen" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "kann Verzeichnis '%s' nicht öffnen" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "kann Verknüpfung '%s' nicht lesen" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "zu lange symbolische Verknüpfung %s" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "kann '%s' nicht mit '%s' symbolisch verknüpfen" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "kann '%s' nicht nach '%s' kopieren" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "ignoriere Vorlage %s" + +#: builtin/init-db.c:133 +#, c-format +msgid "insanely long template path %s" +msgstr "zu langer Vorlagen-Pfad %s" + +#: builtin/init-db.c:141 +#, c-format +msgid "templates not found %s" +msgstr "keine Vorlagen in '%s' gefunden" + +#: builtin/init-db.c:154 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "kopiere keine Vorlagen mit einer falschen Formatversion %d von '%s'" + +#: builtin/init-db.c:192 +#, c-format +msgid "insane git directory %s" +msgstr "ungültiges Git-Verzeichnis %s" + +#: builtin/init-db.c:323 builtin/init-db.c:326 +#, c-format +msgid "%s already exists" +msgstr "%s existiert bereits" + +#: builtin/init-db.c:355 +#, c-format +msgid "unable to handle file type %d" +msgstr "kann nicht mit Dateityp %d umgehen" + +#: builtin/init-db.c:358 +#, c-format +msgid "unable to move %s to %s" +msgstr "Konnte %s nicht nach %s verschieben" + +#: builtin/init-db.c:363 +#, c-format +msgid "Could not create git link %s" +msgstr "Konnte git-Verknüpfung %s nicht erstellen" + +#. +#. * 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 "%s%s Git-Projektarchiv in %s%s\n" + +#: builtin/init-db.c:421 +msgid "Reinitialized existing" +msgstr "Reinitialisierte existierendes" + +#: builtin/init-db.c:421 +msgid "Initialized empty" +msgstr "Initialisierte leeres" + +#: builtin/init-db.c:422 +msgid " shared" +msgstr " gemeinsames" + +#: builtin/init-db.c:441 +msgid "cannot tell cwd" +msgstr "kann aktuelles Arbeitsverzeichnis nicht ermitteln" + +#: builtin/init-db.c:522 builtin/init-db.c:529 +#, c-format +msgid "cannot mkdir %s" +msgstr "kann Verzeichnis %s nicht erstellen" + +#: builtin/init-db.c:533 +#, c-format +msgid "cannot chdir to %s" +msgstr "kann nicht in Verzeichnis %s wechseln" + +#: builtin/init-db.c:555 +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" +"%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s " +"(oder --git-dir=<Verzeichnis>)" + +#: builtin/init-db.c:579 +msgid "Cannot access current working directory" +msgstr "Kann nicht auf aktuelles Arbeitsverzeichnis zugreifen." + +#: builtin/init-db.c:586 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "Kann nicht auf Arbeitsbaum '%s' zugreifen." + +#: builtin/log.c:189 +#, c-format +msgid "Final output: %d %s\n" +msgstr "letzte Ausgabe: %d %s\n" + +#: builtin/log.c:403 builtin/log.c:494 +#, c-format +msgid "Could not read object %s" +msgstr "Kann Objekt %s nicht lesen." + +#: builtin/log.c:518 +#, c-format +msgid "Unknown type: %d" +msgstr "Unbekannter Typ: %d" + +#: builtin/log.c:608 +msgid "format.headers without value" +msgstr "format.headers ohne Wert" + +#: builtin/log.c:682 +msgid "name of output directory is too long" +msgstr "Name des Ausgabeverzeichnisses ist zu lang." + +#: builtin/log.c:693 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Kann Patch-Datei %s nicht öffnen" + +#: builtin/log.c:707 +msgid "Need exactly one range." +msgstr "Brauche genau einen Versionsbereich." + +#: builtin/log.c:715 +msgid "Not a range." +msgstr "Kein Versionsbereich." + +#: builtin/log.c:789 +msgid "Cover letter needs email format" +msgstr "Anschreiben benötigt E-Mail-Format" + +#: builtin/log.c:862 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "ungültiges in-reply-to: %s" + +#: builtin/log.c:935 +msgid "Two output directories?" +msgstr "Zwei Ausgabeverzeichnisse?" + +#: builtin/log.c:1157 +#, c-format +msgid "bogus committer info %s" +msgstr "unechte Einreicher-Informationen %s" + +#: builtin/log.c:1202 +msgid "-n and -k are mutually exclusive." +msgstr "-n und -k schließen sich gegenseitig aus" + +#: builtin/log.c:1204 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix und -k schließen sich gegenseitig aus" + +#: builtin/log.c:1212 +msgid "--name-only does not make sense" +msgstr "--name-only macht keinen Sinn" + +#: builtin/log.c:1214 +msgid "--name-status does not make sense" +msgstr "--name-status macht keinen Sinn" + +#: builtin/log.c:1216 +msgid "--check does not make sense" +msgstr "--check macht keinen Sinn" + +#: builtin/log.c:1239 +msgid "standard output, or directory, which one?" +msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" + +#: builtin/log.c:1241 +#, c-format +msgid "Could not create directory '%s'" +msgstr "Konnte Verzeichnis '%s' nicht erstellen." + +#: builtin/log.c:1394 +msgid "Failed to create output files" +msgstr "Fehler beim Erstellen der Ausgabedateien." + +#: builtin/log.c:1498 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" +"Konnte gefolgten, externen Zweig nicht finden, bitte gebe <upstream> manuell " +"an.\n" + +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#, c-format +msgid "Unknown commit %s" +msgstr "Unbekannte Version %s" + +#: builtin/merge.c:90 +msgid "switch `m' requires a value" +msgstr "Schalter 'm' erfordert einen Wert." + +#: builtin/merge.c:127 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Konnte Zusammenführungsstrategie '%s' nicht finden.\n" + +#: builtin/merge.c:128 +#, c-format +msgid "Available strategies are:" +msgstr "Verfügbare Strategien sind:" + +#: builtin/merge.c:133 +#, c-format +msgid "Available custom strategies are:" +msgstr "Verfügbare benutzerdefinierte Strategien sind:" + +#: builtin/merge.c:240 +msgid "could not run stash." +msgstr "Konnte \"stash\" nicht ausführen." + +#: builtin/merge.c:245 +msgid "stash failed" +msgstr "\"stash\" fehlgeschlagen" + +#: builtin/merge.c:250 +#, c-format +msgid "not a valid object: %s" +msgstr "kein gültiges Objekt: %s" + +#: builtin/merge.c:269 builtin/merge.c:286 +msgid "read-tree failed" +msgstr "read-tree fehlgeschlagen" + +#: builtin/merge.c:316 +msgid " (nothing to squash)" +msgstr " (nichts zu quetschen)" + +#: builtin/merge.c:329 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Quetsche Version -- Zweigspitze (HEAD) wird nicht aktualisiert\n" + +#: builtin/merge.c:361 +msgid "Writing SQUASH_MSG" +msgstr "Schreibe SQUASH_MSG" + +#: builtin/merge.c:363 +msgid "Finishing SQUASH_MSG" +msgstr "Schließe SQUASH_MSG ab" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" +"Keine Zusammenführungsbeschreibung -- Zweigspitze (HEAD) wird nicht " +"aktualisiert\n" + +#: builtin/merge.c:436 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "'%s' zeigt auf keine Version" + +#: builtin/merge.c:535 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Ungültiger branch.%s.mergeoptions String: %s" + +#: builtin/merge.c:628 +msgid "git write-tree failed to write a tree" +msgstr "\"git write-tree\" schlug beim Schreiben eines Baumes fehl" + +#: builtin/merge.c:678 +msgid "failed to read the cache" +msgstr "Lesen des Zwischenspeichers fehlgeschlagen" + +#: builtin/merge.c:709 +msgid "Not handling anything other than two heads merge." +msgstr "Es wird nur die Zusammenführung von zwei Zweigen behandelt." + +#: builtin/merge.c:723 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "Unbekannte Option für merge-recursive: -X%s" + +#: builtin/merge.c:737 +#, c-format +msgid "unable to write %s" +msgstr "konnte %s nicht schreiben" + +#: builtin/merge.c:876 +#, c-format +msgid "Could not read from '%s'" +msgstr "konnte nicht von '%s' lesen" + +#: builtin/merge.c:885 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" +"Zusammenführung wurde nicht eingetragen; benutze 'git commit' um die " +"Zusammenführung abzuschließen.\n" -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung." +#: builtin/merge.c:891 +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 '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" +"Bitte gebe eine Versionsbeschreibung ein um zu erklären, warum diese " +"Zusammenführung erforderlich ist,\n" +"insbesondere wenn es einen aktualisierten, externen Zweig mit einem Thema-" +"Zweig zusammenführt.\n" +"\n" +"Zeilen beginnend mit '#' werden ignoriert, und eine leere Beschreibung " +"bricht die Eintragung ab.\n" -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "Fehler beim Bereitstellen der gewählten Zeile." +#: builtin/merge.c:915 +msgid "Empty commit message." +msgstr "Leere Versionsbeschreibung" -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Voreinstellung" +#: builtin/merge.c:927 +#, c-format +msgid "Wonderful.\n" +msgstr "Wunderbar.\n" -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Systemweit (%s)" +#: builtin/merge.c:992 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" +"Automatische Zusammenführung fehlgeschlagen; behebe die Konflikte und trage " +"dann das Ergebnis ein.\n" -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Andere" +#: builtin/merge.c:1008 +#, c-format +msgid "'%s' is not a commit" +msgstr "'%s' ist keine Version" -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "Fehler" +#: builtin/merge.c:1049 +msgid "No current branch." +msgstr "Du befindest dich auf keinem Zweig." -#: lib/error.tcl:36 -msgid "warning" -msgstr "Warnung" +#: builtin/merge.c:1051 +msgid "No remote for the current branch." +msgstr "Kein externes Archiv für den aktuellen Zweig." -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." +#: builtin/merge.c:1053 +msgid "No default upstream defined for the current branch." msgstr "" -"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können." +"Es ist kein externes Standard-Projektarchiv für den aktuellen Zweig " +"definiert." + +#: builtin/merge.c:1058 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "Kein externer Übernahmezweig für %s von %s" -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Bereitstellung kann nicht wieder freigegeben werden." +#: builtin/merge.c:1145 builtin/merge.c:1302 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - nichts was wir zusammenführen können" -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Fehler in Bereitstellung" +#: builtin/merge.c:1213 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "Es gibt keine Zusammenführung zum Abbrechen (vermisse MERGE_HEAD)" -#: lib/index.tcl:17 +#: builtin/merge.c:1229 git-pull.sh:31 msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." msgstr "" -"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine " -"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu " -"synchronisieren." - -#: lib/index.tcl:28 -msgid "Continue" -msgstr "Fortsetzen" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Bereitstellung freigeben" +"Du hast deine Zusammenführung nicht abgeschlossen (MERGE_HEAD existiert).\n" +"Bitte trage deine Änderungen ein, bevor du zusammenführen kannst." -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Datei »%s« aus der Bereitstellung herausnehmen" +#: builtin/merge.c:1232 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" +"Du hast deine Zusammenführung nicht abgeschlossen (MERGE_HEAD existiert)." -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "Bereit zum Eintragen." +#: builtin/merge.c:1236 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Du hast \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" +"Bitte trage deine Änderungen ein, bevor du zusammenführen kannst." -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "»%s« hinzufügen..." +#: builtin/merge.c:1239 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" +"Du hast \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." + +#: builtin/merge.c:1248 +msgid "You cannot combine --squash with --no-ff." +msgstr "Du kannst --squash nicht mit --no-ff kombinieren." + +#: builtin/merge.c:1253 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "Du kannst --no-ff nicht mit --ff--only kombinieren." + +#: builtin/merge.c:1260 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "Keine Version angegeben und merge.defaultToUpstream ist nicht gesetzt." + +#: builtin/merge.c:1292 +msgid "Can merge only exactly one commit into empty head" +msgstr "Kann nur exakt eine Version in einem leeren Zweig zusammenführen." + +#: builtin/merge.c:1295 +msgid "Squash commit into empty head not supported yet" +msgstr "Bin auf einem Zweig, der noch geboren wird; kann nicht quetschen." + +#: builtin/merge.c:1297 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "nicht vorzuspulende Version macht in einem leeren Zweig keinen Sinn" + +#: builtin/merge.c:1412 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Aktualisiere %s..%s\n" + +#: builtin/merge.c:1450 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "Probiere wirklich triviale \"in-index\"-Zusammenführung...\n" + +#: builtin/merge.c:1457 +#, c-format +msgid "Nope.\n" +msgstr "Nein.\n" + +#: builtin/merge.c:1489 +msgid "Not possible to fast-forward, aborting." +msgstr "Vorspulen nicht möglich, breche ab." + +#: builtin/merge.c:1512 builtin/merge.c:1591 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "Rücklauf des Zweiges bis zum Ursprung...\n" + +#: builtin/merge.c:1516 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Probiere Zusammenführungsstrategie %s...\n" + +#: builtin/merge.c:1582 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Keine Zusammenführungsstrategie behandelt diese Zusammenführung.\n" + +#: builtin/merge.c:1584 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Zusammenführung mit Strategie %s fehlgeschlagen.\n" + +#: builtin/merge.c:1593 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "Benutze \"%s\" um die Auflösung per Hand vorzubereiten.\n" + +#: builtin/merge.c:1605 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" +"Automatische Zusammenführung abgeschlossen; halte, wie gewünscht, vor der " +"Eintragung an\n" + +#: builtin/mv.c:108 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "Prüfe Umbenennung von '%s' nach '%s'\n" + +#: builtin/mv.c:112 +msgid "bad source" +msgstr "ungültige Quelle" + +#: builtin/mv.c:115 +msgid "can not move directory into itself" +msgstr "kann Verzeichnis nicht in sich selbst verschieben" + +#: builtin/mv.c:118 +msgid "cannot move directory over file" +msgstr "kann Verzeichnis nicht über Datei verschieben" + +#: builtin/mv.c:128 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "Huh? %.*s ist in der Bereitstellung?" + +#: builtin/mv.c:140 +msgid "source directory is empty" +msgstr "Quellverzeichnis ist leer" + +#: builtin/mv.c:171 +msgid "not under version control" +msgstr "nicht unter Versionskontrolle" + +#: builtin/mv.c:173 +msgid "destination exists" +msgstr "Ziel existiert bereits" + +#: builtin/mv.c:181 +#, c-format +msgid "overwriting '%s'" +msgstr "überschreibe '%s'" + +#: builtin/mv.c:184 +msgid "Cannot overwrite" +msgstr "Kann nicht überschreiben" + +#: builtin/mv.c:187 +msgid "multiple sources for the same target" +msgstr "mehrere Quellen für das selbe Ziel" + +#: builtin/mv.c:202 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, Quelle=%s, Ziel=%s" + +#: builtin/mv.c:212 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Benenne %s nach %s um\n" + +#: builtin/mv.c:215 builtin/remote.c:731 +#, c-format +msgid "renaming '%s' failed" +msgstr "Umbenennung von '%s' fehlgeschlagen" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "konnte 'show' für Objekt '%s' nicht starten" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "konnte Datei-Deskriptor für Ausgabe von 'show' nicht öffnen" + +#: builtin/notes.c:155 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "Schließen der Verbindung zu 'show' ist für Objekt '%s' fehlgeschlagen." + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "konnte 'show' für Objekt '%s' nicht abschließen" + +#: builtin/notes.c:175 builtin/tag.c:347 +#, c-format +msgid "could not create file '%s'" +msgstr "konnte Datei '%s' nicht erstellen" + +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "Bitte liefere den Notiz-Inhalt unter Verwendung der Option -m oder -F." + +#: builtin/notes.c:210 builtin/notes.c:973 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Entferne Notiz für Objekt %s\n" + +#: builtin/notes.c:215 +msgid "unable to write note object" +msgstr "Konnte Notiz-Objekt nicht schreiben" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "Die Notiz-Inhalte wurden in %s belassen" + +#: builtin/notes.c:251 builtin/tag.c:542 +#, c-format +msgid "cannot read '%s'" +msgstr "kann '%s' nicht lesen" + +#: builtin/notes.c:253 builtin/tag.c:545 +#, c-format +msgid "could not open or read '%s'" +msgstr "konnte '%s' nicht öffnen oder lesen" + +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Konnte '%s' nicht als gültige Referenz auflösen." + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "Fehler beim Lesen des Objektes '%s'." + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "Kann uninitialisierten/unreferenzierten Notiz-Baum nicht eintragen." + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Ungültiger notes.rewriteMode Wert: '%s'" + +#: builtin/notes.c:350 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "" +"Neuschreiben der Notizen in %s zurückgewiesen (außerhalb von refs/notes/)" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:377 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Ungültiger %s Wert: '%s'" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Fehlerhafte Eingabezeile: '%s'." + +#: builtin/notes.c:456 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" + +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 +#: builtin/notes.c:1033 +msgid "too many parameters" +msgstr "zu viele Parameter" + +#: builtin/notes.c:513 builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "Kein Notiz für Objekt %s gefunden." + +#: builtin/notes.c:580 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s " +"gefunden. Verwende '-f' um die existierenden Notizen zu überschreiben." -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Änderungen in Datei »%s« verwerfen?" +#: builtin/notes.c:585 builtin/notes.c:662 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "Überschreibe existierende Notizen für Objekt %s\n" -#: lib/index.tcl:400 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Änderungen in den gewählten %i Dateien verwerfen?" +#: builtin/notes.c:635 +msgid "too few parameters" +msgstr "zu wenig Parameter" -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." +#: builtin/notes.c:656 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" msgstr "" -"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen." - -#: lib/index.tcl:411 -msgid "Do Nothing" -msgstr "Nichts tun" - -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "Änderungen in gewählten Dateien verwerfen" +"Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. " +"Verwende '-f' um die existierenden Notizen zu überschreiben." -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "Änderungen in %s verwerfen" +#: builtin/notes.c:668 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich." -#: lib/merge.tcl:13 +#: builtin/notes.c:717 +#, 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 "" +"Die Optionen -m/-F/-c/-C sind für das Unterkommando 'edit' veraltet.\n" +"Bitte benutze stattdessen 'git notes add -f -m/-F/-c/-C'.\n" + +#: builtin/notes.c:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "Objekt %s hat keine Notiz\n" + +#: builtin/notes.c:1103 builtin/remote.c:1598 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Unbekanntes Unterkommando: %s" + +#: builtin/pack-objects.c:183 builtin/pack-objects.c:186 +#, c-format +msgid "deflate error (%d)" +msgstr "Fehler beim Komprimieren (%d)" + +#: builtin/pack-objects.c:2398 +#, c-format +msgid "unsupported index version %s" +msgstr "Nicht unterstützte Bereitstellungsversion %s" + +#: builtin/pack-objects.c:2402 +#, c-format +msgid "bad index version '%s'" +msgstr "Ungültige Bereitstellungsversion '%s'" + +#: builtin/pack-objects.c:2425 +#, c-format +msgid "option %s does not accept negative form" +msgstr "Option %s akzeptiert keine negative Form" + +#: builtin/pack-objects.c:2429 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "konnte Wert '%s' für Option %s nicht parsen" + +#: builtin/push.c:45 +msgid "tag shorthand without <tag>" +msgstr "Kurzschrift für Markierung ohne <Markierung>" + +#: builtin/push.c:64 +msgid "--delete only accepts plain target ref names" +msgstr "--delete akzeptiert nur reine Referenz-Namen als Ziel" + +#: builtin/push.c:99 msgid "" -"Cannot merge while amending.\n" "\n" -"You must finish amending this commit before starting any type of merge.\n" +"To choose either option permanently, see push.default in 'git help config'." msgstr "" -"Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n" "\n" -"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie " -"zusammenführen können.\n" +"Um eine Variante permanent zu verwenden, siehe push.default in 'git help " +"config'." -#: lib/merge.tcl:27 +#: builtin/push.c:102 +#, c-format msgid "" -"Last scanned state does not match repository state.\n" +"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" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" +"To push to the branch of the same name on the remote, use\n" "\n" -"The rescan will be automatically started now.\n" +" git push %s %s\n" +"%s" msgstr "" -"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" +"Der Name des externen Übernahmezweiges stimmt nicht mit dem Namen deines\n" +"aktuellen Zweiges überein. Um auf den Übernahmezweig in dem externen\n" +"Projektarchiv zu versenden, benutze:\n" +"\n" +" git push %s HEAD:%s\n" "\n" -"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " -"geändert. Vor einem Zusammenführen muss neu geladen werden.\n" +"Um auf den Zweig mit dem selben Namen in dem externen Projekarchiv\n" +"zu versenden, benutze:\n" "\n" -"Es wird gleich neu geladen.\n" +" git push %s %s\n" +"%s" -#: lib/merge.tcl:45 -#, tcl-format +#: builtin/push.c:121 +#, c-format msgid "" -"You are in the middle of a conflicted merge.\n" +"You are not currently on a branch.\n" +"To push the history leading to the current (detached HEAD)\n" +"state now, use\n" "\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" +" git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -"Zusammenführung mit Konflikten.\n" +"Du befindest dich sich im Moment auf keinem Zweig.\n" +"Um die Historie, führend zum aktuellen (freistehende Zweigspitze (HEAD))\n" +"Status zu versenden, benutze\n" "\n" -"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese " -"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder " -"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst " -"danach kann eine neue Zusammenführung begonnen werden.\n" +" git push %s HEAD:<Name-des-externen-Zweiges>\n" -#: lib/merge.tcl:55 -#, tcl-format +#: builtin/push.c:128 +#, c-format msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" +"The current branch %s has no upstream branch.\n" +"To push the current branch and set the remote as upstream, use\n" "\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" +" git push --set-upstream %s %s\n" msgstr "" -"Es liegen Änderungen vor.\n" +"Der aktuelle Zweig %s hat keinen Zweig im externen Projektarchiv.\n" +"Um den aktuellen Zweig zu versenden und das Fernarchiv als externes\n" +"Projektarchiv zu verwenden, benutze\n" "\n" -"Die Datei »%s« wurde geändert. Sie sollten zuerst die bereitgestellte " -"Version abschließen, bevor Sie eine Zusammenführung beginnen. Mit dieser " -"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich " -"einfacher beheben oder abbrechen.\n" - -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s von %s" +" git push --set-upstream %s %s\n" -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Zusammenführen von %s und %s..." +#: builtin/push.c:136 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "Der aktuelle Zweig %s hat mehrere externe Zweige, Versand verweigert." -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "Zusammenführen erfolgreich abgeschlossen." - -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig." - -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "Zusammenführen in »%s«" - -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Zusammenzuführende Version" - -#: lib/merge.tcl:212 +#: builtin/push.c:139 +#, c-format msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" +"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 "" -"Abbruch der Nachbesserung ist nicht möglich.\n" -"\n" -"Sie müssen die Nachbesserung der Version abschließen.\n" +"Du versendest nach '%s', welches kein externes Projektarchiv deines\n" +"aktuellen Zweiges '%s' ist, ohne mir mitzuteilen, was ich versenden\n" +"soll, um welchen externen Zweig zu aktualisieren." -#: lib/merge.tcl:222 +#: builtin/push.c:151 msgid "" -"Abort merge?\n" +"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" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"To squelch this message and adopt the new behavior now, use:\n" "\n" -"Continue with aborting the current merge?" +" 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 "" -"Zusammenführen abbrechen?\n" +"'push.default' ist nicht gesetzt; der implizit gesetzte Wert\n" +"wird in Git 2.0 von 'matching' nach 'simple' geändert. Um diese Meldung zu\n" +"unterdrücken und das aktuelle Verhalten nach Änderung des Standardwertes\n" +"beizubehalten, benutze:" +"\n" +" git config --global push.default matching\n" +"\n" +"Um diese Meldung zu unterdrücken und das neue Verhalten jetzt zu übernehmen,\n" +"benutze:\n" "\n" -"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen " -"verloren.\n" +" git config --global push.default simple\n" "\n" -"Zusammenführen jetzt abbrechen?" +"Führe 'git help config' aus und suche nach 'push.default' für weitere " +"Informationen.\n" +"(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den ähnlichen" +" Modus 'current' anstatt 'simple', falls du gelegentlich ältere Versionen von" +" Git benutzt.)" + +#: builtin/push.c:199 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Du hast keine Referenzspezifikationen zum Versenden angegeben, und push." +"default ist \"nothing\"." -#: lib/merge.tcl:228 +#: builtin/push.c:206 msgid "" -"Reset changes?\n" +"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 "" +"Aktualisierungen wurden zurückgewiesen, weil die Spitze deines aktuellen\n" +"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Führe die\n" +"externen Änderungen zusammen (z.B. 'git pull') bevor du erneut versendest.\n" +"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" +"für weitere Details." + +#: 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 "" +"Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten\n" +"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Wenn du nicht\n" +"beabsichtigt hast, diesen Zweig zu versenden, kannst du auch den zu " +"versendenden\n" +"Zweig spezifizieren oder die Konfigurationsvariable 'push.default' zu " +"'simple', 'current'\n" +"oder 'upstream' setzen, um nur den aktuellen Zweig zu versenden." + +#: 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 "" +"Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten\n" +"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Checke diesen\n" +"Zweig aus und führe die externen Änderungen zusammen (z.B. 'git pull')\n" +"bevor du erneut versendest.\n" +"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" +"für weitere Details." + +#: builtin/push.c:258 +#, c-format +msgid "Pushing to %s\n" +msgstr "Versende nach %s\n" + +#: builtin/push.c:262 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" + +#: builtin/push.c:294 +#, c-format +msgid "bad repository '%s'" +msgstr "ungültiges Projektarchiv '%s'" + +#: builtin/push.c:295 +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" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"and then push using the remote name\n" "\n" -"Continue with resetting the current changes?" +" git push <name>\n" msgstr "" -"Änderungen zurücksetzen?\n" +"Kein Ziel zum Versenden konfiguriert.\n" +"Entweder spezifizierst du die URL von der Kommandozeile oder konfigurierst " +"ein externes Projektarchiv unter Benutzung von\n" +"\n" +" git remote add <Name> <URL>\n" "\n" -"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen " -"verloren.\n" +"und versendest dann unter Benutzung dieses Namens\n" "\n" -"Änderungen jetzt zurücksetzen?" +" git push <Name>\n" -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Abbruch" +#: builtin/push.c:310 +msgid "--all and --tags are incompatible" +msgstr "--all und --tags sind inkompatibel" -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "Dateien zurückgesetzt" +#: builtin/push.c:311 +msgid "--all can't be combined with refspecs" +msgstr "--all kann nicht mit Referenzspezifikationen kombiniert werden" -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "Abbruch fehlgeschlagen." +#: builtin/push.c:316 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror und --tags sind inkompatibel" -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Abbruch durchgeführt. Bereit." +#: builtin/push.c:317 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror kann nicht mit Referenzspezifikationen kombiniert werden" -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Konflikt durch Basisversion ersetzen?" +#: builtin/push.c:322 +msgid "--all and --mirror are incompatible" +msgstr "--all und --mirror sind inkompatibel" -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Konflikt durch diesen Zweig ersetzen?" +#: builtin/push.c:410 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete ist inkompatibel mit --all, --mirror und --tags" -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Konflikt durch anderen Zweig ersetzen?" +#: builtin/push.c:412 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete macht ohne irgendeine Referenz keinen Sinn" -#: lib/mergetool.tcl:14 -#, tcl-format +#: builtin/remote.c:98 +#, c-format +msgid "Updating %s" +msgstr "Aktualisiere %s" + +#: builtin/remote.c:130 msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" msgstr "" -"Hinweis: Der Vergleich zeigt nur konfliktverursachende Änderungen an.\n" -"\n" -"»%s« wird überschrieben.\n" -"\n" -"Diese Operation kann nur rückgängig gemacht werden, wenn die\n" -"Zusammenführung erneut gestartet wird." +"--mirror ist gefährlich und veraltet; bitte\n" +"\t benutze stattdessen --mirror=fetch oder --mirror=push" -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "Datei »%s« hat nicht aufgelöste Konflikte. Trotzdem bereitstellen?" +#: builtin/remote.c:147 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "unbekanntes Argument für Option --mirror: %s" -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Auflösung hinzugefügt für %s" +#: builtin/remote.c:185 +msgid "specifying a master branch makes no sense with --mirror" +msgstr "Angabe eines Hauptzweiges macht mit --mirror keinen Sinn" -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" +#: builtin/remote.c:187 +msgid "specifying branches to track makes sense only with fetch mirrors" +msgstr "" +"die Angabe von zu folgenden Zweigen macht nur mit dem Abholen von " +"Spiegelarchiven Sinn" + +#: builtin/remote.c:195 builtin/remote.c:646 +#, c-format +msgid "remote %s already exists." +msgstr "externes Projektarchiv %s existiert bereits" + +#: builtin/remote.c:199 builtin/remote.c:650 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' ist kein gültiger Name für ein externes Projektarchiv" + +#: builtin/remote.c:243 +#, c-format +msgid "Could not setup master '%s'" +msgstr "Konnte symbolische Referenz für Hauptzweig von '%s' nicht einrichten" + +#: builtin/remote.c:299 +#, c-format +msgid "more than one %s" +msgstr "mehr als ein %s" + +#: builtin/remote.c:339 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "Konnte Abholungszuordnung für Referenzspezifikation %s nicht bekommen" + +#: builtin/remote.c:440 builtin/remote.c:448 +msgid "(matching)" +msgstr "(übereinstimmend)" + +#: builtin/remote.c:452 +msgid "(delete)" +msgstr "(lösche)" + +#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "Konnte '%s' nicht an '%s' anhängen." + +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#, c-format +msgid "No such remote: %s" +msgstr "Kein solches externes Archiv: %s" + +#: builtin/remote.c:656 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen" + +#: builtin/remote.c:662 builtin/remote.c:799 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen" + +#: 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 "" +"Keine Aktualisierung der nicht standardmäßigen Referenzspezifikation zum " +"Abholen\n" +"\t%s\n" +"\tBitte aktualisiere, falls notwendig, die Konfiguration manuell." + +#: builtin/remote.c:683 +#, c-format +msgid "Could not append '%s'" +msgstr "Konnte '%s' nicht anhängen." + +#: builtin/remote.c:694 +#, c-format +msgid "Could not set '%s'" +msgstr "Konnte '%s' nicht setzen" + +#: builtin/remote.c:716 +#, c-format +msgid "deleting '%s' failed" +msgstr "Konnte '%s' nicht löschen" + +#: builtin/remote.c:750 +#, c-format +msgid "creating '%s' failed" +msgstr "Konnte '%s' nicht erstellen" + +#: builtin/remote.c:764 +#, c-format +msgid "Could not remove branch %s" +msgstr "Konnte Zweig %s nicht entfernen" + +#: 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] "" +"Hinweis: Ein Zweig außerhalb der /refs/remotes/ Hierachie wurde nicht " +"entfernt;\n" +"um diesen zu entfernen, benutze:" +msgstr[1] "" +"Hinweis: Einige Zweige außer der /refs/remotes/ Hierarchie wurden nicht " +"entfernt;\n" +"um diese zu entfernen, benutze:" + +#: builtin/remote.c:943 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " neu (wird bei nächster Abholung in remotes/%s gespeichert)" + +#: builtin/remote.c:946 +msgid " tracked" +msgstr " gefolgt" + +#: builtin/remote.c:948 +msgid " stale (use 'git remote prune' to remove)" +msgstr " veraltet (benutze 'git remote prune' zum Entfernen)" + +#: builtin/remote.c:950 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:991 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "ungültiges branch.%s.merge; kann nicht auf > 1 Zweig neu aufbauen" + +#: builtin/remote.c:998 +#, c-format +msgid "rebases onto remote %s" +msgstr "baut neu auf externen Zweig %s auf" + +#: builtin/remote.c:1001 +#, c-format +msgid " merges with remote %s" +msgstr " führt mit externem Zweig %s zusammen" + +#: builtin/remote.c:1002 +msgid " and with remote" +msgstr " und mit externem Zweig" + +#: builtin/remote.c:1004 +#, c-format +msgid "merges with remote %s" +msgstr "führt mit externem Zweig %s zusammen" + +#: builtin/remote.c:1005 +msgid " and with remote" +msgstr " und mit externem Zweig" + +#: builtin/remote.c:1051 +msgid "create" +msgstr "erstellt" + +#: builtin/remote.c:1054 +msgid "delete" +msgstr "gelöscht" + +#: builtin/remote.c:1058 +msgid "up to date" +msgstr "aktuell" + +#: builtin/remote.c:1061 +msgid "fast-forwardable" +msgstr "vorspulbar" + +#: builtin/remote.c:1064 +msgid "local out of date" +msgstr "lokal nicht aktuell" + +#: builtin/remote.c:1071 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s erzwingt Versandt nach %-*s (%s)" + +#: builtin/remote.c:1074 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s versendet nach %-*s (%s)" + +#: builtin/remote.c:1078 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s erzwingt Versand nach %s" + +#: builtin/remote.c:1081 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s versendet nach %s" + +#: builtin/remote.c:1118 +#, c-format +msgid "* remote %s" +msgstr "* externes Projektarchiv %s" + +#: builtin/remote.c:1119 +#, c-format +msgid " Fetch URL: %s" +msgstr " URL zum Abholen: %s" + +#: builtin/remote.c:1120 builtin/remote.c:1285 +msgid "(no URL)" +msgstr "(keine URL)" + +#: builtin/remote.c:1129 builtin/remote.c:1131 +#, c-format +msgid " Push URL: %s" +msgstr " URL zum Versenden: %s" + +#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#, c-format +msgid " HEAD branch: %s" +msgstr " Hauptzweig: %s" + +#: builtin/remote.c:1139 +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr "" +" Hauptzweig (externer Hauptzweig ist mehrdeutig, könnte einer der folgenden " +"sein):\n" + +#: builtin/remote.c:1151 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " externer Zweig:%s" +msgstr[1] " externe Zweige:%s" + +#: builtin/remote.c:1154 builtin/remote.c:1181 +msgid " (status not queried)" +msgstr " (Zustand nicht abgefragt)" + +#: builtin/remote.c:1163 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] " Lokaler Zweig konfiguriert für 'git pull':" +msgstr[1] " Lokale Zweige konfiguriert für 'git pull':" + +#: builtin/remote.c:1171 +msgid " Local refs will be mirrored by 'git push'" +msgstr " Lokale Referenzen werden von 'git push' gespiegelt" + +#: 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] " Lokale Referenz konfiguriert für 'git push'%s:" +msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:" + +#: builtin/remote.c:1216 +msgid "Cannot determine remote HEAD" +msgstr "Kann Hauptzweig des externen Projektarchivs nicht bestimmen" + +#: builtin/remote.c:1218 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "" +"Mehrere Hauptzweige im externen Projektarchiv. Bitte wähle explizit einen " +"aus mit:" + +#: builtin/remote.c:1228 +#, c-format +msgid "Could not delete %s" +msgstr "Konnte %s nicht entfernen" + +#: builtin/remote.c:1236 +#, c-format +msgid "Not a valid ref: %s" +msgstr "keine gültige Referenz: %s" + +#: builtin/remote.c:1238 +#, c-format +msgid "Could not setup %s" +msgstr "Konnte %s nicht einrichten" + +#: builtin/remote.c:1274 +#, c-format +msgid " %s will become dangling!" +msgstr " %s wird unreferenziert!" + +#: builtin/remote.c:1275 +#, c-format +msgid " %s has become dangling!" +msgstr " %s wurde unreferenziert!" + +#: builtin/remote.c:1281 +#, c-format +msgid "Pruning %s" +msgstr "entferne veraltete Zweige von %s" + +#: builtin/remote.c:1282 +#, c-format +msgid "URL: %s" +msgstr "URL: %s" + +#: builtin/remote.c:1295 +#, c-format +msgid " * [would prune] %s" +msgstr " * [würde veralteten Zweig entfernen] %s" + +#: builtin/remote.c:1298 +#, c-format +msgid " * [pruned] %s" +msgstr "* [veralteten Zweig entfernt] %s" + +#: builtin/remote.c:1387 builtin/remote.c:1461 +#, c-format +msgid "No such remote '%s'" +msgstr "Kein solches externes Projektarchiv '%s'" + +#: builtin/remote.c:1414 +msgid "no remote specified" +msgstr "kein externes Projektarchiv angegeben" + +#: builtin/remote.c:1447 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete macht keinen Sinn" + +#: builtin/remote.c:1487 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "ungültiges altes URL Format: %s" + +#: builtin/remote.c:1495 +#, c-format +msgid "No such URL found: %s" +msgstr "Keine solche URL gefunden: %s" + +#: builtin/remote.c:1497 +msgid "Will not delete all non-push URLs" +msgstr "Werde keine URLs entfernen, die nicht für den Versand bestimmt sind" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "mixed" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "soft" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "hard" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "zusammenführen" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "keep" + +#: builtin/reset.c:77 +msgid "You do not have a valid HEAD." +msgstr "Du hast keine gültige Zweigspitze (HEAD)." + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "Fehler beim Finden des Baumes der Zweigspitze (HEAD)." + +#: builtin/reset.c:85 +#, c-format +msgid "Failed to find tree of %s." +msgstr "Fehler beim Finden des Baumes von %s." + +#: builtin/reset.c:96 +msgid "Could not write new index file." +msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." + +#: builtin/reset.c:106 +#, c-format +msgid "HEAD is now at %s" +msgstr "Zweigspitze (HEAD) ist jetzt bei %s" + +#: builtin/reset.c:130 +msgid "Could not read index" +msgstr "Konnte Bereitstellung nicht lesen" + +#: builtin/reset.c:133 +msgid "Unstaged changes after reset:" +msgstr "Nicht bereitgestellte Änderungen nach Zurücksetzung:" + +#: builtin/reset.c:223 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -"Konflikte durch gelöschte Dateien oder symbolische Links können nicht durch " -"das Zusamenführungswerkzeug gelöst werden." +"Kann keine '%s' Zurücksetzung durchführen, während eine Zusammenführung im " +"Gange ist." -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Konflikt-Datei existiert nicht" +#: builtin/reset.c:303 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Konnte Objekt '%s' nicht parsen." -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Kein GUI Zusammenführungswerkzeug: »%s«" +#: builtin/reset.c:308 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}" -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«" +#: builtin/reset.c:317 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "" +"--mixed mit Pfaden ist veraltet; benutze stattdessen 'git reset -- <Pfade>'." + +#: builtin/reset.c:319 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "Eine '%s' Zurücksetzung mit Pfaden ist nicht möglich." + +#: builtin/reset.c:331 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "'%s' Zurücksetzung ist in einem bloßen Projektarchiv nicht erlaubt" + +#: builtin/reset.c:347 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "Konnte Bereitstellungsdatei nicht zu Version '%s' zurücksetzen." + +#: builtin/revert.c:70 builtin/revert.c:92 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s kann nicht mit %s benutzt werden" + +#: builtin/revert.c:131 +msgid "program error" +msgstr "Programmfehler" + +#: builtin/revert.c:221 +msgid "revert failed" +msgstr "\"revert\" fehlgeschlagen" + +#: builtin/revert.c:236 +msgid "cherry-pick failed" +msgstr "\"cherry-pick\" fehlgeschlagen" + +#: builtin/rm.c:109 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" +"'%s' hat bereitgestellten Inhalt unterschiedlich zu der Datei und der\n" +"Zweigspitze (HEAD) (benutze -f um die Entfernung zu erzwingen)" -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?" +#: builtin/rm.c:115 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"'%s' hat Änderungen in der Bereitstellung\n" +"(benutze --cached um die Datei zu behalten, oder -f um die Entfernung zu " +"erzwingen)" -#: lib/mergetool.tcl:323 -#, tcl-format +#: builtin/rm.c:119 +#, c-format msgid "" -"Error retrieving versions:\n" -"%s" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" msgstr "" -"Fehler beim Abrufen der Dateiversionen:\n" -"%s" +"'%s' hat lokale Modifikationen\n" +"(benutze --cached um die Datei zu behalten, oder -f um die Entfernung zu " +"erzwingen)" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "'%s' wird nicht ohne -r rekursiv entfernt" + +#: builtin/rm.c:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: konnte %s nicht entfernen" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "fehlender Autor: %s" + +#: builtin/tag.c:60 +#, c-format +msgid "malformed object at '%s'" +msgstr "fehlerhaftes Objekt bei '%s'" + +#: builtin/tag.c:207 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "Markierungsname zu lang: %.*s..." + +#: builtin/tag.c:212 +#, c-format +msgid "tag '%s' not found." +msgstr "Markierung '%s' nicht gefunden." + +#: builtin/tag.c:227 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Gelöschte Markierung '%s' (war %s)\n" + +#: builtin/tag.c:239 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "Konnte Markierung '%s' nicht verifizieren" + +#: builtin/tag.c:249 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# Gebe eine Markierungsbeschreibung ein\n" +"# Zeilen, die mit '#' beginnen, werden ignoriert.\n" +"#\n" -#: lib/mergetool.tcl:343 -#, tcl-format +#: builtin/tag.c:256 msgid "" -"Could not start the merge tool:\n" "\n" -"%s" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" +"#\n" msgstr "" -"Zusammenführungswerkzeug konnte nicht gestartet werden:\n" "\n" -"%s" +"#\n" +"# Gebe eine Markierungsbeschreibung ein\n" +"# Zeilen, die mit '#' beginnen, werden behalten; du darfst diese\n" +"# selbst entfernen wenn du möchtest.\n" +"#\n" + +#: builtin/tag.c:298 +msgid "unable to sign the tag" +msgstr "konnte Markierung nicht signieren" + +#: builtin/tag.c:300 +msgid "unable to write tag file" +msgstr "konnte Markierungsdatei nicht schreiben" + +#: builtin/tag.c:325 +msgid "bad object type." +msgstr "ungültiger Objekt-Typ" + +#: builtin/tag.c:338 +msgid "tag header too big." +msgstr "Markierungskopf zu groß." + +#: builtin/tag.c:370 +msgid "no tag message?" +msgstr "keine Markierungsbeschreibung?" + +#: builtin/tag.c:376 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "Die Markierungsbeschreibung wurde gelassen in %s\n" + +#: builtin/tag.c:425 +msgid "switch 'points-at' requires an object" +msgstr "Option 'points-at' erfordert ein Objekt" + +#: builtin/tag.c:427 +#, c-format +msgid "malformed object name '%s'" +msgstr "fehlerhafter Objekt-Name '%s'" + +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "--column und -n sind inkompatibel" + +#: builtin/tag.c:523 +msgid "-n option is only allowed with -l." +msgstr "-n Option ist nur erlaubt mit -l." + +#: builtin/tag.c:525 +msgid "--contains option is only allowed with -l." +msgstr "--contains Option ist nur erlaubt mit -l." + +#: builtin/tag.c:527 +msgid "--points-at option is only allowed with -l." +msgstr "--points-at Option ist nur erlaubt mit -l." + +#: builtin/tag.c:535 +msgid "only one -F or -m option is allowed." +msgstr "nur eine -F oder -m Option ist erlaubt." + +#: builtin/tag.c:555 +msgid "too many params" +msgstr "zu viele Parameter" + +#: builtin/tag.c:561 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "'%s' ist kein gültiger Markierungsname." + +#: builtin/tag.c:566 +#, c-format +msgid "tag '%s' already exists" +msgstr "Markierung '%s' existiert bereits" + +#: builtin/tag.c:584 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s: kann Referenz nicht sperren" + +#: builtin/tag.c:586 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s: kann Referenz nicht aktualisieren" + +#: builtin/tag.c:588 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Aktualisierte Markierung '%s' (war %s)\n" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "" +"Siehe 'git help <Kommando>' für weitere Informationen zu einem spezifischen " +"Kommando" -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "Zusammenführungswerkzeug starten..." +#: parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "Anzahl" -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "Zusammenführungswerkzeug fehlgeschlagen." +#: parse-options.h:141 +msgid "time" +msgstr "Zeit" -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Ungültige globale Zeichenkodierung »%s«" +#: parse-options.h:149 +msgid "file" +msgstr "Datei" -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Ungültige Archiv-Zeichenkodierung »%s«" +#: parse-options.h:151 +msgid "when" +msgstr "wann" -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Voreinstellungen wiederherstellen" +#: parse-options.h:156 +msgid "no-op (backward compatibility)" +msgstr "Kein Effekt (Rückwärtskompatibilität)" -#: lib/option.tcl:121 -msgid "Save" -msgstr "Speichern" +#: parse-options.h:228 +msgid "be more verbose" +msgstr "erweiterte Ausgaben" -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "Projektarchiv %s" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Global (Alle Projektarchive)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Benutzername" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "E-Mail-Adresse" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Zusammenführungs-Versionen zusammenfassen" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Ausführlichkeit der Zusammenführen-Meldungen" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Vergleichsstatistik nach Zusammenführen anzeigen" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Zusammenführungswerkzeug" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "Auf Dateiänderungsdatum verlassen" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "Übernahmezweige aufräumen während Anforderung" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "Passend zu Übernahmezweig" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "Kopie-Annotieren nur bei geänderten Dateien" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "Mindestzahl Zeichen für Kopie-Annotieren" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Anzahl Tage für Historien-Kontext" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Anzahl der Kontextzeilen beim Vergleich" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Textbreite der Versionsbeschreibung" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Namensvorschlag für neue Zweige" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Voreingestellte Zeichenkodierung" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Ändern" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Wörterbuch Rechtschreibprüfung:" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Schriftart ändern" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "%s wählen" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Einstellungen" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "Optionen konnten nicht gespeichert werden:" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Externes Archiv hinzufügen" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Neues externes Archiv hinzufügen" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Hinzufügen" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Einzelheiten des externen Archivs" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Adresse:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Weitere Aktion jetzt" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Gleich anfordern" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Externes Archiv initialisieren und dahin versenden" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Nichts tun" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Bitte geben Sie einen Namen des externen Archivs an." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "»%s« ist kein zulässiger Name eines externen Archivs." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Fehler beim Hinzufügen des externen Archivs »%s« aus Herkunftsort »%s«." - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "»%s« anfordern" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "»%s« anfordern" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Initialisieren eines externen Archivs an Adresse »%s« ist nicht möglich." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "»%s« versenden..." - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Einrichten von »%s« an »%s«" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Zweig in externem Archiv löschen" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "In Projektarchiv" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "Externes Archiv:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "Adresse:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "Zweige" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Nur löschen, wenn" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Zusammengeführt mit:" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" +#: parse-options.h:230 +msgid "be more quiet" +msgstr "weniger Ausgaben" + +#: parse-options.h:236 +msgid "use <n> digits to display SHA-1s" +msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" + +#: common-cmds.h:8 +msgid "Add file contents to the index" +msgstr "stellt Dateiinhalte zur Eintragung bereit" + +#: common-cmds.h:9 +msgid "Find by binary search the change that introduced a bug" msgstr "" -"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\n" -"\n" -" - %s" +"Findet über eine Binärsuche die Änderungen, die einen Fehler verursacht haben" -#: lib/remote_branch_delete.tcl:189 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." +#: common-cmds.h:10 +msgid "List, create, or delete branches" +msgstr "Zeigt an, erstellt oder entfernt Zweige" + +#: common-cmds.h:11 +msgid "Checkout a branch or paths to the working tree" +msgstr "Checkt Zweige oder Pfade im Arbeitszweig aus" + +#: common-cmds.h:12 +msgid "Clone a repository into a new directory" +msgstr "Klont ein Projektarchiv in einem neuen Verzeichnis" + +#: common-cmds.h:13 +msgid "Record changes to the repository" +msgstr "Trägt Änderungen in das Projektarchiv ein" + +#: common-cmds.h:14 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "Zeigt Änderungen zwischen Versionen, Version und Arbeitszweig, etc. an" + +#: common-cmds.h:15 +msgid "Download objects and refs from another repository" +msgstr "Lädt Objekte und Referenzen von einem anderen Projektarchiv herunter" + +#: common-cmds.h:16 +msgid "Print lines matching a pattern" +msgstr "Stellt Zeilen dar, die einem Muster entsprechen" + +#: common-cmds.h:17 +msgid "Create an empty git repository or reinitialize an existing one" msgstr "" -"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die " -"notwendigen Versionen vorher angefordert haben. Sie sollten versuchen, " -"zuerst von »%s« anzufordern." +"Erstellt ein leeres Git-Projektarchiv oder initialisiert ein bestehendes neu" -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Bitte wählen Sie mindestens einen Zweig, der gelöscht werden soll." +#: common-cmds.h:18 +msgid "Show commit logs" +msgstr "Zeigt Versionshistorie an" -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Zweige auf »%s« werden gelöscht" +#: common-cmds.h:19 +msgid "Join two or more development histories together" +msgstr "Führt zwei oder mehr Entwicklungszweige zusammen" -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "Kein Projektarchiv ausgewählt." +#: common-cmds.h:20 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "" +"Verschiebt oder benennt eine Datei, ein Verzeichnis, oder eine symbolische " +"Verknüpfung um" -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "»%s« laden..." +#: common-cmds.h:21 +msgid "Fetch from and merge with another repository or a local branch" +msgstr "" +"Fordert Objekte von einem externen Projektarchiv an und führt sie mit einem " +"anderen Projektarchiv oder einem lokalen Zweig zusammen" -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Externes Archiv entfernen" +#: common-cmds.h:22 +msgid "Update remote refs along with associated objects" +msgstr "Aktualisiert externe Referenzen mitsamt den verbundenen Objekten" -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Aufräumen von" +#: common-cmds.h:23 +msgid "Forward-port local commits to the updated upstream head" +msgstr "Baut lokale Versionen auf einem aktuellerem externen Zweig neu auf" -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Anfordern von" +#: common-cmds.h:24 +msgid "Reset current HEAD to the specified state" +msgstr "" +"Setzt die aktuelle Zweigspitze (HEAD) zu einem spezifizierten Zustand zurück" -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Versenden nach" +#: common-cmds.h:25 +msgid "Remove files from the working tree and from the index" +msgstr "Löscht Dateien im Arbeitszweig und von der Bereitstellung" -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Suchen:" +#: common-cmds.h:26 +msgid "Show various types of objects" +msgstr "Zeigt verschiedene Arten von Objekten an" -#: lib/search.tcl:23 -msgid "Next" -msgstr "Nächster" +#: common-cmds.h:27 +msgid "Show the working tree status" +msgstr "Zeigt den Zustand des Arbeitszweiges an" -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Voriger" +#: common-cmds.h:28 +msgid "Create, list, delete or verify a tag object signed with GPG" +msgstr "" +"Erzeugt, listet auf, löscht oder verifiziert ein mit GPG signiertes " +"Markierungsobjekt" -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Groß-/Kleinschreibung unterscheiden" +#: git-am.sh:50 +msgid "You need to set your committer info first" +msgstr "Du musst zuerst die Informationen des Eintragenden setzen." -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Fehler beim Schreiben der Verknüpfung:" +#: git-am.sh:95 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" +"Du scheinst seit dem letzten gescheiterten 'am' die Zweigspitze (HEAD)\n" +"geändert zu haben.\n" +"Keine Zurücksetzung zu ORIG_HEAD." -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Fehler beim Erstellen des Icons:" +#: 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 "" +"Wenn du das Problem gelöst hast, führe \"$cmdline --resolved\" aus.\n" +"Falls du diesen Patch auslassen möchtest, führe stattdessen \"$cmdline --skip" +"\" aus.\n" +"Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der " +"Patches\n" +"abzubrechen, führe \"$cmdline --abort\" aus." + +#: git-am.sh:121 +msgid "Cannot fall back to three-way merge." +msgstr "Kann nicht zu 3-Wege-Zusammenführung zurückfallen." + +#: git-am.sh:137 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" +"Dem Projektarchiv fehlen notwendige Blobs um auf eine 3-Wege-Zusammenführung " +"zurückzufallen." -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Rechtschreibprüfungsprogramm nicht unterstützt" +#: git-am.sh:139 +msgid "Using index info to reconstruct a base tree..." +msgstr "" +"Verwende Informationen aus der Bereitstellung um einen Basisbaum " +"nachzustellen" -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Rechtschreibprüfung nicht verfügbar" +#: git-am.sh:154 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"Hast du den Patch per Hand editiert?\n" +"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden." -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung" +#: git-am.sh:163 +msgid "Falling back to patching base and 3-way merge..." +msgstr "Falle zurück zum Patchen der Basis und der 3-Wege-Zusammenführung..." -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Wörterbuch auf %s zurückgesetzt." +#: git-am.sh:179 +msgid "Failed to merge in the changes." +msgstr "Zusammenführung der Änderungen fehlgeschlagen" -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen" +#: git-am.sh:274 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden." -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Unbekanntes Rechtschreibprüfungsprogramm" +#: git-am.sh:361 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "Patch-Format $patch_format wird nicht unterstützt." -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Keine Vorschläge" +#: git-am.sh:363 +msgid "Patch format detection failed." +msgstr "Patch-Formaterkennung fehlgeschlagen." -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm" +#: 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 "" +"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n" +"entfernt. Bitte nicht mehr verwenden." + +#: git-am.sh:477 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" +"Vorheriges Verzeichnis des Neuaufbaus $dotest existiert noch, aber mbox " +"gegeben." + +#: git-am.sh:482 +msgid "Please make up your mind. --skip or --abort?" +msgstr "Bitte werde dir klar. --skip oder --abort?" + +#: git-am.sh:509 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt." + +#: git-am.sh:575 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" +"Unsaubere Bereitstellung: kann Patches nicht anwenden (unsauber: $files)" -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Rechtschreibprüfung fehlgeschlagen" +#: 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 "" +"Patch ist leer. Wurde er falsch aufgeteilt?\n" +"Wenn du diesen Patch auslassen möchtest, führe stattdessen \"$cmdline --skip" +"\" aus.\n" +"Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der " +"Patches\n" +"abzubrechen, führe \"$cmdline --abort\" aus." + +#: git-am.sh:706 +msgid "Patch does not have a valid e-mail address." +msgstr "Patch enthält keine gültige eMail-Adresse." + +#: git-am.sh:753 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" +"Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem " +"Terminal verbunden ist." + +#: git-am.sh:757 +msgid "Commit Body is:" +msgstr "Beschreibung der Eintragung ist:" + +#. 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 "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " + +#: git-am.sh:800 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "Wende an: $FIRSTLINE" + +#: 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 "" +"Keine Änderungen - hast du vergessen 'git add' zu benutzen?\n" +"Wenn keine Änderungen mehr zum Bereitstellen vorhanden sind, könnten\n" +"diese bereits anderweitig eingefügt worden sein; du könntest diesen Patch\n" +"auslassen." -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Keine Schlüssel gefunden." +#: git-am.sh:829 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" +"Du hast immer noch nicht zusammengeführte Pfade in der Bereitstellung.\n" +"Hast du vergessen 'git add' zu benutzen?" + +#: git-am.sh:845 +msgid "No changes -- Patch already applied." +msgstr "Keine Änderungen -- Patches bereits angewendet." + +#: git-am.sh:855 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "Anwendung des Patches fehlgeschlagen bei $msgnum $FIRSTLINE" + +#: git-am.sh:876 +msgid "applying to an empty history" +msgstr "wende zu leerer Historie an" + +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "Du musst mit \"git bisect start\" beginnen." + +#. 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 "Willst du, dass ich es für dich mache [Y/n]? " + +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "nicht erkannte Option: '$arg'" + +#: git-bisect.sh:99 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "'$arg' scheint keine gültige Version zu sein" + +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" +msgstr "Ungültige Zweigspitze (HEAD) - Zweigspitze (HEAD) wird benötigt" + +#: git-bisect.sh:130 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +msgstr "" +"Auschecken von '$start_head' fehlgeschlagen. Versuche 'git bisect reset " +"<gueltigerzweig>'." + +#: git-bisect.sh:140 +msgid "won't bisect on seeked tree" +msgstr "\"bisect\" auf gesuchtem Zweig nicht möglich" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "Ungültige Zweigspitze (HEAD) - merkwürdige symbolische Referenz" + +#: git-bisect.sh:189 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "Ungültiges \"bisect_write\" Argument: $state" + +#: git-bisect.sh:218 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "Ungültige Referenz-Eingabe: $arg" + +#: git-bisect.sh:232 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "Bitte rufe 'bisect_state' mit mindestens einem Argument auf." + +#: git-bisect.sh:244 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "Ungültige Referenz-Eingabe: $rev" + +#: git-bisect.sh:250 +msgid "'git bisect bad' can take only one argument." +msgstr "'git bisect bad' kann nur ein Argument entgegennehmen." + +#. 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 "Warnung: halbiere nur mit einer fehlerhaften Version" + +#. 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 "Bist du sicher [Y/n]? " + +#: 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 "" +"Du musst mindestens eine korrekte und eine fehlerhafte Version angeben.\n" +"(Du kannst dafür \"git bisect bad\" und \"git bisect good\" benutzen.)" -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Öffentlicher Schlüssel gefunden in: %s" +#: 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 "" +"Du musst mit \"git bisect start\" beginnen.\n" +"Danach musst du mindestens eine korrekte und eine fehlerhafte Version " +"angeben.\n" +"(Du kannst dafür \"git bisect bad\" und \"git bisect good\" benutzen.)" + +#: git-bisect.sh:347 git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "Wir sind nicht beim Halbieren." + +#: git-bisect.sh:354 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "'$invalid' ist keine gültige Version" + +#: git-bisect.sh:363 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." +msgstr "" +"Konnte die ursprüngliche Zweigspitze (HEAD) '$branch' nicht auschecken.\n" +"Versuche 'git bisect reset <Version>'." -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Schlüssel erzeugen" +#: git-bisect.sh:390 +msgid "No logfile given" +msgstr "Keine Log-Datei gegeben" -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "In Zwischenablage kopieren" +#: git-bisect.sh:391 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "kann $file nicht für das Abspielen lesen" -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "Ihr OpenSSH öffenlicher Schlüssel" +#: git-bisect.sh:408 +msgid "?? what are you talking about?" +msgstr "?? Was redest du da?" -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Erzeugen..." +#: git-bisect.sh:420 +#, sh-format +msgid "running $command" +msgstr "führe $command aus" -#: lib/sshkey.tcl:84 -#, tcl-format +#: git-bisect.sh:427 +#, sh-format msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" msgstr "" -"Konnte »ssh-keygen« nicht starten:\n" -"\n" -"%s" +"Ausführung der Halbierung fehlgeschlagen:\n" +"Rückkehrwert $res von '$command' ist < 0 oder >= 128" -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "Schlüsselerzeugung fehlgeschlagen." +#: git-bisect.sh:453 +msgid "bisect run cannot continue any more" +msgstr "Ausführung der Halbierung kann nicht mehr fortgesetzt werden" -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden." +#: git-bisect.sh:459 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" +"Ausführung der Halbierung fehlgeschlagen:\n" +"'bisect_state $state' wurde mit Fehlerwert $res beendet" -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Ihr Schlüssel ist abgelegt in: %s" +#: git-bisect.sh:466 +msgid "bisect run success" +msgstr "Halbierung erfolgreich ausgeführt" -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i von %*i %s (%3i%%)" +#: 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 "" +"\"pull\" ist nicht möglich, weil du nicht zusammengeführte Dateien hast.\n" +"Bitte korrigiere dies im Arbeitsbaum und benutze dann 'git add/rm <Datei>'\n" +"um die Auflösung entsprechend zu markieren, oder benutze 'git commit -a'." -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Werkzeug hinzufügen" +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "" +"\"pull\" ist nicht möglich, weil du nicht zusammengeführte Dateien hast." -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Neues Kommando für Werkzeug hinzufügen" +#: git-pull.sh:197 +msgid "updating an unborn branch with changes added to the index" +msgstr "" +"Aktualisiere eine ungeborenen Zweig mit Änderungen, die zur Bereitstellung " +"hinzugefügt wurden" + +#. 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:228 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" +"Warnung: Die Anforderung aktualisierte die Spitze des aktuellen Zweiges.\n" +"Warnung: Spule deinen Arbeitszweig von Version $orig_head vor." -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Global hinzufügen" +#: git-pull.sh:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "Kann nicht mehrere Zweige in einen ungeborenen Zweig zusammenführen" -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Einzelheiten des Werkzeugs" +#: git-pull.sh:257 +msgid "Cannot rebase onto multiple branches" +msgstr "kann nicht auf mehrere Zweige neu aufbauen" -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:" +#: git-rebase.sh:52 +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 "" +"Wenn du das Problem aufgelöst hast, führe \"git rebase --continue\" aus.\n" +"Falls du diesen Patch auslassen möchtest, führe stattdessen \"git rebase --" +"skip\" aus.\n" +"Um den ursprünglichen Zweig wiederherzustellen und den Neuaufbau " +"abzubrechen,\n" +"führe \"git rebase --abort\" aus." + +#: git-rebase.sh:159 +msgid "The pre-rebase hook refused to rebase." +msgstr "Der \"pre-rebase hook\" hat den Neuaufbau zurückgewiesen." + +#: git-rebase.sh:164 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "\"git-am\" scheint im Gange zu sein. Kann nicht neu aufbauen." + +#: git-rebase.sh:295 +msgid "The --exec option must be used with the --interactive option" +msgstr "Die --exec Option muss mit der --interactive Option benutzt werden" + +#: git-rebase.sh:300 +msgid "No rebase in progress?" +msgstr "Kein Neuaufbau im Gange?" + +#: git-rebase.sh:313 +msgid "Cannot read HEAD" +msgstr "Kann Zweigspitze (HEAD) nicht lesen" + +#: git-rebase.sh:316 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"Du musst alle Zusammenführungskonflikte editieren und diese dann\n" +"mittels \"git add\" als aufgelöst markieren" -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Kommando:" +#: git-rebase.sh:334 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Konnte nicht zu $head_name zurückgehen" -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Bestätigungsfrage vor Starten anzeigen" +#: git-rebase.sh:350 +#, 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 "" +"Es sieht so aus, als ob es das Verzeichnis $state_dir_base bereits gibt\n" +"und es könnte ein anderer Neuaufbau im Gange sein. Wenn das der Fall ist,\n" +"probiere bitte\n" +"\t$cmd_live_rebase\n" +"Wenn das nicht der Fall ist, probiere bitte\n" +"\t$cmd_clear_stale_rebase\n" +"und führe dieses Kommando nochmal aus. Es wird angehalten, falls noch\n" +"etwas Schützenswertes vorhanden ist." + +#: git-rebase.sh:395 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "ungültiger Übernahmezweig $upstream_name" + +#: git-rebase.sh:419 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "$onto_name: es gibt mehr als eine Zusammenführungsbasis" + +#: git-rebase.sh:422 git-rebase.sh:426 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: es gibt keine Zusammenführungsbasis" + +#: git-rebase.sh:431 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "$onto_name zeigt auf keine gültige Version" + +#: git-rebase.sh:454 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "fatal: Zweig $branch_name nicht gefunden" + +#: git-rebase.sh:474 +msgid "Please commit or stash them." +msgstr "Bitte trage die Änderungen ein oder benutze \"stash\"." + +#: git-rebase.sh:492 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "Aktueller Zweig $branch_name ist auf dem neusten Stand." + +#: git-rebase.sh:495 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "" +"Aktueller Zweig $branch_name ist auf dem neusten Stand, Neuaufbau erzwungen." -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Benutzer nach Version fragen (setzt $REVISION)" +#: git-rebase.sh:506 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "Änderungen von $mb zu $onto:" -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)" +#. Detach HEAD and reset the tree +#: git-rebase.sh:515 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "" +"Zunächst wird die Zweigspitze zurückgespult, um deine Änderungen\n" +"darauf neu anzuwenden..." + +#: git-rebase.sh:523 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "$branch_name zu $onto_name vorgespult." + +#: git-stash.sh:51 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash clear mit Parametern ist nicht implementiert" + +#: git-stash.sh:74 +msgid "You do not have the initial commit yet" +msgstr "Du hast bisher noch keine initiale Version" + +#: git-stash.sh:89 +msgid "Cannot save the current index state" +msgstr "Kann den aktuellen Zustand der Bereitstellung nicht speichern" + +#: git-stash.sh:123 git-stash.sh:136 +msgid "Cannot save the current worktree state" +msgstr "Kann den aktuellen Zustand des Arbeitsbaumes nicht speichern" + +#: git-stash.sh:140 +msgid "No changes selected" +msgstr "Keine Änderungen ausgewählt" + +#: git-stash.sh:143 +msgid "Cannot remove temporary index (can't happen)" +msgstr "Kann temporäre Bereitstellung nicht entfernen (kann nicht passieren)" + +#: git-stash.sh:156 +msgid "Cannot record working tree state" +msgstr "Kann Zustand des Arbeitsbaumes nicht aufzeichnen" + +#. 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 "" +"Fehler: unbekannte Option für 'stash save': $option\n" +" Um eine Beschreibung anzugeben, benutze \"git stash save -- " +"'$option'\"" + +#: git-stash.sh:223 +msgid "No local changes to save" +msgstr "Keine lokalen Änderungen zum Speichern" + +#: git-stash.sh:227 +msgid "Cannot initialize stash" +msgstr "Kann \"stash\" nicht initialisieren" + +#: git-stash.sh:235 +msgid "Cannot save the current status" +msgstr "Kann den aktuellen Status nicht speichern" + +#: git-stash.sh:253 +msgid "Cannot remove worktree changes" +msgstr "Kann Änderungen am Arbeitsbaum nicht entfernen" + +#: git-stash.sh:352 +msgid "No stash found." +msgstr "Kein \"stash\" gefunden." + +#: git-stash.sh:359 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "Zu viele Revisionen angegeben: $REV" + +#: git-stash.sh:365 +#, sh-format +msgid "$reference is not valid reference" +msgstr "$reference ist keine gültige Referenz" + +#: git-stash.sh:393 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "'$args' ist keine \"stash\"-artige Version" + +#: git-stash.sh:404 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "'$args' ist keine \"stash\"-Referenz" + +#: git-stash.sh:412 +msgid "unable to refresh index" +msgstr "unfähig die Bereitstellung zu aktualisieren" + +#: git-stash.sh:416 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "" +"Kann \"stash\" nicht anwenden, solang eine Zusammenführung im Gange ist" + +#: git-stash.sh:424 +msgid "Conflicts in index. Try without --index." +msgstr "Konflikte in der Bereitstellung. Versuche es ohne --index." + +#: git-stash.sh:426 +msgid "Could not save index tree" +msgstr "Konnte Bereitstellungsbaum nicht speichern" + +#: git-stash.sh:460 +msgid "Cannot unstage modified files" +msgstr "Kann geänderte Dateien nicht aus der Bereitstellung herausnehmen" + +#: git-stash.sh:474 +msgid "Index was not unstashed." +msgstr "Bereitstellung wurde nicht ausgelagert." + +#: git-stash.sh:491 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "Gelöscht ${REV} ($s)" + +#: git-stash.sh:492 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen" + +#: git-stash.sh:499 +msgid "No branch name specified" +msgstr "Kein Zweigname spezifiziert" + +#: git-stash.sh:570 +msgid "(To restore them type \"git stash apply\")" +msgstr "(Zur Wiederherstellung gebe \"git stash apply\" ein)" + +#: git-submodule.sh:88 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren" + +#: git-submodule.sh:167 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "" +"Keine Unterprojekt-Zuordnung in .gitmodules für Pfad '$sm_path' gefunden" -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Kein Ausgabefenster zeigen" +#: git-submodule.sh:211 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "Klonen von '$url' in Unterprojekt-Pfad '$sm_path' fehlgeschlagen" -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)" +#: git-submodule.sh:223 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "" +"Git-Verzeichnis '$a' ist Teil des Unterprojekt-Pfades '$b', oder umgekehrt" -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Bitte geben Sie einen Werkzeugnamen an." +#: git-submodule.sh:312 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen" -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "Werkzeug »%s« existiert bereits." +#: git-submodule.sh:329 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "'$sm_path' existiert bereits in der Bereitstellung" -#: lib/tools_dlg.tcl:151 -#, tcl-format +#: git-submodule.sh:333 +#, sh-format msgid "" -"Could not add tool:\n" -"%s" +"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 "" -"Werkzeug konnte nicht hinzugefügt werden:\n" -"\n" -"%s" +"Der folgende Pfad wird durch eine deiner \".gitignore\" Dateien ignoriert:\n" +"$sm_path\n" +"Benutze -f wenn du diesen wirklich hinzufügen möchtest." + +#: git-submodule.sh:344 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "" +"Füge existierendes Projektarchiv in '$sm_path' der Bereitstellung hinzu." + +#: git-submodule.sh:346 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Projektarchiv" + +#: git-submodule.sh:360 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "Unfähig Unterprojekt '$sm_path' auszuchecken" + +#: git-submodule.sh:365 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "Hinzufügen von Unterprojekt '$sm_path' fehlgeschlagen" + +#: git-submodule.sh:370 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "Registierung von Unterprojekt '$sm_path' fehlgeschlagen" + +#: git-submodule.sh:413 +#, sh-format +msgid "Entering '$prefix$sm_path'" +msgstr "Betrete '$prefix$sm_path'" + +#: git-submodule.sh:427 +#, sh-format +msgid "Stopping at '$sm_path'; script returned non-zero status." +msgstr "Stoppe bei '$sm_path'; Skript gab nicht-Null Status zurück." + +#: git-submodule.sh:471 +#, sh-format +msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgstr "Keine URL für Unterprojekt-Pfad '$sm_path' in .gitmodules gefunden" + +#: git-submodule.sh:480 +#, sh-format +msgid "Failed to register url for submodule path '$sm_path'" +msgstr "Registrierung der URL für Unterprojekt-Pfad '$sm_path' fehlgeschlagen" + +#: git-submodule.sh:482 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgstr "Unterprojekt '$name' ($url) ist für Pfad '$sm_path' registriert" + +#: git-submodule.sh:490 +#, sh-format +msgid "Failed to register update mode for submodule path '$sm_path'" +msgstr "" +"Registrierung des Aktualisierungsmodus für Unterprojekt-Pfad '$sm_path' " +"fehlgeschlagen" + +#: git-submodule.sh:590 +#, sh-format +msgid "" +"Submodule path '$sm_path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" +"Unterprojekt-Pfad '$sm_path' ist nicht initialisiert\n" +"Vielleicht möchtest du 'update --init' benutzen?" + +#: git-submodule.sh:603 +#, sh-format +msgid "Unable to find current revision in submodule path '$sm_path'" +msgstr "Konnte aktuelle Version in Unterprojekt-Pfad '$sm_path' nicht finden" + +#: git-submodule.sh:622 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "Konnte in Unterprojekt-Pfad '$sm_path' nicht anfordern" + +#: git-submodule.sh:636 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgstr "Neuaufbau von '$sha1' in Unterprojekt-Pfad '$sm_path' nicht möglich" + +#: git-submodule.sh:637 +#, sh-format +msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgstr "Unterprojekt-Pfad '$sm_path': neu aufgebaut in '$sha1'" + +#: git-submodule.sh:642 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgstr "" +"Zusammenführung von '$sha1' in Unterprojekt-Pfad '$sm_path' fehlgeschlagen" + +#: git-submodule.sh:643 +#, sh-format +msgid "Submodule path '$sm_path': merged in '$sha1'" +msgstr "Unterprojekt-Pfad '$sm_path': zusammengeführt in '$sha1'" + +#: git-submodule.sh:648 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgstr "Konnte '$sha1' in Unterprojekt-Pfad '$sm_path' nicht auschecken." + +#: git-submodule.sh:649 +#, sh-format +msgid "Submodule path '$sm_path': checked out '$sha1'" +msgstr "Unterprojekt-Pfad: '$sm_path': '$sha1' ausgecheckt" + +#: git-submodule.sh:671 git-submodule.sh:995 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'" + +#: git-submodule.sh:779 +msgid "The --cached option cannot be used with the --files option" +msgstr "Die --cached Option kann nicht mit der --files Option benutzt werden" + +#. unexpected type +#: git-submodule.sh:819 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "unerwarteter Modus $mod_dst" + +#: git-submodule.sh:837 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr " Warnung: $name beinhaltet nicht Version $sha1_src" + +#: git-submodule.sh:840 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr " Warnung: $name beinhaltet nicht Version $sha1_dst" + +#: git-submodule.sh:843 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" +" Warnung: $name beinhaltet nicht die Versionen $sha1_src und $sha1_dst" + +#: git-submodule.sh:868 +msgid "blob" +msgstr "Blob" + +#: git-submodule.sh:906 +msgid "# Submodules changed but not updated:" +msgstr "# Unterprojekte geändert, aber nicht aktualisiert:" + +#: git-submodule.sh:908 +msgid "# Submodule changes to be committed:" +msgstr "# Änderungen in Unterprojekt zum Eintragen:" + +#: git-submodule.sh:1054 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "Synchronisiere Unterprojekt-URL für '$name'" + +#~ msgid "diff setup failed" +#~ msgstr "diff_setup_done fehlgeschlagen" + +#~ msgid "merge-recursive: disk full?" +#~ msgstr "merge-recursive: Festplatte voll?" + +#~ msgid "diff_setup_done failed" +#~ msgstr "diff_setup_done fehlgeschlagen" + +#~ msgid "-d option is no longer supported. Do not use." +#~ msgstr "-d Option wird nicht länger unterstützt. Nicht benutzen." + +#~ msgid "%s: has been deleted/renamed" +#~ msgstr "%s wurde gelöscht/umbenannt" + +#~ msgid "'%s': not a documentation directory." +#~ msgstr "'%s' ist kein Dokumentationsverzeichnis" + +#~ msgid "--" +#~ msgstr "--" + +#~ msgid "Could not extract email from committer identity." +#~ msgstr "Konnte E-Mail-Adresse des Einreichers nicht extrahieren." + +#~ msgid "cherry-pick" +#~ msgstr "cherry-pick" + +#~ msgid "Please enter the commit message for your changes." +#~ msgstr "Bitte gebe die Versionsbeschreibung für deine Änderungen ein." + +#~ msgid "Too many options specified" +#~ msgstr "Zu viele Optionen angegeben" -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Werkzeug entfernen" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Werkzeugkommandos entfernen" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Entfernen" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Werkzeuge für lokales Archiv werden in Blau angezeigt)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Kommando aufrufen: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Argumente" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "Ok" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Wollen Sie %s wirklich starten?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Werkzeug: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Starten: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Werkzeug erfolgreich abgeschlossen: %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Werkzeug fehlgeschlagen: %s" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Neue Änderungen von »%s« holen" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "Aufräumen von »%s«" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurden" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Änderungen nach »%s« versenden" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Spiegeln nach %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "%s %s nach %s versenden" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "Zweige versenden" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "Lokale Zweige" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Ziel-Projektarchiv" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "Netzwerk-Einstellungen" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "" -"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "Mit Markierungen übertragen" +#~ msgid "" +#~ "To prevent you from losing history, non-fast-forward updates were " +#~ "rejected\n" +#~ "Merge the remote changes (e.g. 'git pull') before pushing again. See " +#~ "the\n" +#~ "'Note about fast-forwards' section of 'git push --help' for details.\n" +#~ msgstr "" +#~ "Um dich vor Verlust von Historie zu bewahren, wurden nicht vorzuspulende " +#~ "Aktualisierungen zurückgewiesen.\n" +#~ "Führe die externen Änderungen zusammen (z.B. 'git pull') bevor du erneut " +#~ "versendest. Siehe auch die 'Note about fast-forwards' Sektion von \n" +#~ "'git push --help' für weitere Details.\n" diff --git a/po/el.po b/po/el.po deleted file mode 100644 index 3634ba4..0000000 --- a/po/el.po +++ /dev/null @@ -1,2005 +0,0 @@ -# Translation of git-gui to Greek -# Copyright (C) 2009 Jimmy Angelakos -# This file is distributed under the same license as the git-gui package. -# Jimmy Angelakos <vyruss@hellug.gr>, 2009. -msgid "" -msgstr "" -"Project-Id-Version: el\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-14 07:18+0100\n" -"PO-Revision-Date: 2009-06-23 21:33+0300\n" -"Last-Translator: Jimmy Angelakos <vyruss@hellug.gr>\n" -"Language-Team: Greek <i18n@lists.hellug.gr>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.3\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 -#: git-gui.sh:763 -msgid "git-gui: fatal error" -msgstr "git-gui: κρίσιμο σφάλμα" - -#: git-gui.sh:593 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Μη έγκυρη γραμματοσειρά στο %s:" - -#: git-gui.sh:620 -msgid "Main Font" -msgstr "Κύρια Γραμματοσειρά" - -#: git-gui.sh:621 -msgid "Diff/Console Font" -msgstr "Γραμματοσειρά Διαφοράς/Κονσόλας" - -#: git-gui.sh:635 -msgid "Cannot find git in PATH." -msgstr "Δε βρέθηκε το git στο PATH." - -#: git-gui.sh:662 -msgid "Cannot parse Git version string:" -msgstr "Αδύνατη η ανάγνωση στοιχειοσειράς έκδοσης Git:" - -#: git-gui.sh:680 -#, tcl-format -msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" -msgstr "" -"Δε μπορεί να ανιχνευτεί η έκδοση του Git. \n" -"\n" -"Το %s υποστηρίζει πως είναι η έκδοση '%s'.\n" -"\n" -"Το %s απαιτεί τουλάχιστον Git 1.5.0 ή πιό πρόσφατη.\n" -"\n" -"Να υποτεθεί πως το '%s' είναι η έκδοση 1.5.0;\n" - -#: git-gui.sh:918 -msgid "Git directory not found:" -msgstr "Δε βρέθηκε φάκελος Git:" - -#: git-gui.sh:925 -msgid "Cannot move to top of working directory:" -msgstr "Δεν είναι δυνατή η μετακίνηση στην κορυφή του φακέλου εργασίας:" - -#: git-gui.sh:932 -msgid "Cannot use funny .git directory:" -msgstr "Δεν είναι δυνατή η χρήση περίεργου φακέλου .git:" - -#: git-gui.sh:937 -msgid "No working directory" -msgstr "Δεν υπάρχει φάκελος εργασίας" - -#: git-gui.sh:1084 lib/checkout_op.tcl:283 -msgid "Refreshing file status..." -msgstr "Ανανέωση κατάστασης αρχείου..." - -#: git-gui.sh:1149 -msgid "Scanning for modified files ..." -msgstr "Ανίχνευση για τροποποιημένα αρχεία..." - -#: git-gui.sh:1324 lib/browser.tcl:246 -msgid "Ready." -msgstr "Έτοιμο." - -#: git-gui.sh:1590 -msgid "Unmodified" -msgstr "Μη τροποποιημένο" - -#: git-gui.sh:1592 -msgid "Modified, not staged" -msgstr "Τροποποιημένο, μη σταδιοποιημένο" - -#: git-gui.sh:1593 git-gui.sh:1598 -msgid "Staged for commit" -msgstr "Σταδιοποιημένο προς υποβολή" - -#: git-gui.sh:1594 git-gui.sh:1599 -msgid "Portions staged for commit" -msgstr "Μέρη σταδιοποιημένα προς υποβολή" - -#: git-gui.sh:1595 git-gui.sh:1600 -msgid "Staged for commit, missing" -msgstr "Σταδιοποιημένο προς υποβολή, λείπει" - -#: git-gui.sh:1597 -msgid "Untracked, not staged" -msgstr "Μη παρακολουθούμενο, μη σταδιοποιημένο" - -#: git-gui.sh:1602 -msgid "Missing" -msgstr "Λείπει" - -#: git-gui.sh:1603 -msgid "Staged for removal" -msgstr "Σταδιοποιημένο προς αφαίρεση" - -#: git-gui.sh:1604 -msgid "Staged for removal, still present" -msgstr "Σταδιοποιημένο προς αφαίρεση, ακόμα παρόν" - -#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609 -msgid "Requires merge resolution" -msgstr "Απαιτεί επίλυση συγχώνευσης" - -#: git-gui.sh:1644 -msgid "Starting gitk... please wait..." -msgstr "Γίνεται εκκίνηση του gitk... παρακαλώ περιμένετε..." - -#: git-gui.sh:1653 -#, tcl-format -msgid "" -"Unable to start gitk:\n" -"\n" -"%s does not exist" -msgstr "" -"Αδυναμία εκκίνησης του gitk:\n" -"\n" -"Το %s δεν υπάρχει" - -#: git-gui.sh:1860 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Αποθετήριο" - -#: git-gui.sh:1861 -msgid "Edit" -msgstr "Επεξεργασία" - -#: git-gui.sh:1863 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Κλάδος" - -#: git-gui.sh:1866 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Υποβολή@@noun" - -#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167 -msgid "Merge" -msgstr "Συγχώνευση" - -#: git-gui.sh:1870 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Απομακρυσμένο" - -#: git-gui.sh:1879 -msgid "Browse Current Branch's Files" -msgstr "Περιήγηση Αρχείων Τρέχοντα Κλάδου" - -#: git-gui.sh:1883 -msgid "Browse Branch Files..." -msgstr "Περιήγηση Αρχείων Κλάδου..." - -#: git-gui.sh:1888 -msgid "Visualize Current Branch's History" -msgstr "Απεικόνιση Ιστορικού Τρέχοντα Κλάδου" - -#: git-gui.sh:1892 -msgid "Visualize All Branch History" -msgstr "Απεικόνιση Ιστορικού Όλων των Κλάδων" - -#: git-gui.sh:1899 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Περιήγηση Αρχείων του %s" - -#: git-gui.sh:1901 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Απεικόνιση Ιστορικού του %s" - -#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Στατιστικά Βάσης Δεδομένων" - -#: git-gui.sh:1909 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Συμπίεση Βάσης Δεδομένων" - -#: git-gui.sh:1912 -msgid "Verify Database" -msgstr "Επαλήθευση Βάσης Δεδομένων" - -#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7 -#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 -msgid "Create Desktop Icon" -msgstr "Δημιουργία Εικονιδίου Επιφάνειας Εργασίας" - -#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185 -msgid "Quit" -msgstr "Έξοδος" - -#: git-gui.sh:1939 -msgid "Undo" -msgstr "Αναίρεση" - -#: git-gui.sh:1942 -msgid "Redo" -msgstr "Ξανά" - -#: git-gui.sh:1946 git-gui.sh:2443 -msgid "Cut" -msgstr "Αποκοπή" - -#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Αντιγραφή" - -#: git-gui.sh:1952 git-gui.sh:2449 -msgid "Paste" -msgstr "Επικόλληση" - -#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Διαγραφή" - -#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71 -msgid "Select All" -msgstr "Επιλογή Όλων" - -#: git-gui.sh:1968 -msgid "Create..." -msgstr "Δημιουργία..." - -#: git-gui.sh:1974 -msgid "Checkout..." -msgstr "Εξαγωγή..." - -#: git-gui.sh:1980 -msgid "Rename..." -msgstr "Μετονομασία..." - -#: git-gui.sh:1985 git-gui.sh:2085 -msgid "Delete..." -msgstr "Διαγραφή..." - -#: git-gui.sh:1990 -msgid "Reset..." -msgstr "Επαναφορά..." - -#: git-gui.sh:2002 git-gui.sh:2389 -msgid "New Commit" -msgstr "Νέα Υποβολή" - -#: git-gui.sh:2010 git-gui.sh:2396 -msgid "Amend Last Commit" -msgstr "Διόρθωση Τελευταίας Υποβολής" - -#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Επανανίχνευση" - -#: git-gui.sh:2025 -msgid "Stage To Commit" -msgstr "Σταδιοποίηση Προς Υποβολή" - -#: git-gui.sh:2031 -msgid "Stage Changed Files To Commit" -msgstr "Σταδιοποίηση Αλλαγμένων Αρχείων Προς Υποβολή" - -#: git-gui.sh:2037 -msgid "Unstage From Commit" -msgstr "Αποσταδιοποίηση Από Υποβολή" - -#: git-gui.sh:2042 lib/index.tcl:395 -msgid "Revert Changes" -msgstr "Αναίρεση Αλλαγών" - -#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467 -msgid "Sign Off" -msgstr "Αποσύνδεση" - -#: git-gui.sh:2053 git-gui.sh:2372 -msgid "Commit@@verb" -msgstr "Υποβολή@@verb" - -#: git-gui.sh:2064 -msgid "Local Merge..." -msgstr "Τοπική Συγχώνευση..." - -#: git-gui.sh:2069 -msgid "Abort Merge..." -msgstr "Ακύρωση Συγχώνευσης..." - -#: git-gui.sh:2081 -msgid "Push..." -msgstr "Ώθηση..." - -#: git-gui.sh:2092 lib/choose_repository.tcl:41 -#, fuzzy -msgid "Apple" -msgstr "" - -#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 -#, tcl-format -msgid "About %s" -msgstr "Περί %s" - -#: git-gui.sh:2099 -msgid "Preferences..." -msgstr "Προτιμήσεις..." - -#: git-gui.sh:2107 git-gui.sh:2639 -msgid "Options..." -msgstr "Επιλογές..." - -#: git-gui.sh:2113 lib/choose_repository.tcl:47 -msgid "Help" -msgstr "Βοήθεια" - -#: git-gui.sh:2154 -msgid "Online Documentation" -msgstr "Διαδικτυακή Τεκμηρίωση" - -#: git-gui.sh:2238 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "κρίσιμο: δε βρέθηκε η διαδρομή: %s: Δεν υπάρχει το αρχείο ή ο φάκελος" - -#: git-gui.sh:2271 -msgid "Current Branch:" -msgstr "Τρέχων Κλάδος:" - -#: git-gui.sh:2292 -msgid "Staged Changes (Will Commit)" -msgstr "Σταδιοποιημένες Αλλαγές (Θα Υποβληθούν)" - -#: git-gui.sh:2312 -msgid "Unstaged Changes" -msgstr "Μη Σταδιοποιημένες Αλλαγές" - -#: git-gui.sh:2362 -msgid "Stage Changed" -msgstr "Σταδιοποίηση Αλλαγών" - -#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182 -msgid "Push" -msgstr "Ώθηση" - -#: git-gui.sh:2408 -msgid "Initial Commit Message:" -msgstr "Αρχικό Μήνυμα Υποβολής:" - -#: git-gui.sh:2409 -msgid "Amended Commit Message:" -msgstr "Διορθωμένο Μήνυμα Υποβολής:" - -#: git-gui.sh:2410 -msgid "Amended Initial Commit Message:" -msgstr "Διορθωμένο Αρχικό Μήνυμα Υποβολής:" - -#: git-gui.sh:2411 -msgid "Amended Merge Commit Message:" -msgstr "Διορθωμένο Μήνυμα Υποβολής Συγχώνευσης:" - -#: git-gui.sh:2412 -msgid "Merge Commit Message:" -msgstr "Μήνυμα Υποβολής Συγχώνευσης:" - -#: git-gui.sh:2413 -msgid "Commit Message:" -msgstr "Μήνυμα Υποβολής:" - -#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73 -msgid "Copy All" -msgstr "Αντιγραφή Όλων" - -#: git-gui.sh:2483 lib/blame.tcl:107 -msgid "File:" -msgstr "Αρχείο:" - -#: git-gui.sh:2589 -msgid "Apply/Reverse Hunk" -msgstr "Εφαρμογή/Αντιστροφή Κομματιού" - -#: git-gui.sh:2595 -msgid "Show Less Context" -msgstr "Προβολή Στενότερου Πλαισίου" - -#: git-gui.sh:2602 -msgid "Show More Context" -msgstr "Προβολή Ευρύτερου Πλαισίου" - -#: git-gui.sh:2610 -msgid "Refresh" -msgstr "Ανανέωση" - -#: git-gui.sh:2631 -msgid "Decrease Font Size" -msgstr "Μείωση Μεγέθους Γραμματοσειράς" - -#: git-gui.sh:2635 -msgid "Increase Font Size" -msgstr "Αύξηση Μεγέθους Γραμματοσειράς" - -#: git-gui.sh:2646 -msgid "Unstage Hunk From Commit" -msgstr "Αποσταδιοποίηση Κομματιού Από Υποβολή" - -#: git-gui.sh:2648 -msgid "Stage Hunk For Commit" -msgstr "Σταδιοποίηση Κομματιού Προς Υποβολή" - -#: git-gui.sh:2667 -msgid "Initializing..." -msgstr "Γίνεται αρχικοποίηση..." - -#: git-gui.sh:2762 -#, tcl-format -msgid "" -"Possible environment issues exist.\n" -"\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" -"\n" -msgstr "" -"Υπάρχουν πιθανά θέματα με το περιβάλλον.\n" -"\n" -"Οι εξής μεταβλητές περιβάλλοντος μάλλον θα\n" -"αγνοηθούν από πιθανή εκτέλεση υποδιεργασίας Git\n" -"από το %s:\n" -"\n" - -#: git-gui.sh:2792 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Αυτό οφείλεται σε ένα γνωστό θέμα με το\n" -"εκτελέσιμο Tcl που διανέμεται με το Cygwin." - -#: git-gui.sh:2797 -#, tcl-format -msgid "" -"\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\n" -msgstr "" -"\n" -"\n" -"Ένα καλό υποκατάστατο για το %s\n" -"είναι η τοποθέτηση τιμών για τις ρυθμίσεις\n" -"user.name και user.email στο προσωπικό σας\n" -"αρχείο ~/.gitconfig .\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - ένα γραφικό περιβάλλον για το Git." - -#: lib/blame.tcl:77 -msgid "File Viewer" -msgstr "Εφαρμογή Προβολής Αρχείου" - -#: lib/blame.tcl:81 -msgid "Commit:" -msgstr "Υποβολή:" - -#: lib/blame.tcl:264 -msgid "Copy Commit" -msgstr "Αντιγραφή Υποβολής" - -#: lib/blame.tcl:384 -#, tcl-format -msgid "Reading %s..." -msgstr "Ανάγνωση %s..." - -#: lib/blame.tcl:488 -msgid "Loading copy/move tracking annotations..." -msgstr "Γίνεται φόρτωση σχολίων παρακολούθησης αντιγραφής/μετακίνησης..." - -#: lib/blame.tcl:508 -msgid "lines annotated" -msgstr "γραμμές σχολιασμένες" - -#: lib/blame.tcl:689 -msgid "Loading original location annotations..." -msgstr "Γίνεται φόρτωση σχολίων αρχικής τοποθεσίας..." - -#: lib/blame.tcl:692 -msgid "Annotation complete." -msgstr "Έγινε ολοκλήρωση του σχολιασμού." - -#: lib/blame.tcl:746 -msgid "Loading annotation..." -msgstr "Φόρτωση σχολίου..." - -#: lib/blame.tcl:802 -msgid "Author:" -msgstr "Δημιουργός:" - -#: lib/blame.tcl:806 -msgid "Committer:" -msgstr "Υποβολέας:" - -#: lib/blame.tcl:811 -msgid "Original File:" -msgstr "Αρχικό Αρχείο:" - -#: lib/blame.tcl:925 -msgid "Originally By:" -msgstr "Αρχικά Από:" - -#: lib/blame.tcl:931 -msgid "In File:" -msgstr "Στο Αρχείο:" - -#: lib/blame.tcl:936 -msgid "Copied Or Moved Here By:" -msgstr "Αντιγράφηκε ή Μετακινήθηκε Εδώ Από:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Εξαγωγή Κλάδου" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "Εξαγωγή" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171 -#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 -msgid "Cancel" -msgstr "Ακύρωση" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 -msgid "Revision" -msgstr "Αναθεώρηση" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242 -msgid "Options" -msgstr "Επιλογές" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Ανάκτηση Κλάδου Παρακολούθησης" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Αποκόλληση Από Τοπικό Κλάδο" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Δημιουργία Κλάδου" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Δημιουργία Νέου Κλάδου" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371 -msgid "Create" -msgstr "Δημιουργία" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Όνομα Κλάδου" - -#: lib/branch_create.tcl:43 -msgid "Name:" -msgstr "Όνομα:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Συμφωνία Ονόματος Κλάδου Παρακολούθησης" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Αρχική Αναθεώρηση" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Ενημέρωση Υπάρχοντα Κλάδου:" - -#: lib/branch_create.tcl:75 -#, fuzzy -msgid "No" -msgstr "Όχι" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Συγχώνευση Επιτάχυνσης Μόνο" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514 -msgid "Reset" -msgstr "Επαναφορά" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Εξαγωγή Μετά τη Δημιουργία" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Παρακαλώ επιλέξτε έναν κλάδο παρακολούθησης." - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "" -"Ο κλάδος παρακολούθησης %s δεν είναι κλάδος που βρίσκεται στο απομακρυσμένο " -"αποθετήριο." - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Παρακαλώ δώστε ένα όνομα κλάδου." - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "'%s' δεν είναι αποδεκτό όνομα κλάδου." - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Διαγραφή Κλάδου" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Διαγραφή Τοπικού Κλάδου" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Τοπικοί Κλάδοι" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Διαγραφή Μόνο Εάν Είναι Συγχωνευμένο Με" - -#: lib/branch_delete.tcl:54 -msgid "Always (Do not perform merge test.)" -msgstr "Πάντα (Μη διενεργηθεί δοκιμή συγχώνευσης.)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Οι εξής κλάδοι δεν είναι πλήρως συγχωνευμένοι με το %s:" - -#: lib/branch_delete.tcl:115 -msgid "" -"Recovering deleted branches is difficult. \n" -"\n" -" Delete the selected branches?" -msgstr "" -"Η ανάκτηση διεγραμμένων κλάδων είναι δύσκολη.\n" -"\n" -"Διαγραφή των επιλεγμένων κλάδων;" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Αποτυχία διαγραφής κλάδων:\n" -"%s" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Μετονομασία Κλάδου" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Μετονομασία" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Κλάδος:" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Νέο Όνομα:" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Παρακαλώ επιλέξτε κλάδο προς μετονομασία:" - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Ο Κλάδος '%s' υπάρχει ήδη." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Αποτυχία μετονομασίας '%s'." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Γίνεται Εκκίνηση..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "Περιηγητής Αρχείων" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Γίνεται φόρτωση %s..." - -#: lib/browser.tcl:187 -#, fuzzy -msgid "[Up To Parent]" -msgstr "[Πάνω Προς Γονέα]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Περιήγηση Αρχείων Κλάδου" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:387 -#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484 -#: lib/choose_repository.tcl:987 -msgid "Browse" -msgstr "Περιήγηση" - -#: lib/checkout_op.tcl:79 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Ανάκτηση %s από το %s" - -#: lib/checkout_op.tcl:127 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "κρίσιμο: Δε μπόρεσε να επιλυθεί το %s" - -#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31 -msgid "Close" -msgstr "Κλείσιμο" - -#: lib/checkout_op.tcl:169 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Ο Κλάδος '%s' δεν υπάρχει." - -#: lib/checkout_op.tcl:206 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"Ο Κλάδος '%s' υπάρχει ήδη.\n" -"\n" -"Δε γίνεται συγχώνευση επιτάχυνσής του στο %s.\n" -"Απαιτείται συγχώνευση." - -#: lib/checkout_op.tcl:220 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Η στρατηγική Συγχώνευσης %s δεν υποστηρίζεται." - -#: lib/checkout_op.tcl:239 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Αποτυχία ενημέρωσης '%s'." - -#: lib/checkout_op.tcl:251 -msgid "Staging area (index) is already locked." -msgstr "Η περιοχή σταδιοποίησης (το ευρετήριο) είναι ήδη κλειδωμένη." - -#: lib/checkout_op.tcl:266 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"Η τελευταία κατάσταση που ανιχνεύθηκε δε συμφωνεί με την κατάσταση του " -"αποθετηρίου.\n" -"\n" -"Κάποιο άλλο πρόγραμμα Git τροποποίησε το αποθετήριο από την τελευταία " -"ανίχνευση. Πρέπει να γίνει επανανίχνευση πριν να αλλαχθεί ο τρέχων κλάδος.\n" -"\n" -"Η επανανίχνευση θα ξεκινήσει αυτόματα τώρα.\n" - -#: lib/checkout_op.tcl:322 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Ενημέρωση φακέλου εργασίας σε '%s'..." - -#: lib/checkout_op.tcl:323 -msgid "files checked out" -msgstr "αρχεία έχουν εξαχθεί" - -#: lib/checkout_op.tcl:353 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "" -"Έγινε ακύρωση εξαγωγής του '%s' (απαιτείται συγχώνευση επιπέδου αρχείου)." - -#: lib/checkout_op.tcl:354 -msgid "File level merge required." -msgstr "Απαιτείται συγχώνευση επιπέδου αρχείου." - -#: lib/checkout_op.tcl:358 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Παραμονή στον κλάδο '%s'." - -#: lib/checkout_op.tcl:429 -msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." -msgstr "" -"Δε βρίσκεστε πια σε τοπικό κλάδο.\n" -"\n" -"Αν θέλατε να βρίσκεστε σε κλάδο, δημιουργήστε έναν τώρα αρχίζοντας από 'This " -"Detached Checkout'." - -#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Έγινε εξαγωγή του '%s'." - -#: lib/checkout_op.tcl:478 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Η επαναφορά '%s' στο '%s' θα χάσει τις εξής υποβολές:" - -#: lib/checkout_op.tcl:500 -msgid "Recovering lost commits may not be easy." -msgstr "Η ανάκτηση χαμένων υποβολών μπορεί να είναι δύσκολη." - -#: lib/checkout_op.tcl:505 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Επαναφορά '%s';" - -#: lib/checkout_op.tcl:510 lib/merge.tcl:163 -msgid "Visualize" -msgstr "Απεικόνιση" - -#: lib/checkout_op.tcl:578 -#, tcl-format -msgid "" -"Failed to set current branch.\n" -"\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" -"\n" -"This should not have occurred. %s will now close and give up." -msgstr "" -"Αποτυχία ορισμού τρέχοντος κλάδου.\n" -"\n" -"Αυτός ο φάκελος εργασίας είναι μόνο εν μέρει επιλεγμένος. 'Εγινε επιτυχής " -"ενημέρωση των αρχείων σας, αλλά απέτυχε η ενημέρωση ενός εσωτερικού αρχείου " -"του Git.\n" -"\n" -"Αυτό δε θα έπρεπε να συμβεί. Το %s θα κλείσει και θα εγκαταλείψει τώρα." - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Επιλογή" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Οικογένεια Γραμματοσειράς" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Μέγεθος Γραμματοσειράς" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Παράδειγμα Γραμματοσειράς" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Αυτό είναι ένα παράδειγμα κειμένου.\n" -"Αν σας αρέσει αυτό το κείμενο, μπορεί να γίνει δικό σας." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Γραφικό Περιβάλλον Git" - -#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376 -msgid "Create New Repository" -msgstr "Δημιουργία Νέου Αποθετηρίου" - -#: lib/choose_repository.tcl:87 -msgid "New..." -msgstr "Νέο..." - -#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460 -msgid "Clone Existing Repository" -msgstr "Κλωνοποίηση Υπάρχοντος Αποθετηρίου" - -#: lib/choose_repository.tcl:100 -msgid "Clone..." -msgstr "Κλωνοποίηση..." - -#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976 -msgid "Open Existing Repository" -msgstr "Άνοιγμα Υπάρχοντος Αποθετηρίου" - -#: lib/choose_repository.tcl:113 -msgid "Open..." -msgstr "Άνοιγμα..." - -#: lib/choose_repository.tcl:126 -msgid "Recent Repositories" -msgstr "Πρόσφατα Αποθετήρια" - -#: lib/choose_repository.tcl:132 -msgid "Open Recent Repository:" -msgstr "Άνοιγμα Πρόσφατου Αποθετηρίου:" - -#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303 -#: lib/choose_repository.tcl:310 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Αποτυχία δημιουργίας αποθετηρίου %s:" - -#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478 -msgid "Directory:" -msgstr "Φάκελος:" - -#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537 -#: lib/choose_repository.tcl:1011 -msgid "Git Repository" -msgstr "Αποθετήριο Git" - -#: lib/choose_repository.tcl:437 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Ο Φάκελος '%s' υπάρχει ήδη." - -#: lib/choose_repository.tcl:441 -#, tcl-format -msgid "File %s already exists." -msgstr "Το αρχείο %s υπάρχει ήδη." - -#: lib/choose_repository.tcl:455 -msgid "Clone" -msgstr "Κλώνος" - -#: lib/choose_repository.tcl:468 -#, fuzzy -msgid "URL:" -msgstr "" - -#: lib/choose_repository.tcl:489 -msgid "Clone Type:" -msgstr "Τύπος Κλώνου:" - -#: lib/choose_repository.tcl:495 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Τυπικό (Ταχύ, Ημι-Πλεονάζον, Hardlinks)" - -#: lib/choose_repository.tcl:501 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Πλήρες Αντίγραφο (Πιο αργό, Πλεονάζον Αντίγραφο Ασφαλείας)" - -#: lib/choose_repository.tcl:507 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Κοινή Χρήση (Ταχύτατο, Δε Συνιστάται, Κανένα Αντίγραφο Ασφαλείας)" - -#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590 -#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806 -#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Δεν είναι αποθετήριο Git: %s" - -#: lib/choose_repository.tcl:579 -msgid "Standard only available for local repository." -msgstr "\"Τυπικό\" διαθέσιμο μόνο για τοπικό αποθετήριο." - -#: lib/choose_repository.tcl:583 -msgid "Shared only available for local repository." -msgstr "\"Κοινή Χρήση\" διαθέσιμη μόνο για τοπικό αποθετήριο." - -#: lib/choose_repository.tcl:604 -#, tcl-format -msgid "Location %s already exists." -msgstr "Η Τοποθεσία %s υπάρχει ήδη." - -#: lib/choose_repository.tcl:615 -msgid "Failed to configure origin" -msgstr "Αποτυχία ρύθμισης πηγής" - -#: lib/choose_repository.tcl:627 -msgid "Counting objects" -msgstr "Γίνεται καταμέτρηση αντικειμένων" - -#: lib/choose_repository.tcl:628 -#, fuzzy -msgid "buckets" -msgstr "" - -#: lib/choose_repository.tcl:652 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Αδυναμία αντιγραφής αντικειμένων/πληροφοριών/ενναλακτικών: %s" - -#: lib/choose_repository.tcl:688 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Τίποτα προς κλωνοποίηση από το %s." - -#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904 -#: lib/choose_repository.tcl:916 -msgid "The 'master' branch has not been initialized." -msgstr "Ο κλάδος 'master' δεν έχει αρχικοποιηθεί." - -#: lib/choose_repository.tcl:703 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Hardlinks μη διαθέσιμα. Μετάπτωση σε αντιγραφή." - -#: lib/choose_repository.tcl:715 -#, tcl-format -msgid "Cloning from %s" -msgstr "Γίνεται κλωνοποίηση από το %s" - -#: lib/choose_repository.tcl:746 -msgid "Copying objects" -msgstr "Γίνεται αντιγραφή αντικειμένων" - -#: lib/choose_repository.tcl:747 -#, fuzzy -msgid "KiB" -msgstr "" - -#: lib/choose_repository.tcl:771 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Αδυναμία αντιγραφής αντικειμένου: %s" - -#: lib/choose_repository.tcl:781 -msgid "Linking objects" -msgstr "Γίνεται σύνδεση αντικειμένων" - -#: lib/choose_repository.tcl:782 -msgid "objects" -msgstr "αντικείμενα" - -#: lib/choose_repository.tcl:790 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Αδυναμία hardlink αντικειμένου: %s" - -#: lib/choose_repository.tcl:845 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Δε μπόρεσε να γίνει ανάκτηση κλάδων και αντικειμένων. Δείτε την έξοδο " -"κονσόλας για λεπτομέρειες." - -#: lib/choose_repository.tcl:856 -msgid "Cannot fetch tags. See console output for details." -msgstr "" -"Δε μπόρεσε να γίνει ανάκτηση ετικετών. Δείτε την έξοδο κονσόλας για " -"λεπτομέρειες." - -#: lib/choose_repository.tcl:880 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Δε μπόρεσε να γίνει καθορισμός του HEAD (παρακλαδιού). Δείτε την έξοδο " -"κονσόλας για " -"λεπτομέρειες." - -#: lib/choose_repository.tcl:889 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Αδυναμία εκκαθάρισης %s" - -#: lib/choose_repository.tcl:895 -msgid "Clone failed." -msgstr "Αποτυχία κλωνοποίησης." - -#: lib/choose_repository.tcl:902 -msgid "No default branch obtained." -msgstr "Δεν έγινε ανάκτηση προεπιλεγμένου κλάδου." - -#: lib/choose_repository.tcl:913 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Δε μπόρεσε να επιλυθεί το %s ως υποβολή." - -#: lib/choose_repository.tcl:925 -msgid "Creating working directory" -msgstr "Δημιουργία φακέλου εργασίας" - -#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127 -#: lib/index.tcl:193 -msgid "files" -msgstr "αρχεία" - -#: lib/choose_repository.tcl:955 -msgid "Initial file checkout failed." -msgstr "Η αρχική εξαγωγή αρχείου απέτυχε." - -#: lib/choose_repository.tcl:971 -msgid "Open" -msgstr "Άνοιγμα" - -#: lib/choose_repository.tcl:981 -msgid "Repository:" -msgstr "Αποθετήριο:" - -#: lib/choose_repository.tcl:1031 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Αποτυχία ανοίγματος αποθετηρίου %s:" - -#: lib/choose_rev.tcl:53 -#, fuzzy -msgid "This Detached Checkout" -msgstr "Αποσυνδεδεμένη Εξαγωγή" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Έκφραση Αναθεώρησης:" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "Τοπικός Κλάδος" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "Κλάδος Παρακολούθησης" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "Ετικέτα" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Μη έγκυρη αναθεώρηση: %s" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "Δεν έχει επιλεγεί αναθεώρηση." - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "Η έκφραση αναθεώρησης είναι κενή." - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "Ενημερωμένο" - -#: lib/choose_rev.tcl:559 -#, fuzzy -msgid "URL" -msgstr "" - -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" -msgstr "" -"Δεν υπάρχει κάτι προς διόρθωση.\n" -"\n" -"Πρόκειται να δημιουργήσετε την αρχική υποβολή. Δεν υπάρχει υποβολή πριν από " -"αυτή για να διορθώσετε.\n" - -#: lib/commit.tcl:18 -msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" -msgstr "" -"Δε γίνεται διόρθωση καθώς συγχωνεύετε.\n" -"\n" -"Βρίσκεστε στο μέσο μιας συγχώνευσης που δεν έχει ολοκληρωθεί. Δε μπορείτε να " -"διορθώσετε την προηγούμενη υποβολή εκτός εάν ακυρώσετε την τρέχουσα ενέργεια " -"συγχώνευσης.\n" - -#: lib/commit.tcl:49 -msgid "Error loading commit data for amend:" -msgstr "Σφάλμα φόρτωσης δεδομένων υποβολής προς διόρθωση:" - -#: lib/commit.tcl:76 -msgid "Unable to obtain your identity:" -msgstr "Αδυναμία ανάκτησης της ταυτότητάς σας:" - -#: lib/commit.tcl:81 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Μη έγκυρο GIT_COMMITTER_IDENT:" - -#: lib/commit.tcl:133 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"Η τελευταία κατάσταση που ανιχνεύθηκε δε συμφωνεί με την κατάσταση του " -"αποθετηρίου.\n" -"\n" -"Κάποιο άλλο πρόγραμμα Git τροποποίησε το αποθετήριο από την τελευταία " -"ανίχνευση. Πρέπει να γίνει επανανίχνευση πριν τη δημιουργία νέας υποβολής.\n" -"\n" -"Η επανανίχνευση θα ξεκινήσει αυτόματα τώρα.\n" - -#: lib/commit.tcl:154 -#, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" -"\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" -msgstr "" -"Τα μη συγχωνευμένα αρχεία δε μπορούν να υποβληθούν.\n" -"\n" -"Το αρχείο %s έχει συγκρούσεις συγχώνευσης. Πρέπει να τις επιλύσετε και να " -"σταδιοποιήσετε το αρχείο πριν την υποβολή.\n" - -#: lib/commit.tcl:162 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Άγνωστη κατάσταση αρχείου %s ανιχνεύθηκε.\n" -"\n" -"Το αρχείο %s δε μπορεί να υποβληθεί από αυτό το πρόγραμμα.\n" - -#: lib/commit.tcl:170 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Δεν υπάρχουν αλλαγές προς υποβολή.\n" -"\n " -"Πρέπει να σταδιοποιήσετε τουλάχιστον 1 αρχείο πριν να κάνετε υποβολή.\n" - -#: lib/commit.tcl:183 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" -msgstr "" -"Παρακαλώ δώστε ένα μήνυμα υποβολής.\n" -"\n" -"Ένα σωστό μήνυμα υποβολής έχει την εξής μορφή:\n" -"\n" -"- Πρώτη γραμμή: Περιγραφή σε μία πρόταση του τι κάνατε.\n" -"- Δεύτερη γραμμή: Κενή\n" -"- Υπόλοιπες γραμμές: Περιγραφή του γιατί αυτή η αλλαγή είναι σωστή.\n" - -#: lib/commit.tcl:207 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "προειδοποίηση: H Tcl δεν υποστηρίζει την κωδικοποίηση '%s'." - -#: lib/commit.tcl:221 -msgid "Calling pre-commit hook..." -msgstr "Γίνεται κλήση του pre-commit hook..." - -#: lib/commit.tcl:236 -msgid "Commit declined by pre-commit hook." -msgstr "Η υποβολή απορρίφθηκε από το pre-commit hook." - -#: lib/commit.tcl:259 -msgid "Calling commit-msg hook..." -msgstr "Γίνεται κλήση του commit-msg hook..." - -#: lib/commit.tcl:274 -msgid "Commit declined by commit-msg hook." -msgstr "Η υποβολή απορρίφθηκε από το commit-msg hook." - -#: lib/commit.tcl:287 -msgid "Committing changes..." -msgstr "Γίνεται υποβολή των αλλαγών..." - -#: lib/commit.tcl:303 -msgid "write-tree failed:" -msgstr "το write-tree απέτυχε:" - -#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368 -msgid "Commit failed." -msgstr "Η υποβολή απέτυχε." - -#: lib/commit.tcl:321 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Η υποβολή %s δείχνει κατεστραμμένη" - -#: lib/commit.tcl:326 -msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" -msgstr "" -"Δεν υπάρχουν αλλαγές προς υποβολή.\n" -"\n" -"Δεν τροποποιήθηκαν αρχεία από αυτή την υποβολή και δεν ήταν υποβολή " -"συγχώνευσης.\n" -"\n" -"Θα ξεκινήσει αυτόματα επανανίχνευση τώρα.\n" - -#: lib/commit.tcl:333 -msgid "No changes to commit." -msgstr "Δεν υπάρχουν αλλαγές προς υποβολή." - -#: lib/commit.tcl:347 -msgid "commit-tree failed:" -msgstr "το commit-tree απέτυχε:" - -#: lib/commit.tcl:367 -msgid "update-ref failed:" -msgstr "το update-ref απέτυχε:" - -#: lib/commit.tcl:454 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Δημιουργήθηκε υποβολή %s: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Γίνεται εργασία... Παρακαλώ περιμένετε..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Επιτυχία" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Σφάλμα: Η Εντολή Απέτυχε" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "Αριθμός ελεύθερων αντικειμένων" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "Χώρος κατειλλημένος από ελεύθερα αντικείμενα" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "Αριθμός πακεταρισμένων αντικειμένων" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "Αριθμός πακέτων" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "Χώρος κατειλλημένος από πακεταρισμένα αντικείμενα" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "Πακεταρισμένα αντικείμενα έτοιμα για κλάδεμα" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "Άχρηστα αρχεία" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Γίνεται συμπίεση της βάσης δεδομένων αντικειμένων" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "" -"Γίνεται επαλήθευση της βάσης δεδομένων αντικειμένων με αντικείμενα fsck" - -#: lib/database.tcl:108 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database when more than %i loose objects exist.\n" -"\n" -"Compress the database now?" -msgstr "" -"Αυτό το αποθετήριο έχει αυτή τη στιγμή περίπου %i ελεύθερα αντικείμενα.\n" -"\n" -"Για τη διατήρηση βέλτιστων επιδόσεων συνιστάται να συμπιέσετε τη βάση " -"δεδομένων όταν υπάρχουν περισσότερα από %i ελεύθερα αντικείμενα.\n" -"\n" -"Συμπίεση της βάσης δεδομένων τώρα;" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Μη έγκυρη ημερομηνία από το Git: %s" - -#: lib/diff.tcl:42 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." -msgstr "" -"Δεν ανιχνεύθηκαν διαφορές.\n" -"\n" -"Το %s δεν έχει αλλαγές." -"\n" -"Η ημερομηνία τροποποίησης αυτού του αρχείου ενημερώθηκε από άλλη εφαρμογή, " -"αλλά το περιεχόμενο του αρχείου δεν άλλαξε.\n" -"\n" -"Θα ξεκινήσει αυτόματα επανανίχνευση για να βρεθούν άλλα αρχεία που μπορεί να " -"βρίσκονται σε ίδια κατάσταση." - -#: lib/diff.tcl:81 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Γίνεται φόρτωση διαφοράς του %s..." - -#: lib/diff.tcl:114 lib/diff.tcl:184 -#, tcl-format -msgid "Unable to display %s" -msgstr "Δεν είναι δυνατή η προβολή του %s" - -#: lib/diff.tcl:115 -msgid "Error loading file:" -msgstr "Σφάλμα φόρτωσης αρχείου:" - -#: lib/diff.tcl:122 -msgid "Git Repository (subproject)" -msgstr "Αποθετήριο Git (θυγατρικό έργο)" - -#: lib/diff.tcl:134 -msgid "* Binary file (not showing content)." -msgstr "* Δυαδικό αρχείο (μη εμφάνιση περιεχομένου)." - -#: lib/diff.tcl:185 -msgid "Error loading diff:" -msgstr "Σφάλμα φόρτωσης διαφοράς:" - -#: lib/diff.tcl:303 -msgid "Failed to unstage selected hunk." -msgstr "Αποτυχία αποσταδιοποίησης επιλεγμένου κομματιού." - -#: lib/diff.tcl:310 -msgid "Failed to stage selected hunk." -msgstr "Αποτυχία σταδιοποίησης επιλεγμένου κομματιού." - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "σφάλμα" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "προειδοποίηση" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Πρέπει να διορθώσετε τα παραπάνω λάθη πριν την υποβολή." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Αδυναμία ξεκλειδώματος του ευρετηρίου." - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Σφάλμα Ευρετηρίου" - -#: lib/index.tcl:21 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Η ενημέρωση του ευρετηρίου Git απέτυχε. Θα ξεκινήσει αυτόματα επανανίχνευση " -"για επανασυγχρονισμό του git-gui." - -#: lib/index.tcl:27 -msgid "Continue" -msgstr "Συνέχεια" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Ξεκλείδωμα Ευρετηρίου" - -#: lib/index.tcl:282 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Αποσταδιοποίηση %s από υποβολή" - -#: lib/index.tcl:313 -msgid "Ready to commit." -msgstr "Έτοιμο προς υποβολή." - -#: lib/index.tcl:326 -#, tcl-format -msgid "Adding %s" -msgstr "Προσθήκη %s" - -#: lib/index.tcl:381 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Αναίρεση αλλαγών στο αρχείο %s;" - -#: lib/index.tcl:383 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Αναίρεση αλλαγών σε αυτά τα %i αρχεία;" - -#: lib/index.tcl:391 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Όλες οι μη σταδιοποιημένες αλλαγές θα χαθούν οριστικά από την αναίρεση." - -#: lib/index.tcl:394 -msgid "Do Nothing" -msgstr "Καμία Ενέργεια" - -#: lib/merge.tcl:13 -msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" -msgstr "" -"Δε γίνεται συγχώνευση καθώς διορθώνετε.\n" -"\n" -"Πρέπει να τελειώσετε τη διόρθωση αυτής της υποβολής πριν να ξεκινήσετε " -"οποιασδήποτε μορφής συγχώνευση.\n" - -#: lib/merge.tcl:27 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"Η τελευταία κατάσταση που ανιχνεύθηκε δε συμφωνεί με την κατάσταση του " -"αποθετηρίου.\n" -"\n" -"Κάποιο άλλο πρόγραμμα Git τροποποίησε το αποθετήριο από την τελευταία " -"ανίχνευση. Πρέπει να γίνει επανανίχνευση πριν τη διενέργεια συγχώνευσης.\n" -"\n" -"Η επανανίχνευση θα ξεκινήσει αυτόματα τώρα.\n" - -#: lib/merge.tcl:44 -#, tcl-format -msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" -msgstr "" -"Βρίσκεστε στο μέσο μιας συγκρουόμενης συγχώνευσης.\n" -"\n" -"Το αρχείο %s έχει συγκρούσεις συγχώνευσης.\n" -"\n" -"Πρέπει να τις επιλύσετε, να σταδιοποιήσετε το αρχείο, και να κάνετε υποβολή " -"για να ολοκληρώσετε την τρέχουσα συγχώνευση. Μόνο τότε μπορείτε να " -"ξεκινήσετε άλλη συγχώνευση.\n" - -#: lib/merge.tcl:54 -#, tcl-format -msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" -msgstr "" -"Βρίσκεστε στο μέσο μιας αλλαγής.\n" -"\n" -"Το αρχείο %s έχει τροποποιηθεί.\n" -"\n" -"Πρέπει να ολοκληρώσετε την τρέχουσα συγχώνευση πριν να ξεκινήσετε συγχώνευση." -" Αυτό βοηθά στην ακύρωση αποτυχημένης συγχώνευσης, εάν χρειαστεί.\n" - -#: lib/merge.tcl:106 -#, tcl-format -msgid "%s of %s" -msgstr "%s από %s" - -#: lib/merge.tcl:119 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Γίνεται συγχώνευση του %s με το %s..." - -#: lib/merge.tcl:130 -msgid "Merge completed successfully." -msgstr "Η συγχώνευση ολοκληρώθηκε επιτυχώς." - -#: lib/merge.tcl:132 -msgid "Merge failed. Conflict resolution is required." -msgstr "Η συγχώνευση απέτυχε. Απαιτείται επίλυση συγκρούσεων." - -#: lib/merge.tcl:157 -#, tcl-format -msgid "Merge Into %s" -msgstr "Συγχώνευση με %s" - -#: lib/merge.tcl:176 -msgid "Revision To Merge" -msgstr "Αναθεώρηση Προς Συγχώνευση" - -#: lib/merge.tcl:211 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Δε γίνεται ακύρωση καθώς διορθώνετε.\n" -"\n" -"Πρέπει να τελειώσετε τη διόρθωση αυτής της υποβολής.\n" - -#: lib/merge.tcl:221 -msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" -msgstr "" -"Ακύρωση συγχώνευσης;\n" -"\n" -"Η ακύρωση της τρέχουσας συγχώνευσης θα προκαλέσει απώλεια *ΟΛΩΝ* των μη " -"υποβεβλημένων αλλαγών.\n" -"\n" -"Να προχωρήσει η ακύρωση της τρέχουσας συγχώνευσης;" - -#: lib/merge.tcl:227 -msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" -msgstr "" -"Επαναφορά αλλαγών;\n" -"\n" -"Η επαναφορά των αλλαγών θα προκαλέσει απώλεια *ΟΛΩΝ* των μη υποβεβλημένων " -"αλλαγών.\n" -"\n" -"Να συνεχίσει η επαναφορά των τρέχουσων αλλαγών;" - -#: lib/merge.tcl:238 -msgid "Aborting" -msgstr "Γίνεται ακύρωση" - -#: lib/merge.tcl:238 -msgid "files reset" -msgstr "αρχεία που επαναφέρθηκαν" - -#: lib/merge.tcl:265 -msgid "Abort failed." -msgstr "Η ακύρωση απέτυχε." - -#: lib/merge.tcl:267 -msgid "Abort completed. Ready." -msgstr "Η ακύρωση απέτυχε. Έτοιμο." - -#: lib/option.tcl:95 -msgid "Restore Defaults" -msgstr "Επαναφορά Προεπιλογών" - -#: lib/option.tcl:99 -msgid "Save" -msgstr "Αποθήκευση" - -#: lib/option.tcl:109 -#, tcl-format -msgid "%s Repository" -msgstr "%s Αποθετήριο" - -#: lib/option.tcl:110 -msgid "Global (All Repositories)" -msgstr "Ολικό (Όλα τα Αποθετήρια)" - -#: lib/option.tcl:116 -msgid "User Name" -msgstr "Όνομα Χρήστη" - -#: lib/option.tcl:117 -msgid "Email Address" -msgstr "Διεύθυνση Email" - -#: lib/option.tcl:119 -msgid "Summarize Merge Commits" -msgstr "Περίληψη Υποβολών Συγχώνευσης" - -#: lib/option.tcl:120 -msgid "Merge Verbosity" -msgstr "Λεπτομέρεια Συγχώνευσης" - -#: lib/option.tcl:121 -msgid "Show Diffstat After Merge" -msgstr "Προβολή Στατιστικών Διαφοράς Μετά από Συγχώνευση" - -#: lib/option.tcl:123 -msgid "Trust File Modification Timestamps" -msgstr "Εμπιστοσύνη Ημερομηνιών Μετατροπής Αρχείων" - -#: lib/option.tcl:124 -msgid "Prune Tracking Branches During Fetch" -msgstr "Κλάδεμα Κλάδων Παρακολούθησης Κατά Την Ανάκτηση" - -#: lib/option.tcl:125 -msgid "Match Tracking Branches" -msgstr "Συμφωνία Κλάδων Παρακολούθησης" - -#: lib/option.tcl:126 -msgid "Number of Diff Context Lines" -msgstr "Αριθμός Γραμμών Εννοιολογικού Πλαισίου Διαφοράς" - -#: lib/option.tcl:127 -msgid "Commit Message Text Width" -msgstr "Πλάτος Κειμένου Μηνύματος Υποβολής" - -#: lib/option.tcl:128 -msgid "New Branch Name Template" -msgstr "Νέο Πρότυπο Ονόματος Κλάδου" - -#: lib/option.tcl:192 -msgid "Spelling Dictionary:" -msgstr "Λεξικό Ορθογραφίας:" - -#: lib/option.tcl:216 -msgid "Change Font" -msgstr "Αλλαγή Γραμματοσειράς" - -#: lib/option.tcl:220 -#, tcl-format -msgid "Choose %s" -msgstr "Επιλογή %s" - -#: lib/option.tcl:226 -#, fuzzy -msgid "pt." -msgstr "" - -#: lib/option.tcl:240 -msgid "Preferences" -msgstr "Προτιμήσεις" - -#: lib/option.tcl:275 -msgid "Failed to completely save options:" -msgstr "Αποτυχία πλήρους αποθήκευσης επιλογών:" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Remote Branch" -msgstr "Διαγραφή Απομακρυσμένου Κλάδου" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Από Αποθετήριο" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 -msgid "Remote:" -msgstr "Απομακρυσμένο:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 -#, fuzzy -msgid "Arbitrary URL:" -msgstr "Αυθαίρετο URL:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "Κλάδοι" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Διαγραφή Μόνο Εάν" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Συγχωνευμένο Με:" - -#: lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Πάντα (Μη διενεργηθούν έλεγχοι συγχώνευσης)" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "Απαιτείται ένας κλάδος για 'Συγχωνευμένο Με'." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Οι εξής κλάδοι δεν είναι πλήρως συγχωνευμένοι με το %s:\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:189 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "" -"Μία ή περισσότερες από τις δοκιμές συγχώνευσης απέτυχαν επειδή δεν έχετε " -"φέρει τις αναγκαίες υποβολές. Δοκιμάστε ανάκτηση από το %s πρώτα." - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Παρακαλώ επιλέξτε έναν ή περισσότερους κλάδους προς διαγραφή." - -#: lib/remote_branch_delete.tcl:216 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Η ανάκτηση διεγραμμένων κλάδων είναι δύσκολη.\n" -"\n" -"Διαγραφή των επιλεγμένων κλάδων;" - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Γίνεται διαγραφή κλάδων από %s" - -#: lib/remote_branch_delete.tcl:286 -msgid "No repository selected." -msgstr "Δεν έχει επιλεγεί αποθετήριο." - -#: lib/remote_branch_delete.tcl:291 -#, tcl-format -msgid "Scanning %s..." -msgstr "Ανίχνευση %s..." - -#: lib/remote.tcl:165 -msgid "Prune from" -msgstr "Κλάδεμα από" - -#: lib/remote.tcl:170 -msgid "Fetch from" -msgstr "Ανάκτηση από" - -#: lib/remote.tcl:213 -msgid "Push to" -msgstr "Ώθηση σε" - -#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 -msgid "Cannot write shortcut:" -msgstr "Δε μπόρεσε να αποθηκευτεί η συντόμευση:" - -#: lib/shortcut.tcl:136 -msgid "Cannot write icon:" -msgstr "Δε μπόρεσε να αποθηκευτεί το εικονίδιο:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Mη υποστηριζόμενος ελεγκτής ορθογραφίας" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Έλεγχος ορθογραφίας μη διαθέσιμος" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Μη έγκυρη ρύθμιση ελέγχου ορθογραφίας" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Γίνεται επαναφορά του λεξικού σε %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Ο ελεγκτής ορθογραφίας απέτυχε σιωπηλά κατά την εκκίνηση" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Μη αναγνωρίσιμος ελεγκτής ορθογραφίας" - -#: lib/spellcheck.tcl:180 -msgid "No Suggestions" -msgstr "Καμία Πρόταση" - -#: lib/spellcheck.tcl:381 -msgid "Unexpected EOF from spell checker" -msgstr "Μη αναμενόμενο τέλος αρχείου από τον ελεγκτή ορθογραφίας" - -#: lib/spellcheck.tcl:385 -msgid "Spell Checker Failed" -msgstr "Αποτυχία Ελεγκτή Ορθογραφίας" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i από %*i %s (%3i%%)" - -#: lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "ανάκτηση %s" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Ανάκτηση νέων αλλαγών από το %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "απομακρυσμένο κλάδεμα %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Γίνεται κλάδεμα κλάδων παρακολούθησης που διεγράφησαν από το %s" - -#: lib/transport.tcl:25 lib/transport.tcl:71 -#, tcl-format -msgid "push %s" -msgstr "ώθηση %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Γίνεται ώθηση αλλαγών στο %s" - -#: lib/transport.tcl:72 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Γίνεται ώθηση %s %s στο %s" - -#: lib/transport.tcl:89 -msgid "Push Branches" -msgstr "Ώθηση Κλάδων" - -#: lib/transport.tcl:103 -msgid "Source Branches" -msgstr "Πηγαίοι Κλάδοι" - -#: lib/transport.tcl:120 -msgid "Destination Repository" -msgstr "Αποθετήριο Προορισμού" - -#: lib/transport.tcl:158 -msgid "Transfer Options" -msgstr "Επιλογές Μεταφοράς" - -#: lib/transport.tcl:160 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "" -"Εξαναγκασμός επεγγραφής υπάρχοντος κλάδου (μπορεί να απορρίψει αλλαγές)" - -#: lib/transport.tcl:164 -msgid "Use thin pack (for slow network connections)" -msgstr "Χρήση ισχνού πακέτου (για αργές συνδέσεις δικτύου)" - -#: lib/transport.tcl:168 -msgid "Include tags" -msgstr "Συμπερίληψη ετικετών" - - diff --git a/po/fr.po b/po/fr.po deleted file mode 100644 index 40441db..0000000 --- a/po/fr.po +++ /dev/null @@ -1,2604 +0,0 @@ -# translation of fr.po to French -# Translation of git-gui to French. -# Copyright (C) 2008 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# -# Christian Couder <chriscool@tuxfamily.org>, 2008. -# Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>, 2008. -msgid "" -msgstr "" -"Project-Id-Version: fr\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2010-02-02 12:59+0100\n" -"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n" -"Language-Team: French\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "git-gui: erreur fatale" - -#: git-gui.sh:743 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Police invalide spécifiée dans %s :" - -#: git-gui.sh:779 -msgid "Main Font" -msgstr "Police principale" - -#: git-gui.sh:780 -msgid "Diff/Console Font" -msgstr "Police diff/console" - -#: git-gui.sh:794 -msgid "Cannot find git in PATH." -msgstr "Impossible de trouver git dans PATH." - -#: git-gui.sh:821 -msgid "Cannot parse Git version string:" -msgstr "Impossible de parser la version de Git :" - -#: git-gui.sh:839 -#, tcl-format -msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" -msgstr "" -"Impossible de déterminer la version de Git.\n" -"\n" -"%s affirme qu'il s'agit de la version '%s'.\n" -"\n" -"%s nécessite au moins Git 1.5.0.\n" -"\n" -"Peut-on considérer que '%s' est en version 1.5.0 ?\n" - -#: git-gui.sh:1128 -msgid "Git directory not found:" -msgstr "Impossible de trouver le répertoire git :" - -#: git-gui.sh:1146 -msgid "Cannot move to top of working directory:" -msgstr "Impossible d'aller à la racine du répertoire de travail :" - -#: git-gui.sh:1154 -msgid "Cannot use bare repository:" -msgstr "Impossible d'utiliser un dépôt nu (bare) :" - -#: git-gui.sh:1162 -msgid "No working directory" -msgstr "Aucun répertoire de travail" - -#: git-gui.sh:1334 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Rafraîchissement du statut des fichiers..." - -#: git-gui.sh:1390 -msgid "Scanning for modified files ..." -msgstr "Recherche de fichiers modifiés..." - -#: git-gui.sh:1454 -msgid "Calling prepare-commit-msg hook..." -msgstr "Lancement de l'action de préparation du message de commit..." - -#: git-gui.sh:1471 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "Commit refusé par l'action de préparation du message de commit." - -#: git-gui.sh:1629 lib/browser.tcl:246 -msgid "Ready." -msgstr "Prêt." - -#: git-gui.sh:1787 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Affiche seulement %s fichiers sur %s." - -#: git-gui.sh:1913 -msgid "Unmodified" -msgstr "Non modifié" - -#: git-gui.sh:1915 -msgid "Modified, not staged" -msgstr "Modifié, pas indexé" - -#: git-gui.sh:1916 git-gui.sh:1924 -msgid "Staged for commit" -msgstr "Indexé" - -#: git-gui.sh:1917 git-gui.sh:1925 -msgid "Portions staged for commit" -msgstr "Portions indexées" - -#: git-gui.sh:1918 git-gui.sh:1926 -msgid "Staged for commit, missing" -msgstr "Indexés, manquant" - -#: git-gui.sh:1920 -msgid "File type changed, not staged" -msgstr "Le type de fichier a changé, non indexé" - -#: git-gui.sh:1921 -msgid "File type changed, staged" -msgstr "Le type de fichier a changé, indexé" - -#: git-gui.sh:1923 -msgid "Untracked, not staged" -msgstr "Non versionné, non indexé" - -#: git-gui.sh:1928 -msgid "Missing" -msgstr "Manquant" - -#: git-gui.sh:1929 -msgid "Staged for removal" -msgstr "Indexé pour suppression" - -#: git-gui.sh:1930 -msgid "Staged for removal, still present" -msgstr "Indexé pour suppression, toujours présent" - -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 -msgid "Requires merge resolution" -msgstr "Nécessite la résolution d'une fusion" - -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "Lancement de gitk... un instant..." - -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" -msgstr "Impossible de trouver gitk dans PATH." - -#: git-gui.sh:2043 -msgid "Couldn't find git gui in PATH" -msgstr "Impossible de trouver git gui dans PATH" - -#: git-gui.sh:2455 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Dépôt" - -#: git-gui.sh:2456 -msgid "Edit" -msgstr "Édition" - -#: git-gui.sh:2458 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Branche" - -#: git-gui.sh:2461 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Commit" - -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Fusionner" - -#: git-gui.sh:2465 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Dépôt distant" - -#: git-gui.sh:2468 -msgid "Tools" -msgstr "Outils" - -#: git-gui.sh:2477 -msgid "Explore Working Copy" -msgstr "Explorer la copie de travail" - -#: git-gui.sh:2483 -msgid "Browse Current Branch's Files" -msgstr "Naviguer dans la branche courante" - -#: git-gui.sh:2487 -msgid "Browse Branch Files..." -msgstr "Naviguer dans la branche..." - -#: git-gui.sh:2492 -msgid "Visualize Current Branch's History" -msgstr "Visualiser l'historique de la branche courante" - -#: git-gui.sh:2496 -msgid "Visualize All Branch History" -msgstr "Voir l'historique de toutes les branches" - -#: git-gui.sh:2503 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Parcourir l'arborescence de %s" - -#: git-gui.sh:2505 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Voir l'historique de la branche : %s" - -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Statistiques du dépôt" - -#: git-gui.sh:2513 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Comprimer le dépôt" - -#: git-gui.sh:2516 -msgid "Verify Database" -msgstr "Vérifier le dépôt" - -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Créer une icône sur le bureau" - -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Quitter" - -#: git-gui.sh:2547 -msgid "Undo" -msgstr "Défaire" - -#: git-gui.sh:2550 -msgid "Redo" -msgstr "Refaire" - -#: git-gui.sh:2554 git-gui.sh:3109 -msgid "Cut" -msgstr "Couper" - -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Copier" - -#: git-gui.sh:2560 git-gui.sh:3115 -msgid "Paste" -msgstr "Coller" - -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Supprimer" - -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 -msgid "Select All" -msgstr "Tout sélectionner" - -#: git-gui.sh:2576 -msgid "Create..." -msgstr "Créer..." - -#: git-gui.sh:2582 -msgid "Checkout..." -msgstr "Charger (checkout)..." - -#: git-gui.sh:2588 -msgid "Rename..." -msgstr "Renommer..." - -#: git-gui.sh:2593 -msgid "Delete..." -msgstr "Supprimer..." - -#: git-gui.sh:2598 -msgid "Reset..." -msgstr "Réinitialiser..." - -#: git-gui.sh:2608 -msgid "Done" -msgstr "Effectué" - -#: git-gui.sh:2610 -msgid "Commit@@verb" -msgstr "Commiter@@verb" - -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "Nouveau commit" - -#: git-gui.sh:2627 git-gui.sh:3057 -msgid "Amend Last Commit" -msgstr "Corriger dernier commit" - -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Recharger modifs." - -#: git-gui.sh:2643 -msgid "Stage To Commit" -msgstr "Indexer" - -#: git-gui.sh:2649 -msgid "Stage Changed Files To Commit" -msgstr "Indexer toutes modifications" - -#: git-gui.sh:2655 -msgid "Unstage From Commit" -msgstr "Désindexer" - -#: git-gui.sh:2661 lib/index.tcl:412 -msgid "Revert Changes" -msgstr "Annuler les modifications" - -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 -msgid "Show Less Context" -msgstr "Montrer moins de contexte" - -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 -msgid "Show More Context" -msgstr "Montrer plus de contexte" - -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 -msgid "Sign Off" -msgstr "Signer" - -#: git-gui.sh:2696 -msgid "Local Merge..." -msgstr "Fusion locale..." - -#: git-gui.sh:2701 -msgid "Abort Merge..." -msgstr "Abandonner fusion..." - -#: git-gui.sh:2713 git-gui.sh:2741 -msgid "Add..." -msgstr "Ajouter..." - -#: git-gui.sh:2717 -msgid "Push..." -msgstr "Pousser..." - -#: git-gui.sh:2721 -msgid "Delete Branch..." -msgstr "Supprimer branche..." - -#: git-gui.sh:2731 git-gui.sh:3292 -msgid "Options..." -msgstr "Options..." - -#: git-gui.sh:2742 -msgid "Remove..." -msgstr "Supprimer..." - -#: git-gui.sh:2751 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Aide" - -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "À propos de %s" - -#: git-gui.sh:2783 -msgid "Online Documentation" -msgstr "Documentation en ligne" - -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "Montrer la clé SSH" - -#: git-gui.sh:2893 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"erreur fatale : pas d'infos sur le chemin %s : Fichier ou répertoire " -"inexistant" - -#: git-gui.sh:2926 -msgid "Current Branch:" -msgstr "Branche courante :" - -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "Modifs. indexées (pour commit)" - -#: git-gui.sh:2967 -msgid "Unstaged Changes" -msgstr "Modifs. non indexées" - -#: git-gui.sh:3017 -msgid "Stage Changed" -msgstr "Indexer modifs." - -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "Pousser" - -#: git-gui.sh:3071 -msgid "Initial Commit Message:" -msgstr "Message de commit initial :" - -#: git-gui.sh:3072 -msgid "Amended Commit Message:" -msgstr "Message de commit corrigé :" - -#: git-gui.sh:3073 -msgid "Amended Initial Commit Message:" -msgstr "Message de commit initial corrigé :" - -#: git-gui.sh:3074 -msgid "Amended Merge Commit Message:" -msgstr "Message de commit de fusion corrigé :" - -#: git-gui.sh:3075 -msgid "Merge Commit Message:" -msgstr "Message de commit de fusion :" - -#: git-gui.sh:3076 -msgid "Commit Message:" -msgstr "Message de commit :" - -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 -msgid "Copy All" -msgstr "Copier tout" - -#: git-gui.sh:3149 lib/blame.tcl:104 -msgid "File:" -msgstr "Fichier :" - -#: git-gui.sh:3255 -msgid "Refresh" -msgstr "Rafraîchir" - -#: git-gui.sh:3276 -msgid "Decrease Font Size" -msgstr "Diminuer la police" - -#: git-gui.sh:3280 -msgid "Increase Font Size" -msgstr "Agrandir la police" - -#: git-gui.sh:3288 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Codage des caractères" - -#: git-gui.sh:3299 -msgid "Apply/Reverse Hunk" -msgstr "Appliquer/Inverser section" - -#: git-gui.sh:3304 -msgid "Apply/Reverse Line" -msgstr "Appliquer/Inverser la ligne" - -#: git-gui.sh:3323 -msgid "Run Merge Tool" -msgstr "Lancer l'outil de fusion" - -#: git-gui.sh:3328 -msgid "Use Remote Version" -msgstr "Utiliser la version distante" - -#: git-gui.sh:3332 -msgid "Use Local Version" -msgstr "Utiliser la version locale" - -#: git-gui.sh:3336 -msgid "Revert To Base" -msgstr "Revenir à la version de base" - -#: git-gui.sh:3354 -msgid "Visualize These Changes In The Submodule" -msgstr "Voir les changments dans le sous-module" - -#: git-gui.sh:3358 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Voir l'historique de la branche courante du sous-module" - -#: git-gui.sh:3362 -msgid "Visualize All Branch History In The Submodule" -msgstr "Voir l'historique de toutes les branches du sous-module" - -#: git-gui.sh:3367 -msgid "Start git gui In The Submodule" -msgstr "Démarrer git gui dans le sous-module" - -#: git-gui.sh:3389 -msgid "Unstage Hunk From Commit" -msgstr "Désindexer la section" - -#: git-gui.sh:3391 -msgid "Unstage Lines From Commit" -msgstr "Désindexer la ligne du commit" - -#: git-gui.sh:3393 -msgid "Unstage Line From Commit" -msgstr "Désindexer la ligne" - -#: git-gui.sh:3396 -msgid "Stage Hunk For Commit" -msgstr "Indexer la section" - -#: git-gui.sh:3398 -msgid "Stage Lines For Commit" -msgstr "Indexer les lignes" - -#: git-gui.sh:3400 -msgid "Stage Line For Commit" -msgstr "Indexer la ligne" - -#: git-gui.sh:3424 -msgid "Initializing..." -msgstr "Initialisation..." - -#: git-gui.sh:3541 -#, tcl-format -msgid "" -"Possible environment issues exist.\n" -"\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" -"\n" -msgstr "" -"Des problèmes d'environnement sont possibles.\n" -"\n" -"Les variables d'environnement suivantes seront\n" -"probablement ignorées par tous les\n" -"sous-processus de Git lancés par %s\n" -"\n" - -#: git-gui.sh:3570 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Ceci est dû à un problème connu avec\n" -"le binaire Tcl distribué par Cygwin." - -#: git-gui.sh:3575 -#, tcl-format -msgid "" -"\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\n" -msgstr "" -"\n" -"\n" -"Un bon remplacement pour %s\n" -"est de mettre les valeurs pour 'user.name' (nom\n" -"de l'utilisateur) et 'user.email' (addresse email\n" -"de l'utilisateur) dans votre fichier '~/.gitconfig'.\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - une interface graphique utilisateur pour Git" - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Visionneur de fichier" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Commit :" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Copier commit" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Chercher texte..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Lancer la détection approfondie des copies" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Montrer l'historique" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Blâmer le commit parent" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Lecture de %s..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "Chargement des annotations de suivi des copies/déplacements..." - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "lignes annotées" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Chargement des annotations d'emplacement original" - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Annotation terminée." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Occupé" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "Annotation en cours d'exécution." - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Recherche de copie approfondie en cours..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Chargement des annotations..." - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Auteur :" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Commiteur :" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "Fichier original :" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Impossible de trouver le commit HEAD :" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Impossible de trouver le commit parent :" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Impossible d'afficher le parent" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "Erreur lors du chargement des différences :" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "À l'origine par :" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "Dans le fichier :" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "Copié ou déplacé ici par :" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Charger la branche (checkout)" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "Charger (checkout)" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "Annuler" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Révision" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "Options" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Récupérer la branche de suivi" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Détacher de la branche locale" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Créer une branche" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Créer une nouvelle branche" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 -msgid "Create" -msgstr "Créer" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Nom de branche" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "Nom :" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Trouver nom de branche de suivi" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Révision initiale" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Mettre à jour une branche existante :" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Non" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Mise à jour rectiligne seulement (fast-forward)" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Réinitialiser" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Charger (checkout) après création" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Choisissez une branche de suivi" - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "La branche de suivi %s n'est pas une branche dans le dépôt distant." - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Fournissez un nom de branche." - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "'%s' n'est pas un nom de branche acceptable." - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Supprimer branche" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Supprimer branche locale" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Branches locales" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Supprimer seulement si fusionnée dans :" - -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Toujours (ne pas vérifier les fusions)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %s :" - -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Il est difficile de récupérer des branches supprimées.\n" -"\n" -"Supprimer les branches sélectionnées ?" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"La suppression des branches suivantes a échoué :\n" -"%s" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Renommer branche" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Renommer" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Branche :" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Nouveau nom :" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Merci de sélectionner une branche à renommer." - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "La branche '%s' existe déjà." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Échec pour renommer '%s'." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Lancement..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "Visionneur de fichier" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Chargement de %s..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Jusqu'au parent]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Naviguer dans les fichiers de le branche" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "Naviguer" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Récupération de %s à partir de %s" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "erreur fatale : Impossible de résoudre %s" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Fermer" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "La branche '%s' n'existe pas." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Échec de la configuration simplifiée de git-pull pour '%s'." - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"La branche '%s' existe déjà.\n" -"\n" -"Impossible de faire une avance rapide (fast forward) vers %s.\n" -"Une fusion est nécessaire." - -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "La stratégie de fusion '%s' n'est pas supportée." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "La mise à jour de '%s' a échoué." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "L'index (staging area) est déjà verrouillé." - -#: lib/checkout_op.tcl:289 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"L'état lors de la dernière synchronisation ne correspond plus à l'état du " -"dépôt.\n" -"\n" -"Un autre programme Git a modifié ce dépôt depuis la dernière " -"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir " -"modifier la branche courante.\n" -"\n" -"Cela va être fait tout de suite automatiquement.\n" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Mise à jour du répertoire courant avec '%s'..." - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "fichiers chargés" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "" -"Chargement de '%s' abandonné (il est nécessaire de fusionner des fichiers)." - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Il est nécessaire de fusionner des fichiers." - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Le répertoire de travail reste sur la branche '%s'." - -#: lib/checkout_op.tcl:452 -msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." -msgstr "" -"Vous n'êtes plus sur une branche locale.\n" -"\n" -"Si vous vouliez être sur une branche, créez-en une maintenant en partant de " -"'Cet emprunt détaché'." - -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "'%s' chargé." - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Réinitialiser '%s' à '%s' va faire perdre les commits suivants :" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Récupérer les commits perdus ne sera peut être pas facile." - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Réinitialiser '%s' ?" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Visualiser" - -#: lib/checkout_op.tcl:635 -#, tcl-format -msgid "" -"Failed to set current branch.\n" -"\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" -"\n" -"This should not have occurred. %s will now close and give up." -msgstr "" -"Le changement de la branche courante a échoué.\n" -"\n" -"Le répertoire courant n'est que partiellement modifié. Les fichiers ont été " -"mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a " -"échouée.\n" -"\n" -"Cela n'aurait pas dû se produire. %s va abandonner et se terminer." - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Sélectionner" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Familles de polices" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Taille de police" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Exemple de police" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Ceci est un texte d'exemple.\n" -"Si vous aimez ce texte, vous pouvez choisir cette police." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" -msgstr "Créer nouveau dépôt" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Nouveau..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" -msgstr "Cloner un dépôt existant" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Cloner..." - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" -msgstr "Ouvrir un dépôt existant" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Ouvrir..." - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Dépôts récemment utilisés" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Ouvrir un dépôt récent :" - -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "La création du dépôt %s a échoué :" - -#: lib/choose_repository.tcl:391 -msgid "Directory:" -msgstr "Répertoire :" - -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" -msgstr "Dépôt Git" - -#: lib/choose_repository.tcl:448 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Le répertoire %s existe déjà." - -#: lib/choose_repository.tcl:452 -#, tcl-format -msgid "File %s already exists." -msgstr "Le fichier %s existe déjà." - -#: lib/choose_repository.tcl:466 -msgid "Clone" -msgstr "Cloner" - -#: lib/choose_repository.tcl:479 -msgid "Source Location:" -msgstr "Emplacement source :" - -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" -msgstr "Répertoire cible :" - -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" -msgstr "Type de clonage :" - -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Standard (rapide, semi-redondant, liens durs)" - -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Copy complète (plus lent, sauvegarde redondante)" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Partagé (le plus rapide, non recommandé, pas de sauvegarde)" - -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "'%s' n'est pas un dépôt Git." - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "Standard n'est disponible que pour un dépôt local." - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "Partagé n'est disponible que pour un dépôt local." - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "L'emplacement %s existe déjà." - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "La configuration de l'origine a échoué." - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "Décompte des objets" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "paniers" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Impossible de copier 'objects/info/alternates' : %s" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Il n'y a rien à cloner depuis %s." - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "La branche 'master' n'a pas été initialisée." - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "" -"Les liens durs ne sont pas supportés. Une copie sera effectuée à la place." - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "Clonage depuis %s" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "Copie des objets" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Impossible de copier l'objet : %s" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "Liaison des objets" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "objets" - -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Impossible créer un lien dur pour l'objet : %s" - -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Impossible de récupérer les branches et objets. Voir la sortie console pour " -"plus de détails." - -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "" -"Impossible de récupérer les marques (tags). Voir la sortie console pour plus " -"de détails." - -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Impossible de déterminer HEAD. Voir la sortie console pour plus de détails." - -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Impossible de nettoyer %s" - -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "Le clonage a échoué." - -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "Aucune branche par défaut n'a été obtenue." - -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Impossible de résoudre %s comme commit." - -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "Création du répertoire de travail" - -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "fichiers" - -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "Le chargement initial du fichier a échoué." - -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "Ouvrir" - -#: lib/choose_repository.tcl:1021 -msgid "Repository:" -msgstr "Dépôt :" - -#: lib/choose_repository.tcl:1072 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Impossible d'ouvrir le dépôt %s :" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "Cet emprunt détaché" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Expression de révision :" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "Branche locale" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "Branche de suivi" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "Marque (tag)" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Révision invalide : %s" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "Pas de révision sélectionnée." - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "L'expression de révision est vide." - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "Mise à jour:" - -#: lib/choose_rev.tcl:559 -msgid "URL" -msgstr "URL" - -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" -msgstr "" -"Il n'y a rien à corriger.\n" -"\n" -"Vous allez créer le commit initial. Il n'y a pas de commit avant celui-ci à " -"corriger.\n" - -#: lib/commit.tcl:18 -msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" -msgstr "" -"Impossible de corriger pendant une fusion.\n" -"\n" -"Vous êtes actuellement au milieu d'une fusion qui n'a pas été complètement " -"terminée. Vous ne pouvez pas corriger le commit précédent sauf si vous " -"abandonnez la fusion courante.\n" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Erreur lors du chargement des données de commit pour correction :" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Impossible d'obtenir votre identité :" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "GIT_COMMITTER_IDENT invalide :" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "attention : Tcl ne supporte pas le codage '%s'." - -#: lib/commit.tcl:149 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"L'état lors de la dernière synchronisation ne correspond plus à l'état du " -"dépôt.\n" -"\n" -"Un autre programme Git a modifié ce dépôt depuis la dernière " -"synchronisation. Une resynshronisation doit être effectuée avant de pouvoir " -"créer un nouveau commit.\n" -"\n" -"Cela va être fait tout de suite automatiquement.\n" - -#: lib/commit.tcl:172 -#, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" -"\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" -msgstr "" -"Des fichiers non fusionnés ne peuvent être commités.\n" -"\n" -"Le fichier %s a des conflicts de fusion. Vous devez les résoudre et pré-" -"commiter le fichier avant de pouvoir commiter.\n" - -#: lib/commit.tcl:180 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Un état de fichier inconnu %s a été détecté.\n" -"\n" -"Le fichier %s ne peut pas être commité par ce programme.\n" - -#: lib/commit.tcl:188 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Pas de modification à commiter.\n" -"\n" -"Vous devez indexer au moins 1 fichier avant de pouvoir commiter.\n" - -#: lib/commit.tcl:203 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" -msgstr "" -"Merci de fournir un message de commit.\n" -"\n" -"Un bon message de commit a le format suivant :\n" -"\n" -"- Première ligne : décrire en une phrase ce que vous avez fait.\n" -"- Deuxième ligne : rien.\n" -"- Lignes suivantes : Décrire pourquoi ces modifications sont bonnes.\n" - -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." -msgstr "Lancement de l'action d'avant-commit..." - -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "Commit refusé par l'action d'avant-commit." - -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "Lancement de l'action \"message de commit\"..." - -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "Commit refusé par l'action \"message de commit\"." - -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "Commit des modifications..." - -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "write-tree a échoué :" - -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "Le commit a échoué." - -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Le commit %s semble être corrompu" - -#: lib/commit.tcl:339 -msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" -msgstr "" -"Pas de modification à commiter.\n" -"\n" -"Aucun fichier n'a été modifié par ce commit et il ne s'agit pas d'un commit " -"de fusion.\n" -"\n" -"Une resynchronisation va être lancée tout de suite automatiquement.\n" - -#: lib/commit.tcl:346 -msgid "No changes to commit." -msgstr "Pas de modifications à commiter." - -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "commit-tree a échoué :" - -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "update-ref a échoué :" - -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Commit %s créé : %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Travail en cours... merci de patienter..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Succès" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Erreur : échec de la commande" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "Nombre d'objets en fichier particulier" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "Espace disque utilisé par les fichiers particuliers" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "Nombre d'objets empaquetés" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "Nombre de paquets d'objets" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "Espace disque utilisé par les objets empaquetés" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "Objets empaquetés attendant d'être supprimés" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "Fichiers poubelle" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Compression de la base des objets" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Vérification de la base des objets avec fsck-objects" - -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"Ce dépôt comprend actuellement environ %i objets ayant leur fichier " -"particulier.\n" -"\n" -"Pour conserver une performance optimale, il est fortement recommandé de " -"comprimer la base de donnée.\n" -"\n" -"Comprimer la base maintenant ?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Date invalide de Git : %s" - -#: lib/diff.tcl:64 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." -msgstr "" -"Aucune différence détectée.\n" -"\n" -"%s ne comporte aucune modification.\n" -"\n" -"La date de modification de ce fichier a été mise à jour par une autre " -"application, mais le contenu du fichier n'a pas changé.\n" -"\n" -"Une resynchronisation va être lancée automatiquement pour trouver d'autres " -"fichiers qui pourraient se trouver dans le même état." - -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Chargement des différences de %s..." - -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"LOCAL : supprimé\n" -"DISTANT :\n" - -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"DISTANT : supprimé\n" -"LOCAL :\n" - -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "LOCAL :\n" - -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "DISTANT :\n" - -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" -msgstr "Impossible d'afficher %s" - -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "Erreur lors du chargement du fichier :" - -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Dépôt Git (sous projet)" - -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* Fichier binaire (pas d'apperçu du contenu)." - -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Le fichier non suivi fait %d octets.\n" -"* Seuls les %d premiers octets sont montrés.\n" - -#: lib/diff.tcl:233 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Fichier suivi raccourcis ici de %s.\n" -"* Pour voir le fichier entier, utilisez un éditeur externe.\n" - -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." -msgstr "Échec lors de la désindexation de la section sélectionnée." - -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "Échec lors de l'indexation de la section." - -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "Échec lors de la désindexation de la ligne sélectionnée." - -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "Échec lors de l'indexation de la ligne." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Défaut" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Système (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Autre" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "erreur" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "attention" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Impossible de déverrouiller l'index." - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Erreur de l'index" - -#: lib/index.tcl:17 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Échec de la mise à jour de l'index. Une resynchronisation va être lancée " -"automatiquement." - -#: lib/index.tcl:28 -msgid "Continue" -msgstr "Continuer" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Déverrouiller l'index" - -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Désindexation de : %s" - -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "Prêt à être commité." - -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "Ajout de %s" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Annuler les modifications dans le fichier %s ? " - -#: lib/index.tcl:400 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Annuler les modifications dans ces %i fichiers ?" - -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Toutes les modifications non-indexées seront définitivement perdues par " -"l'annulation." - -#: lib/index.tcl:411 -msgid "Do Nothing" -msgstr "Ne rien faire" - -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "Annuler modifications dans fichiers selectionnés" - -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "Annulation des modifications dans %s" - -#: lib/merge.tcl:13 -msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" -msgstr "" -"Impossible de fusionner pendant une correction.\n" -"\n" -"Vous devez finir de corriger ce commit avant de lancer une quelconque " -"fusion.\n" - -#: lib/merge.tcl:27 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"L'état lors de la dernière synchronisation ne correspond plus à l'état du " -"dépôt.\n" -"\n" -"Un autre programme Git a modifié ce dépôt depuis la dernière " -"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir " -"fusionner de nouveau.\n" -"\n" -"Cela va être fait tout de suite automatiquement\n" - -#: lib/merge.tcl:45 -#, tcl-format -msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" -msgstr "" -"Vous êtes au milieu d'une fusion conflictuelle.\n" -"\n" -"Le fichier %s a des conflicts de fusion.\n" -"\n" -"Vous devez les résoudre, puis indexer le fichier, et enfin commiter pour " -"terminer la fusion courante. Seulement à ce moment là sera-t-il possible " -"d'effectuer une nouvelle fusion.\n" - -#: lib/merge.tcl:55 -#, tcl-format -msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" -msgstr "" -"Vous êtes au milieu d'une modification.\n" -"\n" -"Le fichier %s a été modifié.\n" -"\n" -"Vous devriez terminer le commit courant avant de lancer une fusion. En " -"faisait comme cela, vous éviterez de devoir éventuellement abandonner une " -"fusion ayant échoué.\n" - -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s de %s" - -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Fusion de %s et %s..." - -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "La fusion s'est faite avec succès." - -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "La fusion a echoué. Il est nécessaire de résoudre les conflits." - -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "Fusion dans %s" - -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Révision à fusionner" - -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Impossible d'abandonner en cours de correction.\n" -"\n" -"Vous devez finir de corriger ce commit.\n" - -#: lib/merge.tcl:222 -msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" -msgstr "" -"Abandonner la fusion ?\n" -"\n" -"Abandonner la fusion courante entrainera la perte de TOUTES les " -"modifications non commitées.\n" -"\n" -"Abandonner quand même la fusion courante ?" - -#: lib/merge.tcl:228 -msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" -msgstr "" -"Réinitialiser les modifications ?\n" -"\n" -"Réinitialiser les modifications va faire perdre TOUTES les modifications non " -"commitées.\n" -"\n" -"Réinitialiser quand même les modifications courantes ?" - -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Abandon" - -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "fichiers réinitialisés" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "L'abandon a échoué." - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Abandon teminé. Prêt." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Forcer la résolution à la version de base ?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Forcer la résolution à cette branche ?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Forcer la résolution à l'autre branche ?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Noter que le diff ne montre que les modifications en conflit.\n" -"\n" -"%s sera écrasé.\n" -"\n" -"Cette opération ne peut être inversée qu'en relançant la fusion." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" -"Le fichier %s semble avoir des conflits non résolus, indexer quand même ?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Ajouter une résolution pour %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" -"Impossible de résoudre la suppression ou de relier des conflits en utilisant " -"un outil" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Le fichier en conflit n'existe pas." - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "'%s' n'est pas un outil graphique pour fusionner des fichiers." - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Outil de fusion '%s' non supporté" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "L'outil de fusion tourne déjà, faut-il le terminer ?" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Erreur lors de la récupération des versions :\n" -"%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Impossible de lancer l'outil de fusion :\n" -"\n" -"%s" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "Lancement de l'outil de fusion..." - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "L'outil de fusion a échoué." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Codage global '%s' invalide" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Codage de dépôt '%s' invalide" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Remettre les valeurs par défaut" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Sauvegarder" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "Dépôt : %s" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Globales (tous les dépôts)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Nom d'utilisateur" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Adresse email" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Résumer les commits de fusion" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Fusion bavarde" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Montrer statistiques de diff après fusion" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Utiliser outil de fusion" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "Faire confiance aux dates de modification de fichiers " - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "Purger les branches de suivi pendant la récupération" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "Faire correspondre les branches de suivi" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "Annoter les copies seulement sur fichiers modifiés" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "Minimum de caratères pour annoter une copie" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Distance de blâme dans l'historique (jours)" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Nombre de lignes de contexte dans les diffs" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Largeur du texte de message de commit" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Nouveau modèle de nom de branche" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Codage du contenu des fichiers par défaut" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Modifier" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Dictionnaire d'orthographe :" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Modifier les polices" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "Choisir %s" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Préférences" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "La sauvegarde complète des options a échoué :" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Supprimer un dépôt distant" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Purger de" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Récupérer de" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Pousser vers" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Ajouter un dépôt distant" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Ajouter un nouveau dépôt distant" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Ajouter" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Détails des dépôts distants" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Emplacement :" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Action supplémentaire" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Récupérer immédiatement" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Initialiser un dépôt distant et pousser" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Ne rien faire d'autre maintenant" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Merci de fournir un nom de dépôt distant." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "'%s' n'est pas un nom de dépôt distant acceptable." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Échec de l'ajout du dépôt distant '%s' à l'emplacement '%s'." - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "récupérer %s" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "Récupération de %s" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Pas de méthode connue pour initialiser le dépôt à l'emplacement '%s'." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "pousser %s" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Mise en place de %s (à %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Supprimer une branche à distance" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Dépôt source" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "Branche distante :" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "Emplacement arbitraire :" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "Branches" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Supprimer seulement si" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Fusionné dans :" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "Une branche est nécessaire pour 'Fusionné dans'." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Les branches suivantes ne sont pas complètement fusionnées dans %s :\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:189 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "" -"Un ou plusieurs des tests de fusion ont échoué parce que vous n'avez pas " -"récupéré les commits nécessaires. Essayez de récupérer à partir de %s " -"d'abord." - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Merci de sélectionner une ou plusieurs branches à supprimer." - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Suppression des branches de %s" - -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "Aucun dépôt n'est sélectionné." - -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "Synchronisation de %s..." - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Chercher :" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "Suivant" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Précédent" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Sensible à la casse" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Impossible d'écrire le raccourci :" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Impossible d'écrire l'icône :" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Vérificateur d'orthographe non supporté" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "La vérification d'orthographe n'est pas disponible" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Configuration de vérification d'orthographe invalide" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Réinitialisation du dictionnaire à %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "La vérification d'orthographe a échoué silencieusement au démarrage" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Vérificateur d'orthographe non reconnu" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Aucune suggestion" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "EOF inattendue envoyée par le vérificateur d'orthographe" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Le vérificateur d'orthographe a échoué" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Aucune clé trouvée." - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Clé publique trouvée dans : %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Générer une clé" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Copier dans le presse-papier" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "Votre clé publique OpenSSH" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Génération..." - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Impossible de lancer ssh-keygen :\n" -"\n" -"%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "La génération a échoué." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "La génération a réussi, mais aucune clé n'a été trouvée." - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Votre clé est dans : %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i de %*i %s (%3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Lancer %s nécessite qu'un fichier soit sélectionné." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Êtes-vous sûr de vouloir lancer %s ?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Outil : %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Lancement de : %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "L'outil a terminé avec succès : %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "L'outil a échoué : %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Ajouter un outil" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Ajouter une nouvelle commande d'outil" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Ajouter globalement" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Détails sur l'outil" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Utiliser les séparateurs '/' pour créer un arbre de sous-menus :" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Commande :" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Montrer une boîte de dialogue avant le lancement" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "" -"Demander à l'utilisateur de sélectionner une révision (change $REVISION)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Demander à l'utilisateur des arguments supplémentaires (change $ARGS)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Ne pas montrer la fenêtre de sortie des commandes" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Lancer seulement si un diff est sélectionné ($FILENAME non vide)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Merci de fournir un nom pour l'outil." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "L'outil '%s' existe déjà." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Impossible d'ajouter l'outil :\n" -"%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Supprimer l'outil" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Supprimer des commandes d'outil" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Supprimer" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Le bleu indique des outils locaux au dépôt)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Lancer commande : %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Arguments" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Récupération des dernières modifications de %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "purger à distance %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Nettoyer les branches de suivi supprimées de %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Les modifications sont poussées vers %s" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Dupliquer dans %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Pousse %s %s vers %s" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "Pousser branches" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "Branches source" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Dépôt de destination" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "Options de transfert" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "" -"Forcer l'écrasement d'une branche existante (peut supprimer des " -"modifications)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "Utiliser des petits paquets (pour les connexions lentes)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "Inclure les marques (tags)" - -#~ msgid "Cannot use funny .git directory:" -#~ msgstr "Impossible d'utiliser le répertoire .git:" - -#~ msgid "Preferences..." -#~ msgstr "Préférences..." - -#~ msgid "Always (Do not perform merge test.)" -#~ msgstr "Toujours (Ne pas faire de test de fusion.)" diff --git a/po/git-gui.pot b/po/git-gui.pot deleted file mode 100644 index 0c94f9c..0000000 --- a/po/git-gui.pot +++ /dev/null @@ -1,2394 +0,0 @@ -# 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: \n" -"POT-Creation-Date: 2010-01-26 15:47-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" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "" - -#: git-gui.sh:743 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "" - -#: git-gui.sh:779 -msgid "Main Font" -msgstr "" - -#: git-gui.sh:780 -msgid "Diff/Console Font" -msgstr "" - -#: git-gui.sh:794 -msgid "Cannot find git in PATH." -msgstr "" - -#: git-gui.sh:821 -msgid "Cannot parse Git version string:" -msgstr "" - -#: git-gui.sh:839 -#, tcl-format -msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" -msgstr "" - -#: git-gui.sh:1128 -msgid "Git directory not found:" -msgstr "" - -#: git-gui.sh:1146 -msgid "Cannot move to top of working directory:" -msgstr "" - -#: git-gui.sh:1154 -msgid "Cannot use bare repository:" -msgstr "" - -#: git-gui.sh:1162 -msgid "No working directory" -msgstr "" - -#: git-gui.sh:1334 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "" - -#: git-gui.sh:1390 -msgid "Scanning for modified files ..." -msgstr "" - -#: git-gui.sh:1454 -msgid "Calling prepare-commit-msg hook..." -msgstr "" - -#: git-gui.sh:1471 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "" - -#: git-gui.sh:1629 lib/browser.tcl:246 -msgid "Ready." -msgstr "" - -#: git-gui.sh:1787 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "" - -#: git-gui.sh:1913 -msgid "Unmodified" -msgstr "" - -#: git-gui.sh:1915 -msgid "Modified, not staged" -msgstr "" - -#: git-gui.sh:1916 git-gui.sh:1924 -msgid "Staged for commit" -msgstr "" - -#: git-gui.sh:1917 git-gui.sh:1925 -msgid "Portions staged for commit" -msgstr "" - -#: git-gui.sh:1918 git-gui.sh:1926 -msgid "Staged for commit, missing" -msgstr "" - -#: git-gui.sh:1920 -msgid "File type changed, not staged" -msgstr "" - -#: git-gui.sh:1921 -msgid "File type changed, staged" -msgstr "" - -#: git-gui.sh:1923 -msgid "Untracked, not staged" -msgstr "" - -#: git-gui.sh:1928 -msgid "Missing" -msgstr "" - -#: git-gui.sh:1929 -msgid "Staged for removal" -msgstr "" - -#: git-gui.sh:1930 -msgid "Staged for removal, still present" -msgstr "" - -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 -msgid "Requires merge resolution" -msgstr "" - -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "" - -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" -msgstr "" - -#: git-gui.sh:2043 -msgid "Couldn't find git gui in PATH" -msgstr "" - -#: git-gui.sh:2455 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "" - -#: git-gui.sh:2456 -msgid "Edit" -msgstr "" - -#: git-gui.sh:2458 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "" - -#: git-gui.sh:2461 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "" - -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "" - -#: git-gui.sh:2465 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "" - -#: git-gui.sh:2468 -msgid "Tools" -msgstr "" - -#: git-gui.sh:2477 -msgid "Explore Working Copy" -msgstr "" - -#: git-gui.sh:2483 -msgid "Browse Current Branch's Files" -msgstr "" - -#: git-gui.sh:2487 -msgid "Browse Branch Files..." -msgstr "" - -#: git-gui.sh:2492 -msgid "Visualize Current Branch's History" -msgstr "" - -#: git-gui.sh:2496 -msgid "Visualize All Branch History" -msgstr "" - -#: git-gui.sh:2503 -#, tcl-format -msgid "Browse %s's Files" -msgstr "" - -#: git-gui.sh:2505 -#, tcl-format -msgid "Visualize %s's History" -msgstr "" - -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "" - -#: git-gui.sh:2513 lib/database.tcl:34 -msgid "Compress Database" -msgstr "" - -#: git-gui.sh:2516 -msgid "Verify Database" -msgstr "" - -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "" - -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "" - -#: git-gui.sh:2547 -msgid "Undo" -msgstr "" - -#: git-gui.sh:2550 -msgid "Redo" -msgstr "" - -#: git-gui.sh:2554 git-gui.sh:3109 -msgid "Cut" -msgstr "" - -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "" - -#: git-gui.sh:2560 git-gui.sh:3115 -msgid "Paste" -msgstr "" - -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "" - -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 -msgid "Select All" -msgstr "" - -#: git-gui.sh:2576 -msgid "Create..." -msgstr "" - -#: git-gui.sh:2582 -msgid "Checkout..." -msgstr "" - -#: git-gui.sh:2588 -msgid "Rename..." -msgstr "" - -#: git-gui.sh:2593 -msgid "Delete..." -msgstr "" - -#: git-gui.sh:2598 -msgid "Reset..." -msgstr "" - -#: git-gui.sh:2608 -msgid "Done" -msgstr "" - -#: git-gui.sh:2610 -msgid "Commit@@verb" -msgstr "" - -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "" - -#: git-gui.sh:2627 git-gui.sh:3057 -msgid "Amend Last Commit" -msgstr "" - -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "" - -#: git-gui.sh:2643 -msgid "Stage To Commit" -msgstr "" - -#: git-gui.sh:2649 -msgid "Stage Changed Files To Commit" -msgstr "" - -#: git-gui.sh:2655 -msgid "Unstage From Commit" -msgstr "" - -#: git-gui.sh:2661 lib/index.tcl:412 -msgid "Revert Changes" -msgstr "" - -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 -msgid "Show Less Context" -msgstr "" - -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 -msgid "Show More Context" -msgstr "" - -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 -msgid "Sign Off" -msgstr "" - -#: git-gui.sh:2696 -msgid "Local Merge..." -msgstr "" - -#: git-gui.sh:2701 -msgid "Abort Merge..." -msgstr "" - -#: git-gui.sh:2713 git-gui.sh:2741 -msgid "Add..." -msgstr "" - -#: git-gui.sh:2717 -msgid "Push..." -msgstr "" - -#: git-gui.sh:2721 -msgid "Delete Branch..." -msgstr "" - -#: git-gui.sh:2731 git-gui.sh:3292 -msgid "Options..." -msgstr "" - -#: git-gui.sh:2742 -msgid "Remove..." -msgstr "" - -#: git-gui.sh:2751 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "" - -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "" - -#: git-gui.sh:2783 -msgid "Online Documentation" -msgstr "" - -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "" - -#: git-gui.sh:2893 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" - -#: git-gui.sh:2926 -msgid "Current Branch:" -msgstr "" - -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "" - -#: git-gui.sh:2967 -msgid "Unstaged Changes" -msgstr "" - -#: git-gui.sh:3017 -msgid "Stage Changed" -msgstr "" - -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "" - -#: git-gui.sh:3071 -msgid "Initial Commit Message:" -msgstr "" - -#: git-gui.sh:3072 -msgid "Amended Commit Message:" -msgstr "" - -#: git-gui.sh:3073 -msgid "Amended Initial Commit Message:" -msgstr "" - -#: git-gui.sh:3074 -msgid "Amended Merge Commit Message:" -msgstr "" - -#: git-gui.sh:3075 -msgid "Merge Commit Message:" -msgstr "" - -#: git-gui.sh:3076 -msgid "Commit Message:" -msgstr "" - -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 -msgid "Copy All" -msgstr "" - -#: git-gui.sh:3149 lib/blame.tcl:104 -msgid "File:" -msgstr "" - -#: git-gui.sh:3255 -msgid "Refresh" -msgstr "" - -#: git-gui.sh:3276 -msgid "Decrease Font Size" -msgstr "" - -#: git-gui.sh:3280 -msgid "Increase Font Size" -msgstr "" - -#: git-gui.sh:3288 lib/blame.tcl:281 -msgid "Encoding" -msgstr "" - -#: git-gui.sh:3299 -msgid "Apply/Reverse Hunk" -msgstr "" - -#: git-gui.sh:3304 -msgid "Apply/Reverse Line" -msgstr "" - -#: git-gui.sh:3323 -msgid "Run Merge Tool" -msgstr "" - -#: git-gui.sh:3328 -msgid "Use Remote Version" -msgstr "" - -#: git-gui.sh:3332 -msgid "Use Local Version" -msgstr "" - -#: git-gui.sh:3336 -msgid "Revert To Base" -msgstr "" - -#: git-gui.sh:3354 -msgid "Visualize These Changes In The Submodule" -msgstr "" - -#: git-gui.sh:3358 -msgid "Visualize Current Branch History In The Submodule" -msgstr "" - -#: git-gui.sh:3362 -msgid "Visualize All Branch History In The Submodule" -msgstr "" - -#: git-gui.sh:3367 -msgid "Start git gui In The Submodule" -msgstr "" - -#: git-gui.sh:3389 -msgid "Unstage Hunk From Commit" -msgstr "" - -#: git-gui.sh:3391 -msgid "Unstage Lines From Commit" -msgstr "" - -#: git-gui.sh:3393 -msgid "Unstage Line From Commit" -msgstr "" - -#: git-gui.sh:3396 -msgid "Stage Hunk For Commit" -msgstr "" - -#: git-gui.sh:3398 -msgid "Stage Lines For Commit" -msgstr "" - -#: git-gui.sh:3400 -msgid "Stage Line For Commit" -msgstr "" - -#: git-gui.sh:3424 -msgid "Initializing..." -msgstr "" - -#: git-gui.sh:3541 -#, tcl-format -msgid "" -"Possible environment issues exist.\n" -"\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" -"\n" -msgstr "" - -#: git-gui.sh:3570 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" - -#: git-gui.sh:3575 -#, tcl-format -msgid "" -"\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\n" -msgstr "" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "" - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "" - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "" - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "" - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "" - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "" - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "" - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "" - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "" - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 -msgid "Create" -msgstr "" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "" - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "" - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "" - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "" - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "" - -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "" - -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "" - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "" - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "" - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "" - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "" - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "" - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "" - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" - -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "" - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "" - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "" - -#: lib/checkout_op.tcl:289 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "" - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "" - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "" - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "" - -#: lib/checkout_op.tcl:452 -msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." -msgstr "" - -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "" - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "" - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "" - -#: lib/checkout_op.tcl:635 -#, tcl-format -msgid "" -"Failed to set current branch.\n" -"\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" -"\n" -"This should not have occurred. %s will now close and give up." -msgstr "" - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" -msgstr "" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "" - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" -msgstr "" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "" - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" -msgstr "" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "" - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "" - -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "" - -#: lib/choose_repository.tcl:391 -msgid "Directory:" -msgstr "" - -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" -msgstr "" - -#: lib/choose_repository.tcl:448 -#, tcl-format -msgid "Directory %s already exists." -msgstr "" - -#: lib/choose_repository.tcl:452 -#, tcl-format -msgid "File %s already exists." -msgstr "" - -#: lib/choose_repository.tcl:466 -msgid "Clone" -msgstr "" - -#: lib/choose_repository.tcl:479 -msgid "Source Location:" -msgstr "" - -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" -msgstr "" - -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" -msgstr "" - -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "" - -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "" - -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "" - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "" - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "" - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "" - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "" - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "" - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "" - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "" - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "" - -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "" - -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" - -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "" - -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" - -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "" - -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "" - -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "" - -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "" - -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "" - -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "" - -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "" - -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "" - -#: lib/choose_repository.tcl:1021 -msgid "Repository:" -msgstr "" - -#: lib/choose_repository.tcl:1072 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "" - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "" - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "" - -#: lib/choose_rev.tcl:559 -msgid "URL" -msgstr "" - -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" -msgstr "" - -#: lib/commit.tcl:18 -msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" -msgstr "" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "" - -#: lib/commit.tcl:149 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" - -#: lib/commit.tcl:172 -#, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" -"\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" -msgstr "" - -#: lib/commit.tcl:180 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" - -#: lib/commit.tcl:188 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" - -#: lib/commit.tcl:203 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" -msgstr "" - -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." -msgstr "" - -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "" - -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "" - -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "" - -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "" - -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "" - -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "" - -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "" - -#: lib/commit.tcl:339 -msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" -msgstr "" - -#: lib/commit.tcl:346 -msgid "No changes to commit." -msgstr "" - -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "" - -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "" - -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "" - -#: lib/console.tcl:186 -msgid "Success" -msgstr "" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "" - -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "" - -#: lib/diff.tcl:64 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." -msgstr "" - -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "" - -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" - -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" - -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "" - -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "" - -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" -msgstr "" - -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "" - -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "" - -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "" - -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" - -#: lib/diff.tcl:233 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" - -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." -msgstr "" - -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "" - -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "" - -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "" - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "" - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "" - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "" - -#: lib/index.tcl:17 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" - -#: lib/index.tcl:28 -msgid "Continue" -msgstr "" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "" - -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "" - -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "" - -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "" - -#: lib/index.tcl:400 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "" - -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" - -#: lib/index.tcl:411 -msgid "Do Nothing" -msgstr "" - -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "" - -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "" - -#: lib/merge.tcl:13 -msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" -msgstr "" - -#: lib/merge.tcl:27 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" - -#: lib/merge.tcl:45 -#, tcl-format -msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" -msgstr "" - -#: lib/merge.tcl:55 -#, tcl-format -msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" -msgstr "" - -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "" - -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "" - -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "" - -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "" - -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "" - -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "" - -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" - -#: lib/merge.tcl:222 -msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" -msgstr "" - -#: lib/merge.tcl:228 -msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" -msgstr "" - -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "" - -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "" - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "" - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "" - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "" - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "" - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "" - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "" - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "" - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "" - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "" - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "" - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "" - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" - -#: lib/remote_branch_delete.tcl:189 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "" - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "" - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "" - -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "" - -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "" - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "" - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "" - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "" - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "" - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "" - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "" - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "" - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "" - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "" diff --git a/po/git.pot b/po/git.pot new file mode 100644 index 0000000..e561158 --- /dev/null +++ b/po/git.pot @@ -0,0 +1,8976 @@ +# 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: 2012-10-16 08:38+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:40 +#, c-format +msgid "hint: %.*s\n" +msgstr "" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:70 +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:322 +msgid "fmt" +msgstr "" + +#: archive.c:322 +msgid "archive format" +msgstr "" + +#: archive.c:323 builtin/log.c:1079 +msgid "prefix" +msgstr "" + +#: archive.c:324 +msgid "prepend prefix to each pathname in the archive" +msgstr "" + +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389 +#: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642 +#: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 +#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "" + +#: archive.c:326 builtin/archive.c:92 +msgid "write the archive to this file" +msgstr "" + +#: archive.c:328 +msgid "read .gitattributes in working directory" +msgstr "" + +#: archive.c:329 +msgid "report archived files on stderr" +msgstr "" + +#: archive.c:330 +msgid "store only" +msgstr "" + +#: archive.c:331 +msgid "compress faster" +msgstr "" + +#: archive.c:339 +msgid "compress better" +msgstr "" + +#: archive.c:342 +msgid "list supported archive formats" +msgstr "" + +#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +msgid "repo" +msgstr "" + +#: archive.c:345 builtin/archive.c:94 +msgid "retrieve the archive from remote repository <repo>" +msgstr "" + +#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619 +msgid "command" +msgstr "" + +#: archive.c:347 builtin/archive.c:96 +msgid "path to the remote git-upload-archive command" +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:672 +#, c-format +msgid "could not open '%s'" +msgstr "" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "" + +#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 +#: builtin/shortlog.c:181 +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:1209 builtin/shortlog.c:284 +#, 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:105 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" + +#: diff.c:110 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr "" + +#: diff.c:210 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" + +#: diff.c:3458 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#: gpg-interface.c:59 +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 "" + +#: grep.c:1441 +#, c-format +msgid "'%s': unable to read %s" +msgstr "" + +#: grep.c:1458 +#, c-format +msgid "'%s': %s" +msgstr "" + +#: grep.c:1469 +#, 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:275 +#, 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:332 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "" + +#: help.c:354 +#, 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:359 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "" + +#: help.c:366 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "" + +#: help.c:370 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +msgstr[1] "" + +#: 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:869 +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:696 +msgid "Unable to write index." +msgstr "" + +#: parse-options.c:494 +msgid "..." +msgstr "" + +#: parse-options.c:512 +#, c-format +msgid "usage: %s" +msgstr "" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:516 +#, c-format +msgid " or: %s" +msgstr "" + +#: parse-options.c:519 +#, c-format +msgid " %s" +msgstr "" + +#: remote.c:1632 +#, 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:1638 +#, 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:1646 +#, 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] "" + +#: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "" + +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:867 +#: builtin/merge.c:1089 builtin/merge.c:1102 +#, 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:770 sequencer.c:853 +#, 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:235 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "" + +#: sequencer.c:266 +msgid "Could not resolve HEAD commit\n" +msgstr "" + +#: sequencer.c:287 +msgid "Unable to update cache tree\n" +msgstr "" + +#: sequencer.c:332 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "" + +#: sequencer.c:337 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "" + +#: sequencer.c:403 +msgid "Your index file is unmerged." +msgstr "" + +#: sequencer.c:406 +msgid "You do not have a valid HEAD" +msgstr "" + +#: sequencer.c:421 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" + +#: sequencer.c:429 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "" + +#: sequencer.c:433 +#, 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:444 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "" + +#: sequencer.c:448 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "" + +#: sequencer.c:532 +#, c-format +msgid "could not revert %s... %s" +msgstr "" + +#: sequencer.c:533 +#, c-format +msgid "could not apply %s... %s" +msgstr "" + +#: sequencer.c:565 +msgid "empty commit set passed" +msgstr "" + +#: sequencer.c:573 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: sequencer.c:578 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "" + +#: sequencer.c:636 +#, c-format +msgid "Cannot %s during a %s" +msgstr "" + +#: sequencer.c:658 +#, c-format +msgid "Could not parse line %d." +msgstr "" + +#: sequencer.c:663 +msgid "No commits parsed." +msgstr "" + +#: sequencer.c:676 +#, c-format +msgid "Could not open %s" +msgstr "" + +#: sequencer.c:680 +#, c-format +msgid "Could not read %s." +msgstr "" + +#: sequencer.c:687 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "" + +#: sequencer.c:715 +#, c-format +msgid "Invalid key: %s" +msgstr "" + +#: sequencer.c:718 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "" + +#: sequencer.c:730 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "" + +#: sequencer.c:751 +msgid "a cherry-pick or revert is already in progress" +msgstr "" + +#: sequencer.c:752 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "" + +#: sequencer.c:756 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "" + +#: sequencer.c:772 sequencer.c:857 +#, c-format +msgid "Error wrapping up %s." +msgstr "" + +#: sequencer.c:791 sequencer.c:925 +msgid "no cherry-pick or revert in progress" +msgstr "" + +#: sequencer.c:793 +msgid "cannot resolve HEAD" +msgstr "" + +#: sequencer.c:795 +msgid "cannot abort from a branch yet to be born" +msgstr "" + +#: sequencer.c:817 builtin/apply.c:4005 +#, c-format +msgid "cannot open %s: %s" +msgstr "" + +#: sequencer.c:820 +#, c-format +msgid "cannot read %s: %s" +msgstr "" + +#: sequencer.c:821 +msgid "unexpected end of file" +msgstr "" + +#: sequencer.c:827 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "" + +#: sequencer.c:850 +#, c-format +msgid "Could not format %s." +msgstr "" + +#: sequencer.c:1012 +msgid "Can't revert as initial commit" +msgstr "" + +#: sequencer.c:1013 +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:426 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "" + +#: wrapper.c:427 +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:785 +msgid "You have unmerged paths." +msgstr "" + +#: wt-status.c:788 wt-status.c:912 +msgid " (fix conflicts and run \"git commit\")" +msgstr "" + +#: wt-status.c:791 +msgid "All conflicts fixed but you are still merging." +msgstr "" + +#: wt-status.c:794 +msgid " (use \"git commit\" to conclude merge)" +msgstr "" + +#: wt-status.c:804 +msgid "You are in the middle of an am session." +msgstr "" + +#: wt-status.c:807 +msgid "The current patch is empty." +msgstr "" + +#: wt-status.c:811 +msgid " (fix conflicts and then run \"git am --resolved\")" +msgstr "" + +#: wt-status.c:813 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:815 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr "" + +#: wt-status.c:873 wt-status.c:883 +msgid "You are currently rebasing." +msgstr "" + +#: wt-status.c:876 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr "" + +#: wt-status.c:878 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:880 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr "" + +#: wt-status.c:886 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr "" + +#: wt-status.c:888 +msgid "You are currently splitting a commit during a rebase." +msgstr "" + +#: wt-status.c:891 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr "" + +#: wt-status.c:893 +msgid "You are currently editing a commit during a rebase." +msgstr "" + +#: wt-status.c:896 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr "" + +#: wt-status.c:898 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr "" + +#: wt-status.c:908 +msgid "You are currently cherry-picking." +msgstr "" + +#: wt-status.c:915 +msgid " (all conflicts fixed: run \"git commit\")" +msgstr "" + +#: wt-status.c:924 +msgid "You are currently bisecting." +msgstr "" + +#: wt-status.c:927 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr "" + +#: wt-status.c:978 +msgid "On branch " +msgstr "" + +#: wt-status.c:985 +msgid "Not currently on any branch." +msgstr "" + +#: wt-status.c:997 +msgid "Initial commit" +msgstr "" + +#: wt-status.c:1011 +msgid "Untracked files" +msgstr "" + +#: wt-status.c:1013 +msgid "Ignored files" +msgstr "" + +#: wt-status.c:1015 +#, c-format +msgid "Untracked files not listed%s" +msgstr "" + +#: wt-status.c:1017 +msgid " (use -u option to show untracked files)" +msgstr "" + +#: wt-status.c:1023 +msgid "No changes" +msgstr "" + +#: wt-status.c:1028 +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "" + +#: wt-status.c:1031 +#, c-format +msgid "no changes added to commit\n" +msgstr "" + +#: wt-status.c:1034 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" + +#: wt-status.c:1037 +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "" + +#: wt-status.c:1040 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "" + +#: wt-status.c:1043 wt-status.c:1048 +#, c-format +msgid "nothing to commit\n" +msgstr "" + +#: wt-status.c:1046 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "" + +#: wt-status.c:1050 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "" + +#: wt-status.c:1158 +msgid "HEAD (no branch)" +msgstr "" + +#: wt-status.c:1164 +msgid "Initial commit on " +msgstr "" + +#: wt-status.c:1179 +msgid "behind " +msgstr "" + +#: wt-status.c:1182 wt-status.c:1185 +msgid "ahead " +msgstr "" + +#: wt-status.c:1187 +msgid ", behind " +msgstr "" + +#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + +#: builtin/add.c:19 +msgid "git add [options] [--] <filepattern>..." +msgstr "" + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "" + +#: builtin/add.c:67 builtin/commit.c:230 +msgid "updating files failed" +msgstr "" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "" + +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "" + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "" + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "" + +#: builtin/add.c:313 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" + +#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 +#: builtin/rm.c:133 +msgid "dry run" +msgstr "" + +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1154 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477 +#: builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "" + +#: builtin/add.c:322 +msgid "interactive picking" +msgstr "" + +#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248 +msgid "select hunks interactively" +msgstr "" + +#: builtin/add.c:324 +msgid "edit current diff and apply" +msgstr "" + +#: builtin/add.c:325 +msgid "allow adding otherwise ignored files" +msgstr "" + +#: builtin/add.c:326 +msgid "update tracked files" +msgstr "" + +#: builtin/add.c:327 +msgid "record only the fact that the path will be added later" +msgstr "" + +#: builtin/add.c:328 +msgid "add changes from all tracked and untracked files" +msgstr "" + +#: builtin/add.c:329 +msgid "don't add, only refresh the index" +msgstr "" + +#: builtin/add.c:330 +msgid "just skip files which cannot be added because of errors" +msgstr "" + +#: builtin/add.c:331 +msgid "check if - even missing - files are ignored in dry run" +msgstr "" + +#: builtin/add.c:353 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "" + +#: builtin/add.c:354 +msgid "no files added" +msgstr "" + +#: builtin/add.c:360 +msgid "adding files failed" +msgstr "" + +#: builtin/add.c:392 +msgid "-A and -u are mutually incompatible" +msgstr "" + +#: builtin/add.c:394 +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/clean.c:95 builtin/commit.c:290 builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "" + +#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260 +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:1420 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "" + +#: builtin/apply.c:1477 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "" + +#: builtin/apply.c:1494 +#, 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:1654 +msgid "new file depends on old contents" +msgstr "" + +#: builtin/apply.c:1656 +msgid "deleted file still has contents" +msgstr "" + +#: builtin/apply.c:1682 +#, c-format +msgid "corrupt patch at line %d" +msgstr "" + +#: builtin/apply.c:1718 +#, c-format +msgid "new file %s depends on old contents" +msgstr "" + +#: builtin/apply.c:1720 +#, c-format +msgid "deleted file %s still has contents" +msgstr "" + +#: builtin/apply.c:1723 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "" + +#: builtin/apply.c:1869 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1898 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "" + +#: builtin/apply.c:1984 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "" + +#: builtin/apply.c:2074 +#, c-format +msgid "unable to read symlink %s" +msgstr "" + +#: builtin/apply.c:2078 +#, c-format +msgid "unable to open or read %s" +msgstr "" + +#: builtin/apply.c:2149 +msgid "oops" +msgstr "" + +#: builtin/apply.c:2671 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "" + +#: builtin/apply.c:2789 +#, 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:2801 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "" + +#: builtin/apply.c:2807 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" + +#: builtin/apply.c:2826 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "" + +#: builtin/apply.c:2929 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "" + +#: builtin/apply.c:2935 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" + +#: builtin/apply.c:2956 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "" + +#: builtin/apply.c:3078 +#, c-format +msgid "cannot checkout %s" +msgstr "" + +#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#, c-format +msgid "read of %s failed" +msgstr "" + +#: builtin/apply.c:3156 builtin/apply.c:3378 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "" + +#: builtin/apply.c:3237 builtin/apply.c:3392 +#, c-format +msgid "%s: does not exist in index" +msgstr "" + +#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#, c-format +msgid "%s: %s" +msgstr "" + +#: builtin/apply.c:3246 builtin/apply.c:3400 +#, c-format +msgid "%s: does not match index" +msgstr "" + +#: builtin/apply.c:3348 +msgid "removal patch leaves file contents" +msgstr "" + +#: builtin/apply.c:3417 +#, c-format +msgid "%s: wrong type" +msgstr "" + +#: builtin/apply.c:3419 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "" + +#: builtin/apply.c:3520 +#, c-format +msgid "%s: already exists in index" +msgstr "" + +#: builtin/apply.c:3523 +#, c-format +msgid "%s: already exists in working directory" +msgstr "" + +#: builtin/apply.c:3543 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "" + +#: builtin/apply.c:3548 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "" + +#: builtin/apply.c:3556 +#, c-format +msgid "%s: patch does not apply" +msgstr "" + +#: builtin/apply.c:3569 +#, c-format +msgid "Checking patch %s..." +msgstr "" + +#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: builtin/apply.c:3767 +#, c-format +msgid "unable to remove %s from index" +msgstr "" + +#: builtin/apply.c:3795 +#, c-format +msgid "corrupt patch for subproject %s" +msgstr "" + +#: builtin/apply.c:3799 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "" + +#: builtin/apply.c:3804 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "" + +#: builtin/apply.c:3807 builtin/apply.c:3915 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "" + +#: builtin/apply.c:3840 +#, c-format +msgid "closing file '%s'" +msgstr "" + +#: builtin/apply.c:3889 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "" + +#: builtin/apply.c:3976 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "" + +#: builtin/apply.c:3984 +msgid "internal error" +msgstr "" + +#. Say this even without --verbose +#: builtin/apply.c:3987 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:3997 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "" + +#: builtin/apply.c:4018 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "" + +#: builtin/apply.c:4021 +#, c-format +msgid "Rejected hunk #%d." +msgstr "" + +#: builtin/apply.c:4171 +msgid "unrecognized input" +msgstr "" + +#: builtin/apply.c:4182 +msgid "unable to read index file" +msgstr "" + +#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/fetch.c:63 +msgid "path" +msgstr "" + +#: builtin/apply.c:4302 +msgid "don't apply changes matching the given path" +msgstr "" + +#: builtin/apply.c:4305 +msgid "apply changes matching the given path" +msgstr "" + +#: builtin/apply.c:4307 +msgid "num" +msgstr "" + +#: builtin/apply.c:4308 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "" + +#: builtin/apply.c:4311 +msgid "ignore additions made by the patch" +msgstr "" + +#: builtin/apply.c:4313 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "" + +#: builtin/apply.c:4317 +msgid "show number of added and deleted lines in decimal notation" +msgstr "" + +#: builtin/apply.c:4319 +msgid "instead of applying the patch, output a summary for the input" +msgstr "" + +#: builtin/apply.c:4321 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "" + +#: builtin/apply.c:4323 +msgid "make sure the patch is applicable to the current index" +msgstr "" + +#: builtin/apply.c:4325 +msgid "apply a patch without touching the working tree" +msgstr "" + +#: builtin/apply.c:4327 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "" + +#: builtin/apply.c:4329 +msgid "attempt three-way merge if a patch does not apply" +msgstr "" + +#: builtin/apply.c:4331 +msgid "build a temporary index based on embedded index information" +msgstr "" + +#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +msgid "paths are separated with NUL character" +msgstr "" + +#: builtin/apply.c:4336 +msgid "ensure at least <n> lines of context match" +msgstr "" + +#: builtin/apply.c:4337 +msgid "action" +msgstr "" + +#: builtin/apply.c:4338 +msgid "detect new or modified lines that have whitespace errors" +msgstr "" + +#: builtin/apply.c:4341 builtin/apply.c:4344 +msgid "ignore changes in whitespace when finding context" +msgstr "" + +#: builtin/apply.c:4347 +msgid "apply the patch in reverse" +msgstr "" + +#: builtin/apply.c:4349 +msgid "don't expect at least one line of context" +msgstr "" + +#: builtin/apply.c:4351 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "" + +#: builtin/apply.c:4353 +msgid "allow overlapping hunks" +msgstr "" + +#: builtin/apply.c:4356 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "" + +#: builtin/apply.c:4359 +msgid "do not trust the line counts in the hunk headers" +msgstr "" + +#: builtin/apply.c:4361 +msgid "root" +msgstr "" + +#: builtin/apply.c:4362 +msgid "prepend <root> to all filenames" +msgstr "" + +#: builtin/apply.c:4384 +msgid "--3way outside a repository" +msgstr "" + +#: builtin/apply.c:4392 +msgid "--index outside a repository" +msgstr "" + +#: builtin/apply.c:4395 +msgid "--cached outside a repository" +msgstr "" + +#: builtin/apply.c:4411 +#, c-format +msgid "can't open patch '%s'" +msgstr "" + +#: builtin/apply.c:4425 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:4431 builtin/apply.c:4441 +#, 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:2373 +msgid "Show blame entries as we find them, incrementally" +msgstr "" + +#: builtin/blame.c:2374 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "" + +#: builtin/blame.c:2375 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "" + +#: builtin/blame.c:2376 +msgid "Show work cost statistics" +msgstr "" + +#: builtin/blame.c:2377 +msgid "Show output score for blame entries" +msgstr "" + +#: builtin/blame.c:2378 +msgid "Show original filename (Default: auto)" +msgstr "" + +#: builtin/blame.c:2379 +msgid "Show original linenumber (Default: off)" +msgstr "" + +#: builtin/blame.c:2380 +msgid "Show in a format designed for machine consumption" +msgstr "" + +#: builtin/blame.c:2381 +msgid "Show porcelain format with per-line commit information" +msgstr "" + +#: builtin/blame.c:2382 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "" + +#: builtin/blame.c:2383 +msgid "Show raw timestamp (Default: off)" +msgstr "" + +#: builtin/blame.c:2384 +msgid "Show long commit SHA1 (Default: off)" +msgstr "" + +#: builtin/blame.c:2385 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "" + +#: builtin/blame.c:2386 +msgid "Show author email instead of name (Default: off)" +msgstr "" + +#: builtin/blame.c:2387 +msgid "Ignore whitespace differences" +msgstr "" + +#: builtin/blame.c:2388 +msgid "Spend extra cycles to find better match" +msgstr "" + +#: builtin/blame.c:2389 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "" + +#: builtin/blame.c:2390 +msgid "Use <file>'s contents as the final image" +msgstr "" + +#: builtin/blame.c:2391 builtin/blame.c:2392 +msgid "score" +msgstr "" + +#: builtin/blame.c:2391 +msgid "Find line copies within and across files" +msgstr "" + +#: builtin/blame.c:2392 +msgid "Find line movements within and across files" +msgstr "" + +#: builtin/blame.c:2393 +msgid "n,m" +msgstr "" + +#: builtin/blame.c:2393 +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:181 +msgid "cannot use -a with -d" +msgstr "" + +#: builtin/branch.c:187 +msgid "Couldn't look up commit object for HEAD" +msgstr "" + +#: builtin/branch.c:192 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "" + +#: builtin/branch.c:203 +#, c-format +msgid "remote branch '%s' not found." +msgstr "" + +#: builtin/branch.c:204 +#, c-format +msgid "branch '%s' not found." +msgstr "" + +#: builtin/branch.c:211 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: builtin/branch.c:217 +#, 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:226 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "" + +#: builtin/branch.c:227 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "" + +#: builtin/branch.c:234 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "" + +#: builtin/branch.c:235 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "" + +#: builtin/branch.c:240 +msgid "Update of config-file failed" +msgstr "" + +#: builtin/branch.c:338 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "" + +#: builtin/branch.c:410 +#, c-format +msgid "[%s: behind %d]" +msgstr "" + +#: builtin/branch.c:412 +#, c-format +msgid "[behind %d]" +msgstr "" + +#: builtin/branch.c:416 +#, c-format +msgid "[%s: ahead %d]" +msgstr "" + +#: builtin/branch.c:418 +#, c-format +msgid "[ahead %d]" +msgstr "" + +#: builtin/branch.c:421 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "" + +#: builtin/branch.c:424 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "" + +#: builtin/branch.c:537 +msgid "(no branch)" +msgstr "" + +#: builtin/branch.c:602 +msgid "some refs could not be read" +msgstr "" + +#: builtin/branch.c:615 +msgid "cannot rename the current branch while not on any." +msgstr "" + +#: builtin/branch.c:625 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "" + +#: builtin/branch.c:640 +msgid "Branch rename failed" +msgstr "" + +#: builtin/branch.c:644 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "" + +#: builtin/branch.c:648 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "" + +#: builtin/branch.c:655 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:670 +#, c-format +msgid "malformed object name %s" +msgstr "" + +#: builtin/branch.c:694 +#, c-format +msgid "could not write branch description template: %s" +msgstr "" + +#: builtin/branch.c:724 +msgid "Generic options" +msgstr "" + +#: builtin/branch.c:726 +msgid "show hash and subject, give twice for upstream branch" +msgstr "" + +#: builtin/branch.c:727 +msgid "suppress informational messages" +msgstr "" + +#: builtin/branch.c:728 +msgid "set up tracking mode (see git-pull(1))" +msgstr "" + +#: builtin/branch.c:730 +msgid "change upstream info" +msgstr "" + +#: builtin/branch.c:734 +msgid "use colored output" +msgstr "" + +#: builtin/branch.c:735 +msgid "act on remote-tracking branches" +msgstr "" + +#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765 +#: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363 +#: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470 +msgid "commit" +msgstr "" + +#: builtin/branch.c:739 builtin/branch.c:745 +msgid "print only branches that contain the commit" +msgstr "" + +#: builtin/branch.c:751 +msgid "Specific git-branch actions:" +msgstr "" + +#: builtin/branch.c:752 +msgid "list both remote-tracking and local branches" +msgstr "" + +#: builtin/branch.c:754 +msgid "delete fully merged branch" +msgstr "" + +#: builtin/branch.c:755 +msgid "delete branch (even if not merged)" +msgstr "" + +#: builtin/branch.c:756 +msgid "move/rename a branch and its reflog" +msgstr "" + +#: builtin/branch.c:757 +msgid "move/rename a branch, even if target exists" +msgstr "" + +#: builtin/branch.c:758 +msgid "list branch names" +msgstr "" + +#: builtin/branch.c:759 +msgid "create the branch's reflog" +msgstr "" + +#: builtin/branch.c:761 +msgid "edit the description for the branch" +msgstr "" + +#: builtin/branch.c:762 +msgid "force creation (when already exists)" +msgstr "" + +#: builtin/branch.c:765 +msgid "print only not merged branches" +msgstr "" + +#: builtin/branch.c:771 +msgid "print only merged branches" +msgstr "" + +#: builtin/branch.c:775 +msgid "list branches in columns" +msgstr "" + +#: builtin/branch.c:788 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:793 builtin/clone.c:561 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:813 +msgid "--column and --verbose are incompatible" +msgstr "" + +#: builtin/branch.c:864 +#, c-format +msgid "branch '%s' does not exist" +msgstr "" + +#: builtin/branch.c:876 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "" + +#: builtin/branch.c:891 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" + +#: builtin/branch.c:894 +#, 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:911 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" + +#: builtin/branch.c:912 +#, c-format +msgid " git branch -d %s\n" +msgstr "" + +#: builtin/branch.c:913 +#, 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/hash-object.c:75 +msgid "read file names from stdin" +msgstr "" + +#: builtin/check-attr.c:23 +msgid "input paths are terminated by a null character" +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:333 builtin/checkout.c:534 builtin/clone.c:586 +#: builtin/merge.c:811 +msgid "unable to write new index file" +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 +#, 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:961 +msgid "paths cannot be used with switching branches" +msgstr "" + +#: builtin/checkout.c:964 builtin/checkout.c:968 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "" + +#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980 +#: builtin/checkout.c:983 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "" + +#: builtin/checkout.c:988 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "" + +#: builtin/checkout.c:1009 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "" + +#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89 +#: builtin/remote.c:169 builtin/remote.c:171 +msgid "branch" +msgstr "" + +#: builtin/checkout.c:1011 +msgid "create and checkout a new branch" +msgstr "" + +#: builtin/checkout.c:1013 +msgid "create/reset and checkout a branch" +msgstr "" + +#: builtin/checkout.c:1014 +msgid "create reflog for new branch" +msgstr "" + +#: builtin/checkout.c:1015 +msgid "detach the HEAD at named commit" +msgstr "" + +#: builtin/checkout.c:1016 +msgid "set upstream info for new branch" +msgstr "" + +#: builtin/checkout.c:1018 +msgid "new branch" +msgstr "" + +#: builtin/checkout.c:1018 +msgid "new unparented branch" +msgstr "" + +#: builtin/checkout.c:1019 +msgid "checkout our version for unmerged files" +msgstr "" + +#: builtin/checkout.c:1021 +msgid "checkout their version for unmerged files" +msgstr "" + +#: builtin/checkout.c:1023 +msgid "force checkout (throw away local modifications)" +msgstr "" + +#: builtin/checkout.c:1024 +msgid "perform a 3-way merge with the new branch" +msgstr "" + +#: builtin/checkout.c:1025 builtin/merge.c:215 +msgid "update ignored files (default)" +msgstr "" + +#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241 +msgid "style" +msgstr "" + +#: builtin/checkout.c:1027 +msgid "conflict style (merge or diff3)" +msgstr "" + +#: builtin/checkout.c:1030 +msgid "second guess 'git checkout no-such-branch'" +msgstr "" + +#: builtin/checkout.c:1054 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "" + +#: builtin/checkout.c:1071 +msgid "--track needs a branch name" +msgstr "" + +#: builtin/checkout.c:1078 +msgid "Missing branch name; try -b" +msgstr "" + +#: builtin/checkout.c:1113 +msgid "invalid path specification" +msgstr "" + +#: builtin/checkout.c:1120 +#, 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:1125 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "" + +#: builtin/checkout.c:1129 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" + +#: builtin/clean.c:19 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" + +#: builtin/clean.c:51 +msgid "do not print names of files removed" +msgstr "" + +#: builtin/clean.c:53 +msgid "force" +msgstr "" + +#: builtin/clean.c:55 +msgid "remove whole directories" +msgstr "" + +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199 +msgid "pattern" +msgstr "" + +#: builtin/clean.c:57 +msgid "add <pattern> to ignore rules" +msgstr "" + +#: builtin/clean.c:58 +msgid "remove ignored files, too" +msgstr "" + +#: builtin/clean.c:60 +msgid "remove only ignored files" +msgstr "" + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" + +#: builtin/clean.c:155 builtin/clean.c:176 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:159 builtin/clean.c:179 +#, c-format +msgid "Removing %s\n" +msgstr "" + +#: builtin/clean.c:162 builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" +msgstr "" + +#: builtin/clean.c:166 +#, c-format +msgid "Would not remove %s\n" +msgstr "" + +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" +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:399 +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:748 +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:719 +#, c-format +msgid "repository '%s' does not exist" +msgstr "" + +#: builtin/clone.c:724 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:734 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:744 +#, c-format +msgid "working tree '%s' already exists." +msgstr "" + +#: builtin/clone.c:757 builtin/clone.c:771 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" + +#: builtin/clone.c:760 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "" + +#: builtin/clone.c:779 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "" + +#: builtin/clone.c:781 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "" + +#: builtin/clone.c:823 +#, c-format +msgid "Don't know how to clone %s" +msgstr "" + +#: builtin/clone.c:872 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "" + +#: builtin/clone.c:879 +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] [--] <filepattern>..." +msgstr "" + +#: builtin/commit.c:39 +msgid "git status [options] [--] <filepattern>..." +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:257 +msgid "failed to unpack HEAD tree object" +msgstr "" + +#: builtin/commit.c:299 +msgid "unable to create temporary index" +msgstr "" + +#: builtin/commit.c:305 +msgid "interactive add failed" +msgstr "" + +#: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409 +msgid "unable to write new_index file" +msgstr "" + +#: builtin/commit.c:390 +msgid "cannot do a partial commit during a merge." +msgstr "" + +#: builtin/commit.c:392 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "" + +#: builtin/commit.c:402 +msgid "cannot read the index" +msgstr "" + +#: builtin/commit.c:422 +msgid "unable to write temporary index file" +msgstr "" + +#: builtin/commit.c:509 builtin/commit.c:515 +#, c-format +msgid "invalid commit: %s" +msgstr "" + +#: builtin/commit.c:538 +msgid "malformed --author parameter" +msgstr "" + +#: builtin/commit.c:558 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "" + +#: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:608 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "" + +#: builtin/commit.c:610 +msgid "could not read log from standard input" +msgstr "" + +#: builtin/commit.c:614 +#, c-format +msgid "could not read log file '%s'" +msgstr "" + +#: builtin/commit.c:620 +msgid "commit has empty message" +msgstr "" + +#: builtin/commit.c:636 +msgid "could not read MERGE_MSG" +msgstr "" + +#: builtin/commit.c:640 +msgid "could not read SQUASH_MSG" +msgstr "" + +#: builtin/commit.c:644 +#, c-format +msgid "could not read '%s'" +msgstr "" + +#: builtin/commit.c:705 +msgid "could not write commit template" +msgstr "" + +#: builtin/commit.c:716 +#, 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:721 +#, 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:733 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:738 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:751 +#, c-format +msgid "%sAuthor: %s" +msgstr "" + +#: builtin/commit.c:758 +#, c-format +msgid "%sCommitter: %s" +msgstr "" + +#: builtin/commit.c:778 +msgid "Cannot read index" +msgstr "" + +#: builtin/commit.c:815 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:830 builtin/tag.c:361 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "" + +#: builtin/commit.c:927 +#, c-format +msgid "No existing author found with '%s'" +msgstr "" + +#: builtin/commit.c:942 builtin/commit.c:1142 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "" + +#: builtin/commit.c:982 +msgid "Using both --reset-author and --author does not make sense" +msgstr "" + +#: builtin/commit.c:993 +msgid "You have nothing to amend." +msgstr "" + +#: builtin/commit.c:996 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "" + +#: builtin/commit.c:998 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "" + +#: builtin/commit.c:1001 +msgid "Options --squash and --fixup cannot be used together" +msgstr "" + +#: builtin/commit.c:1011 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "" + +#: builtin/commit.c:1013 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "" + +#: builtin/commit.c:1021 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "" + +#: builtin/commit.c:1038 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" + +#: builtin/commit.c:1040 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:1042 +msgid "Clever... amending the last one with dirty index." +msgstr "" + +#: builtin/commit.c:1044 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" + +#: builtin/commit.c:1054 builtin/tag.c:577 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "" + +#: builtin/commit.c:1059 +msgid "Paths with -a does not make sense." +msgstr "" + +#: builtin/commit.c:1156 builtin/commit.c:1384 +msgid "show status concisely" +msgstr "" + +#: builtin/commit.c:1158 builtin/commit.c:1386 +msgid "show branch information" +msgstr "" + +#: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389 +msgid "machine-readable output" +msgstr "" + +#: builtin/commit.c:1163 builtin/commit.c:1390 +msgid "terminate entries with NUL" +msgstr "" + +#: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636 +#: builtin/fast-export.c:639 builtin/tag.c:461 +msgid "mode" +msgstr "" + +#: builtin/commit.c:1166 builtin/commit.c:1393 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "" + +#: builtin/commit.c:1169 +msgid "show ignored files" +msgstr "" + +#: builtin/commit.c:1170 parse-options.h:151 +msgid "when" +msgstr "" + +#: builtin/commit.c:1171 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" + +#: builtin/commit.c:1173 +msgid "list untracked files in columns" +msgstr "" + +#: builtin/commit.c:1242 +msgid "couldn't look up newly created commit" +msgstr "" + +#: builtin/commit.c:1244 +msgid "could not parse newly created commit" +msgstr "" + +#: builtin/commit.c:1285 +msgid "detached HEAD" +msgstr "" + +#: builtin/commit.c:1287 +msgid " (root-commit)" +msgstr "" + +#: builtin/commit.c:1354 +msgid "suppress summary after successful commit" +msgstr "" + +#: builtin/commit.c:1355 +msgid "show diff in commit message template" +msgstr "" + +#: builtin/commit.c:1357 +msgid "Commit message options" +msgstr "" + +#: builtin/commit.c:1358 builtin/tag.c:459 +msgid "read message from file" +msgstr "" + +#: builtin/commit.c:1359 +msgid "author" +msgstr "" + +#: builtin/commit.c:1359 +msgid "override author for commit" +msgstr "" + +#: builtin/commit.c:1360 builtin/gc.c:178 +msgid "date" +msgstr "" + +#: builtin/commit.c:1360 +msgid "override date for commit" +msgstr "" + +#: builtin/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537 +#: builtin/notes.c:694 builtin/tag.c:457 +msgid "message" +msgstr "" + +#: builtin/commit.c:1361 +msgid "commit message" +msgstr "" + +#: builtin/commit.c:1362 +msgid "reuse and edit message from specified commit" +msgstr "" + +#: builtin/commit.c:1363 +msgid "reuse message from specified commit" +msgstr "" + +#: builtin/commit.c:1364 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" + +#: builtin/commit.c:1365 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" + +#: builtin/commit.c:1366 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "" + +#: builtin/commit.c:1367 builtin/log.c:1068 builtin/revert.c:109 +msgid "add Signed-off-by:" +msgstr "" + +#: builtin/commit.c:1368 +msgid "use specified template file" +msgstr "" + +#: builtin/commit.c:1369 +msgid "force edit of commit" +msgstr "" + +#: builtin/commit.c:1370 +msgid "default" +msgstr "" + +#: builtin/commit.c:1370 builtin/tag.c:462 +msgid "how to strip spaces and #comments from message" +msgstr "" + +#: builtin/commit.c:1371 +msgid "include status in commit message template" +msgstr "" + +#: builtin/commit.c:1372 builtin/merge.c:213 builtin/tag.c:463 +msgid "key id" +msgstr "" + +#: builtin/commit.c:1373 builtin/merge.c:214 +msgid "GPG sign commit" +msgstr "" + +#. end commit message options +#: builtin/commit.c:1376 +msgid "Commit contents options" +msgstr "" + +#: builtin/commit.c:1377 +msgid "commit all changed files" +msgstr "" + +#: builtin/commit.c:1378 +msgid "add specified files to index for commit" +msgstr "" + +#: builtin/commit.c:1379 +msgid "interactively add files" +msgstr "" + +#: builtin/commit.c:1380 +msgid "interactively add changes" +msgstr "" + +#: builtin/commit.c:1381 +msgid "commit only specified files" +msgstr "" + +#: builtin/commit.c:1382 +msgid "bypass pre-commit hook" +msgstr "" + +#: builtin/commit.c:1383 +msgid "show what would be committed" +msgstr "" + +#: builtin/commit.c:1391 +msgid "amend previous commit" +msgstr "" + +#: builtin/commit.c:1392 +msgid "bypass post-rewrite hook" +msgstr "" + +#: builtin/commit.c:1397 +msgid "ok to record an empty change" +msgstr "" + +#: builtin/commit.c:1400 +msgid "ok to record a change with an empty message" +msgstr "" + +#: builtin/commit.c:1432 +msgid "could not parse HEAD commit" +msgstr "" + +#: builtin/commit.c:1470 builtin/merge.c:508 +#, c-format +msgid "could not open '%s' for reading" +msgstr "" + +#: builtin/commit.c:1477 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "" + +#: builtin/commit.c:1484 +msgid "could not read MERGE_MODE" +msgstr "" + +#: builtin/commit.c:1503 +#, c-format +msgid "could not read commit message: %s" +msgstr "" + +#: builtin/commit.c:1517 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "" + +#: builtin/commit.c:1522 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "" + +#: builtin/commit.c:1537 builtin/merge.c:935 builtin/merge.c:960 +msgid "failed to write commit object" +msgstr "" + +#: builtin/commit.c:1558 +msgid "cannot lock HEAD ref" +msgstr "" + +#: builtin/commit.c:1562 +msgid "cannot update HEAD ref" +msgstr "" + +#: builtin/commit.c:1573 +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:52 +msgid "Config file location" +msgstr "" + +#: builtin/config.c:53 +msgid "use global config file" +msgstr "" + +#: builtin/config.c:54 +msgid "use system config file" +msgstr "" + +#: builtin/config.c:55 +msgid "use repository config file" +msgstr "" + +#: builtin/config.c:56 +msgid "use given config file" +msgstr "" + +#: builtin/config.c:57 +msgid "Action" +msgstr "" + +#: builtin/config.c:58 +msgid "get value: name [value-regex]" +msgstr "" + +#: builtin/config.c:59 +msgid "get all values: key [value-regex]" +msgstr "" + +#: builtin/config.c:60 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "" + +#: builtin/config.c:61 +msgid "replace all matching variables: name value [value_regex]" +msgstr "" + +#: builtin/config.c:62 +msgid "add a new variable: name value" +msgstr "" + +#: builtin/config.c:63 +msgid "remove a variable: name [value-regex]" +msgstr "" + +#: builtin/config.c:64 +msgid "remove all matches: name [value-regex]" +msgstr "" + +#: builtin/config.c:65 +msgid "rename section: old-name new-name" +msgstr "" + +#: builtin/config.c:66 +msgid "remove a section: name" +msgstr "" + +#: builtin/config.c:67 +msgid "list all" +msgstr "" + +#: builtin/config.c:68 +msgid "open an editor" +msgstr "" + +#: builtin/config.c:69 builtin/config.c:70 +msgid "slot" +msgstr "" + +#: builtin/config.c:69 +msgid "find the color configured: [default]" +msgstr "" + +#: builtin/config.c:70 +msgid "find the color setting: [stdout-is-tty]" +msgstr "" + +#: builtin/config.c:71 +msgid "Type" +msgstr "" + +#: builtin/config.c:72 +msgid "value is \"true\" or \"false\"" +msgstr "" + +#: builtin/config.c:73 +msgid "value is decimal number" +msgstr "" + +#: builtin/config.c:74 +msgid "value is --bool or --int" +msgstr "" + +#: builtin/config.c:75 +msgid "value is a path (file or directory name)" +msgstr "" + +#: builtin/config.c:76 +msgid "Other" +msgstr "" + +#: builtin/config.c:77 +msgid "terminate values with NUL byte" +msgstr "" + +#: builtin/config.c:78 +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:224 +#, c-format +msgid "invalid option: %s" +msgstr "" + +#: builtin/diff.c:301 +msgid "Not a git repository" +msgstr "" + +#: builtin/diff.c:344 +#, c-format +msgid "invalid object '%s' given." +msgstr "" + +#: builtin/diff.c:349 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "" + +#: builtin/diff.c:359 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "" + +#: builtin/diff.c:367 +#, 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:635 +msgid "show progress after <n> objects" +msgstr "" + +#: builtin/fast-export.c:637 +msgid "select handling of signed tags" +msgstr "" + +#: builtin/fast-export.c:640 +msgid "select handling of tags that tag filtered objects" +msgstr "" + +#: builtin/fast-export.c:643 +msgid "Dump marks to this file" +msgstr "" + +#: builtin/fast-export.c:645 +msgid "Import marks from this file" +msgstr "" + +#: builtin/fast-export.c:647 +msgid "Fake a tagger when tags lack one" +msgstr "" + +#: builtin/fast-export.c:649 +msgid "Output full tree for each commit" +msgstr "" + +#: builtin/fast-export.c:651 +msgid "Use the done feature to terminate the stream" +msgstr "" + +#: builtin/fast-export.c:652 +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:85 builtin/log.c:1083 +msgid "dir" +msgstr "" + +#: builtin/fetch.c:86 +msgid "prepend this to submodule path output" +msgstr "" + +#: builtin/fetch.c:89 +msgid "default mode for recursion" +msgstr "" + +#: builtin/fetch.c:201 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:254 +#, c-format +msgid "object %s not found" +msgstr "" + +#: builtin/fetch.c:259 +msgid "[up to date]" +msgstr "" + +#: builtin/fetch.c:273 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "" + +#: builtin/fetch.c:274 builtin/fetch.c:360 +msgid "[rejected]" +msgstr "" + +#: builtin/fetch.c:285 +msgid "[tag update]" +msgstr "" + +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +msgid " (unable to update local ref)" +msgstr "" + +#: builtin/fetch.c:305 +msgid "[new tag]" +msgstr "" + +#: builtin/fetch.c:308 +msgid "[new branch]" +msgstr "" + +#: builtin/fetch.c:311 +msgid "[new ref]" +msgstr "" + +#: builtin/fetch.c:356 +msgid "unable to update local ref" +msgstr "" + +#: builtin/fetch.c:356 +msgid "forced update" +msgstr "" + +#: builtin/fetch.c:362 +msgid "(non-fast-forward)" +msgstr "" + +#: builtin/fetch.c:393 builtin/fetch.c:685 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "" + +#: builtin/fetch.c:402 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "" + +#: builtin/fetch.c:488 +#, c-format +msgid "From %.*s\n" +msgstr "" + +#: builtin/fetch.c:499 +#, 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:549 +#, c-format +msgid " (%s will become dangling)" +msgstr "" + +#: builtin/fetch.c:550 +#, c-format +msgid " (%s has become dangling)" +msgstr "" + +#: builtin/fetch.c:557 +msgid "[deleted]" +msgstr "" + +#: builtin/fetch.c:558 builtin/remote.c:1055 +msgid "(none)" +msgstr "" + +#: builtin/fetch.c:675 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" + +#: builtin/fetch.c:709 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:786 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:789 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "" + +#: builtin/fetch.c:891 +#, c-format +msgid "Fetching %s\n" +msgstr "" + +#: builtin/fetch.c:893 builtin/remote.c:100 +#, c-format +msgid "Could not fetch %s" +msgstr "" + +#: builtin/fetch.c:912 +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:932 +msgid "You need to specify a tag name." +msgstr "" + +#: builtin/fetch.c:984 +msgid "fetch --all does not take a repository argument" +msgstr "" + +#: builtin/fetch.c:986 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:997 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:1005 +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:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:787 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "" + +#: builtin/fmt-merge-msg.c:654 +msgid "populate log with at most <n> entries from shortlog" +msgstr "" + +#: builtin/fmt-merge-msg.c:657 +msgid "alias for --log (deprecated)" +msgstr "" + +#: builtin/fmt-merge-msg.c:660 +msgid "text" +msgstr "" + +#: builtin/fmt-merge-msg.c:661 +msgid "use <text> as start of message" +msgstr "" + +#: builtin/fmt-merge-msg.c:662 +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:455 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:531 builtin/grep.c:565 +#, c-format +msgid "unable to read tree (%s)" +msgstr "" + +#: builtin/grep.c:579 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" + +#: builtin/grep.c:637 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "" + +#: builtin/grep.c:654 +#, c-format +msgid "cannot open '%s'" +msgstr "" + +#: builtin/grep.c:729 +msgid "search in index instead of in the work tree" +msgstr "" + +#: builtin/grep.c:731 +msgid "find in contents not managed by git" +msgstr "" + +#: builtin/grep.c:733 +msgid "search in both tracked and untracked files" +msgstr "" + +#: builtin/grep.c:735 +msgid "search also in ignored files" +msgstr "" + +#: builtin/grep.c:738 +msgid "show non-matching lines" +msgstr "" + +#: builtin/grep.c:740 +msgid "case insensitive matching" +msgstr "" + +#: builtin/grep.c:742 +msgid "match patterns only at word boundaries" +msgstr "" + +#: builtin/grep.c:744 +msgid "process binary files as text" +msgstr "" + +#: builtin/grep.c:746 +msgid "don't match patterns in binary files" +msgstr "" + +#: builtin/grep.c:749 +msgid "descend at most <depth> levels" +msgstr "" + +#: builtin/grep.c:753 +msgid "use extended POSIX regular expressions" +msgstr "" + +#: builtin/grep.c:756 +msgid "use basic POSIX regular expressions (default)" +msgstr "" + +#: builtin/grep.c:759 +msgid "interpret patterns as fixed strings" +msgstr "" + +#: builtin/grep.c:762 +msgid "use Perl-compatible regular expressions" +msgstr "" + +#: builtin/grep.c:765 +msgid "show line numbers" +msgstr "" + +#: builtin/grep.c:766 +msgid "don't show filenames" +msgstr "" + +#: builtin/grep.c:767 +msgid "show filenames" +msgstr "" + +#: builtin/grep.c:769 +msgid "show filenames relative to top directory" +msgstr "" + +#: builtin/grep.c:771 +msgid "show only filenames instead of matching lines" +msgstr "" + +#: builtin/grep.c:773 +msgid "synonym for --files-with-matches" +msgstr "" + +#: builtin/grep.c:776 +msgid "show only the names of files without match" +msgstr "" + +#: builtin/grep.c:778 +msgid "print NUL after filenames" +msgstr "" + +#: builtin/grep.c:780 +msgid "show the number of matches instead of matching lines" +msgstr "" + +#: builtin/grep.c:781 +msgid "highlight matches" +msgstr "" + +#: builtin/grep.c:783 +msgid "print empty line between matches from different files" +msgstr "" + +#: builtin/grep.c:785 +msgid "show filename only once above matches from same file" +msgstr "" + +#: builtin/grep.c:788 +msgid "show <n> context lines before and after matches" +msgstr "" + +#: builtin/grep.c:791 +msgid "show <n> context lines before matches" +msgstr "" + +#: builtin/grep.c:793 +msgid "show <n> context lines after matches" +msgstr "" + +#: builtin/grep.c:794 +msgid "shortcut for -C NUM" +msgstr "" + +#: builtin/grep.c:797 +msgid "show a line with the function name before matches" +msgstr "" + +#: builtin/grep.c:799 +msgid "show the surrounding function" +msgstr "" + +#: builtin/grep.c:802 +msgid "read patterns from file" +msgstr "" + +#: builtin/grep.c:804 +msgid "match <pattern>" +msgstr "" + +#: builtin/grep.c:806 +msgid "combine patterns specified with -e" +msgstr "" + +#: builtin/grep.c:818 +msgid "indicate hit with exit status without output" +msgstr "" + +#: builtin/grep.c:820 +msgid "show only matches from files that match all patterns" +msgstr "" + +#: builtin/grep.c:822 +msgid "show parse tree for grep expression" +msgstr "" + +#: builtin/grep.c:826 +msgid "pager" +msgstr "" + +#: builtin/grep.c:826 +msgid "show matching files in the pager" +msgstr "" + +#: builtin/grep.c:829 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "" + +#: builtin/grep.c:830 builtin/show-ref.c:201 +msgid "show usage" +msgstr "" + +#: builtin/grep.c:921 +msgid "no pattern given." +msgstr "" + +#: builtin/grep.c:935 +#, c-format +msgid "bad object %s" +msgstr "" + +#: builtin/grep.c:976 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:999 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "" + +#: builtin/grep.c:1004 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "" + +#: builtin/grep.c:1007 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "" + +#: builtin/grep.c:1015 +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:43 +msgid "print all available commands" +msgstr "" + +#: builtin/help.c:44 +msgid "show man page" +msgstr "" + +#: builtin/help.c:45 +msgid "show manual in web browser" +msgstr "" + +#: builtin/help.c:47 +msgid "show info page" +msgstr "" + +#: builtin/help.c:53 +msgid "git help [--all] [--man|--web|--info] [command]" +msgstr "" + +#: builtin/help.c:65 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "" + +#: builtin/help.c:93 +msgid "Failed to start emacsclient." +msgstr "" + +#: builtin/help.c:106 +msgid "Failed to parse emacsclient version." +msgstr "" + +#: builtin/help.c:114 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "" + +#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "" + +#: builtin/help.c:217 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "" + +#: builtin/help.c:229 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "" + +#: builtin/help.c:299 +msgid "The most commonly used git commands are:" +msgstr "" + +#: builtin/help.c:367 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "" + +#: builtin/help.c:384 +msgid "no man viewer handled the request" +msgstr "" + +#: builtin/help.c:392 +msgid "no info viewer handled the request" +msgstr "" + +#: builtin/help.c:447 builtin/help.c:454 +#, c-format +msgid "usage: %s%s" +msgstr "" + +#: builtin/help.c:470 +#, 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:37 +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +msgstr "" + +#: builtin/log.c:38 +msgid " or: git show [options] <object>..." +msgstr "" + +#: builtin/log.c:100 +msgid "suppress diff output" +msgstr "" + +#: builtin/log.c:101 +msgid "show source" +msgstr "" + +#: builtin/log.c:102 +msgid "decorate options" +msgstr "" + +#: builtin/log.c:189 +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +#: builtin/log.c:403 builtin/log.c:494 +#, c-format +msgid "Could not read object %s" +msgstr "" + +#: builtin/log.c:518 +#, c-format +msgid "Unknown type: %d" +msgstr "" + +#: builtin/log.c:608 +msgid "format.headers without value" +msgstr "" + +#: builtin/log.c:682 +msgid "name of output directory is too long" +msgstr "" + +#: builtin/log.c:693 +#, c-format +msgid "Cannot open patch file %s" +msgstr "" + +#: builtin/log.c:707 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:715 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:789 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:862 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "" + +#: builtin/log.c:890 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "" + +#: builtin/log.c:935 +msgid "Two output directories?" +msgstr "" + +#: builtin/log.c:1063 +msgid "use [PATCH n/m] even with a single patch" +msgstr "" + +#: builtin/log.c:1066 +msgid "use [PATCH] even with multiple patches" +msgstr "" + +#: builtin/log.c:1070 +msgid "print patches to standard out" +msgstr "" + +#: builtin/log.c:1072 +msgid "generate a cover letter" +msgstr "" + +#: builtin/log.c:1074 +msgid "use simple number sequence for output file names" +msgstr "" + +#: builtin/log.c:1075 +msgid "sfx" +msgstr "" + +#: builtin/log.c:1076 +msgid "use <sfx> instead of '.patch'" +msgstr "" + +#: builtin/log.c:1078 +msgid "start numbering patches at <n> instead of 1" +msgstr "" + +#: builtin/log.c:1080 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "" + +#: builtin/log.c:1083 +msgid "store resulting files in <dir>" +msgstr "" + +#: builtin/log.c:1086 +msgid "don't strip/add [PATCH]" +msgstr "" + +#: builtin/log.c:1089 +msgid "don't output binary diffs" +msgstr "" + +#: builtin/log.c:1091 +msgid "don't include a patch matching a commit upstream" +msgstr "" + +#: builtin/log.c:1093 +msgid "show patch format instead of default (patch + stat)" +msgstr "" + +#: builtin/log.c:1095 +msgid "Messaging" +msgstr "" + +#: builtin/log.c:1096 +msgid "header" +msgstr "" + +#: builtin/log.c:1097 +msgid "add email header" +msgstr "" + +#: builtin/log.c:1098 builtin/log.c:1100 +msgid "email" +msgstr "" + +#: builtin/log.c:1098 +msgid "add To: header" +msgstr "" + +#: builtin/log.c:1100 +msgid "add Cc: header" +msgstr "" + +#: builtin/log.c:1102 +msgid "message-id" +msgstr "" + +#: builtin/log.c:1103 +msgid "make first mail a reply to <message-id>" +msgstr "" + +#: builtin/log.c:1104 builtin/log.c:1107 +msgid "boundary" +msgstr "" + +#: builtin/log.c:1105 +msgid "attach the patch" +msgstr "" + +#: builtin/log.c:1108 +msgid "inline the patch" +msgstr "" + +#: builtin/log.c:1112 +msgid "enable message threading, styles: shallow, deep" +msgstr "" + +#: builtin/log.c:1114 +msgid "signature" +msgstr "" + +#: builtin/log.c:1115 +msgid "add a signature" +msgstr "" + +#: builtin/log.c:1117 +msgid "don't print the patch filenames" +msgstr "" + +#: builtin/log.c:1157 +#, c-format +msgid "bogus committer info %s" +msgstr "" + +#: builtin/log.c:1202 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1204 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1212 +msgid "--name-only does not make sense" +msgstr "" + +#: builtin/log.c:1214 +msgid "--name-status does not make sense" +msgstr "" + +#: builtin/log.c:1216 +msgid "--check does not make sense" +msgstr "" + +#: builtin/log.c:1239 +msgid "standard output, or directory, which one?" +msgstr "" + +#: builtin/log.c:1241 +#, c-format +msgid "Could not create directory '%s'" +msgstr "" + +#: builtin/log.c:1394 +msgid "Failed to create output files" +msgstr "" + +#: builtin/log.c:1443 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "" + +#: builtin/log.c:1498 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" + +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/ls-files.c:408 +msgid "git ls-files [options] [<file>...]" +msgstr "" + +#: builtin/ls-files.c:463 +msgid "identify the file status with tags" +msgstr "" + +#: builtin/ls-files.c:465 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "" + +#: builtin/ls-files.c:467 +msgid "show cached files in the output (default)" +msgstr "" + +#: builtin/ls-files.c:469 +msgid "show deleted files in the output" +msgstr "" + +#: builtin/ls-files.c:471 +msgid "show modified files in the output" +msgstr "" + +#: builtin/ls-files.c:473 +msgid "show other files in the output" +msgstr "" + +#: builtin/ls-files.c:475 +msgid "show ignored files in the output" +msgstr "" + +#: builtin/ls-files.c:478 +msgid "show staged contents' object name in the output" +msgstr "" + +#: builtin/ls-files.c:480 +msgid "show files on the filesystem that need to be removed" +msgstr "" + +#: builtin/ls-files.c:482 +msgid "show 'other' directories' name only" +msgstr "" + +#: builtin/ls-files.c:485 +msgid "don't show empty directories" +msgstr "" + +#: builtin/ls-files.c:488 +msgid "show unmerged files in the output" +msgstr "" + +#: builtin/ls-files.c:490 +msgid "show resolve-undo information" +msgstr "" + +#: builtin/ls-files.c:492 +msgid "skip files matching pattern" +msgstr "" + +#: builtin/ls-files.c:495 +msgid "exclude patterns are read from <file>" +msgstr "" + +#: builtin/ls-files.c:498 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "" + +#: builtin/ls-files.c:500 +msgid "add the standard git exclusions" +msgstr "" + +#: builtin/ls-files.c:503 +msgid "make the output relative to the project top directory" +msgstr "" + +#: builtin/ls-files.c:506 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "" + +#: builtin/ls-files.c:507 +msgid "tree-ish" +msgstr "" + +#: builtin/ls-files.c:508 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "" + +#: builtin/ls-files.c:510 +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:870 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:678 +msgid "failed to read the cache" +msgstr "" + +#: builtin/merge.c:709 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:723 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "" + +#: builtin/merge.c:737 +#, c-format +msgid "unable to write %s" +msgstr "" + +#: builtin/merge.c:876 +#, c-format +msgid "Could not read from '%s'" +msgstr "" + +#: builtin/merge.c:885 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" + +#: builtin/merge.c:891 +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 '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" + +#: builtin/merge.c:915 +msgid "Empty commit message." +msgstr "" + +#: builtin/merge.c:927 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:992 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +#: builtin/merge.c:1008 +#, c-format +msgid "'%s' is not a commit" +msgstr "" + +#: builtin/merge.c:1049 +msgid "No current branch." +msgstr "" + +#: builtin/merge.c:1051 +msgid "No remote for the current branch." +msgstr "" + +#: builtin/merge.c:1053 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1058 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1145 builtin/merge.c:1302 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1213 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1229 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:1232 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1236 +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:1239 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1248 +msgid "You cannot combine --squash with --no-ff." +msgstr "" + +#: builtin/merge.c:1253 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "" + +#: builtin/merge.c:1260 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "" + +#: builtin/merge.c:1292 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1295 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:1297 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:1412 +#, c-format +msgid "Updating %s..%s\n" +msgstr "" + +#: builtin/merge.c:1450 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1457 +#, c-format +msgid "Nope.\n" +msgstr "" + +#: builtin/merge.c:1489 +msgid "Not possible to fast-forward, aborting." +msgstr "" + +#: builtin/merge.c:1512 builtin/merge.c:1591 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1516 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#: builtin/merge.c:1582 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "" + +#: builtin/merge.c:1584 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "" + +#: builtin/merge.c:1593 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1605 +#, 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:142 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:148 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:161 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:178 builtin/tag.c:347 +#, c-format +msgid "could not create file '%s'" +msgstr "" + +#: builtin/notes.c:192 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" + +#: builtin/notes.c:213 builtin/notes.c:976 +#, c-format +msgid "Removing note for object %s\n" +msgstr "" + +#: builtin/notes.c:218 +msgid "unable to write note object" +msgstr "" + +#: builtin/notes.c:220 +#, c-format +msgid "The note contents has been left in %s" +msgstr "" + +#: builtin/notes.c:254 builtin/tag.c:542 +#, c-format +msgid "cannot read '%s'" +msgstr "" + +#: builtin/notes.c:256 builtin/tag.c:545 +#, c-format +msgid "could not open or read '%s'" +msgstr "" + +#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 +#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 +#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 +#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:278 +#, c-format +msgid "Failed to read object '%s'." +msgstr "" + +#: builtin/notes.c:302 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:343 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: builtin/notes.c:353 +#, 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:380 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: builtin/notes.c:444 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "" + +#: builtin/notes.c:459 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "" + +#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630 +#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 +#: builtin/notes.c:1036 +msgid "too many parameters" +msgstr "" + +#: builtin/notes.c:516 builtin/notes.c:775 +#, c-format +msgid "No note found for object %s." +msgstr "" + +#: builtin/notes.c:538 builtin/notes.c:695 +msgid "note contents as a string" +msgstr "" + +#: builtin/notes.c:541 builtin/notes.c:698 +msgid "note contents in a file" +msgstr "" + +#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 +#: builtin/notes.c:703 builtin/tag.c:476 +msgid "object" +msgstr "" + +#: builtin/notes.c:544 builtin/notes.c:701 +msgid "reuse and edit specified note object" +msgstr "" + +#: builtin/notes.c:547 builtin/notes.c:704 +msgid "reuse specified note object" +msgstr "" + +#: builtin/notes.c:549 builtin/notes.c:617 +msgid "replace existing notes" +msgstr "" + +#: builtin/notes.c:583 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:588 builtin/notes.c:665 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#: builtin/notes.c:618 +msgid "read objects from stdin" +msgstr "" + +#: builtin/notes.c:620 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "" + +#: builtin/notes.c:638 +msgid "too few parameters" +msgstr "" + +#: builtin/notes.c:659 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:671 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "" + +#: builtin/notes.c:720 +#, 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:867 +msgid "General options" +msgstr "" + +#: builtin/notes.c:869 +msgid "Merge options" +msgstr "" + +#: builtin/notes.c:871 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" + +#: builtin/notes.c:873 +msgid "Committing unmerged notes" +msgstr "" + +#: builtin/notes.c:875 +msgid "finalize notes merge by committing unmerged notes" +msgstr "" + +#: builtin/notes.c:877 +msgid "Aborting notes merge resolution" +msgstr "" + +#: builtin/notes.c:879 +msgid "abort notes merge" +msgstr "" + +#: builtin/notes.c:974 +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +#: builtin/notes.c:986 +msgid "attempt to remove non-existent note is not an error" +msgstr "" + +#: builtin/notes.c:989 +msgid "read object names from the standard input" +msgstr "" + +#: builtin/notes.c:1070 +msgid "notes_ref" +msgstr "" + +#: builtin/notes.c:1071 +msgid "use notes from <notes_ref>" +msgstr "" + +#: builtin/notes.c:1106 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:2398 +#, c-format +msgid "unsupported index version %s" +msgstr "" + +#: builtin/pack-objects.c:2402 +#, c-format +msgid "bad index version '%s'" +msgstr "" + +#: builtin/pack-objects.c:2425 +#, c-format +msgid "option %s does not accept negative form" +msgstr "" + +#: builtin/pack-objects.c:2429 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "" + +#: builtin/pack-objects.c:2448 +msgid "do not show progress meter" +msgstr "" + +#: builtin/pack-objects.c:2450 +msgid "show progress meter" +msgstr "" + +#: builtin/pack-objects.c:2452 +msgid "show progress meter during object writing phase" +msgstr "" + +#: builtin/pack-objects.c:2455 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" + +#: builtin/pack-objects.c:2456 +msgid "version[,offset]" +msgstr "" + +#: builtin/pack-objects.c:2457 +msgid "write the pack index file in the specified idx format version" +msgstr "" + +#: builtin/pack-objects.c:2460 +msgid "maximum size of each output pack file" +msgstr "" + +#: builtin/pack-objects.c:2462 +msgid "ignore borrowed objects from alternate object store" +msgstr "" + +#: builtin/pack-objects.c:2464 +msgid "ignore packed objects" +msgstr "" + +#: builtin/pack-objects.c:2466 +msgid "limit pack window by objects" +msgstr "" + +#: builtin/pack-objects.c:2468 +msgid "limit pack window by memory in addition to object limit" +msgstr "" + +#: builtin/pack-objects.c:2470 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "" + +#: builtin/pack-objects.c:2472 +msgid "reuse existing deltas" +msgstr "" + +#: builtin/pack-objects.c:2474 +msgid "reuse existing objects" +msgstr "" + +#: builtin/pack-objects.c:2476 +msgid "use OFS_DELTA objects" +msgstr "" + +#: builtin/pack-objects.c:2478 +msgid "use threads when searching for best delta matches" +msgstr "" + +#: builtin/pack-objects.c:2480 +msgid "do not create an empty pack output" +msgstr "" + +#: builtin/pack-objects.c:2482 +msgid "read revision arguments from standard input" +msgstr "" + +#: builtin/pack-objects.c:2484 +msgid "limit the objects to those that are not yet packed" +msgstr "" + +#: builtin/pack-objects.c:2487 +msgid "include objects reachable from any reference" +msgstr "" + +#: builtin/pack-objects.c:2490 +msgid "include objects referred by reflog entries" +msgstr "" + +#: builtin/pack-objects.c:2493 +msgid "output pack to stdout" +msgstr "" + +#: builtin/pack-objects.c:2495 +msgid "include tag objects that refer to objects to be packed" +msgstr "" + +#: builtin/pack-objects.c:2497 +msgid "keep unreachable objects" +msgstr "" + +#: builtin/pack-objects.c:2498 parse-options.h:141 +msgid "time" +msgstr "" + +#: builtin/pack-objects.c:2499 +msgid "unpack unreachable objects newer than <time>" +msgstr "" + +#: builtin/pack-objects.c:2502 +msgid "create thin packs" +msgstr "" + +#: builtin/pack-objects.c:2504 +msgid "ignore packs that have companion .keep file" +msgstr "" + +#: builtin/pack-objects.c:2506 +msgid "pack compression level" +msgstr "" + +#: builtin/pack-objects.c:2508 +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:258 +#, c-format +msgid "Pushing to %s\n" +msgstr "" + +#: builtin/push.c:262 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:294 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:295 +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:310 +msgid "--all and --tags are incompatible" +msgstr "" + +#: builtin/push.c:311 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:316 +msgid "--mirror and --tags are incompatible" +msgstr "" + +#: builtin/push.c:317 +msgid "--mirror can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:322 +msgid "--all and --mirror are incompatible" +msgstr "" + +#: builtin/push.c:382 +msgid "repository" +msgstr "" + +#: builtin/push.c:383 +msgid "push all refs" +msgstr "" + +#: builtin/push.c:384 +msgid "mirror all refs" +msgstr "" + +#: builtin/push.c:386 +msgid "delete refs" +msgstr "" + +#: builtin/push.c:387 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "" + +#: builtin/push.c:390 +msgid "force updates" +msgstr "" + +#: builtin/push.c:391 +msgid "check" +msgstr "" + +#: builtin/push.c:392 +msgid "control recursive pushing of submodules" +msgstr "" + +#: builtin/push.c:394 +msgid "use thin pack" +msgstr "" + +#: builtin/push.c:395 builtin/push.c:396 +msgid "receive pack program" +msgstr "" + +#: builtin/push.c:397 +msgid "set upstream for git pull/status" +msgstr "" + +#: builtin/push.c:400 +msgid "prune locally removed refs" +msgstr "" + +#: builtin/push.c:410 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "" + +#: builtin/push.c:412 +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 +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:42 +msgid "git remote set-head <name> (-a | -d | <branch>])" +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:118 +msgid "list replace refs" +msgstr "" + +#: builtin/replace.c:119 +msgid "delete replace refs" +msgstr "" + +#: builtin/replace.c:120 +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] <commit> [--] <paths>..." +msgstr "" + +#: builtin/reset.c:27 +msgid "git reset --patch [<commit>] [--] [<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:77 +msgid "You do not have a valid HEAD." +msgstr "" + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "" + +#: builtin/reset.c:85 +#, c-format +msgid "Failed to find tree of %s." +msgstr "" + +#: builtin/reset.c:96 +msgid "Could not write new index file." +msgstr "" + +#: builtin/reset.c:106 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + +#: builtin/reset.c:130 +msgid "Could not read index" +msgstr "" + +#: builtin/reset.c:133 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:223 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "" + +#: builtin/reset.c:238 +msgid "be quiet, only report errors" +msgstr "" + +#: builtin/reset.c:240 +msgid "reset HEAD and index" +msgstr "" + +#: builtin/reset.c:241 +msgid "reset only HEAD" +msgstr "" + +#: builtin/reset.c:243 builtin/reset.c:245 +msgid "reset HEAD, index and working tree" +msgstr "" + +#: builtin/reset.c:247 +msgid "reset HEAD but keep local changes" +msgstr "" + +#: builtin/reset.c:303 +#, c-format +msgid "Could not parse object '%s'." +msgstr "" + +#: builtin/reset.c:308 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "" + +#: builtin/reset.c:317 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "" + +#: builtin/reset.c:319 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "" + +#: builtin/reset.c:331 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "" + +#: builtin/reset.c:347 +#, c-format +msgid "Could not reset index file to revision '%s'." +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:14 +msgid "git rm [options] [--] <file>..." +msgstr "" + +#: builtin/rm.c:109 +#, 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:115 +#, 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:119 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:134 +msgid "do not list removed files" +msgstr "" + +#: builtin/rm.c:135 +msgid "only remove from the index" +msgstr "" + +#: builtin/rm.c:136 +msgid "override the up-to-date check" +msgstr "" + +#: builtin/rm.c:137 +msgid "allow recursive removal" +msgstr "" + +#: builtin/rm.c:139 +msgid "exit with a zero status even if nothing matched" +msgstr "" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "" + +#: builtin/rm.c:230 +#, 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:157 +#, c-format +msgid "Missing author: %s" +msgstr "" + +#: builtin/shortlog.c:253 +msgid "sort output according to the number of commits per author" +msgstr "" + +#: builtin/shortlog.c:255 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "" + +#: builtin/shortlog.c:257 +msgid "Show the email address of each author" +msgstr "" + +#: builtin/shortlog.c:258 +msgid "w[,i1[,i2]]" +msgstr "" + +#: builtin/shortlog.c:259 +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:182 +msgid "only show tags (can be combined with heads)" +msgstr "" + +#: builtin/show-ref.c:183 +msgid "only show heads (can be combined with tags)" +msgstr "" + +#: builtin/show-ref.c:184 +msgid "stricter reference checking, requires exact ref path" +msgstr "" + +#: builtin/show-ref.c:187 builtin/show-ref.c:189 +msgid "show the HEAD reference" +msgstr "" + +#: builtin/show-ref.c:191 +msgid "dereference tags into object IDs" +msgstr "" + +#: builtin/show-ref.c:193 +msgid "only show SHA1 hash using <n> digits" +msgstr "" + +#: builtin/show-ref.c:197 +msgid "do not print results to stdout (useful with --verify)" +msgstr "" + +#: builtin/show-ref.c:199 +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:38 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "" + +#: builtin/symbolic-ref.c:39 +msgid "shorten ref output" +msgstr "" + +#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +msgid "reason" +msgstr "" + +#: builtin/symbolic-ref.c:40 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 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" + +#: builtin/tag.c:256 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" +"#\n" +msgstr "" + +#: builtin/tag.c:298 +msgid "unable to sign the tag" +msgstr "" + +#: builtin/tag.c:300 +msgid "unable to write tag file" +msgstr "" + +#: builtin/tag.c:325 +msgid "bad object type." +msgstr "" + +#: builtin/tag.c:338 +msgid "tag header too big." +msgstr "" + +#: builtin/tag.c:370 +msgid "no tag message?" +msgstr "" + +#: builtin/tag.c:376 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "" + +#: builtin/tag.c:425 +msgid "switch 'points-at' requires an object" +msgstr "" + +#: builtin/tag.c:427 +#, c-format +msgid "malformed object name '%s'" +msgstr "" + +#: builtin/tag.c:447 +msgid "list tag names" +msgstr "" + +#: builtin/tag.c:449 +msgid "print <n> lines of each tag message" +msgstr "" + +#: builtin/tag.c:451 +msgid "delete tags" +msgstr "" + +#: builtin/tag.c:452 +msgid "verify tags" +msgstr "" + +#: builtin/tag.c:454 +msgid "Tag creation options" +msgstr "" + +#: builtin/tag.c:456 +msgid "annotated tag, needs a message" +msgstr "" + +#: builtin/tag.c:458 +msgid "tag message" +msgstr "" + +#: builtin/tag.c:460 +msgid "annotated and GPG-signed tag" +msgstr "" + +#: builtin/tag.c:464 +msgid "use another key to sign the tag" +msgstr "" + +#: builtin/tag.c:465 +msgid "replace the tag if exists" +msgstr "" + +#: builtin/tag.c:466 +msgid "show tag list in columns" +msgstr "" + +#: builtin/tag.c:468 +msgid "Tag listing options" +msgstr "" + +#: builtin/tag.c:471 +msgid "print only tags that contain the commit" +msgstr "" + +#: builtin/tag.c:477 +msgid "print only tags of the object" +msgstr "" + +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "" + +#: builtin/tag.c:523 +msgid "-n option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:525 +msgid "--contains option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:527 +msgid "--points-at option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:535 +msgid "only one -F or -m option is allowed." +msgstr "" + +#: builtin/tag.c:555 +msgid "too many params" +msgstr "" + +#: builtin/tag.c:561 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "" + +#: builtin/tag.c:566 +#, c-format +msgid "tag '%s' already exists" +msgstr "" + +#: builtin/tag.c:584 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "" + +#: builtin/tag.c:586 +#, c-format +msgid "%s: cannot update the ref" +msgstr "" + +#: builtin/tag.c:588 +#, 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:717 +msgid "continue refresh even when index needs update" +msgstr "" + +#: builtin/update-index.c:720 +msgid "refresh: ignore submodules" +msgstr "" + +#: builtin/update-index.c:723 +msgid "do not ignore new files" +msgstr "" + +#: builtin/update-index.c:725 +msgid "let files replace directories and vice-versa" +msgstr "" + +#: builtin/update-index.c:727 +msgid "notice files missing from worktree" +msgstr "" + +#: builtin/update-index.c:729 +msgid "refresh even if index contains unmerged entries" +msgstr "" + +#: builtin/update-index.c:732 +msgid "refresh stat information" +msgstr "" + +#: builtin/update-index.c:736 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "" + +#: builtin/update-index.c:740 +msgid "<mode> <object> <path>" +msgstr "" + +#: builtin/update-index.c:741 +msgid "add the specified entry to the index" +msgstr "" + +#: builtin/update-index.c:745 +msgid "(+/-)x" +msgstr "" + +#: builtin/update-index.c:746 +msgid "override the executable bit of the listed files" +msgstr "" + +#: builtin/update-index.c:750 +msgid "mark files as \"not changing\"" +msgstr "" + +#: builtin/update-index.c:753 +msgid "clear assumed-unchanged bit" +msgstr "" + +#: builtin/update-index.c:756 +msgid "mark files as \"index-only\"" +msgstr "" + +#: builtin/update-index.c:759 +msgid "clear skip-worktree bit" +msgstr "" + +#: builtin/update-index.c:762 +msgid "add to index only; do not add content to object database" +msgstr "" + +#: builtin/update-index.c:764 +msgid "remove named paths even if present in worktree" +msgstr "" + +#: builtin/update-index.c:766 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "" + +#: builtin/update-index.c:768 +msgid "read list of paths to be updated from standard input" +msgstr "" + +#: builtin/update-index.c:772 +msgid "add entries from standard input to the index" +msgstr "" + +#: builtin/update-index.c:776 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "" + +#: builtin/update-index.c:780 +msgid "only update entries that differ from HEAD" +msgstr "" + +#: builtin/update-index.c:784 +msgid "ignore files missing from worktree" +msgstr "" + +#: builtin/update-index.c:787 +msgid "report actions to standard output" +msgstr "" + +#: builtin/update-index.c:789 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "" + +#: builtin/update-index.c:793 +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:228 +msgid "be more verbose" +msgstr "" + +#: parse-options.h:230 +msgid "be more quiet" +msgstr "" + +#: parse-options.h:236 +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:228 +#, 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:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "" + +#: git-pull.sh:257 +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:88 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "" + +#: git-submodule.sh:167 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "" + +#: git-submodule.sh:211 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "" + +#: git-submodule.sh:223 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "" + +#: git-submodule.sh:312 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" + +#: git-submodule.sh:329 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "" + +#: git-submodule.sh:333 +#, 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:344 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "" + +#: git-submodule.sh:346 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "" + +#: git-submodule.sh:360 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:365 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:370 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:413 +#, sh-format +msgid "Entering '$prefix$sm_path'" +msgstr "" + +#: git-submodule.sh:427 +#, sh-format +msgid "Stopping at '$sm_path'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:471 +#, sh-format +msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:480 +#, sh-format +msgid "Failed to register url for submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:482 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgstr "" + +#: git-submodule.sh:490 +#, sh-format +msgid "Failed to register update mode for submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:590 +#, sh-format +msgid "" +"Submodule path '$sm_path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:603 +#, sh-format +msgid "Unable to find current revision in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:622 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:636 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:637 +#, sh-format +msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:642 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:643 +#, sh-format +msgid "Submodule path '$sm_path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:648 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:649 +#, sh-format +msgid "Submodule path '$sm_path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:671 git-submodule.sh:995 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:779 +msgid "The --cached option cannot be used with the --files option" +msgstr "" + +#. unexpected type +#: git-submodule.sh:819 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "" + +#: git-submodule.sh:837 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr "" + +#: git-submodule.sh:840 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr "" + +#: git-submodule.sh:843 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" + +#: git-submodule.sh:868 +msgid "blob" +msgstr "" + +#: git-submodule.sh:906 +msgid "# Submodules changed but not updated:" +msgstr "" + +#: git-submodule.sh:908 +msgid "# Submodule changes to be committed:" +msgstr "" + +#: git-submodule.sh:1054 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" diff --git a/po/glossary/Makefile b/po/glossary/Makefile deleted file mode 100644 index 749aa2e..0000000 --- a/po/glossary/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -PO_TEMPLATE = git-gui-glossary.pot - -ALL_POFILES = $(wildcard *.po) - -$(PO_TEMPLATE): $(subst .pot,.txt,$(PO_TEMPLATE)) - ./txt-to-pot.sh $< > $@ - -update-po:: git-gui-glossary.pot - $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) diff --git a/po/glossary/de.po b/po/glossary/de.po deleted file mode 100644 index 35764d1..0000000 --- a/po/glossary/de.po +++ /dev/null @@ -1,189 +0,0 @@ -# Translation of git-gui glossary to German -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Christian Stimming <stimming@tuhh.de>, 2007 -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui glossary\n" -"POT-Creation-Date: 2008-01-07 21:20+0100\n" -"PO-Revision-Date: 2008-02-16 21:48+0100\n" -"Last-Translator: Christian Stimming <stimming@tuhh.de>\n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" -msgid "" -"English Term (Dear translator: This file will never be visible to the user!)" -msgstr "" -"Deutsche Übersetzung.\n" -"Andere deutsche SCM:\n" -" http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://" -"tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po " -"(username=guest, password empty, gut),\n" -" http://msdn.microsoft.com/de-de/library/ms181038(vs.80).aspx (MS Visual " -"Source Safe, kommerziell),\n" -" http://cvsbook.red-bean.com/translations/german/Kap_06.html " -"(mittelmäßig),\n" -" http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/de_DE.po?" -"view=markup (mittelmäßig),\n" -" http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po " -"(username=guest, password empty, schlecht)" - -#. "" -msgid "amend" -msgstr "nachbessern (ergänzen)" - -#. "" -msgid "annotate" -msgstr "annotieren" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "Zweig" - -#. "" -msgid "branch [verb]" -msgstr "verzweigen" - -#. "" -msgid "checkout [noun]" -msgstr "" -"Arbeitskopie (Erstellung einer Arbeitskopie; Auscheck? Ausspielung? Abruf? " -"Source Safe: Auscheckvorgang)" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "" -"Arbeitskopie erstellen; Zweig umstellen [checkout a branch] (auschecken? " -"ausspielen? abrufen? Source Safe: auschecken)" - -#. "" -msgid "clone [verb]" -msgstr "klonen" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "" -"Version; Eintragung; Änderung (Buchung?, Eintragung?, Übertragung?, " -"Sendung?, Übergabe?, Einspielung?, Ablagevorgang?)" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "" -"eintragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, " -"übergeben?, einspielen?, einpflegen?, ablegen?)" - -#. "" -msgid "diff [noun]" -msgstr "Vergleich (Source Safe: Unterschiede)" - -#. "" -msgid "diff [verb]" -msgstr "vergleichen" - -#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -msgid "fast forward merge" -msgstr "Schnellzusammenführung" - -#. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." -msgid "fetch" -msgstr "anfordern (holen?)" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "Kontext" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "Bereitstellung" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "Zusammenführung" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "zusammenführen" - -#. "" -msgid "message" -msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "aufräumen (entfernen?)" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "übernehmen (ziehen?)" - -#. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" -msgid "push" -msgstr "versenden (ausliefern? hochladen? verschicken? schieben?)" - -#. "" -msgid "redo" -msgstr "wiederholen" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "Andere Archive (Gegenseite?, Entfernte?, Server?)" - -#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" -msgid "repository" -msgstr "Projektarchiv" - -#. "" -msgid "reset" -msgstr "zurücksetzen (zurückkehren?)" - -#. "" -msgid "revert" -msgstr "verwerfen (bei git-reset), revidieren (bei git-revert, also mit neuem commit)" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "Version (TortoiseSVN: Revision; Source Safe: Version)" - -#. "" -msgid "sign off" -msgstr "abzeichnen (gegenzeichnen?, freizeichnen?, absegnen?)" - -#. "" -msgid "staging area" -msgstr "Bereitstellung" - -#. "" -msgid "status" -msgstr "Status" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "Markierung" - -#. "" -msgid "tag [verb]" -msgstr "markieren" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "Übernahmezweig" - -#. "" -msgid "undo" -msgstr "rückgängig" - -#. "" -msgid "update" -msgstr "aktualisieren" - -#. "" -msgid "verify" -msgstr "überprüfen" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "Arbeitskopie" diff --git a/po/glossary/el.po b/po/glossary/el.po deleted file mode 100644 index 1d3cc81..0000000 --- a/po/glossary/el.po +++ /dev/null @@ -1,171 +0,0 @@ -# Translation of git-gui glossary to Greek -# Copyright (C) 2009 Jimmy Angelakos -# This file is distributed under the same license as the git-gui package. -# Jimmy Angelakos <vyruss@hellug.gr>, 2009. -msgid "" -msgstr "" -"Project-Id-Version: git-gui-glossary\n" -"POT-Creation-Date: 2008-01-07 21:20+0100\n" -"PO-Revision-Date: 2009-06-23 20:41+0300\n" -"Last-Translator: Jimmy Angelakos <vyruss@hellug.gr>\n" -"Language-Team: Greek <i18n@lists.hellug.gr>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.3\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" -msgid "English Term (Dear translator: This file will never be visible to the user!)" -msgstr "" - -#. "" -msgid "amend" -msgstr "διόρθωση" - -#. "" -msgid "annotate" -msgstr "σχολιασμός" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "κλάδος [αντικείμενο]" - -#. "" -msgid "branch [verb]" -msgstr "διακλάδωση [ενέργεια]" - -#. "" -msgid "checkout [noun]" -msgstr "εξαγωγή [αντικείμενο]" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "εξαγωγή [ενέργεια]" - -#. "" -msgid "clone [verb]" -msgstr "κλωνοποίηση [ενέργεια]" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "υποβολή [αντικείμενο] " - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "υποβολή [ενέργεια]" - -#. "" -msgid "diff [noun]" -msgstr "διαφορά [αντικείμενο] " - -#. "" -msgid "diff [verb]" -msgstr "διαφορά [ενέργεια]" - -#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -msgid "fast forward merge" -msgstr "συγχώνευση επιτάχυνσης" - -#. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." -msgid "fetch" -msgstr "ανάκτηση" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "κομμάτι" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "ευρετήριο (στο git-gui: περιοχή σταδιοποίησης)" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "συγχώνευση [αντικείμενο]" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "συγχώνευση [ενέργεια]" - -#. "" -msgid "message" -msgstr "μήνυμα" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "κλάδεμα" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "λήψη" - -#. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" -msgid "push" -msgstr "ώθηση" - -#. "" -msgid "redo" -msgstr "ξανά" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "απομακρυσμένο" - -#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" -msgid "repository" -msgstr "αποθετήριο" - -#. "" -msgid "reset" -msgstr "επαναφορά" - -#. "" -msgid "revert" -msgstr "αναίρεση" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "αναθεώρηση" - -#. "" -#, fuzzy -msgid "sign off" -msgstr "αποσύνδεση" - -#. "" -msgid "staging area" -msgstr "περιοχή σταδιοποίησης" - -#. "" -msgid "status" -msgstr "κατάσταση" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "ετικέτα [αντικείμενο]" - -#. "" -msgid "tag [verb]" -msgstr "ετικέτα [ενέργεια]" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "κλάδος παρακολούθησης" - -#. "" -msgid "undo" -msgstr "αναίρεση" - -#. "" -msgid "update" -msgstr "ενημέρωση" - -#. "" -msgid "verify" -msgstr "επαλήθευση" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "αντίγραφο εργασίας" - - diff --git a/po/glossary/fr.po b/po/glossary/fr.po deleted file mode 100644 index 27c006a..0000000 --- a/po/glossary/fr.po +++ /dev/null @@ -1,166 +0,0 @@ -# translation of fr.po to French -# Translation of git-gui glossary to French -# Copyright (C) 2008 Shawn Pearce, et al. -# -# Christian Couder <chriscool@tuxfamily.org>, 2008. -msgid "" -msgstr "" -"Project-Id-Version: fr\n" -"POT-Creation-Date: 2008-01-15 21:04+0100\n" -"PO-Revision-Date: 2008-01-15 21:17+0100\n" -"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n" -"Language-Team: French\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" -msgid "English Term (Dear translator: This file will never be visible to the user!)" -msgstr "" - -#. "" -msgid "amend" -msgstr "corriger" - -#. "" -msgid "annotate" -msgstr "annoter" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "branche" - -#. "" -msgid "branch [verb]" -msgstr "créer une branche" - -#. "" -msgid "checkout [noun]" -msgstr "emprunt" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "emprunter" - -#. "" -msgid "clone [verb]" -msgstr "cloner" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "commit" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "commiter" - -#. "" -msgid "diff [noun]" -msgstr "différence" - -#. "" -msgid "diff [verb]" -msgstr "comparer" - -#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -msgid "fast forward merge" -msgstr "fusion par avance rapide" - -#. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." -msgid "fetch" -msgstr "récupérer" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "pré-commit" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "fusion" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "fusionner" - -#. "" -msgid "message" -msgstr "message" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "nettoyer" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "tirer" - -#. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" -msgid "push" -msgstr "pousser" - -#. "" -msgid "redo" -msgstr "refaire" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "référentiel distant" - -#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" -msgid "repository" -msgstr "référentiel" - -#. "" -msgid "reset" -msgstr "réinitialiser" - -#. "" -msgid "revert" -msgstr "inverser" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "révision" - -#. "" -msgid "sign off" -msgstr "signer" - -#. "" -msgid "staging area" -msgstr "pré-commit" - -#. "" -msgid "status" -msgstr "état" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "marque" - -#. "" -msgid "tag [verb]" -msgstr "marquer" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "branche de suivi" - -#. "" -msgid "undo" -msgstr "défaire" - -#. "" -msgid "update" -msgstr "mise à jour" - -#. "" -msgid "verify" -msgstr "vérifier" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "copie de travail, arborescence de travail" - diff --git a/po/glossary/git-gui-glossary.pot b/po/glossary/git-gui-glossary.pot deleted file mode 100644 index 40eb3e9..0000000 --- a/po/glossary/git-gui-glossary.pot +++ /dev/null @@ -1,168 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2008-01-07 21:20+0100\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" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" - -#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" -msgid "English Term (Dear translator: This file will never be visible to the user!)" -msgstr "" - -#. "" -msgid "amend" -msgstr "" - -#. "" -msgid "annotate" -msgstr "" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "" - -#. "" -msgid "branch [verb]" -msgstr "" - -#. "" -msgid "checkout [noun]" -msgstr "" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "" - -#. "" -msgid "clone [verb]" -msgstr "" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "" - -#. "" -msgid "diff [noun]" -msgstr "" - -#. "" -msgid "diff [verb]" -msgstr "" - -#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -msgid "fast forward merge" -msgstr "" - -#. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." -msgid "fetch" -msgstr "" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "" - -#. "" -msgid "message" -msgstr "" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "" - -#. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" -msgid "push" -msgstr "" - -#. "" -msgid "redo" -msgstr "" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "" - -#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" -msgid "repository" -msgstr "" - -#. "" -msgid "reset" -msgstr "" - -#. "" -msgid "revert" -msgstr "" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "" - -#. "" -msgid "sign off" -msgstr "" - -#. "" -msgid "staging area" -msgstr "" - -#. "" -msgid "status" -msgstr "" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "" - -#. "" -msgid "tag [verb]" -msgstr "" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "" - -#. "" -msgid "undo" -msgstr "" - -#. "" -msgid "update" -msgstr "" - -#. "" -msgid "verify" -msgstr "" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "" - diff --git a/po/glossary/git-gui-glossary.txt b/po/glossary/git-gui-glossary.txt deleted file mode 100644 index 9b31f69..0000000 --- a/po/glossary/git-gui-glossary.txt +++ /dev/null @@ -1,38 +0,0 @@ -"English Term (Dear translator: This file will never be visible to the user!)" "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" -"amend" "" -"annotate" "" -"branch [noun]" "A 'branch' is an active line of development." -"branch [verb]" "" -"checkout [noun]" "" -"checkout [verb]" "The action of updating the working tree to a revision which was stored in the object database." -"clone [verb]" "" -"commit [noun]" "A single point in the git history." -"commit [verb]" "The action of storing a new snapshot of the project's state in the git history." -"diff [noun]" "" -"diff [verb]" "" -"fast forward merge" "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -"fetch" "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." -"hunk" "One context of consecutive lines in a whole patch, which consists of many such hunks" -"index (in git-gui: staging area)" "A collection of files. The index is a stored version of your working tree." -"merge [noun]" "A successful merge results in the creation of a new commit representing the result of the merge." -"merge [verb]" "To bring the contents of another branch into the current branch." -"message" "" -"prune" "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -"pull" "Pulling a branch means to fetch it and merge it." -"push" "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" -"redo" "" -"remote" "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -"repository" "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" -"reset" "" -"revert" "" -"revision" "A particular state of files and directories which was stored in the object database." -"sign off" "" -"staging area" "" -"status" "" -"tag [noun]" "A ref pointing to a tag or commit object" -"tag [verb]" "" -"tracking branch" "A regular git branch that is used to follow changes from another repository." -"undo" "" -"update" "" -"verify" "" -"working copy, working tree" "The tree of actual checked out files." diff --git a/po/glossary/it.po b/po/glossary/it.po deleted file mode 100644 index bb46b48..0000000 --- a/po/glossary/it.po +++ /dev/null @@ -1,184 +0,0 @@ -# Translation of git-gui glossary to Italian -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Christian Stimming <stimming@tuhh.de>, 2007 -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui glossary\n" -"POT-Creation-Date: 2007-10-19 21:43+0200\n" -"PO-Revision-Date: 2007-10-10 15:24+0200\n" -"Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n" -"Language-Team: Italian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" -msgid "" -"English Term (Dear translator: This file will never be visible to the user!)" -msgstr "" -"Traduzione italiana.\n" -"Altri SCM in italiano:\n" -" http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_it." -"po (username=guest, password empty),\n" -" http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/it_IT.po?" -"view=markup ,\n" -" http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/it_IT/rapidsvn.po " -"(username=guest, password empty)" - -#. "" -msgid "amend" -msgstr "correggere, correzione" - -#. "" -msgid "annotate" -msgstr "annotare, annotazione" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "ramo, diramazione, ramificazione" - -#. "" -msgid "branch [verb]" -msgstr "creare ramo, ramificare, diramare" - -#. "" -msgid "checkout [noun]" -msgstr "attivazione, checkout, revisione attiva, prelievo (TortoiseCVS)?" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "" -"attivare, effettuare un checkout, attivare revisione, prelevare " -"(TortoiseCVS), ritirare (TSVN)?" - -#. "" -msgid "clone [verb]" -msgstr "clonare" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "revisione, commit, deposito (TortoiseCVS), invio (TSVN)?" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "" -"creare una nuova revisione, archiviare, effettuare un commit, depositare " -"(nel server), fare un deposito (TortoiseCVS), inviare (TSVN)?" - -#. "" -msgid "diff [noun]" -msgstr "differenza, confronto, comparazione, raffronto" - -#. "" -msgid "diff [verb]" -msgstr "confronta, mostra le differenze" - -#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -msgid "fast forward merge" -msgstr "fusione in 'fast-forward', fusione in avanti veloce" - -#. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." -msgid "fetch" -msgstr "recuperare, prelevare, prendere da, recuperare (TSVN)" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "indice" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "fusione, unione" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "effettuare la fusione, unire, fondere, eseguire la fusione" - -#. "" -msgid "message" -msgstr "messaggio, commento" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "potatura" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "" -"prendi (recupera) e fondi (unisci)? (in pratica una traduzione di fetch + " -"merge)" - -#. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" -msgid "push" -msgstr "propaga" - -#. "" -msgid "redo" -msgstr "ripeti, rifai" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "remoto" - -#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" -msgid "repository" -msgstr "archivio, repository, database? deposito (rapidsvn)?" - -#. "" -msgid "reset" -msgstr "ripristinare, annullare, azzerare, ripristinare" - -#. "" -msgid "revert" -msgstr "" -"annullare, inverti (rapidsvn), ritorna allo stato precedente, annulla le " -"modifiche della revisione" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "revisione (TortoiseSVN)" - -#. "" -msgid "sign off" -msgstr "sign off, firma" - -#. "" -msgid "staging area" -msgstr "" -"area di preparazione, zona di preparazione, modifiche in preparazione? " -"modifiche in allestimento?" - -#. "" -msgid "status" -msgstr "stato" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "etichetta, etichettatura (TortoiseCVS)" - -#. "" -msgid "tag [verb]" -msgstr "etichettare" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "" -"duplicato locale di ramo remoto, ramo in 'tracking', ramo inseguitore? ramo " -"di {inseguimento,allineamento,rilevamento,puntamento}?" - -#. "" -msgid "undo" -msgstr "annulla" - -#. "" -msgid "update" -msgstr "aggiornamento, aggiornare" - -#. "" -msgid "verify" -msgstr "verifica, verificare" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "directory di lavoro, copia di lavoro" diff --git a/po/glossary/pt_br.po b/po/glossary/pt_br.po deleted file mode 100644 index eb039b2..0000000 --- a/po/glossary/pt_br.po +++ /dev/null @@ -1,169 +0,0 @@ -# Translation of git-gui to Brazilian Portuguese -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git-gui package. -# -# Alexandre Erwin Ittner <alexandre@ittner.com.br>, 2010. -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2010-09-18 11:09-0300\n" -"Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n" -"Language-Team: Brazilian Portuguese <>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" -msgid "" -"English Term (Dear translator: This file will never be visible to the user!)" -msgstr "" - -#. "" -msgid "amend" -msgstr "corrigir" - -#. "" -msgid "annotate" -msgstr "anotar" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "ramo" - -#. "" -msgid "branch [verb]" -msgstr "ramificar" - -#. "" -msgid "checkout [noun]" -msgstr "checkout" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "efetuar checkout" - -#. "" -msgid "clone [verb]" -msgstr "clonar" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "revisão" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "salvar revisão" - -#. "" -msgid "diff [noun]" -msgstr "diff" - -#. "" -msgid "diff [verb]" -msgstr "comparar" - -#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -msgid "fast forward merge" -msgstr "mesclagem rápida" - -#. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." -msgid "fetch" -msgstr "receber" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "trecho" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "índice" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "mesclagem" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "mesclar" - -#. "" -msgid "message" -msgstr "descrição da revisão" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "limpar" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "receber e mesclar" - -#. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" -msgid "push" -msgstr "enviar" - -#. "" -msgid "redo" -msgstr "refazer" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "repositório remoto" - -#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" -msgid "repository" -msgstr "repositório" - -#. "" -msgid "reset" -msgstr "descartar, redefinir" - -#. "" -msgid "revert" -msgstr "reverter" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "revisão" - -#. "" -msgid "sign off" -msgstr "assinar embaixo" - -#. "" -msgid "staging area" -msgstr "???" - -#. "" -msgid "status" -msgstr "status" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "etiqueta" - -#. "" -msgid "tag [verb]" -msgstr "marcar etiqueta" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "ramo de rastreamento" - -#. "" -msgid "undo" -msgstr "desfazer" - -#. "" -msgid "update" -msgstr "atualizar" - -#. "" -msgid "verify" -msgstr "verificar" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "cópia de trabalho, árvore de trabalho" diff --git a/po/glossary/txt-to-pot.sh b/po/glossary/txt-to-pot.sh deleted file mode 100755 index 49bf7c5..0000000 --- a/po/glossary/txt-to-pot.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# This is a very, _very_, simple script to convert a tab-separated -# .txt file into a .pot/.po. -# Its not clever but it took me 2 minutes to write :) -# Michael Twomey <michael.twomey@ireland.sun.com> -# 23 March 2001 -# with slight GnuCash modifications by Christian Stimming <stimming@tuhh.de> -# 19 Aug 2001, 23 Jul 2007 - -#check args -if [ $# -eq 0 ] -then - cat <<! -Usage: `basename $0` git-gui-glossary.txt > git-gui-glossary.pot -! - exit 1; -fi - -GLOSSARY_CSV="$1"; - -if [ ! -f "$GLOSSARY_CSV" ] -then - echo "Can't find $GLOSSARY_CSV."; - exit 1; -fi - -cat <<! -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: `date +'%Y-%m-%d %H:%M%z'`\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" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" - -! - -#Yes this is the most simple awk script you've ever seen :) -awk -F'\t' '{if ($2 != "") print "#. "$2; print "msgid "$1; print "msgstr \"\"\n"}' \ -$GLOSSARY_CSV diff --git a/po/glossary/zh_cn.po b/po/glossary/zh_cn.po deleted file mode 100644 index 158835b..0000000 --- a/po/glossary/zh_cn.po +++ /dev/null @@ -1,170 +0,0 @@ -# Translation of git-gui glossary to Simplified Chinese -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Xudong Guan <xudong.guan@gmail.com> and the zh-kernel.org mailing list, 2007 -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui glossary\n" -"PO-Revision-Date: 2007-07-23 22:07+0200\n" -"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n" -"Language-Team: Simplified Chinese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" -msgid "" -"English Term (Dear translator: This file will never be visible to the user!)" -msgstr "注:这个文件是为了帮助翻译人员统一名词术语。最终用户不会关心这个文件。" - -#. "" -#. amend指用户修改最近一次commit的操作,修订?修改?修正? -#. [WANG Cong]: 根据我的了解,这个词似乎翻译成“修订”多一些。“修正”也可以,“修改”再次之。 -#. [ZHANG Le]: 修订,感觉一般指对一些大型出版物的大规模升级,比如修订新华字典 -# 修正,其实每次amend的结果也不一定就是最后结果,说不定还需要修改。所以不 -# 如就叫修改 -msgid "amend" -msgstr "修订" - -#. "" -#. git annotate 文件名:用来标注文件的每一行在什么时候被谁最后修改。 -#. [WANG Cong]: "标记"一般是mark。;) -#. [ZHANG Le]: 标注,或者干脆用原意:注解,或注释 -msgid "annotate" -msgstr "标注" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "分支" - -#. "" -msgid "branch [verb]" -msgstr "建立分支" - -#. "" -#. [WANG Cong]: 网上有人翻译成“检出”,我感觉更好一些,毕竟把check的意思翻译出来了。 -#. [ZHNAG Le]: 提取吧,提取分支/版本 -#. [rae l]: 签出。subversion软件中的大多词汇已有翻译,既然git与subversion同是SCM管理,可以参考同类软件的翻译也不错。 -msgid "checkout [noun]" -msgstr "签出" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "签出" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "提交" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "提交" - -#. "" -#. 差异?差别? -#. [ZHANG Le]: 个人感觉差别更加中性一些 -msgid "diff [noun]" -msgstr "差别" - -#. "" -msgid "diff [verb]" -msgstr "比较" - -#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -msgid "fast forward merge" -msgstr "快进式合并" - -#. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." -#. 获取?取得?下载?更新?注意和update的区分 -msgid "fetch" -msgstr "获取" - -#. "A collection of files. The index is a stored version of your working tree." -#. index是working tree和repository之间的缓存 -msgid "index (in git-gui: staging area)" -msgstr "工作缓存?" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "合并" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "合并" - -#. "" -#. message是指commit中的文字信息 -msgid "message" -msgstr "描述" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "获取+合并" - -#. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" -msgid "push" -msgstr "推入" - -#. "" -msgid "redo" -msgstr "重做" - -#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" -msgid "repository" -msgstr "仓库" - -#. "" -msgid "reset" -msgstr "重置" - -#. "" -msgid "revert" -msgstr "恢复" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "版本" - -#. "" -msgid "sign off" -msgstr "签名" - -#. "" -#. 似乎是git-gui里面显示的本次提交的文件清单区域 -msgid "staging area" -msgstr "提交暂存区" - -#. "" -msgid "status" -msgstr "状态" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "标签" - -#. "" -msgid "tag [verb]" -msgstr "添加标签" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "跟踪分支" - -#. "" -msgid "undo" -msgstr "撤销" - -#. "" -msgid "update" -msgstr "更新。注意和fetch的区分" - -#. "" -msgid "verify" -msgstr "验证" - -#. "The tree of actual checked out files." -#. "工作副本?工作区域?工作目录" -#. [LI Yang]: 当前副本, 当前源码树? -msgid "working copy, working tree" -msgstr "工作副本,工作源码树" diff --git a/po/hu.po b/po/hu.po deleted file mode 100644 index d106dad..0000000 --- a/po/hu.po +++ /dev/null @@ -1,2602 +0,0 @@ -# Hungarian translations for git-gui-i package. -# Copyright (C) 2007 THE git-gui-i'S COPYRIGHT HOLDER -# This file is distributed under the same license as the git-gui-i package. -# Miklos Vajna <vmiklos@frugalware.org>, 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui-i 18n\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-08 08:31-0800\n" -"PO-Revision-Date: 2008-12-10 15:00+0100\n" -"Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n" -"Language-Team: Hungarian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847 -#: git-gui.sh:866 -msgid "git-gui: fatal error" -msgstr "git-gui: végzetes hiba" - -#: git-gui.sh:689 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Érvénytelen font lett megadva itt: %s:" - -#: git-gui.sh:723 -msgid "Main Font" -msgstr "Fő betűtípus" - -#: git-gui.sh:724 -msgid "Diff/Console Font" -msgstr "Diff/konzol betűtípus" - -#: git-gui.sh:738 -msgid "Cannot find git in PATH." -msgstr "A git nem található a PATH-ban." - -#: git-gui.sh:765 -msgid "Cannot parse Git version string:" -msgstr "Nem értelmezhető a Git verzió sztring:" - -#: git-gui.sh:783 -#, tcl-format -msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" -msgstr "" -"Nem állípítható meg a Git verziója.\n" -"\n" -"A(z) %s szerint a verzió '%s'.\n" -"\n" -"A(z) %s a Git 1.5.0 vagy későbbi verzióját igényli.\n" -"\n" -"Feltételezhetjük, hogy a(z) '%s' verziója legalább 1.5.0?\n" - -#: git-gui.sh:1062 -msgid "Git directory not found:" -msgstr "A Git könyvtár nem található:" - -#: git-gui.sh:1069 -msgid "Cannot move to top of working directory:" -msgstr "Nem lehet a munkakönyvtár tetejére lépni:" - -#: git-gui.sh:1076 -msgid "Cannot use funny .git directory:" -msgstr "Nem használható vicces .git könyvtár:" - -#: git-gui.sh:1081 -msgid "No working directory" -msgstr "Nincs munkakönyvtár" - -#: git-gui.sh:1247 lib/checkout_op.tcl:305 -msgid "Refreshing file status..." -msgstr "A fájlok státuszának frissítése..." - -#: git-gui.sh:1303 -msgid "Scanning for modified files ..." -msgstr "Módosított fájlok keresése ..." - -#: git-gui.sh:1367 -msgid "Calling prepare-commit-msg hook..." -msgstr "A prepare-commit-msg hurok meghívása..." - -#: git-gui.sh:1384 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "A commitot megakadályozta a prepare-commit-msg hurok." - -#: git-gui.sh:1542 lib/browser.tcl:246 -msgid "Ready." -msgstr "Kész." - -#: git-gui.sh:1819 -msgid "Unmodified" -msgstr "Nem módosított" - -#: git-gui.sh:1821 -msgid "Modified, not staged" -msgstr "Módosított, de nem kiválasztott" - -#: git-gui.sh:1822 git-gui.sh:1830 -msgid "Staged for commit" -msgstr "Kiválasztva commitolásra" - -#: git-gui.sh:1823 git-gui.sh:1831 -msgid "Portions staged for commit" -msgstr "Részek kiválasztva commitolásra" - -#: git-gui.sh:1824 git-gui.sh:1832 -msgid "Staged for commit, missing" -msgstr "Kiválasztva commitolásra, hiányzó" - -#: git-gui.sh:1826 -msgid "File type changed, not staged" -msgstr "Fájl típus megváltozott, nem kiválasztott" - -#: git-gui.sh:1827 -msgid "File type changed, staged" -msgstr "A fájltípus megváltozott, kiválasztott" - -#: git-gui.sh:1829 -msgid "Untracked, not staged" -msgstr "Nem követett, nem kiválasztott" - -#: git-gui.sh:1834 -msgid "Missing" -msgstr "Hiányzó" - -#: git-gui.sh:1835 -msgid "Staged for removal" -msgstr "Kiválasztva eltávolításra" - -#: git-gui.sh:1836 -msgid "Staged for removal, still present" -msgstr "Kiválasztva eltávolításra, jelenleg is elérhető" - -#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841 -#: git-gui.sh:1842 git-gui.sh:1843 -msgid "Requires merge resolution" -msgstr "Merge feloldás szükséges" - -#: git-gui.sh:1878 -msgid "Starting gitk... please wait..." -msgstr "A gitk indítása... várjunk..." - -#: git-gui.sh:1887 -msgid "Couldn't find gitk in PATH" -msgstr "A gitk nem található a PATH-ban." - -#: git-gui.sh:2280 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Repó" - -#: git-gui.sh:2281 -msgid "Edit" -msgstr "Szerkesztés" - -#: git-gui.sh:2283 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Branch" - -#: git-gui.sh:2286 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Commit@@főnév" - -#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Merge" - -#: git-gui.sh:2290 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Távoli" - -#: git-gui.sh:2293 -msgid "Tools" -msgstr "Eszközök" - -#: git-gui.sh:2302 -msgid "Explore Working Copy" -msgstr "Munkamásolat felfedezése" - -#: git-gui.sh:2307 -msgid "Browse Current Branch's Files" -msgstr "A jelenlegi branch fájljainak böngészése" - -#: git-gui.sh:2311 -msgid "Browse Branch Files..." -msgstr "A branch fájljainak böngészése..." - -#: git-gui.sh:2316 -msgid "Visualize Current Branch's History" -msgstr "A jelenlegi branch történetének vizualizálása" - -#: git-gui.sh:2320 -msgid "Visualize All Branch History" -msgstr "Az összes branch történetének vizualizálása" - -#: git-gui.sh:2327 -#, tcl-format -msgid "Browse %s's Files" -msgstr "A(z) %s branch fájljainak böngészése" - -#: git-gui.sh:2329 -#, tcl-format -msgid "Visualize %s's History" -msgstr "A(z) %s branch történetének vizualizálása" - -#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Adatbázis statisztikák" - -#: git-gui.sh:2337 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Adatbázis tömörítése" - -#: git-gui.sh:2340 -msgid "Verify Database" -msgstr "Adatbázis ellenőrzése" - -#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7 -#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 -msgid "Create Desktop Icon" -msgstr "Asztal ikon létrehozása" - -#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Kilépés" - -#: git-gui.sh:2371 -msgid "Undo" -msgstr "Visszavonás" - -#: git-gui.sh:2374 -msgid "Redo" -msgstr "Mégis" - -#: git-gui.sh:2378 git-gui.sh:2937 -msgid "Cut" -msgstr "Kivágás" - -#: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Másolás" - -#: git-gui.sh:2384 git-gui.sh:2943 -msgid "Paste" -msgstr "Beillesztés" - -#: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Törlés" - -#: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71 -msgid "Select All" -msgstr "Mindent kiválaszt" - -#: git-gui.sh:2400 -msgid "Create..." -msgstr "Létrehozás..." - -#: git-gui.sh:2406 -msgid "Checkout..." -msgstr "Checkout..." - -#: git-gui.sh:2412 -msgid "Rename..." -msgstr "Átnevezés..." - -#: git-gui.sh:2417 -msgid "Delete..." -msgstr "Törlés..." - -#: git-gui.sh:2422 -msgid "Reset..." -msgstr "Visszaállítás..." - -#: git-gui.sh:2432 -msgid "Done" -msgstr "Kész" - -#: git-gui.sh:2434 -msgid "Commit@@verb" -msgstr "Commit@@ige" - -#: git-gui.sh:2443 git-gui.sh:2878 -msgid "New Commit" -msgstr "Új commit" - -#: git-gui.sh:2451 git-gui.sh:2885 -msgid "Amend Last Commit" -msgstr "Utolsó commit javítása" - -#: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Keresés újra" - -#: git-gui.sh:2467 -msgid "Stage To Commit" -msgstr "Kiválasztás commitolásra" - -#: git-gui.sh:2473 -msgid "Stage Changed Files To Commit" -msgstr "Módosított fájlok kiválasztása commitolásra" - -#: git-gui.sh:2479 -msgid "Unstage From Commit" -msgstr "Commitba való kiválasztás visszavonása" - -#: git-gui.sh:2484 lib/index.tcl:410 -msgid "Revert Changes" -msgstr "Változtatások visszaállítása" - -#: git-gui.sh:2491 git-gui.sh:3083 -msgid "Show Less Context" -msgstr "Kevesebb környezet mutatása" - -#: git-gui.sh:2495 git-gui.sh:3087 -msgid "Show More Context" -msgstr "Több környezet mutatása" - -#: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961 -msgid "Sign Off" -msgstr "Aláír" - -#: git-gui.sh:2518 -msgid "Local Merge..." -msgstr "Helyi merge..." - -#: git-gui.sh:2523 -msgid "Abort Merge..." -msgstr "Merge megszakítása..." - -#: git-gui.sh:2535 git-gui.sh:2575 -msgid "Add..." -msgstr "Hozzáadás..." - -#: git-gui.sh:2539 -msgid "Push..." -msgstr "Push..." - -#: git-gui.sh:2543 -msgid "Delete Branch..." -msgstr "Branch törlése..." - -#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "Névjegy: %s" - -#: git-gui.sh:2557 -msgid "Preferences..." -msgstr "Beállítások..." - -#: git-gui.sh:2565 git-gui.sh:3129 -msgid "Options..." -msgstr "Opciók..." - -#: git-gui.sh:2576 -msgid "Remove..." -msgstr "Eltávolítás..." - -#: git-gui.sh:2585 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Segítség" - -#: git-gui.sh:2611 -msgid "Online Documentation" -msgstr "Online dokumentáció" - -#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "SSH kulcs mutatása" - -#: git-gui.sh:2721 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"végzetes hiba: nem érhető el a(z) %s útvonal: Nincs ilyen fájl vagy könyvtár" - -#: git-gui.sh:2754 -msgid "Current Branch:" -msgstr "Jelenlegi branch:" - -#: git-gui.sh:2775 -msgid "Staged Changes (Will Commit)" -msgstr "Kiválasztott változtatások (commitolva lesz)" - -#: git-gui.sh:2795 -msgid "Unstaged Changes" -msgstr "Kiválasztatlan változtatások" - -#: git-gui.sh:2845 -msgid "Stage Changed" -msgstr "Változtatások kiválasztása" - -#: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "Push" - -#: git-gui.sh:2899 -msgid "Initial Commit Message:" -msgstr "Kezdeti commit üzenet:" - -#: git-gui.sh:2900 -msgid "Amended Commit Message:" -msgstr "Javító commit üzenet:" - -#: git-gui.sh:2901 -msgid "Amended Initial Commit Message:" -msgstr "Kezdeti javító commit üzenet:" - -#: git-gui.sh:2902 -msgid "Amended Merge Commit Message:" -msgstr "Javító merge commit üzenet:" - -#: git-gui.sh:2903 -msgid "Merge Commit Message:" -msgstr "Merge commit üzenet:" - -#: git-gui.sh:2904 -msgid "Commit Message:" -msgstr "Commit üzenet:" - -#: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73 -msgid "Copy All" -msgstr "Összes másolása" - -#: git-gui.sh:2977 lib/blame.tcl:104 -msgid "File:" -msgstr "Fájl:" - -#: git-gui.sh:3092 -msgid "Refresh" -msgstr "Frissítés" - -#: git-gui.sh:3113 -msgid "Decrease Font Size" -msgstr "Font méret csökkentése" - -#: git-gui.sh:3117 -msgid "Increase Font Size" -msgstr "Fönt méret növelése" - -#: git-gui.sh:3125 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Kódolás" - -#: git-gui.sh:3136 -msgid "Apply/Reverse Hunk" -msgstr "Hunk alkalmazása/visszaállítása" - -#: git-gui.sh:3141 -msgid "Apply/Reverse Line" -msgstr "Sor alkalmazása/visszaállítása" - -#: git-gui.sh:3151 -msgid "Run Merge Tool" -msgstr "Merge eszköz futtatása" - -#: git-gui.sh:3156 -msgid "Use Remote Version" -msgstr "Távoli verzió használata" - -#: git-gui.sh:3160 -msgid "Use Local Version" -msgstr "Helyi verzió használata" - -#: git-gui.sh:3164 -msgid "Revert To Base" -msgstr "Visszaállítás az alaphoz" - -#: git-gui.sh:3183 -msgid "Unstage Hunk From Commit" -msgstr "Hunk törlése commitból" - -#: git-gui.sh:3184 -msgid "Unstage Line From Commit" -msgstr "A sor kiválasztásának törlése" - -#: git-gui.sh:3186 -msgid "Stage Hunk For Commit" -msgstr "Hunk kiválasztása commitba" - -#: git-gui.sh:3187 -msgid "Stage Line For Commit" -msgstr "Sor kiválasztása commitba" - -#: git-gui.sh:3210 -msgid "Initializing..." -msgstr "Inicializálás..." - -#: git-gui.sh:3315 -#, tcl-format -msgid "" -"Possible environment issues exist.\n" -"\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" -"\n" -msgstr "" -"Lehetséges, hogy környezeti problémák vannak.\n" -"\n" -"A következő környezeti változók valószínűleg\n" -"figyelmen kívül lesznek hagyva a(z) %s által\n" -"indított folyamatok által:\n" -"\n" - -#: git-gui.sh:3345 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Ez a Cygwin által terjesztett Tcl binárisban\n" -"lévő ismert hiba miatt van." - -#: git-gui.sh:3350 -#, tcl-format -msgid "" -"\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\n" -msgstr "" -"\n" -"\n" -"Egy jó helyettesítés a(z) %s számára\n" -"a user.name és user.email beállítások\n" -"elhelyezése a személyes\n" -"~/.gitconfig fájlba.\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - egy grafikus felület a Githez." - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Fájl néző" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Commit:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Commit másolása" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Szöveg keresése..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Teljes másolat-érzékelés bekapcsolása" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Történeti környezet mutatása" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Szülő commit vizsgálata" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "A(z) %s olvasása..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "A másolást/átnevezést követő annotációk betöltése..." - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "sor annotálva" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Az eredeti hely annotációk betöltése..." - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Az annotáció kész." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Elfoglalt" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "Az annotációs folyamat már fut." - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Futtatás másolás-érzékelésen keresztül..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Az annotáció betöltése..." - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Szerző:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Commiter:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "Eredeti fájl:" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Nem található a HEAD commit:" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Nem található a szülő commit:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Nem lehet megjeleníteni a szülőt" - -#: lib/blame.tcl:1091 lib/diff.tcl:297 -msgid "Error loading diff:" -msgstr "Hiba a diff betöltése közben:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "Eredeti szerző:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "Ebben a fájlban:" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "Ide másolta vagy helyezte:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Branch checkoutolása" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "Checkout" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "Mégsem" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Revízió" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "Opciók" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Követő branch letöltése" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Helyi branch leválasztása" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Branch létrehozása" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Új branch létrehozása" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377 -msgid "Create" -msgstr "Létrehozás" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Branch neve" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "Név:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Egyeztetendő követési branch név" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "A következő revíziótól" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Létező branch frissítése" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Nem" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Csak fast forward" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536 -msgid "Reset" -msgstr "Visszaállítás" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Checkout létrehozás után" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Válasszunk ki egy követő branchet." - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "A(z) %s követő branch nem branch a távoli repóban." - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Adjunk megy egy branch nevet." - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "A(z) '%s' nem egy elfogadható branch név." - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Branch törlése" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Helyi branch törlése" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Helyi branchek" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Csak már merge-ölt törlése" - -#: lib/branch_delete.tcl:54 -msgid "Always (Do not perform merge test.)" -msgstr "Mindig (Ne legyen merge teszt.)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Nem sikerült törölni a következő brancheket:\n" -"%s" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Branch átnevezése" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Átnevezés" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Branch:" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Új név:" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Válasszunk ki egy átnevezendő branchet." - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "A(z) '%s' branch már létezik." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Nem sikerült átnevezni: '%s'." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Indítás..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "Fájl böngésző" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "A(z) %s betöltése..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Fel a szülőhöz]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "A branch fájljainak böngészése" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:394 -#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491 -#: lib/choose_repository.tcl:995 -msgid "Browse" -msgstr "Böngészés" - -#: lib/checkout_op.tcl:84 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "A(z) %s letöltése innen: %s" - -#: lib/checkout_op.tcl:132 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "végzetes: Nem lehet feloldani a következőt: %s" - -#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Bezárás" - -#: lib/checkout_op.tcl:174 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "A(z) '%s' branch nem létezik." - -#: lib/checkout_op.tcl:193 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "" -"Nem sikerült beállítani az egyszerűsített git-pull-t a(z) '%s' számára." - -#: lib/checkout_op.tcl:228 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"A(z) '%s' branch már létezik.\n" -"\n" -"Nem lehet fast-forwardolni a következőhöz: %s.\n" -"Egy merge szükséges." - -#: lib/checkout_op.tcl:242 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "A(z) '%s' merge strategy nem támogatott." - -#: lib/checkout_op.tcl:261 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Nem sikerült frissíteni a következőt: '%s'." - -#: lib/checkout_op.tcl:273 -msgid "Staging area (index) is already locked." -msgstr "A kiválasztási terület (index) már zárolva van." - -#: lib/checkout_op.tcl:288 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"Az utolsó keresési állapot nem egyezik meg a repó állpotával.\n" -"\n" -"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy " -"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani " -"lehetne.\n" -"\n" -"Az újrakeresés most automatikusan el fog indulni.\n" - -#: lib/checkout_op.tcl:344 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "A munkkönyvtár frissiítése a következőre: '%s'..." - -#: lib/checkout_op.tcl:345 -msgid "files checked out" -msgstr "fájl frissítve" - -#: lib/checkout_op.tcl:375 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "A(z) '%s' checkoutja megszakítva (fájlszintű merge-ölés szükséges)." - -#: lib/checkout_op.tcl:376 -msgid "File level merge required." -msgstr "Fájlszintű merge-ölés szükséges." - -#: lib/checkout_op.tcl:380 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Jelenleg a(z) '%s' branchen." - -#: lib/checkout_op.tcl:451 -msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." -msgstr "" -"Már nem egy helyi branchen vagyunk.\n" -"\n" -"Ha egy branchen szeretnénk lenni, hozzunk létre egyet az 'Ez a leválasztott " -"checkout'-ból." - -#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472 -#, tcl-format -msgid "Checked out '%s'." -msgstr "'%s' kifejtve." - -#: lib/checkout_op.tcl:500 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "" -"A(z) '%s' -> '%s' visszaállítás a következő commitok elvesztését jelenti:" - -#: lib/checkout_op.tcl:522 -msgid "Recovering lost commits may not be easy." -msgstr "Az elveszett commitok helyreállítása nem biztos, hogy egyszerű." - -#: lib/checkout_op.tcl:527 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Visszaállítjuk a következőt: '%s'?" - -#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Vizualizálás" - -#: lib/checkout_op.tcl:600 -#, tcl-format -msgid "" -"Failed to set current branch.\n" -"\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" -"\n" -"This should not have occurred. %s will now close and give up." -msgstr "" -"Nem sikerült beállítani a jelenlegi branchet.\n" -"\n" -"A munkakönyvtár csak részben váltott át. A fájlok sikeresen frissítve " -"lettek, de nem sikerült frissíteni egy belső Git fájlt.\n" -"\n" -"Ennek nem szabad megtörténnie. A(z) %s most kilép és feladja." - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Kiválaszt" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Font család" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Font méret" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Font példa" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Ez egy példa szöveg.\n" -"Ha ez megfelel, ez lehet a betűtípus." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382 -msgid "Create New Repository" -msgstr "Új repó létrehozása" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Új..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465 -msgid "Clone Existing Repository" -msgstr "Létező repó másolása" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Másolás..." - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983 -msgid "Open Existing Repository" -msgstr "Létező könyvtár megnyitása" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Meggyitás..." - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Legutóbbi repók" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Legutóbbi repók megnyitása:" - -#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309 -#: lib/choose_repository.tcl:316 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Nem sikerült letrehozni a(z) %s repót:" - -#: lib/choose_repository.tcl:387 -msgid "Directory:" -msgstr "Könyvtár:" - -#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544 -#: lib/choose_repository.tcl:1017 -msgid "Git Repository" -msgstr "Git repó" - -#: lib/choose_repository.tcl:442 -#, tcl-format -msgid "Directory %s already exists." -msgstr "A(z) '%s' könyvtár már létezik." - -#: lib/choose_repository.tcl:446 -#, tcl-format -msgid "File %s already exists." -msgstr "A(z) '%s' fájl már létezik." - -#: lib/choose_repository.tcl:460 -msgid "Clone" -msgstr "Bezárás" - -#: lib/choose_repository.tcl:473 -msgid "Source Location:" -msgstr "Forrás helye:" - -#: lib/choose_repository.tcl:484 -msgid "Target Directory:" -msgstr "Cél könyvtár:" - -#: lib/choose_repository.tcl:496 -msgid "Clone Type:" -msgstr "Másolás típusa:" - -#: lib/choose_repository.tcl:502 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Általános (Gyors, félig-redundáns, hardlinkek)" - -#: lib/choose_repository.tcl:508 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Teljes másolás (Lassabb, redundáns biztonsági mentés)" - -#: lib/choose_repository.tcl:514 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Megosztott (Leggyorsabb, nem ajánlott, nincs mentés)" - -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 -#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813 -#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Nem Git repó: %s" - -#: lib/choose_repository.tcl:586 -msgid "Standard only available for local repository." -msgstr "A standard csak helyi repókra érhető el." - -#: lib/choose_repository.tcl:590 -msgid "Shared only available for local repository." -msgstr "A megosztott csak helyi repókra érhető el." - -#: lib/choose_repository.tcl:611 -#, tcl-format -msgid "Location %s already exists." -msgstr "A(z) '%s' hely már létezik." - -#: lib/choose_repository.tcl:622 -msgid "Failed to configure origin" -msgstr "Nem sikerült beállítani az origint" - -#: lib/choose_repository.tcl:634 -msgid "Counting objects" -msgstr "Objektumok számolása" - -#: lib/choose_repository.tcl:635 -msgid "buckets" -msgstr "vödrök" - -#: lib/choose_repository.tcl:659 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Nem sikerült másolni az objects/info/alternates-t: %s" - -#: lib/choose_repository.tcl:695 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Semmi másolni való nincs innen: %s" - -#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911 -#: lib/choose_repository.tcl:923 -msgid "The 'master' branch has not been initialized." -msgstr "A 'master' branch nincs inicializálva." - -#: lib/choose_repository.tcl:710 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Nem érhetőek el hardlinkek. Másolás használata." - -#: lib/choose_repository.tcl:722 -#, tcl-format -msgid "Cloning from %s" -msgstr "Másolás innen: %s" - -#: lib/choose_repository.tcl:753 -msgid "Copying objects" -msgstr "Objektumok másolása" - -#: lib/choose_repository.tcl:754 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:778 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Nem sikerült másolni az objektumot: %s" - -#: lib/choose_repository.tcl:788 -msgid "Linking objects" -msgstr "Objektumok összefűzése" - -#: lib/choose_repository.tcl:789 -msgid "objects" -msgstr "objektum" - -#: lib/choose_repository.tcl:797 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Nem sikerült hardlinkelni az objektumot: %s" - -#: lib/choose_repository.tcl:852 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Nem sikerült letölteni a branch-eket és az objektumokat. Bővebben a " -"konzolos kimenetben." - -#: lib/choose_repository.tcl:863 -msgid "Cannot fetch tags. See console output for details." -msgstr "Nem sikerült letölteni a tageket. Bővebben a konzolos kimenetben." - -#: lib/choose_repository.tcl:887 -msgid "Cannot determine HEAD. See console output for details." -msgstr "Nem sikerült megállapítani a HEAD-et. Bővebben a konzolos kimenetben." - -#: lib/choose_repository.tcl:896 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Nem sikerült tiszítani: %s." - -#: lib/choose_repository.tcl:902 -msgid "Clone failed." -msgstr "A másolás nem sikerült." - -#: lib/choose_repository.tcl:909 -msgid "No default branch obtained." -msgstr "Nincs alapértelmezett branch." - -#: lib/choose_repository.tcl:920 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Nem sikerült felöldani a(z) %s objektumot commitként." - -#: lib/choose_repository.tcl:932 -msgid "Creating working directory" -msgstr "Munkakönyvtár létrehozása" - -#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128 -#: lib/index.tcl:196 -msgid "files" -msgstr "fájl" - -#: lib/choose_repository.tcl:962 -msgid "Initial file checkout failed." -msgstr "A kezdeti fájl-kibontás sikertelen." - -#: lib/choose_repository.tcl:978 -msgid "Open" -msgstr "Megnyitás" - -#: lib/choose_repository.tcl:988 -msgid "Repository:" -msgstr "Repó:" - -#: lib/choose_repository.tcl:1037 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Nem sikerült megnyitni a(z) %s repót:" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "Ez a leválasztott checkout" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Revízió kifejezés:" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "Helyi branch" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "Követő branch" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "Tag" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Érvénytelen revízió: %s" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "Nincs kiválasztva revízió." - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "A revízió kifejezés üres." - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "Frissítve" - -#: lib/choose_rev.tcl:559 -msgid "URL" -msgstr "URL" - -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" -msgstr "" -"Nincs semmi javítanivaló.\n" -"\n" -"Az első commit létrehozása előtt nincs semmilyen commit amit javitani " -"lehetne.\n" - -#: lib/commit.tcl:18 -msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" -msgstr "" -"Nem lehet javítani merge alatt.\n" -"\n" -"A jelenlegi merge még nem teljesen fejeződött be. Csak akkor javíthat egy " -"előbbi commitot, hogyha megszakítja a jelenlegi merge folyamatot.\n" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Hiba a javítandó commit adat betöltése közben:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Nem sikerült megállapítani az azonosítót:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Érvénytelen GIT_COMMITTER_IDENT:" - -#: lib/commit.tcl:132 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"Az utolsó keresési állapot nem egyezik meg a repó állapotával.\n" -"\n" -"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy " -"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani " -"lehetne.\n" -"\n" -"Az újrakeresés most automatikusan el fog indulni.\n" - -#: lib/commit.tcl:155 -#, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" -"\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" -msgstr "" -"Nem commitolhatunk fájlokat merge előtt.\n" -"\n" -"A(z) %s fájlban ütközések vannak. Egyszer azokat ki kell javítani, majd " -"hozzá ki kell választani a fájlt mielőtt commitolni lehetne.\n" - -#: lib/commit.tcl:163 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Ismeretlen fájl típus %s érzékelve.\n" -"\n" -"A(z) %s fájlt nem tudja ez a program commitolni.\n" - -#: lib/commit.tcl:171 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Nincs commitolandó változtatás.\n" -"\n" -"Legalább egy fájl ki kell választani, hogy commitolni lehessen.\n" - -#: lib/commit.tcl:186 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" -msgstr "" -"Adjunk megy egy commit üzenetet.\n" -"\n" -"Egy jó commit üzenetnek a következő a formátuma:\n" -"\n" -"- Első sor: Egy mondatban leírja, hogy mit csináltunk.\n" -"- Második sor: Üres\n" -"- A többi sor: Leírja, hogy miért jó ez a változtatás.\n" - -#: lib/commit.tcl:210 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "figyelmeztetés: a Tcl nem támogatja a(z) '%s' kódolást." - -#: lib/commit.tcl:226 -msgid "Calling pre-commit hook..." -msgstr "A pre-commit hurok meghívása..." - -#: lib/commit.tcl:241 -msgid "Commit declined by pre-commit hook." -msgstr "A commitot megakadályozta a pre-commit hurok. " - -#: lib/commit.tcl:264 -msgid "Calling commit-msg hook..." -msgstr "A commit-msg hurok meghívása..." - -#: lib/commit.tcl:279 -msgid "Commit declined by commit-msg hook." -msgstr "A commiot megakadályozta a commit-msg hurok." - -#: lib/commit.tcl:292 -msgid "Committing changes..." -msgstr "A változtatások commitolása..." - -#: lib/commit.tcl:308 -msgid "write-tree failed:" -msgstr "a write-tree sikertelen:" - -#: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373 -msgid "Commit failed." -msgstr "A commit nem sikerült." - -#: lib/commit.tcl:326 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "A(z) %s commit sérültnek tűnik" - -#: lib/commit.tcl:331 -msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" -msgstr "" -"Nincs commitolandó változtatás.\n" -"\n" -"Egyetlen fájlt se módosított ez a commit és merge commit se volt.\n" -"\n" -"Az újrakeresés most automatikusan el fog indulni.\n" - -#: lib/commit.tcl:338 -msgid "No changes to commit." -msgstr "Nincs commitolandó változtatás." - -#: lib/commit.tcl:352 -msgid "commit-tree failed:" -msgstr "a commit-tree sikertelen:" - -#: lib/commit.tcl:372 -msgid "update-ref failed:" -msgstr "az update-ref sikertelen:" - -#: lib/commit.tcl:460 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Létrejött a %s commit: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Munka folyamatban.. Várjunk..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Siker" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Hiba: a parancs sikertelen" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "Elvesztett objektumok száma" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "Elveszett objektumok által elfoglalt lemezterület" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "Csomagolt objektumok számra" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "Csomagok száma" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "A csomagolt objektumok által használt lemezterület" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "Eltávolításra váró csomagolt objektumok számra" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "Hulladék fájlok" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Az objektum adatbázis tömörítése" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Az objektum adatbázis ellenőrzése az fsck-objects használatával" - -#: lib/database.tcl:108 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database when more than %i loose objects exist.\n" -"\n" -"Compress the database now?" -msgstr "" -"Ennek a repónak jelenleg %i különálló objektuma van.\n" -"\n" -"Az optimális teljesítményhez erősen ajánlott az adatbázis tömörítése, ha " -"több mint %i objektum létezik.\n" -"\n" -"Lehet most tömöríteni az adatbázist?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Érvénytelen dátum a Git-től: %s" - -#: lib/diff.tcl:59 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." -msgstr "" -"Nincsenek változások.\n" -"\n" -"A(z) %s módosítatlan.\n" -"\n" -"A fájl módosítási dátumát frissítette egy másik alkalmazás, de a fájl " -"tartalma változatlan.\n" -"\n" -"Egy újrakeresés fog indulni a hasonló állapotú fájlok megtalálása érdekében." - -#: lib/diff.tcl:99 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "A(z) %s diff-jének betöltése..." - -#: lib/diff.tcl:120 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"HELYI: törölve\n" -"TÁVOLI:\n" - -#: lib/diff.tcl:125 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"TÁVOLI: törölve\n" -"HELYI:\n" - -#: lib/diff.tcl:132 -msgid "LOCAL:\n" -msgstr "HELYI:\n" - -#: lib/diff.tcl:135 -msgid "REMOTE:\n" -msgstr "TÁVOLI:\n" - -#: lib/diff.tcl:197 lib/diff.tcl:296 -#, tcl-format -msgid "Unable to display %s" -msgstr "Nem lehet megjeleníteni a következőt: %s" - -#: lib/diff.tcl:198 -msgid "Error loading file:" -msgstr "Hiba a fájl betöltése közben:" - -#: lib/diff.tcl:205 -msgid "Git Repository (subproject)" -msgstr "Git repó (alprojekt)" - -#: lib/diff.tcl:217 -msgid "* Binary file (not showing content)." -msgstr "* Bináris fájl (tartalom elrejtése)." - -#: lib/diff.tcl:222 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Nem követett fájl %d bájttal.\n" -"* Csak az első %d bájt mutatása.\n" - -#: lib/diff.tcl:228 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Nem követett fájlt levágta a(z) %s.\n" -"* A teljes tartalom megjelenítéséhez használjunk külső szövegszerkesztőt.\n" - -#: lib/diff.tcl:436 -msgid "Failed to unstage selected hunk." -msgstr "Nem visszavonni a hunk kiválasztását." - -#: lib/diff.tcl:443 -msgid "Failed to stage selected hunk." -msgstr "Nem sikerült kiválasztani a hunkot." - -#: lib/diff.tcl:509 -msgid "Failed to unstage selected line." -msgstr "Nem sikerült visszavonni a sor kiválasztását." - -#: lib/diff.tcl:517 -msgid "Failed to stage selected line." -msgstr "Nem sikerült kiválasztani a sort." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Alapértelmezés" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Rendszer (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Más" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "hiba" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "figyelmeztetés" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Ki kell javítanunk a fenti hibákat commit előtt." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Nem sikerült az index zárolásának feloldása." - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Index hiba" - -#: lib/index.tcl:21 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"A Git index frissítése sikertelen volt. Egy újraolvasás automatikusan " -"elindult, hogy a git-gui újra szinkonban legyen." - -#: lib/index.tcl:27 -msgid "Continue" -msgstr "Folytatás" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Index zárolásának feloldása" - -#: lib/index.tcl:287 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "A(z) %s commitba való kiválasztásának visszavonása" - -#: lib/index.tcl:326 -msgid "Ready to commit." -msgstr "Commitolásra kész." - -#: lib/index.tcl:339 -#, tcl-format -msgid "Adding %s" -msgstr "A(z) %s hozzáadása..." - -#: lib/index.tcl:396 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Visszaállítja a változtatásokat a(z) %s fájlban?" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Visszaállítja a változtatásokat ebben e %i fájlban?" - -#: lib/index.tcl:406 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Minden nem kiválasztott változtatás el fog veszni ezáltal a visszaállítás " -"által." - -#: lib/index.tcl:409 -msgid "Do Nothing" -msgstr "Ne csináljunk semmit" - -#: lib/index.tcl:427 -msgid "Reverting selected files" -msgstr "A kiválasztott fájlok visszaállítása" - -#: lib/index.tcl:431 -#, tcl-format -msgid "Reverting %s" -msgstr "%s visszaállítása" - -#: lib/merge.tcl:13 -msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" -msgstr "" -"Javítás közben nem lehetséges a merge.\n" -"\n" -"Egyszer be kell fejezni ennek a commitnak a javítását, majd kezdődhet egy " -"merge.\n" - -#: lib/merge.tcl:27 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"Az utolsó keresési állapot nem egyezik meg a repó állapotával.\n" -"\n" -"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy " -"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani " -"lehetne.\n" -"\n" -"Az újrakeresés most automatikusan el fog indulni.\n" - -#: lib/merge.tcl:45 -#, tcl-format -msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" -msgstr "" -"Jelenleg egy ütközés feloldása közben vagyunk.\n" -"\n" -"A(z) %s fájlban ütközések vannak.\n" -"\n" -"Fel kell oldanunk őket, kiválasztani a fájlt, és commitolni hogy befejezzük " -"a jelenlegi merge-t. Csak ezután kezdhetünk el egy újabbat.\n" - -#: lib/merge.tcl:55 -#, tcl-format -msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" -msgstr "" -"Jelenleg egy változtatás közben vagyunk.\n" -"\n" -"A(z) %s fájl megváltozott.\n" -"\n" -"Először be kell fejeznünk a jelenlegi commitot, hogy elkezdhessünk egy merge-" -"t. Ez segíteni fog, hogy félbeszakíthassunk egy merge-t.\n" - -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s / %s" - -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "A(z) %s és a(z) %s merge-ölése..." - -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "A merge sikeresen befejeződött." - -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "A merge sikertelen. Fel kell oldanunk az ütközéseket." - -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "Merge-ölés a következőbe: %s" - -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Merge-ölni szándékozott revízió" - -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"A commit javítás közben megszakítva.\n" -"\n" -"Be kell fejeznünk ennek a commitnak a javítását.\n" - -#: lib/merge.tcl:222 -msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" -msgstr "" -"Megszakítjuk a merge-t?\n" -"\n" -"A jelenlegi merge megszakítása *MINDEN* nem commitolt változtatás " -"elvesztését jelenti.\n" -"\n" -"Folytatjuk a jelenlegi merge megszakítását?" - -#: lib/merge.tcl:228 -msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" -msgstr "" -"Visszavonjuk a módosításokat?\n" -"\n" -"A módosítások visszavonása *MINDEN* nem commitolt változtatás elvesztését " -"jelenti.\n" -"\n" -"Folytatjuk a jelenlegi módosítások visszavonását?" - -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Félbeszakítás" - -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "fájl visszaállítva" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "A félbeszakítás nem sikerült." - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "A megkeszakítás befejeződött. Kész." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Feloldás erőltetése az alap verzióhoz?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Feloldás erőltetése ehhez a branch-hez?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Feloldás erőltetése a másik branch-hez?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Megjegyzés: csak az ütköző különbségek látszanak.\n" -"\n" -"A(z) %s felül lesz írva.\n" -"\n" -"Ez a művelet csak a merge újraindításával lesz visszavonható." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" -"A(z) %s fájl nem feloldott ütközéseket tartalmaz, mégis legyen kiválasztva?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Feloldás hozzáadása a(z) %s számára" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "Nem lehet feloldani törlési vagy link ütközést egy eszközzel" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "A konfiklus-fájl nem létezik." - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Nem GUI merge eszköz: %s" - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "A(z) '%s' merge eszköz nem támogatott" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "A merge eszköz már fut, le legyen állítva?" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Hiba a verziók kinyerése közben:\n" -"%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"A merge eszköz indítása sikertelen:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "A merge eszköz futtatása..." - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "A merge eszköz nem sikerült." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Érvénytelen globális kódolás '%s'" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Érvénytelen repó kódolás '%s'" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Alapértelmezés visszaállítása" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Mentés" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "%s Repó" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Globális (minden repó)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Felhasználónév" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Email cím" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "A merge commitok összegzése" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Merge beszédesség" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Diffstat mutatása merge után" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Merge eszköz használata" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "A fájl módosítási dátumok megbízhatóak" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "A követő branchek eltávolítása letöltés alatt" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "A követő branchek egyeztetése" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "A blame másolás bekapcsolása csak megváltozott fájlokra" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "Minimum betűszám blame másolás-érzékeléshez" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Blame történet környezet sugár (napokban)" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "A diff környezeti sorok száma" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Commit üzenet szövegének szélessége" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Új branch név sablon" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Alapértelmezett fájltartalom-kódolás" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Megváltoztatás" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Helyesírás-ellenőrző szótár:" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Betűtípus megváltoztatása" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "%s választása" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Beállítások" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "Nem sikerült teljesen elmenteni a beállításokat:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Remote eltávolítása" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Törlés innen" - -# tcl-format -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Letöltés innen" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Push ide" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Remote hozzáadása" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Új remote hozzáadása" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Hozzáadás" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Remote részletei" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Hely:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Következő művelet" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Letöltés most" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Távoli repó inicializálása és push" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Ne csináljunk semmit" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Adjunk megy egy remote nevet." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "A(z) '%s' nem egy elfogadható remote név." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Nem sikerült a(t) '%s' remote hozzáadása innen: '%s'." - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "a(z) %s letöltése" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "A(z) %s letöltése" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Nem tudni, hogy hogy kell a(z) '%s' helyen repót inicializálni." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "%s push-olása" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "A(z) %s beállítása itt: %s" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Távoli Branch törlése" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Forrás repó" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "Távoli:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "Önkényes hely:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "Branchek" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Törlés csak akkor ha" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Merge-ölt a következőbe:" - -#: lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Mindig (Ne végezzen merge vizsgálatokat)" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "Egy branch szükséges a 'Merge-ölt a következőbe'-hez." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"A következő branchek nem teljesen lettek merge-ölve ebbe: %s:\n" -" - %s" - -#: lib/remote_branch_delete.tcl:189 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "" -"Egy vagy több merge teszt hibát jelzett, mivel nem töltöttük le a megfelelő " -"commitokat. Próbáljunk meg letölteni a következőből: %s először." - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Válasszunk ki egy vagy több branchet törlésre." - -#: lib/remote_branch_delete.tcl:216 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"A törölt branchek visszaállítása nehéz.\n" -"\n" -"Töröljük a kiválasztott brancheket?" - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Brancek törlése innen: %s" - -#: lib/remote_branch_delete.tcl:286 -msgid "No repository selected." -msgstr "Nincs kiválasztott repó." - -#: lib/remote_branch_delete.tcl:291 -#, tcl-format -msgid "Scanning %s..." -msgstr "Keresés itt: %s..." - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Keresés:" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "Következő" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Előző" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Kisbetű-nagybetű számít" - -#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 -msgid "Cannot write shortcut:" -msgstr "Nem sikerült írni a gyorsbillentyűt:" - -#: lib/shortcut.tcl:136 -msgid "Cannot write icon:" -msgstr "Nem sikerült írni az ikont:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Nem támogatott helyesírás-ellenőrző" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "A helyesírás-ellenőrzés nem elérhető" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Érvénytelen a helyesírás-ellenőrző beállítása" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Szótár visszaállítása a következőre: %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "A helyesírás-ellenőrő indítása sikertelen" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Ismeretlen helyesírás-ellenőrző" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Nincs javaslat" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Nem várt EOF a helyesírás-ellenőrzőtől" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "A helyesírás-ellenőrzés sikertelen" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Nincsenek kulcsok." - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Nyilvános kulcs található ebben: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Kulcs generálása" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Másolás vágólapra" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "Az OpenSSH publikus kulcsunk" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Generálás..." - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Az ssh-keygen indítása sikertelen:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "A generálás nem sikerült." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "A generálás sikeres, de egy kulcs se található." - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "A kulcsunk itt van: %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i / %*i %s (%3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "A(z) %s futtatása egy kiválasztott fájlt igényel." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Biztos benne, hogy futtatni kívánja: %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Eszköz: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Futtatás: %s..." - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Az eszköz sikeresen befejeződött: %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Az eszköz sikertelen: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Eszköz hozzáadása" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Új eszköz-parancs hozzáadása" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Globális hozzáadás" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Eszköz részletei" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Használjunk '/' szeparátorokat almenü-fa létrehozásához:" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Parancs:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Parancsablak mutatása futtatás előtt" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "" -"Megkéri a felhasználót, hogy válasszon ki egy revíziót (a $REVISION-t " -"állítja)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Megkérdezi a felhasználót további argumentumokért (a $ARGS-ot állítja)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Ne mutassa a parancs kimeneti ablakát" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Futtatás csak ha egy diff ki van választva (a $FILENAME nem üres)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Adjunk meg egy eszköz nevet." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "A(z) '%s' eszköz már létezik." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Az eszköz nem hozzáadható:\n" -"%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Eszköz eltávolítása" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Eszköz parancsok eltávolítása" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Eltávolítás" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Kék jelzi a repó-specifikus eszközöket)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Parancs futtatása: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Argumentumok" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Új változások letöltése innen: %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "a(z) %s távoli törlése" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "A %s repóból törölt követő branchek törlése" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Változások pusholása ide: %s" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Tükrözés a következő helyre: %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Pusholás: %s %s, ide: %s" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "Branchek pusholása" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "Forrás branchek" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Cél repó" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "Átviteli opciók" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "" -"Létező branch felülírásának erőltetése (lehet, hogy el fog dobni " -"változtatásokat)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "Vékony csomagok használata (lassú hálózati kapcsolatok számára)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "Tageket is" - -#~ msgid "" -#~ "Unable to start gitk:\n" -#~ "\n" -#~ "%s does not exist" -#~ msgstr "" -#~ "A gitk indítása sikertelen:\n" -#~ "\n" -#~ "A(z) %s nem létezik" - -#~ msgid "Apple" -#~ msgstr "Apple" - -#~ msgid "URL:" -#~ msgstr "URL:" - -#~ msgid "Delete Remote Branch" -#~ msgstr "Távoli branch törlése" - -#~ msgid "Not connected to aspell" -#~ msgstr "Nincs kapcsolat az aspellhez" - -#~ msgid "Unstaged Changes (Will Not Be Committed)" -#~ msgstr "Nem kiválasztott változtatások (nem lesz commitolva)" - -#~ msgid "Push to %s..." -#~ msgstr "Pusholás ide: %s..." - -#~ msgid "Add Existing To Commit" -#~ msgstr "Hozzáadás létező commithoz" - -#~ msgid "Add Existing" -#~ msgstr "Létező hozzáadása" - -#~ msgid "" -#~ "Abort commit?\n" -#~ "\n" -#~ "Aborting the current commit will cause *ALL* uncommitted changes to be " -#~ "lost.\n" -#~ "\n" -#~ "Continue with aborting the current commit?" -#~ msgstr "" -#~ "Megszakítjuk a commitot?\n" -#~ "\n" -#~ "A jelenlegi commit megszakítása *MINDEN* nem commitolt változtatás " -#~ "elvesztését jelenti.\n" -#~ "\n" -#~ "Folytatjuk a jelenlegi commit megszakítását?" - -#~ msgid "Aborting... please wait..." -#~ msgstr "Megszakítás... várjunk..." diff --git a/po/is.po b/po/is.po new file mode 100644 index 0000000..8692a8b --- /dev/null +++ b/po/is.po @@ -0,0 +1,93 @@ +# Icelandic translations for Git. +# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <avarab@gmail.com> +# This file is distributed under the same license as the Git package. +# Ævar Arnfjörð Bjarmason <avarab@gmail.com>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2010-09-20 14:44+0000\n" +"PO-Revision-Date: 2010-06-05 19:06 +0000\n" +"Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n" +"Language-Team: Git Mailing List <git@vger.kernel.org>\n" +"Language: is\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.c:5 +msgid "See 'git help COMMAND' for more information on a specific command." +msgstr "Sjá 'git help SKIPUN' til að sjá hjálp fyrir tiltekna skipun." + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.c:10 +msgid "TEST: A C test string" +msgstr "TILRAUN: C tilraunastrengur" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.c:13 +#, c-format +msgid "TEST: A C test string %s" +msgstr "TILRAUN: C tilraunastrengur %s" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.c:16 +#, c-format +msgid "TEST: Hello World!" +msgstr "TILRAUN: Halló Heimur!" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.c:19 +#, c-format +msgid "TEST: Old English Runes" +msgstr "TILRAUN: ᚻᛖ ᚳᚹᚫᚦ ᚦᚫᛏ ᚻᛖ ᛒᚢᛞᛖ ᚩᚾ ᚦᚫᛗ ᛚᚪᚾᛞᛖ ᚾᚩᚱᚦᚹᛖᚪᚱᛞᚢᛗ ᚹᛁᚦ ᚦᚪ ᚹᛖᛥᚫ" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.c:22 +#, c-format +msgid "TEST: ‘single’ and “double” quotes" +msgstr "TILRAUN: ‚einfaldar‘ og „tvöfaldar“ gæsalappir" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.sh:8 +msgid "TEST: A Shell test string" +msgstr "TILRAUN: Skeljartilraunastrengur" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.sh:11 +#, sh-format +msgid "TEST: A Shell test $variable" +msgstr "TILRAUN: Skeljartilraunastrengur með breytunni $variable" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.perl:8 +msgid "TEST: A Perl test string" +msgstr "TILRAUN: Perl tilraunastrengur" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.perl:11 +#, perl-format +msgid "TEST: A Perl test variable %s" +msgstr "TILRAUN: Perl tilraunastrengur með breytunni %s" + +#. 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:355 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s Git lind í %s%s\n" + +#: builtin/init-db.c:356 +msgid "Reinitialized existing" +msgstr "Endurgerði" + +#: builtin/init-db.c:356 +msgid "Initialized empty" +msgstr "Bjó til tóma" + +#: builtin/init-db.c:357 +msgid " shared" +msgstr " sameiginlega" @@ -1,2591 +1,5367 @@ -# Translation of git-gui to Italian -# Copyright (C) 2007 Shawn Pearce -# This file is distributed under the same license as the git-gui package. -# Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>, 2007 -# Michele Ballabio <barra_cuda@katamail.com>, 2007. -# -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2010-01-28 10:04+0100\n" -"Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n" -"Language-Team: Italian <tp@lists.linux.it>\n" +# Italian translations for Git. +# Copyright (C) 2012 Marco Paolone <marcopaolone@gmail.com> +# This file is distributed under the same license as the Git package. +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2012-06-08 10:20+0800\n" +"PO-Revision-Date: 2012-06-14 14:13+0200\n" +"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" +"Language-Team: Italian\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: advice.c:40 +#, c-format +msgid "hint: %.*s\n" +msgstr "suggerimento: %.*s\n" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:70 +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 "" + +#: 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 "header non riconosciuto: %s%s (%d)" + +#: bundle.c:89 builtin/commit.c:696 +#, c-format +msgid "could not open '%s'" +msgstr "non è stato possibile aprire '%s'" -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "git-gui: errore grave" +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "" + +#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289 +#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347 +#: builtin/shortlog.c:181 +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 +#, c-format +msgid "The bundle requires this ref" +msgid_plural "The bundle requires these %d refs" +msgstr[0] "" +msgstr[1] "" + +#: bundle.c:290 +msgid "rev-list died" +msgstr "" -#: git-gui.sh:743 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Caratteri non validi specificati in %s:" +#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "argomento non riconosciuto: %s" -#: git-gui.sh:779 -msgid "Main Font" -msgstr "Caratteri principali" +#: bundle.c:331 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "il ref '%s' è escluso dalle opzioni di rev-list" -#: git-gui.sh:780 -msgid "Diff/Console Font" -msgstr "Caratteri per confronti e terminale" +#: bundle.c:376 +msgid "Refusing to create empty bundle." +msgstr "" -#: git-gui.sh:794 -msgid "Cannot find git in PATH." -msgstr "Impossibile trovare git nel PATH" +#: bundle.c:394 +msgid "Could not spawn pack-objects" +msgstr "" -#: git-gui.sh:821 -msgid "Cannot parse Git version string:" -msgstr "Impossibile determinare la versione di Git:" +#: bundle.c:412 +msgid "pack-objects died" +msgstr "" -#: git-gui.sh:839 -#, tcl-format +#: bundle.c:415 +#, c-format +msgid "cannot create '%s'" +msgstr "impossibile creare '%s'" + +#: bundle.c:437 +msgid "index-pack died" +msgstr "" + +#: commit.c:48 +#, c-format +msgid "could not parse %s" +msgstr "non è stato possibile analizzare %s" + +#: commit.c:50 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s non è un commit!" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "memoria esaurita" + +#: connected.c:39 +msgid "Could not run 'git rev-list'" +msgstr "Non è stato possibile eseguire 'git-rev-list'" + +#: connected.c:48 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "scrittura nella rev-list non riuscita: %s" + +#: connected.c:56 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "" + +#: date.c:95 +msgid "in the future" +msgstr "in futuro" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "%lu secondo fa" +msgstr[1] "%lu secondi fa" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "%lu un minuto fa" +msgstr[1] "%lu minuti fa" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "%lu ora fa" +msgstr[1] "%lu ore fa" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "%lu giorno fa" +msgstr[1] "%lu giorni fa" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "%lu settimana fa" +msgstr[1] "%lu settimane fa" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "%lu mese fa" +msgstr[1] "%lu mesi fa" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "%lu anno" +msgstr[1] "%lu anni" + +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "%s, %lu mese fa" +msgstr[1] "%s, %lu mesi fa" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "%lu anno fa" +msgstr[1] "%lu anni fa" + +#: diff.c:105 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" + +#: diff.c:110 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr " Parametro dirstat '%.*s' sconosciuto\n" + +#: diff.c:210 +#, c-format msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"Trovati errori nella variabile di configurazione 'diff.dirstat':\n" +"%s" + +#: diff.c:1400 +msgid " 0 files changed\n" +msgstr " 0 file modificati\n" + +#: diff.c:1404 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] " %d file modificato" +msgstr[1] " %d file modificati" + +#: diff.c:1421 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] ", %d inserzione(+)" +msgstr[1] ", %d inserzioni(+)" + +#: diff.c:1432 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] ". %d rimozione(-)" +msgstr[1] ", %d rimozioni(-)" + +#: diff.c:3478 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n" +"%s" + +#: gpg-interface.c:59 +msgid "could not run gpg." +msgstr "non è stato possibile eseguire gpg." + +#: gpg-interface.c:71 +msgid "gpg did not accept the data" +msgstr "gpg non ha accettato i dati" + +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "gpg non è riuscito a firmare i dati" + +#: grep.c:1320 +#, c-format +msgid "'%s': unable to read %s" +msgstr "'%s': impossibile leggere %s" + +#: grep.c:1337 +#, c-format +msgid "'%s': %s" +msgstr "'%s': %s" + +#: grep.c:1348 +#, c-format +msgid "'%s': short read %s" msgstr "" -"La versione di Git non può essere determinata.\n" + +#: help.c:207 +#, c-format +msgid "available git commands in '%s'" +msgstr "comandi git disponibili in '%s'" + +#: help.c:214 +msgid "git commands available from elsewhere on your $PATH" +msgstr "comandi git disponibili altrove nel tuo $PATH" + +#: help.c:270 +#, 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 "" +"'%s' sembra essere un comando git, ma non è stato\n" +"possibile eseguirlo. Forse git-%s è corrotto?" + +#: help.c:327 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Oh oh. Il tuo sistema non riporta alcun comando Git." + +#: help.c:349 +#, 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:354 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "automaticamente tra %0.1f secondi..." + +#: help.c:361 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: '%s' non è un comando git. Vedi 'git --help'." + +#: help.c:365 +msgid "" "\n" -"%s riporta che la versione è '%s'.\n" +"Did you mean this?" +msgid_plural "" "\n" -"%s richiede almeno Git 1.5.0 o superiore.\n" +"Did you mean one of these?" +msgstr[0] "" "\n" -"Assumere che '%s' sia alla versione 1.5.0?\n" +"Intendevi questo?" +msgstr[1] "" +"\n" +"Intendevi uno di questi?" + +#: parse-options.c:493 +msgid "..." +msgstr "..." + +#: parse-options.c:511 +#, c-format +msgid "usage: %s" +msgstr " uso: %s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:515 +#, c-format +msgid " or: %s" +msgstr "oppure: %s" + +#: parse-options.c:518 +#, c-format +msgid " %s" +msgstr " %s" + +#: remote.c:1629 +#, 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] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" +msgstr[1] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" + +#: remote.c:1635 +#, 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:1643 +#, 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] "" + +#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 +#: builtin/merge.c:1088 builtin/merge.c:1098 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Non è stato possibile aprire '%s' per la scrittura" + +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 +#: builtin/merge.c:1090 builtin/merge.c:1103 +#, c-format +msgid "Could not write to '%s'" +msgstr "Non è stato possibile scrivere su '%s'" + +#: sequencer.c:144 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" +"dopo aver risolto i conflitti, segna i path corretti\n" +"con 'git add <path>' o 'git rm <path>'" + +#: sequencer.c:147 +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 "" +"dopo aver risolto i conflitti, segna i path corretti\n" +"con 'git add <path>' o 'git rm <path>' ed eseguire\n" +"il commit del risultato con 'git commit'" + +#: sequencer.c:160 sequencer.c:758 sequencer.c:841 +#, c-format +msgid "Could not write to %s" +msgstr "Non è stato possibile scrivere su %s" + +#: sequencer.c:163 +#, c-format +msgid "Error wrapping up %s" +msgstr "" + +#: sequencer.c:178 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "Le tue modifiche locali verranno sovrascritte da cherry-pick" + +#: sequencer.c:180 +msgid "Your local changes would be overwritten by revert." +msgstr "Le tue modifiche locali verranno sovrascritte da revert." + +#: sequencer.c:183 +msgid "Commit your changes or stash them to proceed." +msgstr "" -#: git-gui.sh:1128 -msgid "Git directory not found:" -msgstr "Non trovo la directory di git: " +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:233 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: impossibile scrivere il nuovo index file" -#: git-gui.sh:1146 -msgid "Cannot move to top of working directory:" -msgstr "Impossibile spostarsi sulla directory principale del progetto:" +#: sequencer.c:261 +msgid "Could not resolve HEAD commit\n" +msgstr "Non è stato possibile risolvere il commit HEAD\n" -#: git-gui.sh:1154 -msgid "Cannot use bare repository:" -msgstr "Impossibile usare un archivio senza directory di lavoro:" +#: sequencer.c:282 +msgid "Unable to update cache tree\n" +msgstr "" -#: git-gui.sh:1162 -msgid "No working directory" -msgstr "Nessuna directory di lavoro" +#: sequencer.c:324 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "Non è stato possibile analizzare il commit %s\n" -#: git-gui.sh:1334 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Controllo dello stato dei file in corso..." +#: sequencer.c:329 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "" -#: git-gui.sh:1390 -msgid "Scanning for modified files ..." -msgstr "Ricerca di file modificati in corso..." +#: sequencer.c:395 +msgid "Your index file is unmerged." +msgstr "" -#: git-gui.sh:1454 -msgid "Calling prepare-commit-msg hook..." -msgstr "Avvio prepare-commit-msg hook..." +#: sequencer.c:398 +msgid "You do not have a valid HEAD" +msgstr "Non hai un HEAD valido" -#: git-gui.sh:1471 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "Revisione rifiutata dal prepare-commit-msg hook." +#: sequencer.c:413 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "Il commit %s è un merge ma non è stata specificata l'opzione -m." -#: git-gui.sh:1629 lib/browser.tcl:246 -msgid "Ready." -msgstr "Pronto." +#: sequencer.c:421 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "" -#: git-gui.sh:1787 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Saranno mostrati solo %s file su %s." +#: sequencer.c:425 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "" -#: git-gui.sh:1913 -msgid "Unmodified" -msgstr "Non modificato" +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: sequencer.c:436 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "" -#: git-gui.sh:1915 -msgid "Modified, not staged" -msgstr "Modificato, non preparato per una nuova revisione" +#: sequencer.c:440 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Impossibile ottenere il messaggio di commit per %s" + +#: sequencer.c:524 +#, c-format +msgid "could not revert %s... %s" +msgstr "non è stato possibile eseguire il revert di %s... %s" + +#: sequencer.c:525 +#, c-format +msgid "could not apply %s... %s" +msgstr "non è stato possibile applicare %s... %s" + +#: sequencer.c:553 +msgid "empty commit set passed" +msgstr "è stato passato un set di commit vuoto" + +#: sequencer.c:561 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: lettura di index non riuscita" + +#: sequencer.c:566 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: aggiornamento di index non riuscito" + +#: sequencer.c:624 +#, c-format +msgid "Cannot %s during a %s" +msgstr "" -#: git-gui.sh:1916 git-gui.sh:1924 -msgid "Staged for commit" -msgstr "Preparato per una nuova revisione" +#: sequencer.c:646 +#, c-format +msgid "Could not parse line %d." +msgstr "Non è stato possibile analizzare la riga %d." + +#: sequencer.c:651 +msgid "No commits parsed." +msgstr "Nessun commit analizzato." + +#: sequencer.c:664 +#, c-format +msgid "Could not open %s" +msgstr "Non è stato possibile aprire %s" + +#: sequencer.c:668 +#, c-format +msgid "Could not read %s." +msgstr "Non è stato possibile leggere %s." + +#: sequencer.c:675 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "" + +#: sequencer.c:703 +#, c-format +msgid "Invalid key: %s" +msgstr "Chiave non valida: %s" + +#: sequencer.c:706 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Valore non valido per %s: %s" + +#: sequencer.c:718 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "" + +#: sequencer.c:739 +msgid "a cherry-pick or revert is already in progress" +msgstr "è già in corso un'operazione di cherry-pick o di revert" + +#: sequencer.c:740 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "prova \"git cherry-pick (--continue | --quit | -- abort)\"" + +#: sequencer.c:744 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "" + +#: sequencer.c:760 sequencer.c:845 +#, c-format +msgid "Error wrapping up %s." +msgstr "" -#: git-gui.sh:1917 git-gui.sh:1925 -msgid "Portions staged for commit" -msgstr "Parti preparate per una nuova revisione" +#: sequencer.c:779 sequencer.c:913 +msgid "no cherry-pick or revert in progress" +msgstr "nessuna operazione di cherry-pick o revert in corso" -#: git-gui.sh:1918 git-gui.sh:1926 -msgid "Staged for commit, missing" -msgstr "Preparato per una nuova revisione, mancante" +#: sequencer.c:781 +msgid "cannot resolve HEAD" +msgstr "impossibile risolvere HEAD" -#: git-gui.sh:1920 -msgid "File type changed, not staged" -msgstr "Tipo di file modificato, non preparato per una nuova revisione" +#: sequencer.c:783 +msgid "cannot abort from a branch yet to be born" +msgstr "" -#: git-gui.sh:1921 -msgid "File type changed, staged" -msgstr "Tipo di file modificato, preparato per una nuova revisione" +#: sequencer.c:805 builtin/apply.c:3697 +#, c-format +msgid "cannot open %s: %s" +msgstr "impossibile aprire %s: %s" -#: git-gui.sh:1923 -msgid "Untracked, not staged" -msgstr "Non tracciato, non preparato per una nuova revisione" +#: sequencer.c:808 +#, c-format +msgid "cannot read %s: %s" +msgstr "impossibile leggere %s: %s" -#: git-gui.sh:1928 -msgid "Missing" -msgstr "Mancante" +#: sequencer.c:809 +msgid "unexpected end of file" +msgstr "fine del file inattesa" -#: git-gui.sh:1929 -msgid "Staged for removal" -msgstr "Preparato per la rimozione" +#: sequencer.c:815 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "" -#: git-gui.sh:1930 -msgid "Staged for removal, still present" -msgstr "Preparato alla rimozione, ancora presente" +#: sequencer.c:838 +#, c-format +msgid "Could not format %s." +msgstr "" -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 -msgid "Requires merge resolution" -msgstr "Richiede risoluzione dei conflitti" - -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "Avvio di gitk... attendere..." - -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" -msgstr "Impossibile trovare gitk nel PATH" - -#: git-gui.sh:2043 -msgid "Couldn't find git gui in PATH" -msgstr "Impossibile trovare git gui nel PATH" - -#: git-gui.sh:2455 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Archivio" - -#: git-gui.sh:2456 -msgid "Edit" -msgstr "Modifica" - -#: git-gui.sh:2458 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Ramo" - -#: git-gui.sh:2461 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Revisione" - -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Fusione (Merge)" - -#: git-gui.sh:2465 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Remoto" - -#: git-gui.sh:2468 -msgid "Tools" -msgstr "Accessori" - -#: git-gui.sh:2477 -msgid "Explore Working Copy" -msgstr "Esplora copia di lavoro" - -#: git-gui.sh:2483 -msgid "Browse Current Branch's Files" -msgstr "Esplora i file del ramo attuale" - -#: git-gui.sh:2487 -msgid "Browse Branch Files..." -msgstr "Esplora i file del ramo..." - -#: git-gui.sh:2492 -msgid "Visualize Current Branch's History" -msgstr "Visualizza la cronologia del ramo attuale" - -#: git-gui.sh:2496 -msgid "Visualize All Branch History" -msgstr "Visualizza la cronologia di tutti i rami" - -#: git-gui.sh:2503 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Esplora i file di %s" - -#: git-gui.sh:2505 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Visualizza la cronologia di %s" - -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Statistiche dell'archivio" - -#: git-gui.sh:2513 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Comprimi l'archivio" - -#: git-gui.sh:2516 -msgid "Verify Database" -msgstr "Verifica l'archivio" - -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Crea icona desktop" - -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Esci" - -#: git-gui.sh:2547 -msgid "Undo" -msgstr "Annulla" - -#: git-gui.sh:2550 -msgid "Redo" -msgstr "Ripeti" - -#: git-gui.sh:2554 git-gui.sh:3109 -msgid "Cut" -msgstr "Taglia" - -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Copia" - -#: git-gui.sh:2560 git-gui.sh:3115 -msgid "Paste" -msgstr "Incolla" - -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Elimina" - -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 -msgid "Select All" -msgstr "Seleziona tutto" - -#: git-gui.sh:2576 -msgid "Create..." -msgstr "Crea..." - -#: git-gui.sh:2582 -msgid "Checkout..." -msgstr "Attiva..." - -#: git-gui.sh:2588 -msgid "Rename..." -msgstr "Rinomina" - -#: git-gui.sh:2593 -msgid "Delete..." -msgstr "Elimina..." - -#: git-gui.sh:2598 -msgid "Reset..." -msgstr "Ripristina..." - -#: git-gui.sh:2608 -msgid "Done" -msgstr "Fatto" - -#: git-gui.sh:2610 -msgid "Commit@@verb" -msgstr "Nuova revisione" - -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "Nuova revisione" - -#: git-gui.sh:2627 git-gui.sh:3057 -msgid "Amend Last Commit" -msgstr "Correggi l'ultima revisione" - -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Analizza nuovamente" - -#: git-gui.sh:2643 -msgid "Stage To Commit" -msgstr "Prepara per una nuova revisione" - -#: git-gui.sh:2649 -msgid "Stage Changed Files To Commit" -msgstr "Prepara i file modificati per una nuova revisione" - -#: git-gui.sh:2655 -msgid "Unstage From Commit" -msgstr "Annulla preparazione" - -#: git-gui.sh:2661 lib/index.tcl:412 -msgid "Revert Changes" -msgstr "Annulla modifiche" - -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 -msgid "Show Less Context" -msgstr "Mostra meno contesto" - -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 -msgid "Show More Context" -msgstr "Mostra più contesto" - -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 -msgid "Sign Off" -msgstr "Sign Off" - -#: git-gui.sh:2696 -msgid "Local Merge..." -msgstr "Fusione locale..." - -#: git-gui.sh:2701 -msgid "Abort Merge..." -msgstr "Interrompi fusione..." - -#: git-gui.sh:2713 git-gui.sh:2741 -msgid "Add..." -msgstr "Aggiungi..." - -#: git-gui.sh:2717 -msgid "Push..." -msgstr "Propaga..." - -#: git-gui.sh:2721 -msgid "Delete Branch..." -msgstr "Elimina ramo..." - -#: git-gui.sh:2731 git-gui.sh:3292 -msgid "Options..." -msgstr "Opzioni..." - -#: git-gui.sh:2742 -msgid "Remove..." -msgstr "Rimuovi..." +#: sequencer.c:1000 +msgid "Can't revert as initial commit" +msgstr "Impossibile eseguire il revert come commit iniziale" -#: git-gui.sh:2751 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Aiuto" +#: sequencer.c:1001 +msgid "Can't cherry-pick into empty head" +msgstr "" -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "Informazioni su %s" +#: sha1_name.c:864 +msgid "HEAD does not point to a branch" +msgstr "HEAD non punta ad un branch" -#: git-gui.sh:2783 -msgid "Online Documentation" -msgstr "Documentazione sul web" +#: sha1_name.c:867 +#, c-format +msgid "No such branch: '%s'" +msgstr "Nessun branch esistente: '%s'" -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "Mostra chave SSH" +#: sha1_name.c:869 +#, c-format +msgid "No upstream configured for branch '%s'" +msgstr "Nessun upstream configurato per il branch '%s'" -#: git-gui.sh:2893 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" +#: sha1_name.c:872 +#, c-format +msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -"errore grave: impossibile effettuare lo stat del path %s: file o directory " -"non trovata" -#: git-gui.sh:2926 -msgid "Current Branch:" -msgstr "Ramo attuale:" +#: wrapper.c:413 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "impossibile trovare l'utente corrente nel file passwd: %s" -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "Modifiche preparate (saranno nella nuova revisione)" +#: wrapper.c:414 +msgid "no such user" +msgstr "utente non esistente" -#: git-gui.sh:2967 -msgid "Unstaged Changes" -msgstr "Modifiche non preparate" +#: wt-status.c:135 +msgid "Unmerged paths:" +msgstr "" -#: git-gui.sh:3017 -msgid "Stage Changed" -msgstr "Prepara modificati" +#: wt-status.c:141 wt-status.c:158 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr "" -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "Propaga (Push)" +#: wt-status.c:143 wt-status.c:160 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr "" -#: git-gui.sh:3071 -msgid "Initial Commit Message:" -msgstr "Messaggio di revisione iniziale:" +#: wt-status.c:144 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr " (usa \"git add/rm <file>...\" come appropriato per la risoluzione)" -#: git-gui.sh:3072 -msgid "Amended Commit Message:" -msgstr "Messaggio di revisione corretto:" +#: wt-status.c:152 +msgid "Changes to be committed:" +msgstr "" -#: git-gui.sh:3073 -msgid "Amended Initial Commit Message:" -msgstr "Messaggio iniziale di revisione corretto:" +#: wt-status.c:170 +msgid "Changes not staged for commit:" +msgstr "" -#: git-gui.sh:3074 -msgid "Amended Merge Commit Message:" -msgstr "Messaggio di fusione corretto:" +#: wt-status.c:174 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr "" -#: git-gui.sh:3075 -msgid "Merge Commit Message:" -msgstr "Messaggio di fusione:" +#: wt-status.c:176 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr "" -#: git-gui.sh:3076 -msgid "Commit Message:" -msgstr "Messaggio di revisione:" +#: wt-status.c:177 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr "" -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 -msgid "Copy All" -msgstr "Copia tutto" +#: wt-status.c:179 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr "" -#: git-gui.sh:3149 lib/blame.tcl:104 -msgid "File:" -msgstr "File:" +#: wt-status.c:188 +#, c-format +msgid "%s files:" +msgstr "%s file:" -#: git-gui.sh:3255 -msgid "Refresh" -msgstr "Rinfresca" +#: wt-status.c:191 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr "" -#: git-gui.sh:3276 -msgid "Decrease Font Size" -msgstr "Diminuisci dimensione caratteri" +#: wt-status.c:208 +msgid "bug" +msgstr "bug" -#: git-gui.sh:3280 -msgid "Increase Font Size" -msgstr "Aumenta dimensione caratteri" +#: wt-status.c:213 +msgid "both deleted:" +msgstr "entrambi eliminati:" -#: git-gui.sh:3288 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Codifica" +#: wt-status.c:214 +msgid "added by us:" +msgstr "aggiunto da noi:" -#: git-gui.sh:3299 -msgid "Apply/Reverse Hunk" -msgstr "Applica/Inverti sezione" +#: wt-status.c:215 +msgid "deleted by them:" +msgstr "eliminato da loro:" -#: git-gui.sh:3304 -msgid "Apply/Reverse Line" -msgstr "Applica/Inverti riga" +#: wt-status.c:216 +msgid "added by them:" +msgstr "aggiunto da loro:" -#: git-gui.sh:3323 -msgid "Run Merge Tool" -msgstr "Avvia programma esterno per la risoluzione dei conflitti" +#: wt-status.c:217 +msgid "deleted by us:" +msgstr "eliminato da noi:" -#: git-gui.sh:3328 -msgid "Use Remote Version" -msgstr "Usa versione remota" +#: wt-status.c:218 +msgid "both added:" +msgstr "entrambi aggiunti:" -#: git-gui.sh:3332 -msgid "Use Local Version" -msgstr "Usa versione locale" +#: wt-status.c:219 +msgid "both modified:" +msgstr "entrambi modificati:" -#: git-gui.sh:3336 -msgid "Revert To Base" -msgstr "Ritorna alla revisione comune" +#: wt-status.c:249 +msgid "new commits, " +msgstr "nuovi commit, " -#: git-gui.sh:3354 -msgid "Visualize These Changes In The Submodule" -msgstr "Visualizza queste modifiche nel sottomodulo" +#: wt-status.c:251 +msgid "modified content, " +msgstr "contenuto modificato, " -#: git-gui.sh:3358 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Visualizza la cronologia del ramo attuale nel sottomodulo" +#: wt-status.c:253 +msgid "untracked content, " +msgstr "" -#: git-gui.sh:3362 -msgid "Visualize All Branch History In The Submodule" -msgstr "Visualizza la cronologia di tutti i rami nel sottomodulo" +#: wt-status.c:267 +#, c-format +msgid "new file: %s" +msgstr "nuovo file: %s" + +#: wt-status.c:270 +#, c-format +msgid "copied: %s -> %s" +msgstr "copiato: %s -> %s" + +#: wt-status.c:273 +#, c-format +msgid "deleted: %s" +msgstr "eliminato: %s" + +#: wt-status.c:276 +#, c-format +msgid "modified: %s" +msgstr "modificato: %s" + +#: wt-status.c:279 +#, c-format +msgid "renamed: %s -> %s" +msgstr "rinominato: %s -> %s" + +#: wt-status.c:282 +#, c-format +msgid "typechange: %s" +msgstr "" -#: git-gui.sh:3367 -msgid "Start git gui In The Submodule" -msgstr "Avvia git gui nel sottomodulo" +#: wt-status.c:285 +#, c-format +msgid "unknown: %s" +msgstr "sconosciuto: %s" -#: git-gui.sh:3389 -msgid "Unstage Hunk From Commit" -msgstr "Annulla preparazione della sezione per una nuova revisione" +#: wt-status.c:288 +#, c-format +msgid "unmerged: %s" +msgstr "" -#: git-gui.sh:3391 -msgid "Unstage Lines From Commit" -msgstr "Annulla preparazione delle linee per una nuova revisione" +#: wt-status.c:291 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "" -#: git-gui.sh:3393 -msgid "Unstage Line From Commit" -msgstr "Annulla preparazione della linea per una nuova revisione" +#: wt-status.c:737 +msgid "On branch " +msgstr "Sul branch " -#: git-gui.sh:3396 -msgid "Stage Hunk For Commit" -msgstr "Prepara sezione per una nuova revisione" +#: wt-status.c:744 +msgid "Not currently on any branch." +msgstr "" -#: git-gui.sh:3398 -msgid "Stage Lines For Commit" -msgstr "Prepara linee per una nuova revisione" +#: wt-status.c:755 +msgid "Initial commit" +msgstr "Commit iniziale" -#: git-gui.sh:3400 -msgid "Stage Line For Commit" -msgstr "Prepara linea per una nuova revisione" +#: wt-status.c:769 +msgid "Untracked" +msgstr "" -#: git-gui.sh:3424 -msgid "Initializing..." -msgstr "Inizializzazione..." +#: wt-status.c:771 +msgid "Ignored" +msgstr "Ignorato" -#: git-gui.sh:3541 -#, tcl-format -msgid "" -"Possible environment issues exist.\n" -"\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" -"\n" +#: wt-status.c:773 +#, c-format +msgid "Untracked files not listed%s" msgstr "" -"Possibili problemi con le variabili d'ambiente.\n" -"\n" -"Le seguenti variabili d'ambiente saranno probabilmente\n" -"ignorate da tutti i sottoprocessi di Git avviati\n" -"da %s:\n" -"\n" -#: git-gui.sh:3570 +#: wt-status.c:775 +msgid " (use -u option to show untracked files)" +msgstr "" + +#: wt-status.c:781 +msgid "No changes" +msgstr "Nessuna modifica" + +#: wt-status.c:785 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "nessuna modifica aggiunta al commit%s\n" + +#: wt-status.c:787 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr " (usa \"git add\" e/o \"git commit -a\")" + +#: wt-status.c:789 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "" + +#: wt-status.c:791 +msgid " (use \"git add\" to track)" +msgstr "" + +#: wt-status.c:793 wt-status.c:796 wt-status.c:799 +#, c-format +msgid "nothing to commit%s\n" +msgstr "" + +#: wt-status.c:794 +msgid " (create/copy files and use \"git add\" to track)" +msgstr "" + +#: wt-status.c:797 +msgid " (use -u to show untracked files)" +msgstr "" + +#: wt-status.c:800 +msgid " (working directory clean)" +msgstr "" + +#: wt-status.c:908 +msgid "HEAD (no branch)" +msgstr "HEAD (nessun branch)" + +#: wt-status.c:914 +msgid "Initial commit on " +msgstr "Commit iniziale su " + +#: wt-status.c:929 +msgid "behind " +msgstr "indietro " + +#: wt-status.c:932 wt-status.c:935 +msgid "ahead " +msgstr "avanti " + +#: wt-status.c:937 +msgid ", behind " +msgstr ", indietro " + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "status diff %c inatteso" + +#: builtin/add.c:67 builtin/commit.c:226 +msgid "updating files failed" +msgstr "aggiornamento dei file non riuscito" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "elimina '%s'\n" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Il path '%s' è nel sottomodulo '%.*s'" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "" + +#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "'%s' si trova oltre un link simbolico" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "Non è stato possibile leggere index" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Non è stato possibile aprire '%s' per la scrittura." + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "Non è stato possibile scrivere la patch" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "Non è stato possibile eseguire lo stat di '%s'" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "Patch vuota. Operazione interrotta." + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "Non è stato possibile applicare '%s'" + +#: builtin/add.c:312 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "I seguenti path sono stati ignorati da uno o più dei tuoi file .gitignore:\n" + +#: builtin/add.c:352 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Usa -f se vuoi davvero aggiungerli.\n" + +#: builtin/add.c:353 +msgid "no files added" +msgstr "nessun file aggiunto" + +#: builtin/add.c:359 +msgid "adding files failed" +msgstr "aggiunta dei file non riuscita" + +#: builtin/add.c:391 +msgid "-A and -u are mutually incompatible" +msgstr "-A e -u sono reciprocamente incompatibili" + +#: builtin/add.c:393 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "L'opzione --ignore-missing può essere usata solo con --dry-run" + +#: builtin/add.c:413 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "" + +#: builtin/add.c:414 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Forse intendevi dire 'git add .'?\n" + +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "index file corrotto" + +#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "Impossibile scrivere il nuovo index file" + +#: builtin/apply.c:53 +msgid "git apply [options] [<patch>...]" +msgstr "git apply [opzioni] [<patch>...]" + +#: builtin/apply.c:106 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "" + +#: builtin/apply.c:121 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "" + +#: builtin/apply.c:815 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "" + +#: builtin/apply.c:824 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec ha restituito %d per l'input: %s" + +#: builtin/apply.c:905 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "impossibile trovare il nome del file nella patch alla riga %d" + +#: builtin/apply.c:937 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "git apply: git-diff errato - atteso /dev/null, ricevuto %s alla riga %d" + +#: builtin/apply.c:941 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "git apply: git-diff errato - nuovo nome del file inconsistente alla riga %d" + +#: builtin/apply.c:942 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "git apply: git-diff errato - vecchio nome del file inconsistente alla riga %d" + +#: builtin/apply.c:949 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: git-diff errato - atteso /dev/nulla alla riga %d" + +#: builtin/apply.c:1394 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: riga inattesa: %.*s" + +#: builtin/apply.c:1451 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "frammento di patch senza intestazione alla riga %d: %.*s" + +#: builtin/apply.c:1468 +#, c-format msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." +"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:1628 +msgid "new file depends on old contents" +msgstr "il nuovo file dipende da contenuti precedenti" + +#: builtin/apply.c:1630 +msgid "deleted file still has contents" +msgstr "il file eliminato ha ancora dei contenuti" + +#: builtin/apply.c:1656 +#, c-format +msgid "corrupt patch at line %d" msgstr "" -"\n" -"Ciò è dovuto a un problema conosciuto\n" -"causato dall'eseguibile Tcl distribuito da Cygwin." -#: git-gui.sh:3575 -#, tcl-format +#: builtin/apply.c:1692 +#, c-format +msgid "new file %s depends on old contents" +msgstr "il nuovo file %s dipende da contenuti precedenti" + +#: builtin/apply.c:1694 +#, c-format +msgid "deleted file %s still has contents" +msgstr "il file eliminato %s ha ancora dei contenuti" + +#: builtin/apply.c:1697 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** attenzione: il file %s diventa vuoto ma non è eliminato" + +#: builtin/apply.c:1843 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "patch binaria corrotta alla riga %d: %.*s" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1872 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "patch binaria non riconosciuta alla riga %d" + +#: builtin/apply.c:1958 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "" + +#: builtin/apply.c:2048 +#, c-format +msgid "unable to read symlink %s" +msgstr "impossibile leggere il link simbolico %s" + +#: builtin/apply.c:2052 +#, c-format +msgid "unable to open or read %s" +msgstr "impossibile aprire o leggere %s" + +#: builtin/apply.c:2123 +msgid "oops" +msgstr "oops" + +#: builtin/apply.c:2645 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "inizio della riga non valido: '%c'" + +#: builtin/apply.c:2763 +#, 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:2775 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "" + +#: builtin/apply.c:2781 +#, c-format msgid "" -"\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\n" +"while searching for:\n" +"%.*s" msgstr "" -"\n" -"\n" -"Una buona alternativa a %s\n" -"consiste nell'assegnare valori alle variabili di configurazione\n" -"user.name e user.email nel tuo file ~/.gitconfig personale.\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - un'interfaccia grafica per Git." - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Mostra file" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Revisione:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Copia revisione" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Trova testo..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Ricerca accurata delle copie" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Mostra contesto nella cronologia" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Annota la revisione precedente" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Lettura di %s..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "Caricamento annotazioni per copie/spostamenti..." - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "linee annotate" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Caricamento annotazioni per posizione originaria..." - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Annotazione completata." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Occupato" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "Il processo di annotazione è già in corso." - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Ricerca accurata delle copie in corso..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Caricamento annotazioni..." - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Autore:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Revisione creata da:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "File originario:" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Impossibile trovare la revisione HEAD:" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Impossibile trovare la revisione precedente:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Impossibile visualizzare la revisione precedente" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "Errore nel caricamento delle differenze:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "In origine da:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "Nel file:" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "Copiato o spostato qui da:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Attiva ramo" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "Attiva" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "Annulla" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Revisione" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "Opzioni" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Recupera duplicato locale di ramo remoto" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Stacca da ramo locale" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Crea ramo" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Crea nuovo ramo" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 -msgid "Create" -msgstr "Crea" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Nome del ramo" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "Nome:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Appaia nome del duplicato locale di ramo remoto" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Revisione iniziale" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Aggiorna ramo esistente:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "No" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Solo fast forward" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Ripristina" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Attiva dopo la creazione" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Scegliere un duplicato locale di ramo remoto" - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "" -"Il duplicato locale del ramo remoto %s non è un ramo nell'archivio remoto." +"durante la ricerca per:\n" +"%.*s" + +#: builtin/apply.c:2800 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "dati della patch binaria mancanti per '%s'" + +#: builtin/apply.c:2903 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "la patch binaria non può essere applicata a '%s'" + +#: builtin/apply.c:2909 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "la patch binaria su '%s' crea risultati non corretti (atteso %s, ricevuto %s)" + +#: builtin/apply.c:2930 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "patch non riuscita: %s:%ld" + +#: builtin/apply.c:3045 +#, c-format +msgid "patch %s has been renamed/deleted" +msgstr "la patch %s è stata rinominata/eliminata" + +#: builtin/apply.c:3052 builtin/apply.c:3069 +#, c-format +msgid "read of %s failed" +msgstr "lettura di %s non riuscita" + +#: builtin/apply.c:3084 +msgid "removal patch leaves file contents" +msgstr "la rimozione della patch lascia contenuti del file" + +#: builtin/apply.c:3105 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: esiste già nella directory di lavoro" + +#: builtin/apply.c:3143 +#, c-format +msgid "%s: has been deleted/renamed" +msgstr "%s: è stata eliminata/rinominata" + +#: builtin/apply.c:3148 builtin/apply.c:3179 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: builtin/apply.c:3159 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: non esiste in index" + +#: builtin/apply.c:3173 +#, c-format +msgid "%s: does not match index" +msgstr "%s: non corrisponde a index" + +#: builtin/apply.c:3190 +#, c-format +msgid "%s: wrong type" +msgstr "%s: tipo errato" + +#: builtin/apply.c:3192 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s ha il tipo %o, atteso %o" + +#: builtin/apply.c:3247 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: esiste già in index" + +#: builtin/apply.c:3267 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "" + +#: builtin/apply.c:3272 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "" + +#: builtin/apply.c:3280 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: la patch non può essere applicata" + +#: builtin/apply.c:3293 +#, c-format +msgid "Checking patch %s..." +msgstr "Controllo della patch %s..." + +#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry non riuscito per il path '%s'" + +#: builtin/apply.c:3491 +#, c-format +msgid "unable to remove %s from index" +msgstr "impossibile rimuovere %s da index" + +#: builtin/apply.c:3518 +#, c-format +msgid "corrupt patch for subproject %s" +msgstr "patch corrotta per il sottoprogetto %s" + +#: builtin/apply.c:3522 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "impossibile eseguire lo stat del file appena creato '%s'" + +#: builtin/apply.c:3527 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "" + +#: builtin/apply.c:3530 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "impossibile aggiungere la voce della cache per %s" + +#: builtin/apply.c:3563 +#, c-format +msgid "closing file '%s'" +msgstr "chiusura del file '%s'" + +#: builtin/apply.c:3612 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "impossibile scrivere il file '%s' in modalità %o" + +#: builtin/apply.c:3668 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Patch %s applicata correttamente." + +#: builtin/apply.c:3676 +msgid "internal error" +msgstr "errore interno" + +#. Say this even without --verbose +#: builtin/apply.c:3679 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:3689 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "" + +#: builtin/apply.c:3710 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Frammento #%d applicato correttamente." + +#: builtin/apply.c:3713 +#, c-format +msgid "Rejected hunk #%d." +msgstr "Frammento #%d respinto." + +#: builtin/apply.c:3844 +msgid "unrecognized input" +msgstr "input non riconosciuto" + +#: builtin/apply.c:3855 +msgid "unable to read index file" +msgstr "impossibile leggere index file" + +#: builtin/apply.c:3970 builtin/apply.c:3973 +msgid "path" +msgstr "path" + +#: builtin/apply.c:3971 +msgid "don't apply changes matching the given path" +msgstr "non applica le modifiche corrispondenti al path specificato" + +#: builtin/apply.c:3974 +msgid "apply changes matching the given path" +msgstr "applica le modifiche corrispondenti al path specificato" + +#: builtin/apply.c:3976 +msgid "num" +msgstr "num" -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Inserire un nome per il ramo." +#: builtin/apply.c:3977 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "" + +#: builtin/apply.c:3980 +msgid "ignore additions made by the patch" +msgstr "ignora le aggiunte create dalla patch" + +#: builtin/apply.c:3982 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "invece di applicare la patch, mostra l'output di diffstat per l'input" + +#: builtin/apply.c:3986 +msgid "shows number of added and deleted lines in decimal notation" +msgstr "mostra il numero di righe aggiunte e eliminate in notazione decimale" + +#: builtin/apply.c:3988 +msgid "instead of applying the patch, output a summary for the input" +msgstr "invece di applicare la patch, mostra un riassunto per l'input" + +#: builtin/apply.c:3990 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "invece di applicare la patch, verifica se può essere applicata" + +#: builtin/apply.c:3992 +msgid "make sure the patch is applicable to the current index" +msgstr "assicura che la patch sia applicabile all'attuale index" + +#: builtin/apply.c:3994 +msgid "apply a patch without touching the working tree" +msgstr "" + +#: builtin/apply.c:3996 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "applica anche la patch (da usare con --stat/--summary/--check)" + +#: builtin/apply.c:3998 +msgid "build a temporary index based on embedded index information" +msgstr "" -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "'%s' non è utilizzabile come nome di ramo." +#: builtin/apply.c:4000 +msgid "paths are separated with NUL character" +msgstr "i path sono separati con un carattere NUL" -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Elimina ramo" +#: builtin/apply.c:4003 +msgid "ensure at least <n> lines of context match" +msgstr "assicura almeno <n> righe di contesto corrispondente" -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Elimina ramo locale" +#: builtin/apply.c:4004 +msgid "action" +msgstr "azione" -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Rami locali" +#: builtin/apply.c:4005 +msgid "detect new or modified lines that have whitespace errors" +msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi" -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Cancella solo se fuso con un altro ramo" +#: builtin/apply.c:4008 builtin/apply.c:4011 +msgid "ignore changes in whitespace when finding context" +msgstr "" + +#: builtin/apply.c:4014 +msgid "apply the patch in reverse" +msgstr "applica la patch in maniera inversa" + +#: builtin/apply.c:4016 +msgid "don't expect at least one line of context" +msgstr "" -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Sempre (non verificare le fusioni)" +#: builtin/apply.c:4018 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "lascia i frammenti respinti nei file .rej corrispondenti" -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "I rami seguenti non sono stati fusi completamente in %s:" +#: builtin/apply.c:4020 +msgid "allow overlapping hunks" +msgstr "consente la sovrapposizione dei frammenti" -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 +#: builtin/apply.c:4021 +msgid "be verbose" +msgstr "dettagliato" + +#: builtin/apply.c:4023 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "" + +#: builtin/apply.c:4026 +msgid "do not trust the line counts in the hunk headers" +msgstr "" + +#: builtin/apply.c:4028 +msgid "root" +msgstr "radice" + +#: builtin/apply.c:4029 +msgid "prepend <root> to all filenames" +msgstr "antepone <root> a tutti i nomi file" + +#: builtin/apply.c:4050 +msgid "--index outside a repository" +msgstr "--index al di fuori di un repository" + +#: builtin/apply.c:4053 +msgid "--cached outside a repository" +msgstr "--cached al di fuori di un repository" + +#: builtin/apply.c:4069 +#, c-format +msgid "can't open patch '%s'" +msgstr "impossibile aprire la patch '%s'" + +#: builtin/apply.c:4083 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:4089 builtin/apply.c:4099 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d riga aggiunge errori di spazi bianchi." +msgstr[1] "%d righe aggiungono errori di spazi bianchi." + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "non è stato possibile creare il file del repository '%s'" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "non è stato possibile redirigere l'output" + +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" +msgstr "git archive: Remote non ha un URL" + +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive: atteso ACK/NAK, ricevuto EOF" + +#: builtin/archive.c:63 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:65 +#, c-format +msgid "remote error: %s" +msgstr "errore remoto: %s" + +#: builtin/archive.c:66 +msgid "git archive: protocol error" +msgstr "git archive: errore del protocollo" + +#: builtin/archive.c:71 +msgid "git archive: expected a flush" +msgstr "git archive: atteso un flush" + +#: builtin/branch.c:144 +#, c-format msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." msgstr "" -"Ripristinare rami cancellati è difficile.\n" -"\n" -"Cancellare i rami selezionati?" -#: lib/branch_delete.tcl:141 -#, tcl-format +#: builtin/branch.c:148 +#, c-format msgid "" -"Failed to delete branches:\n" -"%s" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." msgstr "" -"Impossibile cancellare i rami:\n" -"%s" -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Rinomina ramo" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Rinomina" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Ramo:" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Nuovo Nome:" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Scegliere un ramo da rinominare." - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Il ramo '%s' esiste già." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Impossibile rinominare '%s'." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Avvio in corso..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "File browser" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Caricamento %s..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Directory superiore]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Esplora i file del ramo" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "Esplora" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Recupero %s da %s" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "errore grave: impossibile risolvere %s" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Chiudi" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Il ramo '%s' non esiste." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Impossibile configurare git-pull semplificato per '%s'." - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." +#: builtin/branch.c:180 +msgid "cannot use -a with -d" +msgstr "impossibile usare -a con -d" + +#: builtin/branch.c:186 +msgid "Couldn't look up commit object for HEAD" msgstr "" -"Il ramo '%s' esiste già.\n" -"\n" -"Non può effettuare un 'fast-forward' a %s.\n" -"E' necessaria una fusione." -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "La strategia di fusione '%s' non è supportata." +#: builtin/branch.c:191 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "" + +#: builtin/branch.c:202 +#, c-format +msgid "remote branch '%s' not found." +msgstr "il branch remoto '%s' non è stato trovato." -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Impossibile aggiornare '%s'." +#: builtin/branch.c:203 +#, c-format +msgid "branch '%s' not found." +msgstr "branch '%s' non trovato." -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." +#: builtin/branch.c:210 +#, c-format +msgid "Couldn't look up commit object for '%s'" msgstr "" -"L'area di preparazione per una nuova revisione (indice) è già bloccata." -#: lib/checkout_op.tcl:289 +#: builtin/branch.c:216 +#, c-format msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n" -"\n" -"Un altro programma Git ha modificato questo archivio dall'ultima analisi. " -"Bisogna effettuare una nuova analisi prima di poter cambiare il ramo " -"attuale.\n" -"\n" -"La nuova analisi comincerà ora.\n" -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Aggiornamento della directory di lavoro a '%s' in corso..." +#: builtin/branch.c:225 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "Errore nella rimozione del branch remoto '%s'" + +#: builtin/branch.c:226 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "Errore nella rimozione del branch '%s'" + +#: builtin/branch.c:233 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "Ramo remoto %s eliminato (era %s).\n" + +#: builtin/branch.c:234 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Ramo %s eliminato (era %s).\n" + +#: builtin/branch.c:239 +msgid "Update of config-file failed" +msgstr "Aggiornamento del file di configurazione fallito" + +#: builtin/branch.c:337 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "il branch '%s' non punta ad un commit" + +#: builtin/branch.c:409 +#, c-format +msgid "[%s: behind %d]" +msgstr "[%s: dietro %d]" + +#: builtin/branch.c:411 +#, c-format +msgid "[behind %d]" +msgstr "[dietro %d]" + +#: builtin/branch.c:415 +#, c-format +msgid "[%s: ahead %d]" +msgstr "[%s: avanti %d]" + +#: builtin/branch.c:417 +#, c-format +msgid "[ahead %d]" +msgstr "" -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "file presenti nella directory di lavoro" +#: builtin/branch.c:420 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "" -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "Attivazione di '%s' fallita (richiesta una fusione a livello file)." +#: builtin/branch.c:423 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "" -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "E' richiesta una fusione a livello file." +#: builtin/branch.c:535 +msgid "(no branch)" +msgstr "(nessun branch)" -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Si rimarrà sul ramo '%s'." +#: builtin/branch.c:600 +msgid "some refs could not be read" +msgstr "" -#: lib/checkout_op.tcl:452 -msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." +#: builtin/branch.c:613 +msgid "cannot rename the current branch while not on any." +msgstr "" + +#: builtin/branch.c:623 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Nome del branch non valido: '%s'" + +#: builtin/branch.c:638 +msgid "Branch rename failed" +msgstr "" + +#: builtin/branch.c:642 +#, c-format +msgid "Renamed a misnamed branch '%s' away" msgstr "" -"Non si è più su un ramo locale\n" -"\n" -"Se si vuole rimanere su un ramo, crearne uno ora a partire da 'Questa " -"revisione attiva staccata'." -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Attivazione di '%s' completata." +#: builtin/branch.c:646 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "Ramo rinominato in %s, ma HEAD non è aggiornato!" -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" +#: builtin/branch.c:653 +msgid "Branch is renamed, but update of config-file failed" msgstr "" -"Ripristinare '%s' a '%s' comporterà la perdita delle seguenti revisioni:" +"Il branch è stato rinominato, ma l'aggiornamento del file di configurazione " +"è fallito" -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Ricomporre le revisioni perdute potrebbe non essere semplice." +#: builtin/branch.c:668 +#, c-format +msgid "malformed object name %s" +msgstr "nome dell'oggetto %s errato" -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Ripristinare '%s'?" +#: builtin/branch.c:692 +#, c-format +msgid "could not write branch description template: %s" +msgstr "" -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Visualizza" +#: builtin/branch.c:783 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:788 builtin/clone.c:558 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:808 +msgid "--column and --verbose are incompatible" +msgstr "--column e --verbose non sono compatibili" + +#: builtin/branch.c:857 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" +"le opzioni -a e -r per 'git branch' non hanno senso con il nome di un branch" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s è corretto\n" + +#: 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/checkout.c:113 builtin/checkout.c:146 +#, c-format +msgid "path '%s' does not have our version" +msgstr "il path '%s' non ha la nostra versione" + +#: builtin/checkout.c:115 builtin/checkout.c:148 +#, c-format +msgid "path '%s' does not have their version" +msgstr "il path '%s' non ha la loro versione" + +#: builtin/checkout.c:131 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "" -#: lib/checkout_op.tcl:635 -#, tcl-format +#: builtin/checkout.c:175 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "il path '%s' non ha le versioni necessarie" + +#: builtin/checkout.c:192 +#, c-format +msgid "path '%s': cannot merge" +msgstr "" + +#: builtin/checkout.c:209 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "" + +#: builtin/checkout.c:234 builtin/checkout.c:392 +msgid "corrupt index file" +msgstr "file index corrotto" + +#: builtin/checkout.c:264 builtin/checkout.c:271 +#, c-format +msgid "path '%s' is unmerged" +msgstr "" + +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/merge.c:812 +msgid "unable to write new index file" +msgstr "impossibile scrivere il nuovo file index" + +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 +msgid "diff_setup_done failed" +msgstr "diff_setup_done non riuscito" + +#: builtin/checkout.c:414 +msgid "you need to resolve your current index first" +msgstr "è necessario risolvere prima l'attuale index" + +#: builtin/checkout.c:533 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "" + +#: builtin/checkout.c:566 +msgid "HEAD is now at" +msgstr "HEAD si trova ora a" + +#: builtin/checkout.c:573 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Ripristina il branch '%s'\n" + +#: builtin/checkout.c:576 +#, c-format +msgid "Already on '%s'\n" +msgstr "Si è già su '%s'\n" + +#: builtin/checkout.c:580 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:582 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:584 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Si è passati al branch '%s'\n" + +#: builtin/checkout.c:640 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... e %d altri.\n" + +#. The singular version +#: builtin/checkout.c:646 +#, c-format msgid "" -"Failed to set current branch.\n" +"Warning: you are leaving %d commit behind, not connected to\n" +"any of your branches:\n" "\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\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:664 +#, 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" -"This should not have occurred. %s will now close and give up." msgstr "" -"Impossibile preparare il ramo attuale.\n" +"Se si vuole mantenerle creando un nuovo branch, questo potrebbe essere\n" +"un buon momento per farlo con:\n" "\n" -"Questa directory di lavoro è stata convertita solo parzialmente. I file sono " -"stati aggiornati correttamente, ma l'aggiornamento di un file di Git ha " -"prodotto degli errori.\n" +" git branch nuovo_nome_branch %s\n" "\n" -"Questo non sarebbe dovuto succedere. %s ora terminerà senza altre azioni." -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Seleziona" +#: builtin/checkout.c:694 +msgid "internal error in revision walk" +msgstr "" -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Famiglia di caratteri" +#: builtin/checkout.c:698 +msgid "Previous HEAD position was" +msgstr "La precedente posizione di HEAD era" -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Dimensione caratteri" +#: builtin/checkout.c:724 +msgid "You are on a branch yet to be born" +msgstr "" -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Esempio caratteri" +#. case (1) +#: builtin/checkout.c:855 +#, c-format +msgid "invalid reference: %s" +msgstr "riferimento non valido: %s" -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." +#. case (1): want a tree +#: builtin/checkout.c:894 +#, c-format +msgid "reference is not a tree: %s" msgstr "" -"Questo è un testo d'esempio.\n" -"Se ti piace questo testo, scegli questo carattere." -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" +#: builtin/checkout.c:974 +msgid "-B cannot be used with -b" +msgstr "-B non può essere usata con -b" -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" -msgstr "Crea nuovo archivio" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Nuovo..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" -msgstr "Clona archivio esistente" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Clona..." +#: builtin/checkout.c:983 +msgid "--patch is incompatible with all other options" +msgstr "--patch non è compatibile con tutte le altre opzioni" -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" -msgstr "Apri archivio esistente" +#: builtin/checkout.c:986 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "--detach non può essere usata con -b/-B/--orphan" -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Apri..." +#: builtin/checkout.c:988 +msgid "--detach cannot be used with -t" +msgstr "--detach non può essere usata con -t" -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Archivi recenti" +#: builtin/checkout.c:994 +msgid "--track needs a branch name" +msgstr "--track necessita del nome di un branch" + +#: builtin/checkout.c:1001 +msgid "Missing branch name; try -b" +msgstr "Nome del branch mancante; prova con -b" + +#: builtin/checkout.c:1007 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "" -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Apri archivio recente:" +#: builtin/checkout.c:1009 +msgid "--orphan cannot be used with -t" +msgstr "--orphan non può essere usata con -t" -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Impossibile creare l'archivio %s:" - -#: lib/choose_repository.tcl:391 -msgid "Directory:" -msgstr "Directory:" - -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" -msgstr "Archivio Git" - -#: lib/choose_repository.tcl:448 -#, tcl-format -msgid "Directory %s already exists." -msgstr "La directory %s esiste già." - -#: lib/choose_repository.tcl:452 -#, tcl-format -msgid "File %s already exists." -msgstr "Il file %s esiste già." - -#: lib/choose_repository.tcl:466 -msgid "Clone" -msgstr "Clona" - -#: lib/choose_repository.tcl:479 -msgid "Source Location:" -msgstr "Posizione sorgente:" - -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" -msgstr "Directory di destinazione:" - -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" -msgstr "Tipo di clone:" - -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Standard (veloce, semi-ridondante, con hardlink)" - -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Copia completa (più lento, backup ridondante)" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Shared (il più veloce, non raccomandato, nessun backup)" +#: builtin/checkout.c:1019 +msgid "git checkout: -f and -m are incompatible" +msgstr "git checkout: -f e -m non sono compatibili" -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "%s non è un archivio Git." - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "Standard è disponibile solo per archivi locali." - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "Shared è disponibile solo per archivi locali." - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "Il file/directory %s esiste già." - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "Impossibile configurare origin" - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "Calcolo oggetti" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Impossibile copiare oggetti/info/alternate: %s" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Niente da clonare da %s." - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "Il ramo 'master' non è stato inizializzato." - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Impossibile utilizzare gli hardlink. Si ricorrerà alla copia." - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "Clonazione da %s" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "Copia degli oggetti" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Impossibile copiare oggetto: %s" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "Collegamento oggetti" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "oggetti" - -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Hardlink impossibile sull'oggetto: %s" +#: builtin/checkout.c:1053 +msgid "invalid path specification" +msgstr "" -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Impossibile recuperare rami e oggetti. Controllare i dettagli forniti dalla " -"console." +#: builtin/checkout.c:1061 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." +#: builtin/checkout.c:1063 +msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -"Impossibile recuperare le etichette. Controllare i dettagli forniti dalla " -"console." -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Impossibile determinare HEAD. Controllare i dettagli forniti dalla console." +#: builtin/checkout.c:1068 +msgid "git checkout: --detach does not take a path argument" +msgstr "git checkout: --detach non prende un path come argomento" -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Impossibile ripulire %s" +#: builtin/checkout.c:1071 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "Clonazione non riuscita." +#: builtin/checkout.c:1090 +msgid "Cannot switch branch to a non-commit." +msgstr "" -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "Non è stato trovato un ramo predefinito." +#: builtin/checkout.c:1093 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "--ours/--theirs non sono compatibili con il passaggio ai branch." -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Impossibile risolvere %s come una revisione." +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "-x e -X non possono essere usati insieme" -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "Creazione directory di lavoro" +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" +"clean.requireForce è impostato a vero, ma né -n né -f sono state specificate; " +"clean interrotto" -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "file" +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" +"clean.requireForce è vero per default, ma né -n né -f sono state specificate; " +"clean interrotto" -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "Attivazione iniziale non riuscita." +#: builtin/clean.c:155 builtin/clean.c:176 +#, c-format +msgid "Would remove %s\n" +msgstr "" -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "Apri" +#: builtin/clean.c:159 builtin/clean.c:179 +#, c-format +msgid "Removing %s\n" +msgstr "Rimozione di %s\n" -#: lib/choose_repository.tcl:1021 -msgid "Repository:" -msgstr "Archivio:" +#: builtin/clean.c:162 builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" +msgstr "rimozione di %s non riuscita" -#: lib/choose_repository.tcl:1072 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Impossibile accedere all'archivio %s:" +#: builtin/clean.c:166 +#, c-format +msgid "Would not remove %s\n" +msgstr "" -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "Questa revisione attiva staccata" +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" +msgstr "" -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Espressione di revisione:" +#: builtin/clone.c:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "il repository di riferimento '%s' non è una directory locale." + +#: builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "apertura di '%s' non riuscita" + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "creazione della directory '%s' non riuscita" + +#: builtin/clone.c:308 builtin/diff.c:75 +#, c-format +msgid "failed to stat '%s'" +msgstr "stat di '%s' non riuscito" + +#: builtin/clone.c:310 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s esiste e non è una directory" + +#: builtin/clone.c:324 +#, c-format +msgid "failed to stat %s\n" +msgstr "stat di %s non riuscito\n" + +#: builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "rimozione del link '%s' non riuscita" + +#: builtin/clone.c:346 +#, c-format +msgid "failed to create link '%s'" +msgstr "creazione del link '%s' non riuscita" + +#: builtin/clone.c:350 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "copia del file in '%s' non riuscita" + +#: builtin/clone.c:373 +#, c-format +msgid "done.\n" +msgstr "fatto.\n" + +#: builtin/clone.c:440 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "Non è stato possibile trovare il branch remoto %s da clonare." + +#: builtin/clone.c:549 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" +"l'HEAD remoto si riferisce ad un ref inesistente, impossibile eseguire il " +"checkout.\n" -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "Ramo locale" +#: builtin/clone.c:639 +msgid "Too many arguments." +msgstr "Troppi argomenti." -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "Duplicato locale di ramo remoto" +#: builtin/clone.c:643 +msgid "You must specify a repository to clone." +msgstr "Devi specificare un repository da clonare." -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "Etichetta" +#: builtin/clone.c:654 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "le opzioni --bare e --origin %s non sono compatibili." -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Revisione non valida: %s" +#: builtin/clone.c:668 +#, c-format +msgid "repository '%s' does not exist" +msgstr "il repository '%s' non esiste" -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "Nessuna revisione selezionata." +#: builtin/clone.c:673 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "L'espressione di revisione è vuota." +#: builtin/clone.c:683 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "" +"il path di destinazione '%s' esiste già e non è una directory vuota." -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "Aggiornato" +#: builtin/clone.c:693 +#, c-format +msgid "working tree '%s' already exists." +msgstr "" -#: lib/choose_rev.tcl:559 -msgid "URL" -msgstr "URL" +#: builtin/clone.c:706 builtin/clone.c:720 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" +#: builtin/clone.c:709 +#, c-format +msgid "could not create work tree dir '%s'." msgstr "" -"Non c'è niente da correggere.\n" -"\n" -"Stai per creare la revisione iniziale. Non esiste una revisione precedente " -"da correggere.\n" -#: lib/commit.tcl:18 -msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" +#: builtin/clone.c:728 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "Clone nel repository spoglio '%s'...\n" + +#: builtin/clone.c:730 +#, c-format +msgid "Cloning into '%s'...\n" msgstr "" -"Non è possibile effettuare una correzione durante una fusione.\n" -"\n" -"In questo momento si sta effettuando una fusione che non è stata del tutto " -"completata. Non puoi correggere la revisione precedente a meno che prima tu " -"non interrompa l'operazione di fusione in corso.\n" -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Errore durante il caricamento dei dati della revisione da correggere:" +#: builtin/clone.c:786 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Non so come clonare %s" -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Impossibile ottenere la tua identità:" +#: builtin/clone.c:835 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "Il branch remoto %s non è stato trovato in upstream %s" -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "GIT_COMMITTER_IDENT non valida:" +#: builtin/clone.c:842 +msgid "You appear to have cloned an empty repository." +msgstr "Sembra che tu abbia clonato un repository vuoto." -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "attenzione: Tcl non supporta la codifica '%s'." +#: builtin/column.c:51 +msgid "--command must be the first argument" +msgstr "--command deve essere il primo argomento" -#: lib/commit.tcl:149 +#: builtin/commit.c:43 msgid "" -"Last scanned state does not match repository state.\n" +"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" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" "\n" -"The rescan will be automatically started now.\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" msgstr "" -"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n" +"Il tuo nome e l'indirizzo email sono stati configurati automaticamente usando\n" +"il tuo nome utente ed il nome host. Per favore, verifica che siano esatti.\n" +"È possibile eliminare questo messaggio impostandoli esplicitamente:\n" +"\n" +" git config --global user.name \"Tuo Nome\"\n" +" git config --global user.email tu@esempio.com\n" "\n" -"Un altro programma Git ha modificato questo archivio dall'ultima analisi. " -"Bisogna effettuare una nuova analisi prima di poter creare una nuova " -"revisione.\n" +"Dopo questa operazione, puoi ripristinare l'identità usata in questo commit con:\n" "\n" -"La nuova analisi comincerà ora.\n" +" git commit --amend --reset-author\n" -#: lib/commit.tcl:172 -#, tcl-format +#: builtin/commit.c:55 msgid "" -"Unmerged files cannot be committed.\n" -"\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" +"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 "" -"Non è possibile creare una revisione con file non sottoposti a fusione.\n" -"\n" -"Il file %s presenta dei conflitti. Devi risolverli e preparare il file per " -"creare una nuova revisione prima di effettuare questa azione.\n" -#: lib/commit.tcl:180 -#, tcl-format +#: builtin/commit.c:60 msgid "" -"Unknown file state %s detected.\n" +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" +"If you wish to commit it anyway, use:\n" "\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Stato di file %s sconosciuto.\n" +" git commit --allow-empty\n" "\n" -"Questo programma non può creare una revisione contenente il file %s.\n" +"Otherwise, please use 'git reset'\n" +msgstr "" + +#: builtin/commit.c:253 +msgid "failed to unpack HEAD tree object" +msgstr "" + +#: builtin/commit.c:295 +msgid "unable to create temporary index" +msgstr "" + +#: builtin/commit.c:301 +msgid "interactive add failed" +msgstr "add interattivo non riuscito" + +#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 +msgid "unable to write new_index file" +msgstr "impossibile scrivere il file new_index" + +#: builtin/commit.c:386 +msgid "cannot do a partial commit during a merge." +msgstr "impossibile eseguire un commit parziale durante un merge." + +#: builtin/commit.c:388 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "impossibile eseguire un commit parziale durante un cherry-pick." + +#: builtin/commit.c:398 +msgid "cannot read the index" +msgstr "impossibile leggere index" + +#: builtin/commit.c:418 +msgid "unable to write temporary index file" +msgstr "" + +#: builtin/commit.c:493 builtin/commit.c:499 +#, c-format +msgid "invalid commit: %s" +msgstr "commit non valido: %s" + +#: builtin/commit.c:522 +msgid "malformed --author parameter" +msgstr "parametro --author malformato" + +#: builtin/commit.c:582 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "" -#: lib/commit.tcl:188 +#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 +#, c-format +msgid "could not lookup commit %s" +msgstr "non è stato possibile trovare il commit %s" + +#: builtin/commit.c:632 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(lettura del messaggio di log dallo standard input)\n" + +#: builtin/commit.c:634 +msgid "could not read log from standard input" +msgstr "non è stato possibile leggere il log dallo standard input" + +#: builtin/commit.c:638 +#, c-format +msgid "could not read log file '%s'" +msgstr "non è stato possibile leggere il file di log '%s'" + +#: builtin/commit.c:644 +msgid "commit has empty message" +msgstr "il commit ha un messaggio vuoto" + +#: builtin/commit.c:660 +msgid "could not read MERGE_MSG" +msgstr "non è stato possibile leggere MERGE_MSG" + +#: builtin/commit.c:664 +msgid "could not read SQUASH_MSG" +msgstr "non è stato possibile leggere SQUASH_MSG" + +#: builtin/commit.c:668 +#, c-format +msgid "could not read '%s'" +msgstr "non è stato possibile leggere '%s'" + +#: builtin/commit.c:720 +msgid "could not write commit template" +msgstr "non è stato possibile scrivere il modello di commit" + +#: builtin/commit.c:731 +#, c-format msgid "" -"No changes to commit.\n" "\n" -"You must stage at least 1 file before you can commit.\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 "" -"Nessuna modifica per la nuova revisione.\n" "\n" -"Devi preparare per una nuova revisione almeno 1 file prima di effettuare " -"questa operazione.\n" +"Sembra che si stia eseguendo il commit di un merge.\n" +"Se l'operazione non è corretta, per favore elimina il file\n" +"\t%s\n" +"e riprova.\n" -#: lib/commit.tcl:203 +#: builtin/commit.c:736 +#, c-format msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" "\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\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 "" -"Bisogna fornire un messaggio di revisione.\n" "\n" -"Un buon messaggio di revisione ha il seguente formato:\n" -"\n" -"- Prima linea: descrivi in una frase ciò che hai fatto.\n" -"- Seconda linea: vuota.\n" -"- Terza linea: spiega a cosa serve la tua modifica.\n" +"Sembra che si stia eseguendo il commit di un cherry-pick.\n" +"Se l'operazione non è corretta, per favore rimuovi il file\n" +"\t%s\n" +"e riprova.\n" + +#: builtin/commit.c:748 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Per favore inserisci il messaggio di commit per le modifiche. Le righe\n" +"che iniziano con '#' verranno ignorate, e un messaggio vuoto annulla il commit.\n" + +#: builtin/commit.c:753 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Per favore inserisci il messaggio di commit per le modifiche. Le\n" +"righe che iniziano con '#' verranno mantenute; possono comunque essere\n" +"rimosse manualmente. Un messaggio vuoto annulla il commit.\n" + +#: builtin/commit.c:766 +#, c-format +msgid "%sAuthor: %s" +msgstr "%sAutore: %s" + +#: builtin/commit.c:773 +#, c-format +msgid "%sCommitter: %s" +msgstr "%sCommitter: %s" + +#: builtin/commit.c:793 +msgid "Cannot read index" +msgstr "Impossibile leggere index" + +#: builtin/commit.c:830 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:845 builtin/tag.c:361 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "Per favore, specifica il messaggio usando l'opzione -m o -F.\n" + +#: builtin/commit.c:942 +#, c-format +msgid "No existing author found with '%s'" +msgstr "Nessun autore esistente trovato con '%s'" + +#: builtin/commit.c:957 builtin/commit.c:1157 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "" + +#: builtin/commit.c:997 +msgid "Using both --reset-author and --author does not make sense" +msgstr "L'uso di entrambe le opzioni --reset-author e --author non ha senso" -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." -msgstr "Avvio pre-commit hook..." +#: builtin/commit.c:1008 +msgid "You have nothing to amend." +msgstr "" + +#: builtin/commit.c:1011 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "" + +#: builtin/commit.c:1013 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "" -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "Revisione rifiutata dal pre-commit hook." +#: builtin/commit.c:1016 +msgid "Options --squash and --fixup cannot be used together" +msgstr "Le opzioni --squash e --fixup non possono essere usate insieme" -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "Avvio commit-msg hook..." +#: builtin/commit.c:1026 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "Solo una delle opzioni -c/-C/-F/--fixup può essere usata." -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "Revisione rifiutata dal commit-msg hook." +#: builtin/commit.c:1028 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "L'opzione -m non può essere combinata con -c/-C/-F/--fixup." -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "Archiviazione modifiche..." +#: builtin/commit.c:1036 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "L'opzione --reset-author può essere usata solo con -C, -c o --amend." -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "write-tree non riuscito:" +#: builtin/commit.c:1053 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" +"Può essere usata solo una delle opzioni --include/--only/--all/--" +"interactive/--patch ." -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "Impossibile creare una nuova revisione." +#: builtin/commit.c:1055 +msgid "No paths with --include/--only does not make sense." +msgstr "Devi specificare un path se usi --include/--only." -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "La revisione %s sembra essere danneggiata" +#: builtin/commit.c:1057 +msgid "Clever... amending the last one with dirty index." +msgstr "" -#: lib/commit.tcl:339 +#: builtin/commit.c:1059 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" + +#: builtin/commit.c:1069 builtin/tag.c:577 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "" + +#: builtin/commit.c:1074 +msgid "Paths with -a does not make sense." +msgstr "I path con -a non hanno senso." + +#: builtin/commit.c:1257 +msgid "couldn't look up newly created commit" +msgstr "non è stato possibile trovare il commit appena creato" + +#: builtin/commit.c:1259 +msgid "could not parse newly created commit" +msgstr "non è stato possibile analizzare il commit appena creato" + +#: builtin/commit.c:1300 +msgid "detached HEAD" +msgstr "" + +#: builtin/commit.c:1302 +msgid " (root-commit)" +msgstr " (root-commit)" + +#: builtin/commit.c:1446 +msgid "could not parse HEAD commit" +msgstr "non è stato possibile analizzare il commit HEAD" + +#: builtin/commit.c:1484 builtin/merge.c:509 +#, c-format +msgid "could not open '%s' for reading" +msgstr "non è stato possibile aprire '%s' per la lettura" + +#: builtin/commit.c:1491 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "File MERGE_HEAD corrotto (%s)" + +#: builtin/commit.c:1498 +msgid "could not read MERGE_MODE" +msgstr "non è stato possibile leggere MERGE_MODE" + +#: builtin/commit.c:1517 +#, c-format +msgid "could not read commit message: %s" +msgstr "non è stato possibile leggere il messaggio di commit: %s" + +#: builtin/commit.c:1531 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Commit interrotto; il messaggio non è stato modificato.\n" + +#: builtin/commit.c:1536 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Interruzione del commit a causa di un messaggio di commit vuoto.\n" + +#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 +msgid "failed to write commit object" +msgstr "scrittura dell'oggetto di commit non riuscita" + +#: builtin/commit.c:1572 +msgid "cannot lock HEAD ref" +msgstr "" + +#: builtin/commit.c:1576 +msgid "cannot update HEAD ref" +msgstr "" + +#: builtin/commit.c:1587 msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" +"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 "" +"Il repository è stato aggiornato, ma non è stato possibile scrivere il file\n" +"new_index. Verifica che l'unità disco non sia piena o che la quota non sia\n" +"stata superata, ed esegui \"git reset HEAD\" per il ripristino." + +#: 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 "il tag '%s' è davvero '%s' qui" + +#: builtin/describe.c:267 +#, c-format +msgid "Not a valid object name %s" +msgstr "Non è il nome di un oggetto valido %s" + +#: builtin/describe.c:270 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s non è un oggetto '%s' valido" + +#: builtin/describe.c:287 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "nessun tag corrisponde esattamente a '%s'" + +#: 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 "" +"Nessun tag può descrivere '%s'.\n" +"Prova con --always, o crea dei tag." + +#: 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:436 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long non è compatibile con --abbrev=0" + +#: 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:77 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "'%s': non è un file regolare o un link simbolico" + +#: builtin/diff.c:220 +#, c-format +msgid "invalid option: %s" +msgstr "opzione non valida: %s" + +#: builtin/diff.c:297 +msgid "Not a git repository" +msgstr "Non è un repository git" + +#: builtin/diff.c:347 +#, c-format +msgid "invalid object '%s' given." +msgstr "oggetto non valido '%s' specificato." + +#: builtin/diff.c:352 +#, c-format +msgid "more than %d trees given: '%s'" msgstr "" -"Nessuna modifica per la nuova revisione.\n" -"\n" -"Questa revisione non modifica alcun file e non effettua alcuna fusione.\n" -"\n" -"Si procederà subito ad una nuova analisi.\n" -#: lib/commit.tcl:346 -msgid "No changes to commit." -msgstr "Nessuna modifica per la nuova revisione." +#: builtin/diff.c:362 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "più di due blob specificati: '%s'" -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "commit-tree non riuscito:" +#: builtin/diff.c:370 +#, c-format +msgid "unhandled object '%s' given." +msgstr "oggetto non gestito '%s' specificato." -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "update-ref non riuscito:" +#: builtin/fetch.c:200 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:253 +#, c-format +msgid "object %s not found" +msgstr "oggetto %s non trovato" -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Creata revisione %s: %s" +#: builtin/fetch.c:259 +msgid "[up to date]" +msgstr "[aggiornato]" + +#: builtin/fetch.c:273 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "" -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Elaborazione in corso... attendere..." +#: builtin/fetch.c:274 builtin/fetch.c:360 +msgid "[rejected]" +msgstr "[respinto]" -#: lib/console.tcl:186 -msgid "Success" -msgstr "Successo" +#: builtin/fetch.c:285 +msgid "[tag update]" +msgstr "[tag aggiornata]" -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Errore: comando non riuscito" +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +msgid " (unable to update local ref)" +msgstr " (impossibile aggiornare il ref locale)" -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "Numero di oggetti slegati" +#: builtin/fetch.c:305 +msgid "[new tag]" +msgstr "[nuova tag]" -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "Spazio su disco utilizzato da oggetti slegati" +#: builtin/fetch.c:308 +msgid "[new branch]" +msgstr "[nuovo branch]" -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "Numero di oggetti impacchettati" +#: builtin/fetch.c:311 +msgid "[new ref]" +msgstr "[nuovo ref]" -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "Numero di pacchetti" +#: builtin/fetch.c:356 +msgid "unable to update local ref" +msgstr "impossibile aggiornare il ref locale" -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "Spazio su disco utilizzato da oggetti impacchettati" +#: builtin/fetch.c:356 +msgid "forced update" +msgstr "aggiornamento forzato" -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "Oggetti impacchettati che attendono la potatura" +#: builtin/fetch.c:362 +msgid "(non-fast-forward)" +msgstr "" -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "File inutili" +#: builtin/fetch.c:393 builtin/fetch.c:685 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "impossibile aprire %s: %s\n" -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Compressione dell'archivio in corso" +#: builtin/fetch.c:402 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s non ha inviato tutti gli oggetti necessari\n" -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Verifica dell'archivio con fsck-objects in corso" +#: builtin/fetch.c:488 +#, c-format +msgid "From %.*s\n" +msgstr "Da %.*s\n" -#: lib/database.tcl:107 -#, tcl-format +#: builtin/fetch.c:499 +#, c-format msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -"Questo archivio attualmente ha circa %i oggetti slegati.\n" -"\n" -"Per mantenere buone prestazioni si raccomanda di comprimere l'archivio.\n" -"\n" -"Comprimere l'archivio ora?" +"non è stato possibile aggiornare alcuni ref locali; prova con\n" +" 'git remote prune %s' per rimuovere ogni branch che vada in conflitto" + +#: builtin/fetch.c:549 +#, c-format +msgid " (%s will become dangling)" +msgstr "" + +#: builtin/fetch.c:550 +#, c-format +msgid " (%s has become dangling)" +msgstr "" + +#: builtin/fetch.c:557 +msgid "[deleted]" +msgstr "[eliminato]" -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Git ha restituito una data non valida: %s" +#: builtin/fetch.c:558 builtin/remote.c:1055 +msgid "(none)" +msgstr "(nessuno)" + +#: builtin/fetch.c:675 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" -#: lib/diff.tcl:64 -#, tcl-format +#: builtin/fetch.c:709 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:786 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:789 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "L'opzione \"%s\" è ignorata per %s\n" + +#: builtin/fetch.c:888 +#, c-format +msgid "Fetching %s\n" +msgstr "" + +#: builtin/fetch.c:890 builtin/remote.c:100 +#, c-format +msgid "Could not fetch %s" +msgstr "" + +#: builtin/fetch.c:907 msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." msgstr "" -"Non sono state trovate differenze.\n" -"\n" -"%s non ha modifiche.\n" -"\n" -"La data di modifica di questo file è stata cambiata da un'altra " -"applicazione, ma il contenuto del file è rimasto invariato.\n" -"\n" -"Si procederà automaticamente ad una nuova analisi per trovare altri file che " -"potrebbero avere lo stesso stato." +"Nessun repository remoto specificato. Per favore, specifica un URL o\n" +"il nome di un remote da cui prelevare nuove revisioni." -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Caricamento delle differenze di %s..." +#: builtin/fetch.c:927 +msgid "You need to specify a tag name." +msgstr "Devi specificare il nome di un tag." -#: lib/diff.tcl:125 +#: builtin/fetch.c:979 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all non richiede il repository come argomento" + +#: builtin/fetch.c:981 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:992 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:1000 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "%s non valido: '%s'" + +#: builtin/gc.c:90 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "" + +#: builtin/gc.c:221 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:224 +#, c-format msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" +"Auto packing the repository for optimum performance. You may also\n" +"run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" -"LOCALE: cancellato\n" -"REMOTO:\n" -#: lib/diff.tcl:130 +#: builtin/gc.c:251 msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" +"There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -"REMOTO: cancellato\n" -"LOCALE:\n" -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "LOCALE:\n" +#: builtin/grep.c:216 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: creazione del thread non riuscita: %s" -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "REMOTO:\n" +#: builtin/grep.c:402 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:478 builtin/grep.c:512 +#, c-format +msgid "unable to read tree (%s)" +msgstr "impossibile leggere il tree (%s)" + +#: builtin/grep.c:526 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" -msgstr "Impossibile visualizzare %s" +#: builtin/grep.c:584 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "switch '%c' richiede un valore numerico" -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "Errore nel caricamento del file:" +#: builtin/grep.c:601 +#, c-format +msgid "cannot open '%s'" +msgstr "impossibile aprire '%s'" -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Archivio Git (sottoprogetto)" +#: builtin/grep.c:885 +msgid "no pattern given." +msgstr "nessun modello specificato." -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* File binario (il contenuto non sarà mostrato)." +#: builtin/grep.c:899 +#, c-format +msgid "bad object %s" +msgstr "oggetto %s errato" -#: lib/diff.tcl:227 -#, tcl-format +#: builtin/grep.c:940 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:963 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached o --untracked non può essere usato con --no-index." + +#: builtin/grep.c:968 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "--no-index o --untracked non possono essere usate con le revisioni." + +#: builtin/grep.c:971 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "" + +#: builtin/grep.c:979 +msgid "both --cached and trees are given." +msgstr "" + +#: builtin/help.c:59 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "formato di aiuto '%s' non riconosciuto" + +#: builtin/help.c:87 +msgid "Failed to start emacsclient." +msgstr "Esecuzione di emacsclient non riuscita." + +#: builtin/help.c:100 +msgid "Failed to parse emacsclient version." +msgstr "Verifica della versione di emacsclient non riuscita." + +#: builtin/help.c:108 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "la versione '%d' di emacsclient è troppo vecchia (<22)." + +#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "esecuzione di '%s' non riuscita: %s" + +#: builtin/help.c:211 +#, c-format msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." msgstr "" -"* Il file non tracciato è di %d byte.\n" -"* Saranno visualizzati solo i primi %d byte.\n" +"'%s': path ad un visualizzatore man pages non supportato.\n" +"Usa invece 'man.<tool>.cmd'." -#: lib/diff.tcl:233 -#, tcl-format +#: builtin/help.c:223 +#, c-format msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." msgstr "" -"\n" -"* %s non visualizza completamente questo file non tracciato.\n" -"* Per visualizzare il file completo, usare un programma esterno.\n" +"'%s': comando per visualizzatore man pages supportato.\n" +"Per favore usa 'man.<tool>.path' invece." + +#: builtin/help.c:287 +msgid "The most commonly used git commands are:" +msgstr "I comandi git usati più di frequente sono:" + +#: builtin/help.c:355 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "'%s': visualizzatore man sconosciuto." + +#: builtin/help.c:372 +msgid "no man viewer handled the request" +msgstr "nessun visualizzatore man ha gestito la richiesta" + +#: builtin/help.c:380 +msgid "no info viewer handled the request" +msgstr "nessun visualizzatore info ha gestito la richiesta" + +#: builtin/help.c:391 +#, c-format +msgid "'%s': not a documentation directory." +msgstr "'%s': non è una directory della documentazione." + +#: builtin/help.c:432 builtin/help.c:439 +#, c-format +msgid "usage: %s%s" +msgstr "uso: %s%s" + +#: builtin/help.c:453 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "'git %s è un alias di '%s'" + +#: builtin/index-pack.c:169 +#, c-format +msgid "object type mismatch at %s" +msgstr "" + +#: builtin/index-pack.c:189 +msgid "object of unexpected type" +msgstr "" + +#: builtin/index-pack.c:226 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:236 +msgid "early EOF" +msgstr "EOF prematuro" + +#: builtin/index-pack.c:237 +msgid "read error on input" +msgstr "errore di lettura in input" + +#: builtin/index-pack.c:249 +msgid "used more bytes than were available" +msgstr "usati più byte di quelli disponibili" + +#: builtin/index-pack.c:256 +msgid "pack too large for current definition of off_t" +msgstr "pack troppo largo per la definizione corrente di off_t" + +#: builtin/index-pack.c:272 +#, c-format +msgid "unable to create '%s'" +msgstr "impossibile creare '%s'" + +#: builtin/index-pack.c:277 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "impossibile aprire il file pack '%s'" + +#: builtin/index-pack.c:291 +msgid "pack signature mismatch" +msgstr "la firma del pack non coincide" + +#: builtin/index-pack.c:311 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "" + +#: builtin/index-pack.c:405 +#, c-format +msgid "inflate returned %d" +msgstr "" + +#: builtin/index-pack.c:450 +msgid "offset value overflow for delta base object" +msgstr "" + +#: builtin/index-pack.c:458 +msgid "delta base offset is out of bound" +msgstr "" + +#: builtin/index-pack.c:466 +#, c-format +msgid "unknown object type %d" +msgstr "tipo di oggetto %d sconosciuto" + +#: builtin/index-pack.c:495 +msgid "cannot pread pack file" +msgstr "" + +#: builtin/index-pack.c:497 +#, 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] "" -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." -msgstr "Impossibile rimuovere la sezione scelta dalla nuova revisione." +#: builtin/index-pack.c:510 +msgid "serious inflate inconsistency" +msgstr "" + +#: builtin/index-pack.c:583 +#, c-format +msgid "cannot read existing object %s" +msgstr "non è possibile leggere l'oggetto %s esistente" + +#: builtin/index-pack.c:586 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "TROVATA COLLISIONE SHA1 CON %s !" + +#: builtin/index-pack.c:598 +#, c-format +msgid "invalid blob object %s" +msgstr "oggetto blob %s non valido" + +#: builtin/index-pack.c:610 +#, c-format +msgid "invalid %s" +msgstr "%s non valido" + +#: builtin/index-pack.c:612 +msgid "Error in object" +msgstr "Errore nell'oggetto" + +#: builtin/index-pack.c:614 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "Non tutti gli oggetti figlio di %s sono raggiungibili" + +#: builtin/index-pack.c:687 builtin/index-pack.c:713 +msgid "failed to apply delta" +msgstr "applicazione del delta non riuscita" + +#: builtin/index-pack.c:850 +msgid "Receiving objects" +msgstr "Ricezione degli oggetti" + +#: builtin/index-pack.c:850 +msgid "Indexing objects" +msgstr "Indicizzazione degli oggetti" + +#: builtin/index-pack.c:872 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "il pack è corrotto (SHA1 non corrisponde)" + +#: builtin/index-pack.c:877 +msgid "cannot fstat packfile" +msgstr "" -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "Impossibile preparare la sezione scelta per una nuova revisione." +#: builtin/index-pack.c:880 +msgid "pack has junk at the end" +msgstr "" -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "Impossibile rimuovere la riga scelta dalla nuova revisione." +#: builtin/index-pack.c:903 +msgid "Resolving deltas" +msgstr "Risoluzione dei delta" -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "Impossibile preparare la riga scelta per una nuova revisione." +#: builtin/index-pack.c:954 +msgid "confusion beyond insanity" +msgstr "confusione al di là della follia" -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Predefinito" +#: builtin/index-pack.c:973 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "pack ha %d delta irrisolto" +msgstr[1] "pack ha %d delta irrisolti" -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Codifica di sistema (%s)" +#: builtin/index-pack.c:998 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "" -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Altro" +#: builtin/index-pack.c:1077 +#, c-format +msgid "local object %s is corrupt" +msgstr "l'oggetto locale %s è corrotto" -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "errore" +#: builtin/index-pack.c:1101 +msgid "error while closing pack file" +msgstr "errore nella chiusura del file pack" -#: lib/error.tcl:36 -msgid "warning" -msgstr "attenzione" +#: builtin/index-pack.c:1114 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "impossibile scrivere il file keep '%s'" -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." +#: builtin/index-pack.c:1122 +#, c-format +msgid "cannot close written keep file '%s'" msgstr "" -"Bisogna correggere gli errori suddetti prima di creare una nuova revisione." -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Impossibile sbloccare l'accesso all'indice" +#: builtin/index-pack.c:1135 +msgid "cannot store pack file" +msgstr "impossibile archiviare il file pack" + +#: builtin/index-pack.c:1146 +msgid "cannot store index file" +msgstr "impossibile archiviare index file" -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Errore nell'indice" +#: builtin/index-pack.c:1247 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Impossibile aprire il file pack '%s' esistente" + +#: builtin/index-pack.c:1249 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "" + +#: builtin/index-pack.c:1296 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "non delta: %d oggetto" +msgstr[1] "non delta: %d oggetti" + +#: builtin/index-pack.c:1303 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "lunghezza della catena = %d: %lu oggetto" +msgstr[1] "lunghezza della catena = %d: %lu oggetti" + +#: builtin/index-pack.c:1330 +msgid "Cannot come back to cwd" +msgstr "" + +#: builtin/index-pack.c:1374 builtin/index-pack.c:1377 +#: builtin/index-pack.c:1389 builtin/index-pack.c:1393 +#, c-format +msgid "bad %s" +msgstr "%s errato" + +#: builtin/index-pack.c:1407 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin non può essere usato senza --stdin" + +#: builtin/index-pack.c:1411 builtin/index-pack.c:1421 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "il nome del file pack '%s' non termina con '.pack'" + +#: builtin/index-pack.c:1430 +msgid "--verify with no packfile name given" +msgstr "--verify senza un nome del file pack specificato" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Non è stato possible rendere %s scrivibile dal gruppo" + +#: 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 "impossibile eseguire lo stat di '%s'" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "" -#: lib/index.tcl:17 +#: 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:322 builtin/init-db.c:325 +#, c-format +msgid "%s already exists" +msgstr "%s esiste già" + +#: builtin/init-db.c:354 +#, c-format +msgid "unable to handle file type %d" +msgstr "impossibile gestire il tipo di file %d" + +#: builtin/init-db.c:357 +#, c-format +msgid "unable to move %s to %s" +msgstr "impossibile spostare %s in %s" + +#: builtin/init-db.c:362 +#, c-format +msgid "Could not create git link %s" +msgstr "Non è stato possibile creare il link git %s" + +#. +#. * 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:419 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s repository Git in %s%s\n" + +#: builtin/init-db.c:420 +msgid "Reinitialized existing" +msgstr "Reinizializzato un esistente" + +#: builtin/init-db.c:420 +msgid "Initialized empty" +msgstr "Inizializzato un" + +#: builtin/init-db.c:421 +msgid " shared" +msgstr " condiviso" + +#: builtin/init-db.c:440 +msgid "cannot tell cwd" +msgstr "" + +#: builtin/init-db.c:521 builtin/init-db.c:528 +#, c-format +msgid "cannot mkdir %s" +msgstr "" + +#: builtin/init-db.c:532 +#, c-format +msgid "cannot chdir to %s" +msgstr "" + +#: builtin/init-db.c:554 +#, c-format msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" msgstr "" -"Impossibile aggiornare l'indice. Ora sarà avviata una nuova analisi che " -"aggiornerà git-gui." +"%s (o --work-tree=<directory>) non consentito senza specificare %s (o --git-" +"dir=<directory>)" + +#: builtin/init-db.c:578 +msgid "Cannot access current working directory" +msgstr "Impossibile accedere alla directory di lavoro corrente" + +#: builtin/init-db.c:585 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "" + +#: builtin/log.c:188 +#, c-format +msgid "Final output: %d %s\n" +msgstr "Output finale: %d %s\n" + +#: builtin/log.c:401 builtin/log.c:489 +#, c-format +msgid "Could not read object %s" +msgstr "Non è stato possibile leggere l'oggetto %s" -#: lib/index.tcl:28 -msgid "Continue" -msgstr "Continua" +#: builtin/log.c:513 +#, c-format +msgid "Unknown type: %d" +msgstr "Tipo sconosciuto: %d" -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Sblocca l'accesso all'indice" +#: builtin/log.c:602 +msgid "format.headers without value" +msgstr "format.headers non ha alcun valore" -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "%s non farà parte della prossima revisione" +#: builtin/log.c:676 +msgid "name of output directory is too long" +msgstr "il nome della directory di output è troppo lungo" -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "Pronto per creare una nuova revisione." +#: builtin/log.c:687 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Impossibile aprire il file patch %s" -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "Aggiunta di %s in corso" +#: builtin/log.c:701 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:709 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:786 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:859 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "" + +#: builtin/log.c:932 +msgid "Two output directories?" +msgstr "Due directory di output?" -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Annullare le modifiche nel file %s?" +#: builtin/log.c:1153 +#, c-format +msgid "bogus committer info %s" +msgstr "" -#: lib/index.tcl:400 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Annullare le modifiche in questi %i file?" +#: builtin/log.c:1198 +msgid "-n and -k are mutually exclusive." +msgstr "" -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." +#: builtin/log.c:1200 +msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -"Tutte le modifiche non preparate per una nuova revisione saranno perse per " -"sempre." -#: lib/index.tcl:411 -msgid "Do Nothing" -msgstr "Non fare niente" +#: builtin/log.c:1208 +msgid "--name-only does not make sense" +msgstr "--name-only non ha senso" + +#: builtin/log.c:1210 +msgid "--name-status does not make sense" +msgstr "--name-status non ha senso" + +#: builtin/log.c:1212 +msgid "--check does not make sense" +msgstr "--check non ha senso" -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "Annullo le modifiche nei file selezionati" +#: builtin/log.c:1235 +msgid "standard output, or directory, which one?" +msgstr "standard output, o directory, quale dei due?" -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "Annullo le modifiche in %s" +#: builtin/log.c:1237 +#, c-format +msgid "Could not create directory '%s'" +msgstr "Non è stato possibile creare la directory '%s'" -#: lib/merge.tcl:13 +#: builtin/log.c:1390 +msgid "Failed to create output files" +msgstr "Creazione dei file di output non riuscita" + +#: builtin/log.c:1494 +#, c-format msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -"Non posso effettuare fusioni durante una correzione.\n" -"\n" -"Bisogna finire di correggere questa revisione prima di iniziare una " -"qualunque fusione.\n" -#: lib/merge.tcl:27 +#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524 +#, c-format +msgid "Unknown commit %s" +msgstr "Commit %s sconosciuto" + +#: builtin/merge.c:90 +msgid "switch `m' requires a value" +msgstr "lo switch 'm' richiede un valore" + +#: builtin/merge.c:127 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n" + +#: builtin/merge.c:128 +#, c-format +msgid "Available strategies are:" +msgstr "Le strategie disponibili sono:" + +#: builtin/merge.c:133 +#, c-format +msgid "Available custom strategies are:" +msgstr "Le strategie personalizzate disponibili sono:" + +#: builtin/merge.c:240 +msgid "could not run stash." +msgstr "non è stato possibile eseguire stash." + +#: builtin/merge.c:245 +msgid "stash failed" +msgstr "esecuzione di stash non riuscita" + +#: builtin/merge.c:250 +#, c-format +msgid "not a valid object: %s" +msgstr "non è un oggetto valido: %s" + +#: builtin/merge.c:269 builtin/merge.c:286 +msgid "read-tree failed" +msgstr "read-tree non riuscito" + +#: 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 "Scrittura di SQUASH_MSG" + +#: builtin/merge.c:363 +msgid "Finishing SQUASH_MSG" +msgstr "Completamento di SQUASH_MSG" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n" + +#: builtin/merge.c:437 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "'%s' non punta ad un commit" + +#: builtin/merge.c:536 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Stringa branch.%s.mergeoptions errata: %s" + +#: builtin/merge.c:629 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:679 +msgid "failed to read the cache" +msgstr "lettura della cache non riuscita" + +#: builtin/merge.c:697 +msgid "Unable to write index." +msgstr "Impossibile scrivere index." + +#: builtin/merge.c:710 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:724 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "Opzione per merge-recursive sconosciuta: -X%s" + +#: builtin/merge.c:738 +#, c-format +msgid "unable to write %s" +msgstr "non è possibile scrivere %s" + +#: builtin/merge.c:877 +#, c-format +msgid "Could not read from '%s'" +msgstr "Non è stato possibile leggere da '%s'" + +#: builtin/merge.c:886 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" + +#: builtin/merge.c:892 msgid "" -"Last scanned state does not match repository state.\n" +"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" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" +"Lines starting with '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" + +#: builtin/merge.c:916 +msgid "Empty commit message." +msgstr "Messaggio di commit vuoto." + +#: builtin/merge.c:928 +#, c-format +msgid "Wonderful.\n" +msgstr "Splendido.\n" + +#: builtin/merge.c:993 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" +"Merge automatico fallito; risolvi i conflitti ed eseguire il commit\n" +"del risultato.\n" + +#: builtin/merge.c:1009 +#, c-format +msgid "'%s' is not a commit" +msgstr "'%s' non è un commit" + +#: builtin/merge.c:1050 +msgid "No current branch." +msgstr "Nessun branch corrente." + +#: builtin/merge.c:1052 +msgid "No remote for the current branch." +msgstr "Nessun remote per il branch corrente." + +#: builtin/merge.c:1054 +msgid "No default upstream defined for the current branch." +msgstr "Nessun upstream di default definito per il branch corrente." + +#: builtin/merge.c:1059 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1146 builtin/merge.c:1303 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - non è qualcosa per cui possiamo eseguire il merge" + +#: builtin/merge.c:1214 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "Non c'è nessun merge da interrompere (manca MERGE_HEAD)" + +#: builtin/merge.c:1230 git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Il merge non è stato concluso (esiste MERGE_HEAD).\n" +"Per favore, esegui il commit delle modifiche prima del merge." + +#: builtin/merge.c:1233 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Il merge non è stato concluso (esiste MERGE_HEAD)." + +#: builtin/merge.c:1237 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Il cherry-pick non è stato concluso (esiste CHERRY_PICK_HEAD).\n" +"Per favore, esegui il commit delle modifiche prima del merge." + +#: builtin/merge.c:1240 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "Il tuo cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)." + +#: builtin/merge.c:1249 +msgid "You cannot combine --squash with --no-ff." +msgstr "Impossibile combinare --squash con --no-off." + +#: builtin/merge.c:1254 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "Impossibile combinare --no-ff con --ff-only." + +#: builtin/merge.c:1261 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "Nessun commit specificato e merge.defaultToUpstream non definito." + +#: builtin/merge.c:1293 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1296 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:1298 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:1413 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Aggiornamento di %s..%s\n" + +#: builtin/merge.c:1451 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1458 +#, c-format +msgid "Nope.\n" +msgstr "No.\n" + +#: builtin/merge.c:1490 +msgid "Not possible to fast-forward, aborting." +msgstr "Fast-forward non possibile, stop." + +#: builtin/merge.c:1513 builtin/merge.c:1592 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1517 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Tentativo con la strategia di merge %s...\n" + +#: builtin/merge.c:1583 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Nessuna strategia di merge ha gestito il merge.\n" + +#: builtin/merge.c:1585 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Merge con la strategia %s fallito.\n" + +#: builtin/merge.c:1594 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1606 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" +"Il merge automatico è andato a buon fine; fermato prima del commit come " +"richiesto\n" + +#: 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 "non è possibile spostare la directory in sé stessa" + +#: builtin/mv.c:118 +msgid "cannot move directory over file" +msgstr "non è possibile spostare la directory su un file" + +#: builtin/mv.c:128 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "Eh? %.*s si trova in index?" + +#: builtin/mv.c:140 +msgid "source directory is empty" +msgstr "la directory sorgente è vuota" + +#: builtin/mv.c:171 +msgid "not under version control" +msgstr "non è sotto controllo di versione" + +#: builtin/mv.c:173 +msgid "destination exists" +msgstr "la destinazione esiste" + +#: builtin/mv.c:181 +#, c-format +msgid "overwriting '%s'" +msgstr "sovrascrittura di %s in corso" + +#: builtin/mv.c:184 +msgid "Cannot overwrite" +msgstr "Impossibile sovrascrivere" + +#: builtin/mv.c:187 +msgid "multiple sources for the same target" +msgstr "fonti multiple per la stessa destinazione" + +#: builtin/mv.c:202 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, sorgente=%s, destinazione=%s" + +#: builtin/mv.c:212 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Rinominazione di %s in %s in corso\n" + +#: builtin/mv.c:215 builtin/remote.c:731 +#, c-format +msgid "renaming '%s' failed" +msgstr "rinomina di '%s' non riuscita" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "impossibile avviare 'show' per l'oggetto '%s'" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:155 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:175 builtin/tag.c:347 +#, c-format +msgid "could not create file '%s'" +msgstr "non è stato possibile creare il file '%s'" + +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "Per favore specifica il contenuto delle note usando le opzioni -m o -F" + +#: builtin/notes.c:210 builtin/notes.c:973 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Rimozione della nota per l'oggetto %s\n" + +#: builtin/notes.c:215 +msgid "unable to write note object" +msgstr "impossibile scrivere l'oggetto nota" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "Il contenuto della nota è stato lasciato in %s" + +#: builtin/notes.c:251 builtin/tag.c:542 +#, c-format +msgid "cannot read '%s'" +msgstr "impossibile leggere '%s'" + +#: builtin/notes.c:253 builtin/tag.c:545 +#, c-format +msgid "could not open or read '%s'" +msgstr "non è stato possibile aprire o leggere '%s'" + +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "Lettura dell'oggetto '%s' non riuscita." + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Valore di notes.rewriteMode errato: '%s'" + +#: builtin/notes.c:350 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "Impossibile riscrivere le note in %s (al di fuori di refs/notes/)" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:377 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Valore di %s errato: '%s'" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Riga di input malformata: '%s'." + +#: builtin/notes.c:456 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Copia delle note da '%s' a '%s' non riuscita" + +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 +#: builtin/notes.c:1033 +msgid "too many parameters" +msgstr "troppi parametri" + +#: builtin/notes.c:513 builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "Nessuna nota trovata per l'oggetto %s." + +#: builtin/notes.c:580 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:585 builtin/notes.c:662 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "Sovrascrittura delle note esistenti per l'oggetto %s\n" + +#: builtin/notes.c:635 +msgid "too few parameters" +msgstr "troppi pochi parametri" + +#: builtin/notes.c:656 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Impossibile copiare le note. Trovate note esistenti per l'oggetto %s. Usa " +"'-f' per sovrascrivere le note esistenti" + +#: builtin/notes.c:668 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "Note mancanti per l'oggetto sorgente %s. Impossibile copiare." + +#: builtin/notes.c:717 +#, 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 "" +"Le opzioni -m/-F/-c/-C per il sottocomando 'edit' sono deprecate.\n" +"Per favore usa 'git notes add -f -m/-F/-c/-C' invece.\n" + +#: builtin/notes.c:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "L'oggetto %s non ha note.\n" + +#: builtin/notes.c:1103 builtin/remote.c:1598 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sottocomando sconosciuto: %s" + +#: builtin/pack-objects.c:2337 +#, c-format +msgid "unsupported index version %s" +msgstr "versione %s di index non supportata" + +#: builtin/pack-objects.c:2341 +#, c-format +msgid "bad index version '%s'" +msgstr "versione '%s' di index errata" + +#: builtin/pack-objects.c:2364 +#, c-format +msgid "option %s does not accept negative form" +msgstr "l'opzione %s non accetta forme negative" + +#: builtin/pack-objects.c:2368 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "impossibile analizzare il valore '%s' per l'opzione %s" + +#: builtin/push.c:45 +msgid "tag shorthand without <tag>" +msgstr "" + +#: builtin/push.c:64 +msgid "--delete only accepts plain target ref names" +msgstr "--delete accetta solo nomi dei ref di destinazione in chiaro" + +#: builtin/push.c:99 +msgid "" "\n" -"The rescan will be automatically started now.\n" +"To choose either option permanently, see push.default in 'git help config'." msgstr "" -"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n" + +#: 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" -"Un altro programma Git ha modificato questo archivio dall'ultima analisi." -"Bisogna effettuare una nuova analisi prima di poter effettuare una fusione.\n" +"To push to the branch of the same name on the remote, use\n" "\n" -"La nuova analisi comincerà ora.\n" +" git push %s %s\n" +"%s" +msgstr "" -#: lib/merge.tcl:45 -#, tcl-format +#: builtin/push.c:121 +#, c-format msgid "" -"You are in the middle of a conflicted merge.\n" +"You are not currently on a branch.\n" +"To push the history leading to the current (detached HEAD)\n" +"state now, use\n" "\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" +" git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -"Sei nel mezzo di una fusione con conflitti.\n" + +#: 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" -"Il file %s ha dei conflitti.\n" +" git push --set-upstream %s %s\n" +msgstr "" +"Il branch corrente %s non ha alcun branch upstream.\n" +"Per eseguire il push del branch corrente ed impostare remote come upstream, usa\n" "\n" -"Bisogna risolvere i conflitti, preparare il file per una nuova revisione ed " -"infine crearla per completare la fusione attuale. Solo a questo punto potrai " -"iniziare un'altra fusione.\n" +" git push --set-upstream %s %s\n" + +#: builtin/push.c:136 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "Il branch corrente %s ha branch multipli in upstream; push non eseguito." + +#: 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:174 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Non è stato specificato alcun refspec per il push, e push.default è \"nothing\"." + +#: builtin/push.c:181 +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:187 +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\n" +"variable to 'current' or 'upstream' to push only the current branch." +msgstr "" + +#: builtin/push.c:193 +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:233 +#, c-format +msgid "Pushing to %s\n" +msgstr "" + +#: builtin/push.c:237 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:269 +#, c-format +msgid "bad repository '%s'" +msgstr "repository '%s' errato" -#: lib/merge.tcl:55 -#, tcl-format +#: builtin/push.c:270 msgid "" -"You are in the middle of a change.\n" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" "\n" -"File %s is modified.\n" +" git remote add <name> <url>\n" "\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" msgstr "" -"Sei nel mezzo di una modifica.\n" +"Nessuna destinazione per il push configurata.\n" +"Specifica un URL dalla riga di comando oppure configurare un repository " +"remoto usando\n" +"\n" +" git remote add <nome> <url>\n" "\n" -"Il file %s è stato modificato.\n" +"e poi eseguire il push usando il nome del remote\n" "\n" -"Bisogna completare la creazione della revisione attuale prima di iniziare " -"una fusione. In questo modo sarà più facile interrompere una fusione non " -"riuscita, nel caso ce ne fosse bisogno.\n" +" git push <nome>\n" + +#: builtin/push.c:285 +msgid "--all and --tags are incompatible" +msgstr "--all e --tags non sono compatibili" + +#: builtin/push.c:286 +msgid "--all can't be combined with refspecs" +msgstr "" -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s di %s" +#: builtin/push.c:291 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror e --tags non sono compatibili" -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Fusione di %s e %s in corso..." +#: builtin/push.c:292 +msgid "--mirror can't be combined with refspecs" +msgstr "" -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "Fusione completata con successo." +#: builtin/push.c:297 +msgid "--all and --mirror are incompatible" +msgstr "--all e --mirror non sono compatibili" -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "Fusione non riuscita. Bisogna risolvere i conflitti." +#: builtin/push.c:385 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete non è compatibile con --all, --mirror e --tags" -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "Fusione in %s" +#: builtin/push.c:387 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete non ha senso senza alcun ref" -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Revisione da fondere" +#: builtin/remote.c:98 +#, c-format +msgid "Updating %s" +msgstr "Aggiornamento di %s" -#: lib/merge.tcl:212 +#: builtin/remote.c:130 msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" msgstr "" -"Interruzione impossibile durante una correzione.\n" -"\n" -"Bisogna finire di correggere questa revisione.\n" +"--mirror è pericoloso e deprecato; per favore\n" +"\t usa invece --mirror-fetch o --mirror-push" + +#: builtin/remote.c:147 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "argomento di mirror sconosciuto: %s" + +#: builtin/remote.c:185 +msgid "specifying a master branch makes no sense with --mirror" +msgstr "specificare un branch master con --mirror non ha senso" + +#: 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 "il remoto %s esiste già." + +#: builtin/remote.c:199 builtin/remote.c:650 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' non è un nome di remoto valido" + +#: builtin/remote.c:243 +#, c-format +msgid "Could not setup master '%s'" +msgstr "Non è stato possibile configurare il master '%s'" + +#: builtin/remote.c:299 +#, c-format +msgid "more than one %s" +msgstr "più di un %s" + +#: 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 "(corrispondente)" -#: lib/merge.tcl:222 +#: builtin/remote.c:452 +msgid "(delete)" +msgstr "(elimina)" + +#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "Non è stato possibile aggiungere '%s' a '%s'" + +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#, c-format +msgid "No such remote: %s" +msgstr "Remote non esistente: %s" + +#: builtin/remote.c:656 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "Non è stato possibile rinominare la sezione di configurazione da '%s' in '%s'" + +#: builtin/remote.c:662 builtin/remote.c:799 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Non è stato possibile rimuovere la sezione di configurazione '%s'" + +#: builtin/remote.c:677 +#, c-format msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" +"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 "Non è stato possibile impostare '%s'" + +#: builtin/remote.c:716 +#, c-format +msgid "deleting '%s' failed" +msgstr "eliminazione di '%s' non riuscita" + +#: builtin/remote.c:750 +#, c-format +msgid "creating '%s' failed" +msgstr "creazione di '%s' non riuscita" + +#: builtin/remote.c:764 +#, c-format +msgid "Could not remove branch %s" +msgstr "Non è stato possibile rimuovere il branch %s" + +#: 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] "" +"Nota: un branch al di fuori della gerarchia refs/remotes/ non è stato " +"eliminato;\n" +"per eliminarlo, usare:" +msgstr[1] "" +"Nota: alcuni branch al di fuori della gerarchia refs/remotes/ non sono stati " +"eliminati;\n" +"per eliminarli, usare:" + +#: 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 " vecchio (usare 'git remote prune' per rimuoverlo)" + +#: builtin/remote.c:950 +msgid " ???" +msgstr "???" + +#: builtin/remote.c:991 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "" +"branch.%s.merge non valido; impossibile eseguire il rebase su > 1 branch" + +#: builtin/remote.c:998 +#, c-format +msgid "rebases onto remote %s" +msgstr "" + +#: builtin/remote.c:1001 +#, c-format +msgid " merges with remote %s" +msgstr " merge con il remote %s" + +#: builtin/remote.c:1002 +msgid " and with remote" +msgstr " e con il remote" + +#: builtin/remote.c:1004 +#, c-format +msgid "merges with remote %s" +msgstr "merge con il remote %s" + +#: builtin/remote.c:1005 +msgid " and with remote" +msgstr "" + +#: builtin/remote.c:1051 +msgid "create" +msgstr "crea" + +#: builtin/remote.c:1054 +msgid "delete" +msgstr "elimina" + +#: builtin/remote.c:1058 +msgid "up to date" +msgstr "aggiornato" + +#: builtin/remote.c:1061 +msgid "fast-forwardable" +msgstr "" + +#: builtin/remote.c:1064 +msgid "local out of date" +msgstr "locale non aggiornato" + +#: 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 " %-*s esegue il push su %s" + +#: builtin/remote.c:1118 +#, c-format +msgid "* remote %s" +msgstr "* remote %s" + +#: builtin/remote.c:1119 +#, c-format +msgid " Fetch URL: %s" +msgstr "" + +#: builtin/remote.c:1120 builtin/remote.c:1285 +msgid "(no URL)" +msgstr "(nessun URL)" + +#: 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 " branch HEAD: %s" + +#: builtin/remote.c:1139 +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr "" +" branch HEAD (l'HEAD remoto è ambiguo, potrebbe essere uno dei seguenti):\n" + +#: builtin/remote.c:1151 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " Branch remoto:%s" +msgstr[1] " Branch remoti:%s" + +#: 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] " Branch locale configurato per 'git pull':" +msgstr[1] " Branch locali configurati per 'git pull':" + +#: 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] " Ref locale configurato per 'git push'%s:" +msgstr[1] " Ref locali configurati per 'git push'%s:" + +#: builtin/remote.c:1216 +msgid "Cannot determine remote HEAD" +msgstr "Impossibile determinare l'HEAD remoto" + +#: 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 "Non è stato possibile eliminare %s" + +#: builtin/remote.c:1236 +#, c-format +msgid "Not a valid ref: %s" +msgstr "Non è un ref valido: %s" + +#: builtin/remote.c:1238 +#, c-format +msgid "Could not setup %s" +msgstr "Non è stato possibile configurare %s" + +#: 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 "URL: %s" + +#: builtin/remote.c:1295 +#, c-format +msgid " * [would prune] %s" +msgstr "" + +#: builtin/remote.c:1298 +#, c-format +msgid " * [pruned] %s" +msgstr "" + +#: builtin/remote.c:1387 builtin/remote.c:1461 +#, c-format +msgid "No such remote '%s'" +msgstr "Remote '%s' non esistente" + +#: builtin/remote.c:1414 +msgid "no remote specified" +msgstr "nessun remote specificato" + +#: builtin/remote.c:1447 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete non ha senso" + +#: 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 "Nessuna URL trovata: %s" + +#: builtin/remote.c:1497 +msgid "Will not delete all non-push URLs" +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:77 +msgid "You do not have a valid HEAD." +msgstr "" + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "" + +#: builtin/reset.c:85 +#, c-format +msgid "Failed to find tree of %s." +msgstr "" + +#: builtin/reset.c:96 +msgid "Could not write new index file." +msgstr "Non è stato possibile scrivere il nuovo index file." + +#: builtin/reset.c:106 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ora si trova a %s" + +#: builtin/reset.c:130 +msgid "Could not read index" +msgstr "Non è stato possibile leggere index" + +#: builtin/reset.c:133 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:223 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "Impossibile eseguire un %s reset nel corso di un merge." + +#: builtin/reset.c:297 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Non è stato possibile analizzare l'oggetto '%s'." + +#: builtin/reset.c:302 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch non è compatibile con --{hard,mixed,soft}" + +#: builtin/reset.c:311 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "--mixed con i path è deprecata; usa invece 'git reset -- <path>'." + +#: builtin/reset.c:313 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "" + +#: builtin/reset.c:325 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "%s reset non è consentito in un repository spoglio" + +#: builtin/reset.c:341 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "" +"Non è stato possibile ripristinare index file " +"alla revisione '%s'." + +#: builtin/revert.c:70 builtin/revert.c:92 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s non può essere usata con %s" + +#: builtin/revert.c:131 +msgid "program error" +msgstr "errore del programma" + +#: builtin/revert.c:221 +msgid "revert failed" +msgstr "revert non riuscito" + +#: builtin/revert.c:236 +msgid "cherry-pick failed" +msgstr "cherry-pick non riuscito" + +#: builtin/rm.c:109 +#, 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:115 +#, 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:119 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"'%s' contiene delle modifiche locali\n" +"(usa --cached per mantenere il file, o -f per forzare la rimozione)" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "" + +#: builtin/rm.c:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: non è possibile eliminare %s" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "Autore mancante: %s" + +#: builtin/tag.c:60 +#, c-format +msgid "malformed object at '%s'" msgstr "" -"Interrompere fusione?\n" + +#: builtin/tag.c:207 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "nome tag troppo lungo: %.*s..." + +#: builtin/tag.c:212 +#, c-format +msgid "tag '%s' not found." +msgstr "tag '%s' non trovato." + +#: builtin/tag.c:227 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Tag '%s' eliminato (era %s)\n" + +#: builtin/tag.c:239 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "non è stato possibile verificare il tag '%s'" + +#: builtin/tag.c:249 +msgid "" "\n" -"L'interruzione della fusione attuale causerà la perdita di *TUTTE* le " -"modifiche non ancora presenti nell'archivio.\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" "\n" -"Continuare con l'interruzione della fusione attuale?" +"#\n" +"# Scrivere un messaggio associato al tag\n" +"# Le righe che iniziano con '#' verranno ignorate.\n" +"#\n" -#: lib/merge.tcl:228 +#: builtin/tag.c:256 msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" "\n" -"Continue with resetting the current changes?" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" +"#\n" msgstr "" -"Ripristinare la revisione attuale e annullare le modifiche?\n" "\n" -"L'annullamento delle modifiche causerà la perdita di *TUTTE* le modifiche " -"non ancora presenti nell'archivio.\n" -"\n" -"Continuare con l'annullamento delle modifiche attuali?" +"#\n" +"# Scrivere un messaggio associato al tag\n" +"# Le righe che iniziano con '#' verranno mantenute; possono essere comunque " +"rimosse manualmente.\n" +"#\n" + +#: builtin/tag.c:298 +msgid "unable to sign the tag" +msgstr "impossibile firmare il tag" + +#: builtin/tag.c:300 +msgid "unable to write tag file" +msgstr "impossibile scrivere il file di tag" + +#: builtin/tag.c:325 +msgid "bad object type." +msgstr "tipo di oggetto errato." + +#: builtin/tag.c:338 +msgid "tag header too big." +msgstr "intestazione del tag troppo grande." + +#: builtin/tag.c:370 +msgid "no tag message?" +msgstr "nessun messaggio per il tag?" + +#: builtin/tag.c:376 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "Il messaggio del tag è stato lasciato in %s\n" + +#: builtin/tag.c:425 +msgid "switch 'points-at' requires an object" +msgstr "lo switch 'points-at' richiede un oggetto" + +#: builtin/tag.c:427 +#, c-format +msgid "malformed object name '%s'" +msgstr "nome oggetto '%s' malformato" + +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "--column e -n non sono compatibili" + +#: builtin/tag.c:523 +msgid "-n option is only allowed with -l." +msgstr "l'opzione -n è consentita solo con -l." + +#: builtin/tag.c:525 +msgid "--contains option is only allowed with -l." +msgstr "l'opzione --contains è consentita solo con -l." + +#: builtin/tag.c:527 +msgid "--points-at option is only allowed with -l." +msgstr "l'opzione --points-at è consentita solo con -l." + +#: builtin/tag.c:535 +msgid "only one -F or -m option is allowed." +msgstr "è consentita una sola opzione tra -F e -m." + +#: builtin/tag.c:555 +msgid "too many params" +msgstr "troppi parametri" + +#: builtin/tag.c:561 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "'%s' non è un nome tag valido." + +#: builtin/tag.c:566 +#, c-format +msgid "tag '%s' already exists" +msgstr "il tag '%s' esiste già" + +#: builtin/tag.c:584 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s: impossibile riservare il ref" + +#: builtin/tag.c:586 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s: impossibile aggiornare il ref" + +#: builtin/tag.c:588 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Tag '%s' aggiornato (era %s)\n" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "" +"Vedi 'git help <comando> per maggiori informazioni su un comando " +"specifico." + +#: parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "n" + +#: parse-options.h:141 +msgid "time" +msgstr "tempo" + +#: parse-options.h:149 +msgid "file" +msgstr "file" + +#: parse-options.h:151 +msgid "when" +msgstr "quando" + +#: parse-options.h:156 +msgid "no-op (backward compatibility)" +msgstr "" + +#: parse-options.h:228 +msgid "be more verbose" +msgstr "più dettagliato" + +#: parse-options.h:230 +msgid "be more quiet" +msgstr "meno dettagliato" + +#: parse-options.h:236 +msgid "use <n> digits to display SHA-1s" +msgstr "usare <n> cifre per mostrare gli hash SHA-1" + +#: common-cmds.h:8 +msgid "Add file contents to the index" +msgstr "Aggiunge il contenuto del file a index" -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Interruzione" +#: common-cmds.h:9 +msgid "Find by binary search the change that introduced a bug" +msgstr "Cerca mediante ricerca binaria la modifica che ha introdotto un bug" -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "ripristino file" +#: common-cmds.h:10 +msgid "List, create, or delete branches" +msgstr "Elenca, crea o elimina branch" -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "Interruzione non riuscita." +#: 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 "Clona un repository in una nuova directory" + +#: common-cmds.h:13 +msgid "Record changes to the repository" +msgstr "Registra modifiche nel repository" + +#: 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 "Scarica oggetti e ref da un altro repository" + +#: common-cmds.h:16 +msgid "Print lines matching a pattern" +msgstr "Stampa le righe corrispondenti ad un modello" + +#: common-cmds.h:17 +msgid "Create an empty git repository or reinitialize an existing one" +msgstr "Crea un repository git vuoto o reinizializza uno esistente" -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Interruzione completata. Pronto." +#: common-cmds.h:18 +msgid "Show commit logs" +msgstr "Mostra log del commit" -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Imporre la risoluzione alla revisione comune?" +#: common-cmds.h:19 +msgid "Join two or more development histories together" +msgstr "Unisce due o più cronologie di sviluppo" -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Imporre la risoluzione al ramo attuale?" +#: common-cmds.h:20 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "Sposta o rinomina un file, una directory o un link simbolico" -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Imporre la risoluzione all'altro ramo?" +#: common-cmds.h:21 +msgid "Fetch from and merge with another repository or a local branch" +msgstr "Combina fetche + merge da un altro repository o un branch locale" -#: lib/mergetool.tcl:14 -#, tcl-format +#: common-cmds.h:22 +msgid "Update remote refs along with associated objects" +msgstr "Aggiorna i ref remoti insieme agli oggetti associati" + +#: 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 "Ripristina l'HEAD corrente allo stato specificato" + +#: 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 "Mostra vari tipi di oggetti" + +#: 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 "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG" + +#: git-am.sh:50 +msgid "You need to set your committer info first" +msgstr "È necessario impostare le informazioni sul committer" + +#: git-am.sh:95 msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" msgstr "" -"Si stanno mostrando solo le modifiche con conflitti.\n" -"\n" -"%s sarà sovrascritto.\n" -"\n" -"Questa operazione può essere modificata solo ricominciando la fusione." -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" +#: git-am.sh:105 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\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 "" -"Il file %s sembra contenere conflitti non risolti, preparare per la prossima " -"revisione?" +"Quando hai risolto il problema esegui \"$cmdline --resolved\".\n" +"Se vuoi saltare questa patch, esegui invece \"$cmdline --skip\".\n" +"Per ripristinare il branch originale e interrompere l'applicazione delle " +"patch esegui \"$cmdline --abort\"." -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" +#: git-am.sh:121 +msgid "Cannot fall back to three-way merge." msgstr "" -"La risoluzione dei conflitti per %s è preparata per la prossima revisione" -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" +#: git-am.sh:137 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -"Non è possibile risolvere i conflitti per cancellazioni o link con un " -"programma esterno" -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Non esiste un file con conflitti." +#: git-am.sh:154 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"La tua patch è stata modificata manualmente?\n" +"Non può essere applicata ai blob registrati nel proprio index." + +#: git-am.sh:163 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "'%s' non è una GUI per la risoluzione dei conflitti." +#: git-am.sh:275 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Può essere applicata solo una serie di patch StGIT per volta" -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Il programma '%s' non è supportato" +#: git-am.sh:362 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "Il formato patch $patch_format non è supportato." -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "La risoluzione dei conflitti è già avviata, terminarla?" +#: git-am.sh:364 +msgid "Patch format detection failed." +msgstr "Rilevamento del formato della patch non riuscito." + +#: git-am.sh:418 +msgid "-d option is no longer supported. Do not use." +msgstr "l'opzione -d non è più supportata. Non utilizzarla." + +#: git-am.sh:481 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" -#: lib/mergetool.tcl:323 -#, tcl-format +#: git-am.sh:486 +msgid "Please make up your mind. --skip or --abort?" +msgstr "Per favore, deciditi. --skip o --abort?" + +#: git-am.sh:513 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" + +#: git-am.sh:579 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" + +#: git-am.sh:671 +#, sh-format msgid "" -"Error retrieving versions:\n" -"%s" +"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 "" -"Errore: revisione non trovata:\n" -"%s" -#: lib/mergetool.tcl:343 -#, tcl-format +#: git-am.sh:708 +msgid "Patch does not have a valid e-mail address." +msgstr "La patch non contiene un indirizzo email valido." + +#: git-am.sh:755 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" + +#: git-am.sh:759 +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:766 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "Applicare? sì[y]/no[n]/modifica[e]/visualizza patch[v]/accetta tutto[a] " + +#: git-am.sh:802 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "" + +#: git-am.sh:823 msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" +"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:831 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" msgstr "" -"Impossibile avviare la risoluzione dei conflitti:\n" -"\n" -"%s" -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "Avvio del programma per la risoluzione dei conflitti in corso..." +#: git-am.sh:847 +msgid "No changes -- Patch already applied." +msgstr "Nessuna modifica -- patch già applicata." -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "Risoluzione dei conflitti non riuscita." +#: git-am.sh:857 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "Patch non riuscita a $msgnum $FIRSTLINE" -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" +#: git-am.sh:873 +msgid "applying to an empty history" msgstr "" -"La codifica dei caratteri '%s' specificata per tutti gli archivi non è valida" -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "Devi iniziare con \"git bisect start\"" + +#. 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 "Vuoi che me ne occupi io [Y/n]? " + +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "opzione non riconosciuta: '$arg'" + +#: git-bisect.sh:99 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "'$arg' non sembra essere una revisione valida" + +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" msgstr "" -"La codifica dei caratteri '%s' specificata per l'archivio attuale non è " -"valida" -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Ripristina valori predefiniti" +#: git-bisect.sh:130 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +msgstr "" +"Checkout di '$start_head' non riuscito. Prova 'git bisect reset " +"<branch-valido>'." -#: lib/option.tcl:121 -msgid "Save" -msgstr "Salva" +#: git-bisect.sh:140 +msgid "won't bisect on seeked tree" +msgstr "" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "HEAD errato - strano ref simbolico" -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "Archivio di %s" +#: git-bisect.sh:189 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "Argomento bisect_write errato: $state" -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Tutti gli archivi" +#: git-bisect.sh:218 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "" -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Nome utente" +#: git-bisect.sh:232 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "Per favore, chiama 'bisect_state' con almeno un argomento." -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Indirizzo Email" +#: 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 "'git bisect bad' può prendere un solo argomento." + +#. 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 "" -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Riepilogo nelle revisioni di fusione" +#. 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 "Sei sicuro? [Y/n] " -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Prolissità della fusione" +#: 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 "" +"Devi specificare almeno una revisione corretta ed una errata.\n" +"(Puoi usare \"git bisect bad\" e \"git bisect good\" per questo scopo.)" -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Mostra statistiche delle differenze dopo la fusione" +#: 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 "" -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Programma da utilizzare per la risoluzione dei conflitti" +#: git-bisect.sh:347 git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "Non stiamo eseguendo un bisect." -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "Fidati delle date di modifica dei file" +#: git-bisect.sh:354 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "'$invalid' non è un commit valido" -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" +#: git-bisect.sh:363 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." msgstr "" -"Effettua potatura dei duplicati locali di rami remoti durante il recupero" -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "Appaia duplicati locali di rami remoti" +#: git-bisect.sh:390 +msgid "No logfile given" +msgstr "Nessun file di log specificato" -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "Ricerca copie solo nei file modificati" +#: git-bisect.sh:391 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "" -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "Numero minimo di lettere che attivano la ricerca delle copie" +#: git-bisect.sh:408 +msgid "?? what are you talking about?" +msgstr "?? di cosa si sta parlando?" -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Giorni di contesto nella cronologia delle annotazioni" +#: git-bisect.sh:420 +#, sh-format +msgid "running $command" +msgstr "sto eseguendo $command" -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Numero di linee di contesto nelle differenze" +#: git-bisect.sh:427 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" +"bisect run non riuscito:\n" +"il codice di uscita $res da '$command' è < 0 oppure >= 128" -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Larghezza del messaggio di revisione" +#: git-bisect.sh:453 +msgid "bisect run cannot continue any more" +msgstr "bisect run non può più proseguire" -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Modello per il nome di un nuovo ramo" +#: git-bisect.sh:459 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" +"bisect run non riuscito:\n" +"bisect_state $state è uscito con il codice di errore $res" -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Codifica predefinita per il contenuto dei file" +#: git-bisect.sh:466 +msgid "bisect run success" +msgstr "bisect run eseguito con successo" -#: lib/option.tcl:203 -msgid "Change" -msgstr "Cambia" +#: 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 "" -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Lingua dizionario:" +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "" +"Il pull non è possibile perché ci sono file di cui non è stato eseguito il " +"merge." -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Cambia caratteri" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "Scegli %s" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Preferenze" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "Impossibile salvare completamente le opzioni:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Rimuovi archivio remoto" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Effettua potatura da" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Recupera da" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Propaga verso" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Aggiungi archivio remoto" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Aggiungi nuovo archivio remoto" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Aggiungi" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Dettagli sull'archivio remoto" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Posizione:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Altra azione" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Recupera subito" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Inizializza l'archivio remoto e propaga" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Non fare altro" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Inserire un nome per l'archivio remoto." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "'%s' non è utilizzabile come nome di archivio remoto." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Impossibile aggiungere l'archivio remoto '%s' posto in '%s'." - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "recupera da %s" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "Recupero %s" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Impossibile inizializzare l'archivio posto in '%s'." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "propaga verso %s" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Imposto %s (in %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Elimina ramo remoto" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Da archivio" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "Remoto:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "Posizione specifica:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "Rami" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Elimina solo se" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Fuso in:" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "Si richiede un ramo per 'Fuso in'." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" +#: git-pull.sh:197 +msgid "updating an unborn branch with changes added to the index" msgstr "" -"I rami seguenti non sono stati fusi completamente in %s:\n" -"\n" -" - %s" -#: lib/remote_branch_delete.tcl:189 -#, tcl-format +#. 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:228 +#, sh-format msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." msgstr "" -"Impossibile verificare una o più fusioni: mancano le revisioni necessarie. " -"Prova prima a recuperarle da %s." -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Scegliere uno o più rami da cancellare." +#: git-pull.sh:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "Impossibile eseguire il merge di branch multipli in un head vuoto" -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Cancellazione rami da %s" +#: git-pull.sh:257 +msgid "Cannot rebase onto multiple branches" +msgstr "Impossibile eseguire il rebase su branch multipli" -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "Nessun archivio selezionato." +#: git-stash.sh:51 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash clear con parametri non è implementato" -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "Analisi in corso %s..." +#: git-stash.sh:74 +msgid "You do not have the initial commit yet" +msgstr "Non hai ancora un commit iniziale" -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Trova:" +#: git-stash.sh:89 +msgid "Cannot save the current index state" +msgstr "Impossibile salvare lo stato corrente di index" -#: lib/search.tcl:23 -msgid "Next" -msgstr "Succ" +#: git-stash.sh:123 git-stash.sh:136 +msgid "Cannot save the current worktree state" +msgstr "" -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Prec" +#: git-stash.sh:140 +msgid "No changes selected" +msgstr "Nessuna modifica selezionata" -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Distingui maiuscole" +#: git-stash.sh:143 +msgid "Cannot remove temporary index (can't happen)" +msgstr "" -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Impossibile scrivere shortcut:" +#: git-stash.sh:156 +msgid "Cannot record working tree state" +msgstr "" -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Impossibile scrivere icona:" +#. 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 "" +"errore: opzione sconosciuta per 'stash save': $option\n" +" Per aggiungere un messaggio, usare git stash save -- '$option'" -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Correttore ortografico non supportato" +#: git-stash.sh:223 +msgid "No local changes to save" +msgstr "Nessuna modifica locale da salvare" -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Correzione ortografica indisponibile" +#: git-stash.sh:227 +msgid "Cannot initialize stash" +msgstr "Impossibile inizializzare stash" -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "La configurazione del correttore ortografico non è valida" +#: git-stash.sh:235 +msgid "Cannot save the current status" +msgstr "Impossibile salvare lo stato attuale" -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Il dizionario è stato reimpostato su %s." +#: git-stash.sh:253 +msgid "Cannot remove worktree changes" +msgstr "" -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Il correttore ortografico ha riportato un errore all'avvio" +#: git-stash.sh:352 +msgid "No stash found." +msgstr "Nessuno stash trovato." -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Correttore ortografico non riconosciuto" +#: git-stash.sh:359 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "Troppe revisioni specificate: $REV" -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Nessun suggerimento" +#: git-stash.sh:365 +#, sh-format +msgid "$reference is not valid reference" +msgstr "$reference non è un riferimento valido" -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Il correttore ortografico ha mandato un EOF inaspettato" +#: git-stash.sh:393 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "'$args' non è un commit di tipo stash" -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Errore nel correttore ortografico" +#: git-stash.sh:404 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "'$args' non è un referimento a uno stash" -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Chiavi non trovate." +#: git-stash.sh:412 +msgid "unable to refresh index" +msgstr "impossibile aggiornare index" -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Chiave pubblica trovata in: %s" +#: git-stash.sh:416 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "Impossibile applicare uno stash nel mezzo di un merge" -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Crea chiave" +#: git-stash.sh:424 +msgid "Conflicts in index. Try without --index." +msgstr "Ci sono conflitti in index. Prova senza --index." -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Copia negli appunti" +#: git-stash.sh:426 +msgid "Could not save index tree" +msgstr "" -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "La tua chiave pubblica OpenSSH" +#: git-stash.sh:460 +msgid "Cannot unstage modified files" +msgstr "" -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Creazione chiave in corso..." +#: git-stash.sh:474 +msgid "Index was not unstashed." +msgstr "" -#: lib/sshkey.tcl:84 -#, tcl-format +#: git-stash.sh:491 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "${REV} eliminata ($s)" + +#: git-stash.sh:492 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}: non è stato possibile rimuovere la voce di stash" + +#: git-stash.sh:499 +msgid "No branch name specified" +msgstr "Nome del branch non specificato" + +#: git-stash.sh:570 +msgid "(To restore them type \"git stash apply\")" +msgstr "(Per ripristinarli digita \"git stash apply\")" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "" + +#: git-submodule.sh:109 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "" + +#: git-submodule.sh:150 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "" + +#: git-submodule.sh:160 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "" + +#: git-submodule.sh:249 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "repo URL: '$repo' deve essere assoluto o iniziare con ./|../" + +#: git-submodule.sh:266 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "'$sm_path' esiste già in index" + +#: git-submodule.sh:270 +#, sh-format msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" +"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 "" -"Impossibile avviare ssh-keygen:\n" -"\n" -"%s" +"Il seguente path è ignorato da uno dei tuoi file .gitignore:\n" +"$sm_path\n" +"Usa -f se vuoi davvero aggiungerlo." -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "Errore durante la creazione della chiave." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "La chiave è stata creata con successo, ma non è stata trovata." - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "La chiave è in: %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%1$s ... %6$s: %2$*i di %4$*i (%7$3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Bisogna selezionare un file prima di eseguire %s." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Vuoi davvero eseguire %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Accessorio: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Eseguo: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Il programma esterno è terminato con successo: %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Il programma esterno ha riportato un errore: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Aggiungi accessorio" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Aggiungi un nuovo comando" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Aggiungi per tutti gli archivi" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Dettagli sull'accessorio" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Utilizza il separatore '/' per creare un albero di sottomenu:" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Comando:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Mostra una finestra di dialogo prima dell'avvio" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Chiedi all'utente di scegliere una revisione (imposta $REVISION)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Chiedi all'utente di fornire argomenti aggiuntivi (imposta $ARGS)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Non mostrare la finestra di comando" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Avvia solo se è selezionata una differenza ($FILENAME non è vuoto)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Bisogna dare un nome all'accessorio." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "L'accessorio '%s' esiste già." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" +#: git-submodule.sh:281 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -"Impossibile aggiungere l'accessorio:\n" -"\n" -"%s" -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Rimuovi accessorio" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Rimuovi i comandi accessori" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Rimuovi" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Il colore blu indica accessori per l'archivio locale)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Avvia il comando: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Argomenti" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Recupero nuove modifiche da %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "potatura remota di %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Effettua potatura dei duplicati locali di rami remoti cancellati da %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Propagazione modifiche a %s" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Mirroring verso %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Propagazione %s %s a %s" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "Propaga rami" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "Rami di origine" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Archivio di destinazione" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "Opzioni di trasferimento" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Sovrascrivi ramo esistente (alcune modifiche potrebbero essere perse)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "Utilizza 'thin pack' (per connessioni lente)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "Includi etichette" +#: git-submodule.sh:283 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "'$sm_path' esiste già e non è un repository git valido" + +#: git-submodule.sh:297 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:302 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:307 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:349 +#, sh-format +msgid "Entering '$prefix$sm_path'" +msgstr "" + +#: git-submodule.sh:363 +#, sh-format +msgid "Stopping at '$sm_path'; script returned non-zero status." +msgstr "" +"Interruzione a '$sm_path'; lo script ha restituito uno stato diverso da zero." + +#: git-submodule.sh:406 +#, sh-format +msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:415 +#, sh-format +msgid "Failed to register url for submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:417 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgstr "" + +#: git-submodule.sh:425 +#, sh-format +msgid "Failed to register update mode for submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:524 +#, sh-format +msgid "" +"Submodule path '$sm_path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:537 +#, sh-format +msgid "Unable to find current revision in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:556 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:570 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:571 +#, sh-format +msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:576 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:577 +#, sh-format +msgid "Submodule path '$sm_path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:582 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:583 +#, sh-format +msgid "Submodule path '$sm_path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:605 git-submodule.sh:928 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:713 +msgid "--cached cannot be used with --files" +msgstr "--cached non può essere usata con --files" + +#. unexpected type +#: git-submodule.sh:753 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "modalità $mod_dst inattesa" + +#: git-submodule.sh:771 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr " Attenzione: $name non contiene commit $sha1_src" + +#: git-submodule.sh:774 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr " Attenzione: $name non contiene commit $sha1_dst" + +#: git-submodule.sh:777 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr " Attenzione: $name non contiene commit $sha1_src e $sha1_dst" + +#: git-submodule.sh:802 +msgid "blob" +msgstr "blob" + +#: git-submodule.sh:803 +msgid "submodule" +msgstr "sottomodulo" + +#: git-submodule.sh:840 +msgid "# Submodules changed but not updated:" +msgstr "" + +#: git-submodule.sh:842 +msgid "# Submodule changes to be committed:" +msgstr "" + +#: git-submodule.sh:974 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" + +#~ msgid "--" +#~ msgstr "--" + +#~ msgid "Could not extract email from committer identity." +#~ msgstr "" +#~ "Non è stato possibile estrarre l'indirizzo email dall'identità del " +#~ "committer." diff --git a/po/ja.po b/po/ja.po deleted file mode 100644 index 9aff249..0000000 --- a/po/ja.po +++ /dev/null @@ -1,2555 +0,0 @@ -# Translation of git-gui to Japanese -# Copyright (C) 2007 Shawn Pearce -# This file is distributed under the same license as the git-gui package. -# しらいし ななこ <nanako3@bluebottle.com>, 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2010-02-02 19:03+0900\n" -"Last-Translator: しらいし ななこ <nanako3@lavabit.com>\n" -"Language-Team: Japanese\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "git-gui: 致命的なエラー" - -#: git-gui.sh:743 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "%s に無効なフォントが指定されています:" - -#: git-gui.sh:779 -msgid "Main Font" -msgstr "主フォント" - -#: git-gui.sh:780 -msgid "Diff/Console Font" -msgstr "diff/コンソール・フォント" - -#: git-gui.sh:794 -msgid "Cannot find git in PATH." -msgstr "PATH 中に git が見つかりません" - -#: git-gui.sh:821 -msgid "Cannot parse Git version string:" -msgstr "Git バージョン名が理解できません:" - -#: git-gui.sh:839 -#, tcl-format -msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" -msgstr "" -"Git のバージョンが確認できません。\n" -"\n" -"%s はバージョン '%s' とのことです。\n" -"\n" -"%s は最低でも 1.5.0 かそれ以降の Git が必要です\n" -"\n" -"'%s' はバージョン 1.5.0 と思って良いですか?\n" - -#: git-gui.sh:1128 -msgid "Git directory not found:" -msgstr "Git ディレクトリが見つかりません:" - -#: git-gui.sh:1146 -msgid "Cannot move to top of working directory:" -msgstr "作業ディレクトリの最上位に移動できません" - -#: git-gui.sh:1154 -msgid "Cannot use bare repository:" -msgstr "裸のリポジトリは使えません:" - -#: git-gui.sh:1162 -msgid "No working directory" -msgstr "作業ディレクトリがありません" - -#: git-gui.sh:1334 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "ファイル状態を更新しています…" - -#: git-gui.sh:1390 -msgid "Scanning for modified files ..." -msgstr "変更されたファイルをスキャンしています…" - -#: git-gui.sh:1454 -msgid "Calling prepare-commit-msg hook..." -msgstr "prepare-commit-msg フックを実行中・・・" - -#: git-gui.sh:1471 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "prepare-commit-msg フックがコミットを拒否しました" - -#: git-gui.sh:1629 lib/browser.tcl:246 -msgid "Ready." -msgstr "準備完了" - -#: git-gui.sh:1787 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "全体で%s個の内の%sファイルだけ表示しています" - -#: git-gui.sh:1913 -msgid "Unmodified" -msgstr "変更無し" - -#: git-gui.sh:1915 -msgid "Modified, not staged" -msgstr "変更あり、コミット未予定" - -#: git-gui.sh:1916 git-gui.sh:1924 -msgid "Staged for commit" -msgstr "コミット予定済" - -#: git-gui.sh:1917 git-gui.sh:1925 -msgid "Portions staged for commit" -msgstr "部分的にコミット予定済" - -#: git-gui.sh:1918 git-gui.sh:1926 -msgid "Staged for commit, missing" -msgstr "コミット予定済、ファイル無し" - -#: git-gui.sh:1920 -msgid "File type changed, not staged" -msgstr "ファイル型変更、コミット未予定" - -#: git-gui.sh:1921 -msgid "File type changed, staged" -msgstr "ファイル型変更、コミット予定済" - -#: git-gui.sh:1923 -msgid "Untracked, not staged" -msgstr "管理外、コミット未予定" - -#: git-gui.sh:1928 -msgid "Missing" -msgstr "ファイル無し" - -#: git-gui.sh:1929 -msgid "Staged for removal" -msgstr "削除予定済" - -#: git-gui.sh:1930 -msgid "Staged for removal, still present" -msgstr "削除予定済、ファイル未削除" - -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 -msgid "Requires merge resolution" -msgstr "要マージ解決" - -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "gitk を起動中…お待ち下さい…" - -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" -msgstr "PATH 中に gitk が見つかりません" - -#: git-gui.sh:2043 -msgid "Couldn't find git gui in PATH" -msgstr "PATH 中に git gui が見つかりません" - -#: git-gui.sh:2455 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "リポジトリ" - -#: git-gui.sh:2456 -msgid "Edit" -msgstr "編集" - -#: git-gui.sh:2458 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "ブランチ" - -#: git-gui.sh:2461 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "コミット" - -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "マージ" - -#: git-gui.sh:2465 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "リモート" - -#: git-gui.sh:2468 -msgid "Tools" -msgstr "ツール" - -#: git-gui.sh:2477 -msgid "Explore Working Copy" -msgstr "ワーキングコピーをブラウズ" - -#: git-gui.sh:2483 -msgid "Browse Current Branch's Files" -msgstr "現在のブランチのファイルを見る" - -#: git-gui.sh:2487 -msgid "Browse Branch Files..." -msgstr "ブランチのファイルを見る…" - -#: git-gui.sh:2492 -msgid "Visualize Current Branch's History" -msgstr "現在のブランチの履歴を見る" - -#: git-gui.sh:2496 -msgid "Visualize All Branch History" -msgstr "全てのブランチの履歴を見る" - -#: git-gui.sh:2503 -#, tcl-format -msgid "Browse %s's Files" -msgstr "ブランチ %s のファイルを見る" - -#: git-gui.sh:2505 -#, tcl-format -msgid "Visualize %s's History" -msgstr "ブランチ %s の履歴を見る" - -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "データベース統計" - -#: git-gui.sh:2513 lib/database.tcl:34 -msgid "Compress Database" -msgstr "データベース圧縮" - -#: git-gui.sh:2516 -msgid "Verify Database" -msgstr "データベース検証" - -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "デスクトップ・アイコンを作る" - -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "終了" - -#: git-gui.sh:2547 -msgid "Undo" -msgstr "元に戻す" - -#: git-gui.sh:2550 -msgid "Redo" -msgstr "やり直し" - -#: git-gui.sh:2554 git-gui.sh:3109 -msgid "Cut" -msgstr "切り取り" - -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "コピー" - -#: git-gui.sh:2560 git-gui.sh:3115 -msgid "Paste" -msgstr "貼り付け" - -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "削除" - -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 -msgid "Select All" -msgstr "全て選択" - -#: git-gui.sh:2576 -msgid "Create..." -msgstr "作成…" - -#: git-gui.sh:2582 -msgid "Checkout..." -msgstr "チェックアウト" - -#: git-gui.sh:2588 -msgid "Rename..." -msgstr "名前変更…" - -#: git-gui.sh:2593 -msgid "Delete..." -msgstr "削除…" - -#: git-gui.sh:2598 -msgid "Reset..." -msgstr "リセット…" - -#: git-gui.sh:2608 -msgid "Done" -msgstr "完了" - -#: git-gui.sh:2610 -msgid "Commit@@verb" -msgstr "コミット" - -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "新規コミット" - -#: git-gui.sh:2627 git-gui.sh:3057 -msgid "Amend Last Commit" -msgstr "最新コミットを訂正" - -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "再スキャン" - -#: git-gui.sh:2643 -msgid "Stage To Commit" -msgstr "コミット予定する" - -#: git-gui.sh:2649 -msgid "Stage Changed Files To Commit" -msgstr "変更されたファイルをコミット予定" - -#: git-gui.sh:2655 -msgid "Unstage From Commit" -msgstr "コミットから降ろす" - -#: git-gui.sh:2661 lib/index.tcl:412 -msgid "Revert Changes" -msgstr "変更を元に戻す" - -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 -msgid "Show Less Context" -msgstr "文脈を少なく" - -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 -msgid "Show More Context" -msgstr "文脈を多く" - -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 -msgid "Sign Off" -msgstr "署名" - -#: git-gui.sh:2696 -msgid "Local Merge..." -msgstr "ローカル・マージ…" - -#: git-gui.sh:2701 -msgid "Abort Merge..." -msgstr "マージ中止…" - -#: git-gui.sh:2713 git-gui.sh:2741 -msgid "Add..." -msgstr "追加" - -#: git-gui.sh:2717 -msgid "Push..." -msgstr "プッシュ…" - -#: git-gui.sh:2721 -msgid "Delete Branch..." -msgstr "ブランチ削除..." - -#: git-gui.sh:2731 git-gui.sh:3292 -msgid "Options..." -msgstr "オプション…" - -#: git-gui.sh:2742 -msgid "Remove..." -msgstr "削除..." - -#: git-gui.sh:2751 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "ヘルプ" - -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "%s について" - -#: git-gui.sh:2783 -msgid "Online Documentation" -msgstr "オンライン・ドキュメント" - -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "SSH キーを表示" - -#: git-gui.sh:2893 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"致命的: パス %s が stat できません。そのようなファイルやディレクトリはありま" -"せん" - -#: git-gui.sh:2926 -msgid "Current Branch:" -msgstr "現在のブランチ" - -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "ステージングされた(コミット予定済の)変更" - -#: git-gui.sh:2967 -msgid "Unstaged Changes" -msgstr "コミット予定に入っていない変更" - -#: git-gui.sh:3017 -msgid "Stage Changed" -msgstr "変更をコミット予定に入れる" - -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "プッシュ" - -#: git-gui.sh:3071 -msgid "Initial Commit Message:" -msgstr "最初のコミットメッセージ:" - -#: git-gui.sh:3072 -msgid "Amended Commit Message:" -msgstr "訂正したコミットメッセージ:" - -#: git-gui.sh:3073 -msgid "Amended Initial Commit Message:" -msgstr "訂正した最初のコミットメッセージ:" - -#: git-gui.sh:3074 -msgid "Amended Merge Commit Message:" -msgstr "訂正したマージコミットメッセージ:" - -#: git-gui.sh:3075 -msgid "Merge Commit Message:" -msgstr "マージコミットメッセージ:" - -#: git-gui.sh:3076 -msgid "Commit Message:" -msgstr "コミットメッセージ:" - -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 -msgid "Copy All" -msgstr "全てコピー" - -#: git-gui.sh:3149 lib/blame.tcl:104 -msgid "File:" -msgstr "ファイル:" - -#: git-gui.sh:3255 -msgid "Refresh" -msgstr "再読み込み" - -#: git-gui.sh:3276 -msgid "Decrease Font Size" -msgstr "フォントを小さく" - -#: git-gui.sh:3280 -msgid "Increase Font Size" -msgstr "フォントを大きく" - -#: git-gui.sh:3288 lib/blame.tcl:281 -msgid "Encoding" -msgstr "エンコーディング" - -#: git-gui.sh:3299 -msgid "Apply/Reverse Hunk" -msgstr "パッチを適用/取り消す" - -#: git-gui.sh:3304 -msgid "Apply/Reverse Line" -msgstr "パッチ行を適用/取り消す" - -#: git-gui.sh:3323 -msgid "Run Merge Tool" -msgstr "マージツールを起動" - -#: git-gui.sh:3328 -msgid "Use Remote Version" -msgstr "リモートの方を採用" - -#: git-gui.sh:3332 -msgid "Use Local Version" -msgstr "ローカルの方を採用" - -#: git-gui.sh:3336 -msgid "Revert To Base" -msgstr "ベース版を採用" - -#: git-gui.sh:3354 -msgid "Visualize These Changes In The Submodule" -msgstr "サブモジュール内のこれらの変更を見る" - -#: git-gui.sh:3358 -msgid "Visualize Current Branch History In The Submodule" -msgstr "サブモジュール内で現在のブランチの履歴を見る" - -#: git-gui.sh:3362 -msgid "Visualize All Branch History In The Submodule" -msgstr "サブモジュール内で全てのブランチの履歴を見る" - -#: git-gui.sh:3367 -msgid "Start git gui In The Submodule" -msgstr "サブモジュール内でgit guiを起動する" - -#: git-gui.sh:3389 -msgid "Unstage Hunk From Commit" -msgstr "パッチをコミット予定から外す" - -#: git-gui.sh:3391 -msgid "Unstage Lines From Commit" -msgstr "コミット予定から行を外す" - -#: git-gui.sh:3393 -msgid "Unstage Line From Commit" -msgstr "コミット予定から行を外す" - -#: git-gui.sh:3396 -msgid "Stage Hunk For Commit" -msgstr "パッチをコミット予定に加える" - -#: git-gui.sh:3398 -msgid "Stage Lines For Commit" -msgstr "パッチ行をコミット予定に加える" - -#: git-gui.sh:3400 -msgid "Stage Line For Commit" -msgstr "パッチ行をコミット予定に加える" - -#: git-gui.sh:3424 -msgid "Initializing..." -msgstr "初期化しています…" - -#: git-gui.sh:3541 -#, tcl-format -msgid "" -"Possible environment issues exist.\n" -"\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" -"\n" -msgstr "" -"環境に問題がある可能性があります\n" -"\n" -"以下の環境変数は %s が起動する Git サブプロセスによって無視されるでしょう:\n" -"\n" - -#: git-gui.sh:3570 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"これは Cygwin で配布されている Tcl バイナリに\n" -"関しての既知の問題によります" - -#: git-gui.sh:3575 -#, tcl-format -msgid "" -"\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\n" -msgstr "" -"\n" -"\n" -"個人的な ~/.gitconfig ファイル内で user.name と user.email の値を設定\n" -"するのが、%s の良い代用となります\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "Git のグラフィカルUI git-gui" - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "ファイルピューワ" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "コミット:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "コミットをコピー" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "テキストを検索" - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "コピー検知" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "文脈を見せる" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "親コミットを註釈" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "%s を読んでいます…" - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "コピー・移動追跡データを読んでいます…" - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "行を注釈しました" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "元位置行の注釈データを読んでいます…" - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "注釈完了しました" - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "実行中" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "すでに blame プロセスを実行中です。" - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "コピー検知を実行中…" - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "注釈を読み込んでいます…" - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "作者:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "コミット者:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "元ファイル" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "HEAD コミットが見つかりません" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "親コミットが見つかりません:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "親を表示できません" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "diff を読む際のエラーです:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "原作者:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "ファイル:" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "複写・移動者:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "ブランチをチェックアウト" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "チェックアウト" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "中止" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "リビジョン" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "オプション" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "トラッキング・ブランチをフェッチ" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "ローカル・ブランチから削除" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "ブランチを作成" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "ブランチを新規作成" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 -msgid "Create" -msgstr "作成" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "ブランチ名" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "名前:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "トラッキング・ブランチ名を合わせる" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "初期リビジョン" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "既存のブランチを更新:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "いいえ" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "早送りのみ" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "リセット" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "作成してすぐチェックアウト" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "トラッキング・ブランチを選択して下さい。" - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "トラッキング・ブランチ %s は遠隔リポジトリのブランチではありません。" - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "ブランチ名を指定して下さい。" - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "'%s' はブランチ名に使えません。" - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "ブランチ削除" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "ローカル・ブランチを削除" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "ローカル・ブランチ" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "マージ済みの時のみ削除" - -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "無条件(マージ検査をしない)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "以下のブランチは %s に完全にマージされていません:" - -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"削除したブランチを回復するのは困難です。\n" -"\n" -"選択したブランチを削除して良いですか?" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"以下のブランチを削除できません:\n" -"%s" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "ブランチの名前変更" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "名前変更" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "ブランチ:" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "新しい名前:" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "名前を変更するブランチを選んで下さい。" - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "'%s'というブランチは既に存在します。" - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "'%s'の名前変更に失敗しました。" - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "起動中…" - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "ファイル・ブラウザ" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "%s をロード中…" - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[上位フォルダへ]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "現在のブランチのファイルを見る" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "ブラウズ" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "%s から %s をフェッチしています" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "致命的エラー: %s を解決できません" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "閉じる" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "ブランチ'%s'は存在しません。" - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "'%s' に簡易 git-pull を設定できませんでした" - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"ブランチ '%s' は既に存在します。\n" -"\n" -"%s に早送りできません。\n" -"マージが必要です。" - -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "'%s' マージ戦略はサポートされていません。" - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "'%s' の更新に失敗しました。" - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "インデックスは既にロックされています。" - -#: lib/checkout_op.tcl:289 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"最後にスキャンした状態はリポジトリの状態と合致しません。\n" -"\n" -"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。現在" -"のブランチを変更する前に、再スキャンが必要です。\n" -"\n" -"自動的に再スキャンを開始します。\n" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "作業ディレクトリを '%s' に更新しています…" - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "チェックアウトされたファイル" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "'%s' のチェックアウトを中止しました(ファイル毎のマージが必要です)。" - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "ファイル毎のマージが必要です。" - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "ブランチ '%s' に滞まります。" - -#: lib/checkout_op.tcl:452 -msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." -msgstr "" -"ローカル・ブランチから離れます。\n" -"\n" -"ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブラン" -"チを開始してください。" - -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "'%s' をチェックアウトしました" - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "'%s' を '%s' にリセットすると、以下のコミットが失なわれます:" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "失なわれたコミットを回復するのは簡単ではありません。" - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "'%s' をリセットしますか?" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "可視化" - -#: lib/checkout_op.tcl:635 -#, tcl-format -msgid "" -"Failed to set current branch.\n" -"\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" -"\n" -"This should not have occurred. %s will now close and give up." -msgstr "" -"現在のブランチを設定できません。\n" -"\n" -"作業ディレクトリは部分的にしか切り替わっていません。ファイルの更新には成功し" -"ましたが、 Git の内部データを更新できませんでした。\n" -"起こるはずのないエラーです。あきらめて %s を終了します。" - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "選択" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "フォント・ファミリー" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "フォントの大きさ" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "フォント・サンプル" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"これはサンプル文です。\n" -"このフォントが気に入ればお使いになれます。" - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git GUI" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" -msgstr "新しいリポジトリを作る" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "新規…" - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" -msgstr "既存リポジトリを複製する" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "複製…" - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" -msgstr "既存リポジトリを開く" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "開く…" - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "最近使ったリポジトリ" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "最近使ったリポジトリを開く" - -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "リポジトリ %s を作製できません:" - -#: lib/choose_repository.tcl:391 -msgid "Directory:" -msgstr "ディレクトリ:" - -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" -msgstr "GIT リポジトリ" - -#: lib/choose_repository.tcl:448 -#, tcl-format -msgid "Directory %s already exists." -msgstr "ディレクトリ '%s' は既に存在します。" - -#: lib/choose_repository.tcl:452 -#, tcl-format -msgid "File %s already exists." -msgstr "ファイル '%s' は既に存在します。" - -#: lib/choose_repository.tcl:466 -msgid "Clone" -msgstr "複製" - -#: lib/choose_repository.tcl:479 -msgid "Source Location:" -msgstr "ソースの位置" - -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" -msgstr "先ディレクトリ:" - -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" -msgstr "複製方式:" - -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "標準(高速・中冗長度・ハードリンク)" - -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "全複写(低速・冗長バックアップ)" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "共有(最高速・非推奨・バックアップ無し)" - -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Git リポジトリではありません: %s" - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "標準方式は同一計算機上のリポジトリにのみ使えます。" - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "共有方式は同一計算機上のリポジトリにのみ使えます。" - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "'%s' は既に存在します。" - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "origin を設定できませんでした" - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "オブジェクトを数えています" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "バケツ" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "objects/info/alternates を複写できません: %s" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "%s から複製する内容はありません" - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "'master' ブランチが初期化されていません" - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "ハードリンクが作れないので、コピーします" - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "%s から複製しています" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "オブジェクトを複写しています" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "オブジェクトを複写できません: %s" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "オブジェクトを連結しています" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "オブジェクト" - -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "オブジェクトをハードリンクできません: %s" - -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "ブランチやオブジェクトを取得できません。コンソール出力を見て下さい" - -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "タグを取得できません。コンソール出力を見て下さい" - -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "HEAD を確定できません。コンソール出力を見て下さい" - -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "%s を掃除できません" - -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "複写に失敗しました。" - -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "デフォールト・ブランチが取得されませんでした" - -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "%s をコミットとして解釈できません" - -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "作業ディレクトリを作成しています" - -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "ファイル" - -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "初期チェックアウトに失敗しました" - -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "開く" - -#: lib/choose_repository.tcl:1021 -msgid "Repository:" -msgstr "リポジトリ:" - -#: lib/choose_repository.tcl:1072 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "リポジトリ %s を開けません:" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "分離されたチェックアウト" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "リビジョン式:" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "ローカル・ブランチ" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "トラッキング・ブランチ" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "タグ" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "無効なリビジョン: %s" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "リビジョンが未選択です。" - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "リビジョン式が空です。" - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "更新しました" - -#: lib/choose_rev.tcl:559 -msgid "URL" -msgstr "URL" - -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" -msgstr "" -"訂正するコミットがそもそもありません。\n" -"\n" -"これから作るのは最初のコミットです。その前にはまだ訂正するようなコミットはあ" -"りません。\n" - -#: lib/commit.tcl:18 -msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" -msgstr "" -"マージ中にコミットの訂正はできません。\n" -"\n" -"現在はまだマージの途中です。先にこのマージを中止しないと、前のコミットの訂正" -"はできません\n" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "訂正するコミットのデータを読めません:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "ユーザの正体を確認できません:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "GIT_COMMITTER_IDENT が無効です:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません" - -#: lib/commit.tcl:149 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"最後にスキャンした状態はリポジトリの状態と合致しません。\n" -"\n" -"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。新し" -"くコミットする前に、再スキャンが必要です。\n" -"\n" -"自動的に再スキャンを開始します。\n" - -#: lib/commit.tcl:172 -#, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" -"\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" -msgstr "" -"マージしていないファイルはコミットできません。\n" -"\n" -"ファイル %s にはマージ衝突が残っています。まず解決してコミット予定に加える必" -"要があります。\n" - -#: lib/commit.tcl:180 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"不明なファイル状態 %s です。\n" -"\n" -"ファイル %s は本プログラムではコミットできません。\n" - -#: lib/commit.tcl:188 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"コミットする変更がありません。\n" -"\n" -"最低一つの変更をコミット予定に加えてからコミットして下さい。\n" - -#: lib/commit.tcl:203 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" -msgstr "" -"コミット・メッセージを入力して下さい。\n" -"\n" -"正しいコミット・メッセージは:\n" -"\n" -"- 第1行: 何をしたか、を1行で要約。\n" -"- 第2行: 空白\n" -"- 残りの行: なぜ、この変更が良い変更か、の説明。\n" - -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." -msgstr "コミット前フックを実行中・・・" - -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "コミット前フックがコミットを拒否しました" - -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "コミット・メッセージ・フックを実行中・・・" - -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "コミット・メッセージ・フックがコミットを拒否しました" - -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "変更点をコミット中・・・" - -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "write-tree が失敗しました:" - -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "コミットに失敗しました。" - -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "コミット %s は壊れています" - -#: lib/commit.tcl:339 -msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" -msgstr "" -"コミットする変更がありません。\n" -"\n" -"マージでなく、また、一つも変更点がありません。\n" -"\n" -"自動的に再スキャンを開始します。\n" - -#: lib/commit.tcl:346 -msgid "No changes to commit." -msgstr "コミットする変更がありません。" - -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "commit-tree が失敗しました:" - -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "update-ref が失敗しました:" - -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "コミット %s を作成しました: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "実行中…お待ち下さい…" - -#: lib/console.tcl:186 -msgid "Success" -msgstr "成功" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "エラー: コマンドが失敗しました" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "ばらばらなオブジェクトの数" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "ばらばらなオブジェクトの使用するディスク量" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "パックされたオブジェクトの数" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "パックの数" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "パックされたオブジェクトの使用するディスク量" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "パックに存在するので捨てて良いオブジェクトの数" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "ゴミファイル" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "データベース圧縮" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "fsck-objects でオブジェクト・データベースを検証しています" - -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"このリポジトリにはおおよそ %i 個の個別オブジェクトがあります\n" -"\n" -"最適な性能を保つために、データベースを圧縮することを推奨します\n" -"\n" -"データベースを圧縮しますか?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Git から出た無効な日付: %s" - -#: lib/diff.tcl:64 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." -msgstr "" -"変更がありません。\n" -"\n" -"%s には変更がありません。\n" -"\n" -"このファイルの変更時刻は他のアプリケーションによって更新されていますがファイ" -"ル内容には変更がありません。\n" -"\n" -"同様な状態のファイルを探すために、自動的に再スキャンを開始します。" - -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "%s の変更点をロード中…" - -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"LOCAL: 削除\n" -"Remote:\n" - -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"REMOTE: 削除\n" -"LOCAL:\n" - -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "LOCAL:\n" - -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "REMOTE\n" - -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" -msgstr "%s を表示できません" - -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "ファイルを読む際のエラーです:" - -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Git リポジトリ(サブプロジェクト)" - -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* バイナリファイル(内容は表示しません)" - -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* 管理外のファイルの大きさは %d バイトです。\n" -"* 最初の %d バイトだけ表示しています。\n" - -#: lib/diff.tcl:233 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"\n" -"* %s は管理外のファイルをここで切りおとしました。\n" -"* 全体を見るには外部エディタを使ってください。\n" - -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." -msgstr "選択されたパッチをコミット予定から外せません。" - -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "選択されたパッチをコミット予定に加えられません。" - -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "選択されたパッチ行をコミット予定から外せません。" - -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "選択されたパッチ行をコミット予定に加えられません。" - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "デフォールト" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "システム (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "その他" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "エラー" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "警告" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "コミットする前に、以上のエラーを修正して下さい" - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "インデックスをロックできません" - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "索引エラー" - -#: lib/index.tcl:17 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンし" -"ます。" - -#: lib/index.tcl:28 -msgid "Continue" -msgstr "続行" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "インデックスのロック解除" - -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "コミットから '%s' を降ろす" - -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "コミット準備完了" - -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "コミットに %s を加えています" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "ファイル %s にした変更を元に戻しますか?" - -#: lib/index.tcl:400 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "これら %i 個のファイルにした変更を元に戻しますか?" - -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。" - -#: lib/index.tcl:411 -msgid "Do Nothing" -msgstr "何もしない" - -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "選択されたファイルにした変更を元に戻します" - -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "%s にした変更を元に戻します" - -#: lib/merge.tcl:13 -msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" -msgstr "" -"訂正中にはマージできません。\n" -"\n" -"訂正処理を完了するまでは新たにマージを開始できません。\n" - -#: lib/merge.tcl:27 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"最後にスキャンした状態はリポジトリの状態と合致しません。\n" -"\n" -"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。マー" -"ジを開始する前に、再スキャンが必要です。\n" -"\n" -"自動的に再スキャンを開始します。\n" - -#: lib/merge.tcl:45 -#, tcl-format -msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" -msgstr "" -"衝突のあったマージの途中です。\n" -"\n" -"ファイル %s にはマージ中の衝突が残っています。\n" -"\n" -"このファイルの衝突を解決し、コミット予定に加えて、コミットすることでマージを" -"完了します。そうやって始めて、新たなマージを開始できるようになります。\n" - -#: lib/merge.tcl:55 -#, tcl-format -msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" -msgstr "" -"変更の途中です。\n" -"\n" -"ファイル %s は変更中です。\n" -"\n" -"現在のコミットを完了してからマージを開始して下さい。そうする方がマージに失敗" -"したときの回復が楽です。\n" - -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s の %s ブランチ" - -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "%s と %s をマージ中・・・" - -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "マージが完了しました" - -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "マージが失敗しました。衝突の解決が必要です。" - -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "%s にマージ" - -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "マージするリビジョン" - -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"訂正中には中止できません。\n" -"\n" -"まず今のコミット訂正を完了させて下さい。\n" - -#: lib/merge.tcl:222 -msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" -msgstr "" -"マージを中断しますか?\n" -"\n" -"現在のマージを中断すると、コミットしていない全ての変更が失われます。\n" -"\n" -"マージを中断してよろしいですか?" - -#: lib/merge.tcl:228 -msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" -msgstr "" -"変更点をリセットしますか?\n" -"\n" -"変更点をリセットすると、コミットしていない全ての変更が失われます。\n" -"\n" -"リセットしてよろしいですか?" - -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "中断しています" - -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "リセットしたファイル" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "中断に失敗しました。" - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "中断完了。" - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "共通の版を使いますか?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "自分の側の版を使いますか?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "相手制の版を使いますか?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"競合する変更点だけが表示されていることに注意してください。\n" -"\n" -"%s は上書きされます。\n" -"\n" -"やり直すにはマージ全体をやり直してください。" - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" -"ファイル %s には解決していない競合部分がまだあるようですが、いいですか?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "%s への解決をステージします" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "ツールでは削除やリンク競合は扱えません" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "競合ファイルは存在しません。" - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "GUI マージツールではありません: %s" - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "マージツール '%s' はサポートしていません" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "マージツールはすでに起動しています。終了しますか?" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"版の取り出し時にエラーが出ました:\n" -"%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"マージツールが起動できません:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "マージツールを実行しています..." - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "マージツールが失敗しました。" - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "全体エンコーディングに 無効な %s が指定されています" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "リポジトリエンコーディングに 無効な %s が指定されています" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "既定値に戻す" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "保存" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "%s リポジトリ" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "大域(全てのリポジトリ)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "ユーザ名" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "電子メールアドレス" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "マージコミットの要約" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "マージの冗長度" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "マージ後に diffstat を表示" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "マージツールを使用" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "ファイル変更時刻を信頼する" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "フェッチ中にトラッキングブランチを刈る" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "トラッキングブランチを合わせる" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "変更されたファイルのみコピー検知を行なう" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "コピーを検知する最少文字数" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "註釈する履歴半径(日数)" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "diff の文脈行数" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "コミットメッセージのテキスト幅" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "新しいブランチ名のテンプレート" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "ファイル内容のデフォールトエンコーディング" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "変更" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "スペルチェック辞書" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "フォントを変更" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "%s を選択" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "ポイント" - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "設定" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "完全にオプションを保存できません:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "リモートを削除" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "から刈込む…" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "取得元" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "プッシュ先" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "リモートを追加" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "リモートを新規に追加" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "追加" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "リモートの詳細" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "場所:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "その他の動作" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "即座に取得" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "リモートレポジトリを初期化してプッシュ" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "何もしない" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "リモート名を指定して下さい。" - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "'%s' はリモート名に使えません。" - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "場所 '%2$s' のリモート '%1$s'の名前変更に失敗しました。" - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "%s を取得" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "%s からフェッチしています" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "リポジトリ '%s' を初期化できません。" - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "%s をプッシュ" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "%2$s にある %1$s をセットアップします" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "遠隔でブランチ削除" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "元のリポジトリ" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "リモート:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "任意の位置:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "ブランチ" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "条件付で削除" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "マージ先:" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "'マージ先' にはブランチが必要です。" - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"以下のブランチは %s に完全にマージされていません:\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:189 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "" -"必要なコミットが不足しているために、マージ検査が失敗しました。まず %s から" -"フェッチして下さい。" - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "削除するブランチを選択して下さい。" - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "%s からブランチを削除しています。" - -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "リポジトリが選択されていません。" - -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "%s をスキャンしています…" - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "検索:" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "次" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "前" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "大文字小文字を区別" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "ショートカットが書けません:" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "アイコンが書けません:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "サポートされていないスペルチェッカーです" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "スペルチェック機能は使えません" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "スペルチェックの設定が不正です" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "辞書を %s に巻き戻します" - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "スペルチェッカーの起動に失敗しました" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "スペルチェッカーが判別できません" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "提案なし" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "スペルチェッカーが予想外の EOF を返しました" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "スペルチェック失敗" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "キーがありません。" - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "公開鍵がありました: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "鍵を生成" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "クリップボードにコピー" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "あなたの OpenSSH 公開鍵" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "生成中..." - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"ssh-keygen を起動できません:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "生成に失敗しました。" - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "生成には成功しましたが、鍵が見つかりません。" - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "あなたの鍵は %s にあります" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%1$s ... %4$*i %6$s 中の %2$*i (%7$3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "ファイルを選択してから %s を起動してください。" - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "本当に %s を起動しますか?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "ツール: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "実行中: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "ツールが完了しました: %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "ツールが失敗しました: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "ツールの追加" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "新規ツールコマンドの追加" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "全体に追加" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "ツールの詳細" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "'/' でサブメニューを区切ります:" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "コマンド:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "起動する前にダイアログを表示" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "ユーザにコミットを一つ選ばせる ($REVISION にセットします)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "ユーザに他の引数を追加させる ($ARGS にセットします)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "コマンドからの出力ウィンドウを見せない" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "パッチが選ばれているときだけ動かす($FILENAME が空でない)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "ツール名を指定して下さい。" - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "ツール '%s' は既に存在します。" - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"ツールを追加できません:\n" -"%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "ツールの削除" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "ツールコマンドの削除" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "削除" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(青色はローカルレポジトリのツールです)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "コマンドを起動: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "引数" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "%s から新しい変更をフェッチしています" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "遠隔刈込 %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "%s から削除されたトラッキング・ブランチを刈っています" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "%s へ変更をプッシュしています" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "%s へミラーしています" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "%3$s へ %1$s %2$s をプッシュしています" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "ブランチをプッシュ" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "元のブランチ" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "送り先リポジトリ" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "通信オプション" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "既存ブランチを上書き(変更を破棄する可能性があります)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "Thin Pack を使う(遅いネットワーク接続)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "タグを含める" diff --git a/po/nb.po b/po/nb.po deleted file mode 100644 index d66aa50..0000000 --- a/po/nb.po +++ /dev/null @@ -1,2474 +0,0 @@ -# Norwegian (Bokmål) translation of git-gui. -# Copyright (C) 2007-2008 Shawn Pearce, et al. -# This file is distributed under the same license as the git-gui package. -# -# Fredrik Skolmli <fredrik@frsk.net>, 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: nb\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-16 13:56-0800\n" -"PO-Revision-Date: 2008-12-03 16:05+0100\n" -"Last-Translator: Fredrik Skolmli <fredrik@frsk.net>\n" -"Language-Team: Norwegian Bokmål\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847 -#: git-gui.sh:866 -msgid "git-gui: fatal error" -msgstr "git-gui: Kritisk feil" - -#: git-gui.sh:689 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Ugyldig font spesifisert i %s:" - -#: git-gui.sh:723 -msgid "Main Font" -msgstr "Hovedskrifttype" - -#: git-gui.sh:724 -msgid "Diff/Console Font" -msgstr "Diff-/Konsollskrifttype" - -#: git-gui.sh:738 -msgid "Cannot find git in PATH." -msgstr "Kan ikke finne git i PATH" - -#: git-gui.sh:765 -msgid "Cannot parse Git version string:" -msgstr "Kan ikke tyde Git's oppgitte versjon:" - -#: git-gui.sh:783 -#, tcl-format -msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" -msgstr "" -"Kan ikke avgjøre hvilken Git-versjon du har.\n" -"\n" -"%s sier versjonen er '%s'.\n" -"\n" -"%s krever Git versjon 1.5.0 eller nyere.\n" -"\n" -"Anta at '%s' er versjon 1.5.0?\n" - -#: git-gui.sh:1062 -msgid "Git directory not found:" -msgstr "Git-katalog ikke funnet:" - -#: git-gui.sh:1069 -msgid "Cannot move to top of working directory:" -msgstr "Kan ikke gå til toppen av arbeidskatalogen:" - -#: git-gui.sh:1076 -msgid "Cannot use funny .git directory:" -msgstr "" - -#: git-gui.sh:1081 -msgid "No working directory" -msgstr "Ingen arbeidskatalog" - -#: git-gui.sh:1247 lib/checkout_op.tcl:305 -msgid "Refreshing file status..." -msgstr "Oppdaterer filstatus..." - -#: git-gui.sh:1303 -msgid "Scanning for modified files ..." -msgstr "Søker etter endrede filer..." - -#: git-gui.sh:1367 -msgid "Calling prepare-commit-msg hook..." -msgstr "" - -#: git-gui.sh:1384 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "" - -#: git-gui.sh:1542 lib/browser.tcl:246 -msgid "Ready." -msgstr "Klar." - -#: git-gui.sh:1819 -msgid "Unmodified" -msgstr "Uendret" - -#: git-gui.sh:1821 -msgid "Modified, not staged" -msgstr "Endret, ikke køet" - -#: git-gui.sh:1822 git-gui.sh:1830 -msgid "Staged for commit" -msgstr "Køet for innsjekking" - -#: git-gui.sh:1823 git-gui.sh:1831 -msgid "Portions staged for commit" -msgstr "Delvis køet for innsjekking" - -#: git-gui.sh:1824 git-gui.sh:1832 -msgid "Staged for commit, missing" -msgstr "Klar for innsjekking, fraværende" - -#: git-gui.sh:1826 -msgid "File type changed, not staged" -msgstr "Filtype endret, ikke køet" - -#: git-gui.sh:1827 -msgid "File type changed, staged" -msgstr "Filtype endret, køet" - -#: git-gui.sh:1829 -msgid "Untracked, not staged" -msgstr "Usporet, ikke køet" - -#: git-gui.sh:1834 -msgid "Missing" -msgstr "Fraværende" - -#: git-gui.sh:1835 -msgid "Staged for removal" -msgstr "Køet for fjerning" - -#: git-gui.sh:1836 -msgid "Staged for removal, still present" -msgstr "Køet for fjerning, fortsatt tilstede" - -#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841 -#: git-gui.sh:1842 git-gui.sh:1843 -msgid "Requires merge resolution" -msgstr "Sammenslåingen krever konflikthåndtering" - -#: git-gui.sh:1878 -msgid "Starting gitk... please wait..." -msgstr "Starter gitk... Vennligst vent..." - -#: git-gui.sh:1887 -msgid "Couldn't find gitk in PATH" -msgstr "Kunne ikke finne gitk i PATH" - -#: git-gui.sh:2280 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Arkiv" - -#: git-gui.sh:2281 -msgid "Edit" -msgstr "Redigere" - -#: git-gui.sh:2283 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Gren" - -#: git-gui.sh:2286 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Innsjekking" - -#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Sammenslåing" - -#: git-gui.sh:2290 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Fjernarkiv" - -#: git-gui.sh:2293 -msgid "Tools" -msgstr "Verktøy" - -#: git-gui.sh:2302 -msgid "Explore Working Copy" -msgstr "Utforsk arbeidskopien" - -#: git-gui.sh:2307 -msgid "Browse Current Branch's Files" -msgstr "Utforsk denne grens filer" - -#: git-gui.sh:2311 -msgid "Browse Branch Files..." -msgstr "Bla igjennom filer på gren..." - -#: git-gui.sh:2316 -msgid "Visualize Current Branch's History" -msgstr "Visualiser denne grens historikk" - -#: git-gui.sh:2320 -msgid "Visualize All Branch History" -msgstr "Visualiser alle greners historikk" - -#: git-gui.sh:2327 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Bla i filene til %s" - -#: git-gui.sh:2329 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Visualiser historien til %s" - -#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Databasestatistikk" - -#: git-gui.sh:2337 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Kompress databasen" - -#: git-gui.sh:2340 -msgid "Verify Database" -msgstr "Verifiser databasen" - -#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7 -#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 -msgid "Create Desktop Icon" -msgstr "Lag skrivebordsikon" - -#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Avslutt" - -#: git-gui.sh:2371 -msgid "Undo" -msgstr "Angre" - -#: git-gui.sh:2374 -msgid "Redo" -msgstr "Gjør om" - -#: git-gui.sh:2378 git-gui.sh:2923 -msgid "Cut" -msgstr "Klipp ut" - -#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Kopier" - -#: git-gui.sh:2384 git-gui.sh:2929 -msgid "Paste" -msgstr "Lim inn" - -#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Slett" - -#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71 -msgid "Select All" -msgstr "Velg alle" - -#: git-gui.sh:2400 -msgid "Create..." -msgstr "Opprett..." - -#: git-gui.sh:2406 -msgid "Checkout..." -msgstr "Sjekk ut..." - -#: git-gui.sh:2412 -msgid "Rename..." -msgstr "Endre navn..." - -#: git-gui.sh:2417 -msgid "Delete..." -msgstr "Slett..." - -#: git-gui.sh:2422 -msgid "Reset..." -msgstr "Tilbakestill..." - -#: git-gui.sh:2432 -msgid "Done" -msgstr "Ferdig" - -#: git-gui.sh:2434 -msgid "Commit@@verb" -msgstr "Sjekk inn" - -#: git-gui.sh:2443 git-gui.sh:2864 -msgid "New Commit" -msgstr "Ny innsjekking" - -#: git-gui.sh:2451 git-gui.sh:2871 -msgid "Amend Last Commit" -msgstr "Legg til forrige innsjekking" - -#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Søk på ny" - -#: git-gui.sh:2467 -msgid "Stage To Commit" -msgstr "Legg til i innsjekkingskøen" - -#: git-gui.sh:2473 -msgid "Stage Changed Files To Commit" -msgstr "Legg til endrede filer i innsjekkingskøen" - -#: git-gui.sh:2479 -msgid "Unstage From Commit" -msgstr "Fjern fra innsjekkingskøen" - -#: git-gui.sh:2484 lib/index.tcl:410 -msgid "Revert Changes" -msgstr "Tilbakestill endringer" - -#: git-gui.sh:2491 git-gui.sh:3069 -msgid "Show Less Context" -msgstr "Vis mindre innhold" - -#: git-gui.sh:2495 git-gui.sh:3073 -msgid "Show More Context" -msgstr "Vis mer innhold" - -#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947 -msgid "Sign Off" -msgstr "Signér" - -#: git-gui.sh:2518 -msgid "Local Merge..." -msgstr "Lokal sammenslåing..." - -#: git-gui.sh:2523 -msgid "Abort Merge..." -msgstr "Avbryt sammenslåing..." - -#: git-gui.sh:2535 git-gui.sh:2575 -msgid "Add..." -msgstr "Legg til..." - -#: git-gui.sh:2539 -msgid "Push..." -msgstr "Send..." - -#: git-gui.sh:2543 -msgid "Delete Branch..." -msgstr "Fjern gren..." - -#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "Om %s" - -#: git-gui.sh:2557 -msgid "Preferences..." -msgstr "Innstillinger..." - -#: git-gui.sh:2565 git-gui.sh:3115 -msgid "Options..." -msgstr "Alternativer..." - -#: git-gui.sh:2576 -msgid "Remove..." -msgstr "Fjern..." - -#: git-gui.sh:2585 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Hjelp" - -#: git-gui.sh:2611 -msgid "Online Documentation" -msgstr "Online dokumentasjon" - -#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "Vis SSH-nøkkel" - -#: git-gui.sh:2707 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"kritisk: kunne ikke finne status for sti %s: Ingen slik fil eller katalog" - -#: git-gui.sh:2740 -msgid "Current Branch:" -msgstr "Nåværende gren:" - -#: git-gui.sh:2761 -msgid "Staged Changes (Will Commit)" -msgstr "Køede endringer (til innsjekking)" - -#: git-gui.sh:2781 -msgid "Unstaged Changes" -msgstr "Ukøede endringer" - -#: git-gui.sh:2831 -msgid "Stage Changed" -msgstr "Kø endret" - -#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182 -msgid "Push" -msgstr "Send" - -#: git-gui.sh:2885 -msgid "Initial Commit Message:" -msgstr "Innledende innsjekkingsmelding:" - -#: git-gui.sh:2886 -msgid "Amended Commit Message:" -msgstr "Utdypt innsjekkingsmelding" - -#: git-gui.sh:2887 -msgid "Amended Initial Commit Message:" -msgstr "Utdypt innledende innsjekkingsmelding:" - -#: git-gui.sh:2888 -msgid "Amended Merge Commit Message:" -msgstr "Utdypt innsjekkingsmelding for sammenslåing:" - -#: git-gui.sh:2889 -msgid "Merge Commit Message:" -msgstr "Revisjonsmelding for sammenslåing:" - -#: git-gui.sh:2890 -msgid "Commit Message:" -msgstr "Revisjonsmelding:" - -#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73 -msgid "Copy All" -msgstr "Kopier alle" - -#: git-gui.sh:2963 lib/blame.tcl:104 -msgid "File:" -msgstr "Fil:" - -#: git-gui.sh:3078 -msgid "Refresh" -msgstr "Oppdater" - -#: git-gui.sh:3099 -msgid "Decrease Font Size" -msgstr "Gjør teksten mindre" - -#: git-gui.sh:3103 -msgid "Increase Font Size" -msgstr "Gjør teksten større" - -#: git-gui.sh:3111 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Tekstkoding" - -#: git-gui.sh:3122 -msgid "Apply/Reverse Hunk" -msgstr "Bruk/tilbakestill del" - -#: git-gui.sh:3127 -msgid "Apply/Reverse Line" -msgstr "Bruk/tilbakestill linje" - -#: git-gui.sh:3137 -msgid "Run Merge Tool" -msgstr "Start sammenslåingsprosess" - -#: git-gui.sh:3142 -msgid "Use Remote Version" -msgstr "Bruk versjon fra fjernarkiv" - -#: git-gui.sh:3146 -msgid "Use Local Version" -msgstr "Bruk lokal versjon" - -#: git-gui.sh:3150 -msgid "Revert To Base" -msgstr "Tilbakestill til baseversjonen" - -#: git-gui.sh:3169 -msgid "Unstage Hunk From Commit" -msgstr "Fjern delen fra innsjekkingskøen" - -#: git-gui.sh:3170 -msgid "Unstage Line From Commit" -msgstr "Fjern linjen fra innsjekkingskøen" - -#: git-gui.sh:3172 -msgid "Stage Hunk For Commit" -msgstr "Legg del i innsjekkingskøen" - -#: git-gui.sh:3173 -msgid "Stage Line For Commit" -msgstr "Legg til linje i innsjekkingskøen" - -#: git-gui.sh:3196 -msgid "Initializing..." -msgstr "Initsialiserer..." - -#: git-gui.sh:3301 -#, tcl-format -msgid "" -"Possible environment issues exist.\n" -"\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" -"\n" -msgstr "" - -#: git-gui.sh:3331 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" - -#: git-gui.sh:3336 -#, tcl-format -msgid "" -"\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\n" -msgstr "" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - Et grafisk brukergrensesnitt for Git." - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Filviser" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Innsjekking:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Kopier innsjekking" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Søk etter tekst..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Gjennomfør full deteksjon av kopieringer" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Vis historikkens innhold" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Leser %s..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "" - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "" - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "" - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Opptatt" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "" - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Kjører kopidetektering..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "" - -#: lib/blame.tcl:964 -msgid "Author:" -msgstr "Forfatter:" - -#: lib/blame.tcl:968 -msgid "Committer:" -msgstr "Innsjekker:" - -#: lib/blame.tcl:973 -msgid "Original File:" -msgstr "Opprinnelig fil:" - -#: lib/blame.tcl:1021 -msgid "Cannot find HEAD commit:" -msgstr "Finner ikke HEAD's innsjekking:" - -#: lib/blame.tcl:1076 -msgid "Cannot find parent commit:" -msgstr "Kan ikke finne innsjekkingens forelder:" - -#: lib/blame.tcl:1091 -msgid "Unable to display parent" -msgstr "Kan ikke vise forelder" - -#: lib/blame.tcl:1092 lib/diff.tcl:297 -msgid "Error loading diff:" -msgstr "Feil ved innlasting av forskjell:" - -#: lib/blame.tcl:1232 -msgid "Originally By:" -msgstr "Opprinnelig av:" - -#: lib/blame.tcl:1238 -msgid "In File:" -msgstr "I fil:" - -#: lib/blame.tcl:1243 -msgid "Copied Or Moved Here By:" -msgstr "Kopiert eller flyttet hit av:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Sjekk ut gren" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "Utsjekking" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:97 -msgid "Cancel" -msgstr "Avbryt" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Revisjon" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "Valg" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Hent sporet gren" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Koble bort lokal gren" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Opprett gren" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Opprett ny gren" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377 -msgid "Create" -msgstr "Opprett" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Navn på gren" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "Navn:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Bruk navn på sporet gren" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Starter revisjon" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Oppdater eksisterende gren:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Nei" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Kun hurtigfremspoling" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536 -msgid "Reset" -msgstr "Tilbakestill" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Sjekk ut etter oppretting" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Velg en gren som skal følges." - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Den fulgte grenen %s er ikke en gren i fjernarkivet." - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Angi et navn for grenen." - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "'%s' kan ikke brukes som navn på en gren." - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Fjern gren" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Fjern lokal gren" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Lokale grener" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Fjern kun ved sammenslåing" - -#: lib/branch_delete.tcl:54 -msgid "Always (Do not perform merge test.)" -msgstr "Alltid (Ikke utfør sammenslåingstest.)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Følgende grener er ikke fullstendig slått sammen med %s:" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Kunne ikke fjerne grener:\n" -"%s" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Gi gren nytt navn" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Endre navn" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Gren:" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Nytt navn:" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Vennligst velg grenen du vil endre navn på." - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Grenen '%s' eksisterer allerede." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Kunne ikke endre navnet '%s'." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Starter..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "Utforsker" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Laster %s..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Opp til forelder]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Bla igjennom grenens filer" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:394 -#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491 -#: lib/choose_repository.tcl:995 -msgid "Browse" -msgstr "Bla igjennom" - -#: lib/checkout_op.tcl:84 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Henter %s fra %s" - -#: lib/checkout_op.tcl:132 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "kritisk: Kan ikke åpne %s" - -#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Lukk" - -#: lib/checkout_op.tcl:174 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Grenen '%s' eksisterer ikke." - -#: lib/checkout_op.tcl:193 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Kunne ikke konfigurere forenklet git-pull for '%s'." - -#: lib/checkout_op.tcl:228 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"Grenen '%s' eksisterer allerede.\n" -"\n" -"Den kan ikke hurtigfremspoles til %s.\n" -"En sammenslåing er påkrevd." - -#: lib/checkout_op.tcl:242 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Sammenslåingsstrategien '%s' er ikke støttet." - -#: lib/checkout_op.tcl:261 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Kunne ikke oppdatere '%s'." - -#: lib/checkout_op.tcl:273 -msgid "Staging area (index) is already locked." -msgstr "Køområdet (index) er allerede låst." - -#: lib/checkout_op.tcl:288 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" - -#: lib/checkout_op.tcl:344 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Oppdaterer arbeidskatalogen til '%s'..." - -#: lib/checkout_op.tcl:345 -msgid "files checked out" -msgstr "filer sjekket ut" - -#: lib/checkout_op.tcl:375 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "Avbrøt utsjekkingen av '%s' (sammenslåing på filnivå kreves)." - -#: lib/checkout_op.tcl:376 -msgid "File level merge required." -msgstr "Sammenslåing på filnivå kreves" - -#: lib/checkout_op.tcl:380 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Blir stående på grenen '%s'." - -#: lib/checkout_op.tcl:451 -msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." -msgstr "" - -#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Sjekket ut '%s'." - -#: lib/checkout_op.tcl:500 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "" -"Tilbakestilling av '%s' til '%s' vil medføre tap av følgende innsjekkinger:" - -#: lib/checkout_op.tcl:522 -msgid "Recovering lost commits may not be easy." -msgstr "" -"Det vil kanskje ikke være så enkelt å gjenopprette en tapt innsjekking." - -#: lib/checkout_op.tcl:527 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Tilbakestill '%s'?" - -#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Visualiser" - -#: lib/checkout_op.tcl:600 -#, tcl-format -msgid "" -"Failed to set current branch.\n" -"\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" -"\n" -"This should not have occurred. %s will now close and give up." -msgstr "" - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Velg" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Skrifttype-familie" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Skriftstørrelse" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Skrifteksempel" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Dette er en eksempeltekst.\n" -"Hvis du liker hvordan teksten ser ut, kan du velge dette som din skrifttype." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382 -msgid "Create New Repository" -msgstr "Opprett nytt arkiv" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Ny..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465 -msgid "Clone Existing Repository" -msgstr "Klon eksistererende arkiv" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Klon..." - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983 -msgid "Open Existing Repository" -msgstr "Åpne eksistererende arkiv" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Åpne..." - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Nylig brukte arkiv" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Åpne nylig brukt arkiv:" - -#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309 -#: lib/choose_repository.tcl:316 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Kunne ikke opprette arkivet %s:" - -#: lib/choose_repository.tcl:387 -msgid "Directory:" -msgstr "Mappe:" - -#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544 -#: lib/choose_repository.tcl:1017 -msgid "Git Repository" -msgstr "Git arkiv" - -#: lib/choose_repository.tcl:442 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Mappen %s eksisterer allerede." - -#: lib/choose_repository.tcl:446 -#, tcl-format -msgid "File %s already exists." -msgstr "Filen %s eksisterer allerede." - -#: lib/choose_repository.tcl:460 -msgid "Clone" -msgstr "Klon" - -#: lib/choose_repository.tcl:473 -msgid "Source Location:" -msgstr "Kildeplassering:" - -#: lib/choose_repository.tcl:484 -msgid "Target Directory:" -msgstr "Destinasjonsmappe:" - -#: lib/choose_repository.tcl:496 -msgid "Clone Type:" -msgstr "Klontype:" - -#: lib/choose_repository.tcl:502 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Standard (rask, delvis redundant, hardlinker)" - -#: lib/choose_repository.tcl:508 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Full kopi (tregere, redundant sikkerhetskopi)" - -#: lib/choose_repository.tcl:514 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Delt (raskest, ikke anbefalt, ingen sikkerhetskopiering)" - -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 -#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813 -#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Ikke et Git-arkiv: %s" - -#: lib/choose_repository.tcl:586 -msgid "Standard only available for local repository." -msgstr "Standard er kun tilgjengelig for lokalt arkiv." - -#: lib/choose_repository.tcl:590 -msgid "Shared only available for local repository." -msgstr "Delt er kun tilgjengelig for lokalt arkiv." - -#: lib/choose_repository.tcl:611 -#, tcl-format -msgid "Location %s already exists." -msgstr "Stedet %s eksisterer allerede." - -#: lib/choose_repository.tcl:622 -msgid "Failed to configure origin" -msgstr "Kunne ikke konfigurere kildeoppføring" - -#: lib/choose_repository.tcl:634 -msgid "Counting objects" -msgstr "Teller objekter" - -#: lib/choose_repository.tcl:635 -msgid "buckets" -msgstr "bøtter" - -#: lib/choose_repository.tcl:659 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Kunne ikke kopiere objekter/informasjon/alternativt: %s" - -#: lib/choose_repository.tcl:695 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Ingenting å klone fra %s." - -#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911 -#: lib/choose_repository.tcl:923 -msgid "The 'master' branch has not been initialized." -msgstr "Grenen 'master' har ikke blitt initsialisert." - -#: lib/choose_repository.tcl:710 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Harde linker er utilgjengelig. Går tilbake til kopiering." - -#: lib/choose_repository.tcl:722 -#, tcl-format -msgid "Cloning from %s" -msgstr "Kloner fra %s" - -#: lib/choose_repository.tcl:753 -msgid "Copying objects" -msgstr "Kopierer objekter" - -#: lib/choose_repository.tcl:754 -msgid "KiB" -msgstr "kB" - -#: lib/choose_repository.tcl:778 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Kunne ikke kopiere objekt: %s" - -#: lib/choose_repository.tcl:788 -msgid "Linking objects" -msgstr "Lenker objekter" - -#: lib/choose_repository.tcl:789 -msgid "objects" -msgstr "objekter" - -#: lib/choose_repository.tcl:797 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Kunne ikke opprette hardlink med objektet: %s" - -#: lib/choose_repository.tcl:852 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "Kunne ikke hente grener og objekter. Se utdata i konsoll for detaljer." - -#: lib/choose_repository.tcl:863 -msgid "Cannot fetch tags. See console output for details." -msgstr "Kunne ikke hente tagger. Se utdata i konsoll for detaljer." - -#: lib/choose_repository.tcl:887 -msgid "Cannot determine HEAD. See console output for details." -msgstr "Kan ikke bestemme HEAD. Se utdata i konsoll for detaljer." - -#: lib/choose_repository.tcl:896 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Kunne ikke rydde opp %s" - -#: lib/choose_repository.tcl:902 -msgid "Clone failed." -msgstr "Kloning feilet." - -#: lib/choose_repository.tcl:909 -msgid "No default branch obtained." -msgstr "Ingen standardgren hentet." - -#: lib/choose_repository.tcl:920 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Kan ikke finne %s som en innsjekking." - -#: lib/choose_repository.tcl:932 -msgid "Creating working directory" -msgstr "Oppretter arbeidskatalog" - -#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128 -#: lib/index.tcl:196 -msgid "files" -msgstr "filer" - -#: lib/choose_repository.tcl:962 -msgid "Initial file checkout failed." -msgstr "Initsialiserende utsjekking feilet." - -#: lib/choose_repository.tcl:978 -msgid "Open" -msgstr "Åpne" - -#: lib/choose_repository.tcl:988 -msgid "Repository:" -msgstr "Arkiv:" - -#: lib/choose_repository.tcl:1037 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Kunne ikke åpne arkivet %s:" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "Denne frakoblede utsjekkingen" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Revisjonsuttrykk:" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "Lokal gren" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "Sporet gren" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "Tag" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Ugyldig revisjon: %s" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "Ingen revisjoner valgt." - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "Revisjonsuttrykk er tomt." - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "Oppdatert" - -#: lib/choose_rev.tcl:559 -msgid "URL" -msgstr "URL" - -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" -msgstr "" -"Det er ingenting å legge til.\n" -"\n" -"Du er i ferd med å lage den initsialiserende revisjonen. Det er ingen " -"tidligere revisjoner å tilføye.\n" - -#: lib/commit.tcl:18 -msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" -msgstr "" -"Kan ikke tilføye under sammenslåing.\n" -"\n" -"Du er for øyeblikket under en pågående sammenslåing som ikke er fullført. Du " -"kan ikke tilføye en tidligere revisjon med mindre du først avbryter denne " -"sammenslåingen.\n" - -#: lib/commit.tcl:49 -msgid "Error loading commit data for amend:" -msgstr "Feil ved innhenting av revisjonsdata for tilføying:" - -#: lib/commit.tcl:76 -msgid "Unable to obtain your identity:" -msgstr "Kunne ikke avgjøre din identitet:" - -#: lib/commit.tcl:81 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Ugyldig GIT_COMMITTER_IDENT:" - -#: lib/commit.tcl:133 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" - -#: lib/commit.tcl:156 -#, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" -"\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" -msgstr "" - -#: lib/commit.tcl:164 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Ukjent filstatus %s er funnet.\n" -"\n" -"Filen %s kan ikke sjekkes inn av dette programmet.\n" - -#: lib/commit.tcl:172 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Ingen endringer å sjekke inn.\n" -"\n" -"Du må køe minst en fil før du kan sjekke inn noe.\n" - -#: lib/commit.tcl:187 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" -msgstr "" -"Vennligst angi en revisjonsmelding.\n" -"\n" -"En god melding har følgende format:\n" -"\n" -"- Første linje: En beskrivelse av hva du har gjort i én setning.\n" -"- Andre linje: Blank\n" -"- Resterende linjer: Forklar hvorfor denne endringen er bra.\n" - -#: lib/commit.tcl:211 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "advarsel: Tcl støtter ikke denne tegnkodingen '%s'." - -#: lib/commit.tcl:227 -msgid "Calling pre-commit hook..." -msgstr "" - -#: lib/commit.tcl:242 -msgid "Commit declined by pre-commit hook." -msgstr "" - -#: lib/commit.tcl:265 -msgid "Calling commit-msg hook..." -msgstr "" - -#: lib/commit.tcl:280 -msgid "Commit declined by commit-msg hook." -msgstr "" - -#: lib/commit.tcl:293 -msgid "Committing changes..." -msgstr "Sjekker inn endringer..." - -#: lib/commit.tcl:309 -msgid "write-tree failed:" -msgstr "Skriving til tre feilet:" - -#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374 -msgid "Commit failed." -msgstr "Innsjekking feilet." - -#: lib/commit.tcl:327 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Revisjon %s ser ut til å være korrupt" - -#: lib/commit.tcl:332 -msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" -msgstr "" -"Ingen endringer til innsjekking.\n" -"\n" -"Ingen filer ble endret av denne revisjonen, og det var ikke en revisjon fra " -"en sammenslåing.\n" -"\n" -"Et nytt søk vil bli startet automatisk.\n" - -#: lib/commit.tcl:339 -msgid "No changes to commit." -msgstr "Ingen endringer til innsekking." - -#: lib/commit.tcl:353 -msgid "commit-tree failed:" -msgstr "commit-tree feilet:" - -#: lib/commit.tcl:373 -msgid "update-ref failed:" -msgstr "update-ref feilet:" - -#: lib/commit.tcl:461 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Opprettet innsjekking %s: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Jobber... Vennligst vent..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Suksess" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Feil: Kommandoen feilet" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "Antall løse objekter" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "Diskplass brukt av løse objekter" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "Antall pakkede objekter" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "Antall pakker" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "Diskplass brukt av pakkede objekter" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "Pakkede objekter som avventer fjerning" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "Avfallsfiler" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Komprimerer objektdatabasen" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Verifiserer objektdatabasen med fsck-objects" - -#: lib/database.tcl:108 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database when more than %i loose objects exist.\n" -"\n" -"Compress the database now?" -msgstr "" -"Dette arkivet inneholder omtrent %i 'løse' objekter.\n" -"\n" -"For å sikre en optimal ytelse er det sterkt anbefalt at du komprimerer " -"databasen når det er flere enn %i 'løse' objekter i den.\n" -"\n" -"Komprimere databasen nå?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Ugyldig dato fra Git: %s" - -#: lib/diff.tcl:59 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." -msgstr "" -"Ingen forandringer funnet.\n" -"\n" -"%s har ingen endringer.\n" -"\n" -"Tidsstempelet for endring på denne filen ble oppdatert av en annen " -" applikasjon, men innholdet er uendret.\n" -"\n" -"En gjennomsøking vil nå starte automatisk for å se om andre filer har " -"status." - -#: lib/diff.tcl:99 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Laster inn forskjellene av %s..." - -#: lib/diff.tcl:120 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "LOKAL: slettet\n" -"FJERN:\n" - -#: lib/diff.tcl:125 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "FJERN: slettet\n" -"LOKAL:\n" - -#: lib/diff.tcl:132 -msgid "LOCAL:\n" -msgstr "LOKAL:\n" - -#: lib/diff.tcl:135 -msgid "REMOTE:\n" -msgstr "FJERN:\n" - -#: lib/diff.tcl:197 lib/diff.tcl:296 -#, tcl-format -msgid "Unable to display %s" -msgstr "Kan ikke vise %s" - -#: lib/diff.tcl:198 -msgid "Error loading file:" -msgstr "Feil ved lesing av fil: %s" - -#: lib/diff.tcl:205 -msgid "Git Repository (subproject)" -msgstr "Git-arkiv (underprosjekt)" - -#: lib/diff.tcl:217 -msgid "* Binary file (not showing content)." -msgstr "* Binærfil (viser ikke innhold)" - -#: lib/diff.tcl:222 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Usporet fil er %d bytes.\n" -"* Viser bare %d første bytes.\n" - -#: lib/diff.tcl:228 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Usporede filer klippet her av %s.\n" -"* For å se hele filen, bruk et eksternt redigeringsverktøy.\n" - -#: lib/diff.tcl:436 -msgid "Failed to unstage selected hunk." -msgstr "Kunne ikke fjerne den valgte delen fra innsjekkingskøen." - -#: lib/diff.tcl:443 -msgid "Failed to stage selected hunk." -msgstr "Kunne ikke legge til den valgte delen i innsjekkingskøen." - -#: lib/diff.tcl:509 -msgid "Failed to unstage selected line." -msgstr "Kunne ikke fjerne den valgte linjen fra innsjekkingskøen." - -#: lib/diff.tcl:517 -msgid "Failed to stage selected line." -msgstr "Kunne ikke legge til den valgte linjen i innsjekkingskøen." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Standard" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Systemets (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Andre" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "feil" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "advarsel" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Du må rette de ovenstående feilene før innsjekking." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Kunne ikke låse opp indexen." - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Feil på index" - -#: lib/index.tcl:21 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Oppdatering av Git's index mislyktes. Et nytt søk vil bli startet for å " -"resynkronisere git-gui." - -#: lib/index.tcl:27 -msgid "Continue" -msgstr "Fortsett" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Lås opp index" - -#: lib/index.tcl:287 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Fjerner %s fra innsjekkingskøen" - -#: lib/index.tcl:326 -msgid "Ready to commit." -msgstr "Klar til innsjekking." - -#: lib/index.tcl:339 -#, tcl-format -msgid "Adding %s" -msgstr "Legger til %s" - -#: lib/index.tcl:396 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Reverter endringene i filen %s?" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Reverter endringene i disse %i filene?" - -#: lib/index.tcl:406 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "Endringer som ikke ligger i innsjekkingskøen vil bli tapt av denne " -"reverteringen" - -#: lib/index.tcl:409 -msgid "Do Nothing" -msgstr "Ikke gjør noe" - -#: lib/index.tcl:427 -msgid "Reverting selected files" -msgstr "Reverterer valgte filer" - -#: lib/index.tcl:431 -#, tcl-format -msgid "Reverting %s" -msgstr "Reverterer %s" - -#: lib/merge.tcl:13 -msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" -msgstr "" -"Kunne ikke slå sammen under utvidelse.\n" -"\n" -"Du må først fullføre utvidelsen av denne revisjonen før du kan starte en " -"sammenslåing.\n" - -#: lib/merge.tcl:27 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" - -#: lib/merge.tcl:45 -#, tcl-format -msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" -msgstr "" - -#: lib/merge.tcl:55 -#, tcl-format -msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" -msgstr "" - -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s av %s" - -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Slår sammen %s og %s" - -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "Vellykket sammenslåing fullført." - -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "Sammenslåing feilet. Håndtering av konflikten kreves." - -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "Slå sammen inn i %s" - -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Revisjon til sammenslåing" - -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Kan ikke avbryte under utvidelse av revisjon.\n" -"\n" -"Du må fullføre utvidelsen av denne revisjonen.\n" - -#: lib/merge.tcl:222 -msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" -msgstr "" -"Avbryt sammenslåing?\n" -"\n" -"Avbryting av pågående sammenslåing vil føre til at *alle* endringer som ikke " -" er sjekket inn, vil gå tapt.\n" -"\n" -"Fortsette med å avbryte den pågående sammenslåingen?" - -#: lib/merge.tcl:228 -msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" -msgstr "" -"Nullstill endringer?\n" -"\n" -"Nullstilling av endringer vil føre til at *alle* endringer som ikke er " -"sjekket inn går tapt.\n" -"\n" -"Fortsette med nullstilling av endringer?" - -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Avbryter" - -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "filer tilbakestilt" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "Avbryting feilet." - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Avbryting fullført. Klar." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Tving håndtering til opprinnelig versjon?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Tving håndtering i denne grenen?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Tving håndtering i den andre grenen?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Merk deg at endringsvisningen kun viser motstridende endringer.\n" -"\n" -"%s vil bli overskrevet.\n" -"\n" -"Denne operasjonen kan kun bli angret ved å starte sammenslåingen på ny." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "Filen %s ser ut til å ha uløste konflikter, skal filen likevel køes?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Legger til løsninge på konflikt for %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Konfliktfil eksisterer ikke" - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "" - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Kunne ikke hente versjoner:\n" -"%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "" - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "" - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Gjennopprett standardverdier" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Lagre" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "%s arkiv" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Globalt (alle arkiv)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Navn" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Epost-adresse" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Oppsummer innsjekkinger fra sammenslåinger" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Detaljenivå på sammenslåing" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Vis endringsstatistikk etter sammenslåing" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Bruk sammenslåingsverktøy" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "Stol på filers tid for endring" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Antall linjer sammenhengende endringer" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Tekstbredde for vindu til innsjekkingsmeldinger" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Mal for navn på nye grener" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Standard tekstenkoding for innhold i filer" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Endre" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Stavebokordlister:" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Endre skrifttype" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "Velg %s" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Egenskaper" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "Kunne ikke lagre alternativ:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Fjern fjernarkiv" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Fjern fra" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Hent fra" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Send til" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Legg til fjernarkiv" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Legg til nytt fjernarkiv" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Legg til" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Detaljer for fjernarkiv" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Lokasjon:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Videre handling" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Hent umiddelbart" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Initsialiser og send til fjernarkiv" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Ikke gjør mer nå" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Vennligst angi et navn for fjernarkivet." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "'%s' er ikke et tillatt navn for et fjernarkiv." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Kunne ikke legge til fjernarkivet '%s' på '%s'." - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "hent %s" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "Henter %s" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Vet ikke hvordan arkiv på '%s' skal opprettes." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71 -#, tcl-format -msgid "push %s" -msgstr "send %s" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Initsialiserer %s (på %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Fjern gren fra fjernarkiv" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Fra arkiv" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 -msgid "Remote:" -msgstr "Fjernarkiv:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 -msgid "Arbitrary Location:" -msgstr "Vilkårlig lokasjon:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "Grener" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Slett kun hvis" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Slått sammen i:" - -#: lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Alltid (Ikke utfør sammenslåingskontroll)" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "En gren kreves for 'sammenslåing i'." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Følgende grener er ikke fullestendig sammenslått med %s:\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:189 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "" -"En eller flere av testene som blir kjørt under sammenslåing feilet fordi du" -"ikke har hentet inn de nødvendige innsjekkingene. Prøv å hent disse fra %s" -"først" - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Velg en eller flere grener som skal fjernes." - -#: lib/remote_branch_delete.tcl:216 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Gjenoppretting av fjernede grener er vanskelig.\n" -"\n" -"Fjern den merkede grenen?" - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Fjerner grenene fra %s" - -#: lib/remote_branch_delete.tcl:286 -msgid "No repository selected." -msgstr "Ingen arkiv valgt." - -#: lib/remote_branch_delete.tcl:291 -#, tcl-format -msgid "Scanning %s..." -msgstr "Søker %s..." - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Finn:" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "Neste" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Forrige" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Skiller på store og små bokstaver" - -#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 -msgid "Cannot write shortcut:" -msgstr "Kan ikke opprette snarvei:" - -#: lib/shortcut.tcl:136 -msgid "Cannot write icon:" -msgstr "Kan ikke opprette ikon:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Stavekontrolleren er ikke støttet" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Stavekontroll er ikke tilgjengelig" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Ugyldig stavekontroll-konfigurasjon" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Reverterer ordbok til %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Stavekontrollen feilet stille under oppstart" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Stavekontrolleren er ukjent" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Ingen forslag" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Uventet slutt på filen fra stavekontrollen" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Stavekontroll mislyktes" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Ingen nøkler funnet." - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Funnet en offentlig nøkkel i: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Generer nøkkel" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Kopier til utklippstavlen" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "Din offentlige OpenSSH-nøkkel" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Genererer..." - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Kunne ikke starte ssh-keygen:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "Generering feilet." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "Generering vellykket, men ingen nøkler er funnet." - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Nøkkelen din ligger i: %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i av %*i %s (%3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Å kjøre %s krever at en fil er valgt" - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Er du sikker på at du vil kjøre %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Verktøy: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Kjører: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Verktøyet ble fullført med suksess: %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Verktøy feilet: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Legg til verktøy" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Legg til ny verktøykommando" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Legg til globalt" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Verktøydetaljer" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Bruk '/'-separator for å lage undermenyer:" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Kommando:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Vis en dialog før start" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Spør brukeren om å velge en revisjon (setter $REVISION)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Spør brukeren for ytterligere paramtere (setter $ARGS)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Ikke vis kommandoens utdata i vinduet" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Kjør kun om forskjellene er markert ($FILENAME er ikke tom)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Vennligst angi et navn for dette verktøyet." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "Verktøyet '%s' eksisterer allerede." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Kunne ikke legge til verktøyet:\n" -"%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Fjern verktøyet" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Fjern verktøyskommandoen" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Fjern" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Blue angir lokale verktøy til arkivet)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Kjør kommando: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Argumenter" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Henter nye endringer fra %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "slett fjernarkiv %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Fjrner sporing av grener slettet fra %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Sender endringer til %s" - -#: lib/transport.tcl:72 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Sender %s %s til %s" - -#: lib/transport.tcl:89 -msgid "Push Branches" -msgstr "Send grener" - -#: lib/transport.tcl:103 -msgid "Source Branches" -msgstr "Kildegrener" - -#: lib/transport.tcl:120 -msgid "Destination Repository" -msgstr "Destinasjonsarkiv" - -#: lib/transport.tcl:158 -msgid "Transfer Options" -msgstr "Overføringsalternativer" - -#: lib/transport.tcl:160 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Tving overskrivning av eksisterende gren (kan forkaste endringer)" - -#: lib/transport.tcl:164 -msgid "Use thin pack (for slow network connections)" -msgstr "Bruk tynne pakker (for tregere nettverkstilkoblinger)" - -#: lib/transport.tcl:168 -msgid "Include tags" -msgstr "Inkluder tagger" diff --git a/po/nl.po b/po/nl.po new file mode 100644 index 0000000..e1399e2 --- /dev/null +++ b/po/nl.po @@ -0,0 +1,3493 @@ +# Dutch translations for Git. +# Copyright (C) 2012 Vincent van Ravesteijn <vfr@lyx.org> +# This file is distributed under the same license as the Git package. +# Vincent van Ravesteijn <vfr@lyx.org>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2012-02-28 09:17+0800\n" +"PO-Revision-Date: 2012-03-07 12:02+0100\n" +"Last-Translator: Vincent van Ravesteijn <vfr@lyx.org>\n" +"Language-Team: Dutch\n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ASCII\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: advice.c:34 +#, c-format +msgid "hint: %.*s\n" +msgstr "" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:64 +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 "" + +#: commit.c:47 +#, c-format +msgid "could not parse %s" +msgstr "" + +#: commit.c:49 +#, 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 "" + +#: diff.c:104 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" + +#: diff.c:109 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr "" + +#: diff.c:205 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" + +#: diff.c:1331 +msgid " 0 files changed\n" +msgstr "" + +#: diff.c:1335 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] "" +msgstr[1] "" + +#: diff.c:1352 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] "" +msgstr[1] "" + +#: diff.c:1363 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] "" +msgstr[1] "" + +#: diff.c:3364 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#: gpg-interface.c:59 +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 "" + +#: grep.c:1285 +#, c-format +msgid "'%s': unable to read %s" +msgstr "" + +#: grep.c:1302 +#, c-format +msgid "'%s': %s" +msgstr "" + +#: grep.c:1313 +#, c-format +msgid "'%s': short read %s" +msgstr "" + +#: help.c:287 +#, 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 "" + +#: remote.c:1607 +#, 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:1613 +#, 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:1621 +#, 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] "" + +#: sequencer.c:120 builtin/merge.c:862 builtin/merge.c:983 +#: builtin/merge.c:1093 builtin/merge.c:1103 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "" + +#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865 +#: builtin/merge.c:1095 builtin/merge.c:1108 +#, c-format +msgid "Could not write to '%s'" +msgstr "" + +#: sequencer.c:142 +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:154 sequencer.c:680 sequencer.c:763 +#, c-format +msgid "Could not write to %s" +msgstr "" + +#: sequencer.c:157 +#, c-format +msgid "Error wrapping up %s" +msgstr "" + +#: sequencer.c:172 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "" + +#: sequencer.c:174 +msgid "Your local changes would be overwritten by revert." +msgstr "" + +#: sequencer.c:177 +msgid "Commit your changes or stash them to proceed." +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:227 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "" + +#: sequencer.c:293 +msgid "Your index file is unmerged." +msgstr "" + +#: sequencer.c:296 +msgid "You do not have a valid HEAD" +msgstr "" + +#: sequencer.c:311 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" + +#: sequencer.c:319 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "" + +#: sequencer.c:323 +#, 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:334 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "" + +#: sequencer.c:338 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "" + +#: sequencer.c:422 +#, c-format +msgid "could not revert %s... %s" +msgstr "" + +#: sequencer.c:423 +#, c-format +msgid "could not apply %s... %s" +msgstr "" + +#: sequencer.c:445 sequencer.c:904 builtin/log.c:286 builtin/log.c:709 +#: builtin/log.c:1325 builtin/log.c:1544 builtin/merge.c:348 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "" + +#: sequencer.c:448 +msgid "empty commit set passed" +msgstr "" + +#: sequencer.c:456 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: sequencer.c:461 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "" + +#: sequencer.c:546 +#, c-format +msgid "Cannot %s during a %s" +msgstr "" + +#: sequencer.c:568 +#, c-format +msgid "Could not parse line %d." +msgstr "" + +#: sequencer.c:573 +msgid "No commits parsed." +msgstr "" + +#: sequencer.c:586 +#, c-format +msgid "Could not open %s" +msgstr "" + +#: sequencer.c:590 +#, c-format +msgid "Could not read %s." +msgstr "" + +#: sequencer.c:597 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "" + +#: sequencer.c:625 +#, c-format +msgid "Invalid key: %s" +msgstr "" + +#: sequencer.c:628 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "" + +#: sequencer.c:640 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "" + +#: sequencer.c:661 +msgid "a cherry-pick or revert is already in progress" +msgstr "" + +#: sequencer.c:662 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "" + +#: sequencer.c:666 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "" + +#: sequencer.c:682 sequencer.c:767 +#, c-format +msgid "Error wrapping up %s." +msgstr "" + +#: sequencer.c:701 sequencer.c:835 +msgid "no cherry-pick or revert in progress" +msgstr "" + +#: sequencer.c:703 +msgid "cannot resolve HEAD" +msgstr "" + +#: sequencer.c:705 +msgid "cannot abort from a branch yet to be born" +msgstr "" + +#: sequencer.c:727 +#, c-format +msgid "cannot open %s: %s" +msgstr "" + +#: sequencer.c:730 +#, c-format +msgid "cannot read %s: %s" +msgstr "" + +#: sequencer.c:731 +msgid "unexpected end of file" +msgstr "" + +#: sequencer.c:737 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "" + +#: sequencer.c:760 +#, c-format +msgid "Could not format %s." +msgstr "" + +#: sequencer.c:922 +msgid "Can't revert as initial commit" +msgstr "" + +#: sequencer.c:923 +msgid "Can't cherry-pick into empty head" +msgstr "" + +#: wt-status.c:134 +msgid "Unmerged paths:" +msgstr "" + +#: wt-status.c:140 wt-status.c:157 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr "" + +#: wt-status.c:142 wt-status.c:159 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr "" + +#: wt-status.c:143 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr "" + +#: wt-status.c:151 +msgid "Changes to be committed:" +msgstr "" + +#: wt-status.c:169 +msgid "Changes not staged for commit:" +msgstr "" + +#: wt-status.c:173 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:175 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:176 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr "" + +#: wt-status.c:178 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr "" + +#: wt-status.c:187 +#, c-format +msgid "%s files:" +msgstr "" + +#: wt-status.c:190 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr "" + +#: wt-status.c:207 +msgid "bug" +msgstr "" + +#: wt-status.c:212 +msgid "both deleted:" +msgstr "" + +#: wt-status.c:213 +msgid "added by us:" +msgstr "" + +#: wt-status.c:214 +msgid "deleted by them:" +msgstr "" + +#: wt-status.c:215 +msgid "added by them:" +msgstr "" + +#: wt-status.c:216 +msgid "deleted by us:" +msgstr "" + +#: wt-status.c:217 +msgid "both added:" +msgstr "" + +#: wt-status.c:218 +msgid "both modified:" +msgstr "" + +#: wt-status.c:248 +msgid "new commits, " +msgstr "" + +#: wt-status.c:250 +msgid "modified content, " +msgstr "" + +#: wt-status.c:252 +msgid "untracked content, " +msgstr "" + +#: wt-status.c:266 +#, c-format +msgid "new file: %s" +msgstr "" + +#: wt-status.c:269 +#, c-format +msgid "copied: %s -> %s" +msgstr "" + +#: wt-status.c:272 +#, c-format +msgid "deleted: %s" +msgstr "" + +#: wt-status.c:275 +#, c-format +msgid "modified: %s" +msgstr "" + +#: wt-status.c:278 +#, c-format +msgid "renamed: %s -> %s" +msgstr "" + +#: wt-status.c:281 +#, c-format +msgid "typechange: %s" +msgstr "" + +#: wt-status.c:284 +#, c-format +msgid "unknown: %s" +msgstr "" + +#: wt-status.c:287 +#, c-format +msgid "unmerged: %s" +msgstr "" + +#: wt-status.c:290 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "" + +#: wt-status.c:713 +msgid "On branch " +msgstr "" + +#: wt-status.c:720 +msgid "Not currently on any branch." +msgstr "" + +#: wt-status.c:731 +msgid "Initial commit" +msgstr "" + +#: wt-status.c:745 +msgid "Untracked" +msgstr "" + +#: wt-status.c:747 +msgid "Ignored" +msgstr "" + +#: wt-status.c:749 +#, c-format +msgid "Untracked files not listed%s" +msgstr "" + +#: wt-status.c:751 +msgid " (use -u option to show untracked files)" +msgstr "" + +#: wt-status.c:757 +msgid "No changes" +msgstr "" + +#: wt-status.c:761 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "" + +#: wt-status.c:763 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr "" + +#: wt-status.c:765 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "" + +#: wt-status.c:767 +msgid " (use \"git add\" to track)" +msgstr "" + +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 +#, c-format +msgid "nothing to commit%s\n" +msgstr "" + +#: wt-status.c:770 +msgid " (create/copy files and use \"git add\" to track)" +msgstr "" + +#: wt-status.c:773 +msgid " (use -u to show untracked files)" +msgstr "" + +#: wt-status.c:776 +msgid " (working directory clean)" +msgstr "" + +#: wt-status.c:884 +msgid "HEAD (no branch)" +msgstr "" + +#: wt-status.c:890 +msgid "Initial commit on " +msgstr "" + +#: wt-status.c:905 +msgid "behind " +msgstr "" + +#: wt-status.c:908 wt-status.c:911 +msgid "ahead " +msgstr "" + +#: wt-status.c:913 +msgid ", behind " +msgstr "" + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "" + +#: builtin/add.c:67 builtin/commit.c:298 +msgid "updating files failed" +msgstr "" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "" + +#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "" + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "" + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "" + +#: builtin/add.c:312 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" + +#: builtin/add.c:352 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "" + +#: builtin/add.c:353 +msgid "no files added" +msgstr "" + +#: builtin/add.c:359 +msgid "adding files failed" +msgstr "" + +#: builtin/add.c:391 +msgid "-A and -u are mutually incompatible" +msgstr "" + +#: builtin/add.c:393 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "" + +#: builtin/add.c:413 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "" + +#: builtin/add.c:414 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "" + +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "" + +#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "" + +#: 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/branch.c:137 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" + +#: builtin/branch.c:141 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" + +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" +#: builtin/branch.c:163 +msgid "remote " +msgstr "" + +#: builtin/branch.c:171 +msgid "cannot use -a with -d" +msgstr "" + +#: builtin/branch.c:177 +msgid "Couldn't look up commit object for HEAD" +msgstr "" + +#: builtin/branch.c:182 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "" + +#: builtin/branch.c:192 +#, c-format +msgid "%sbranch '%s' not found." +msgstr "" + +#: builtin/branch.c:200 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: builtin/branch.c:206 +#, 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:214 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "" + +#: builtin/branch.c:219 +#, c-format +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "" + +#: builtin/branch.c:224 +msgid "Update of config-file failed" +msgstr "" + +#: builtin/branch.c:322 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "" + +#: builtin/branch.c:394 +#, c-format +msgid "behind %d] " +msgstr "" + +#: builtin/branch.c:396 +#, c-format +msgid "ahead %d] " +msgstr "" + +#: builtin/branch.c:398 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "" + +#: builtin/branch.c:501 +msgid "(no branch)" +msgstr "" + +#: builtin/branch.c:562 +msgid "some refs could not be read" +msgstr "" + +#: builtin/branch.c:575 +msgid "cannot rename the current branch while not on any." +msgstr "" + +#: builtin/branch.c:585 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "" + +#: builtin/branch.c:600 +msgid "Branch rename failed" +msgstr "" + +#: builtin/branch.c:604 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "" + +#: builtin/branch.c:608 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "" + +#: builtin/branch.c:615 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:630 +#, c-format +msgid "malformed object name %s" +msgstr "" + +#: builtin/branch.c:654 +#, c-format +msgid "could not write branch description template: %s\n" +msgstr "" + +#: builtin/branch.c:742 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:747 builtin/clone.c:558 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:805 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +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/checkout.c:113 builtin/checkout.c:146 +#, c-format +msgid "path '%s' does not have our version" +msgstr "" + +#: builtin/checkout.c:115 builtin/checkout.c:148 +#, c-format +msgid "path '%s' does not have their version" +msgstr "" + +#: builtin/checkout.c:131 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "" + +#: builtin/checkout.c:175 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "" + +#: builtin/checkout.c:192 +#, c-format +msgid "path '%s': cannot merge" +msgstr "" + +#: builtin/checkout.c:209 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "" + +#: builtin/checkout.c:212 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: builtin/checkout.c:234 builtin/checkout.c:392 +msgid "corrupt index file" +msgstr "" + +#: builtin/checkout.c:264 builtin/checkout.c:271 +#, c-format +msgid "path '%s' is unmerged" +msgstr "" + +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/merge.c:809 +msgid "unable to write new index file" +msgstr "" + +#: builtin/checkout.c:319 builtin/diff.c:298 builtin/merge.c:406 +msgid "diff_setup_done failed" +msgstr "" + +#: builtin/checkout.c:414 +msgid "you need to resolve your current index first" +msgstr "" + +#: builtin/checkout.c:533 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "" + +#: builtin/checkout.c:565 +msgid "HEAD is now at" +msgstr "" + +#: builtin/checkout.c:572 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:575 +#, c-format +msgid "Already on '%s'\n" +msgstr "" + +#: builtin/checkout.c:579 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:581 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:583 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:639 +#, c-format +msgid " ... and %d more.\n" +msgstr "" + +#. The singular version +#: builtin/checkout.c:645 +#, 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:663 +#, 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:692 +msgid "internal error in revision walk" +msgstr "" + +#: builtin/checkout.c:696 +msgid "Previous HEAD position was" +msgstr "" + +#: builtin/checkout.c:722 +msgid "You are on a branch yet to be born" +msgstr "" + +#. case (1) +#: builtin/checkout.c:853 +#, c-format +msgid "invalid reference: %s" +msgstr "" + +#. case (1): want a tree +#: builtin/checkout.c:892 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:972 +msgid "-B cannot be used with -b" +msgstr "" + +#: builtin/checkout.c:981 +msgid "--patch is incompatible with all other options" +msgstr "" + +#: builtin/checkout.c:984 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "" + +#: builtin/checkout.c:986 +msgid "--detach cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:992 +msgid "--track needs a branch name" +msgstr "" + +#: builtin/checkout.c:999 +msgid "Missing branch name; try -b" +msgstr "" + +#: builtin/checkout.c:1005 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "" + +#: builtin/checkout.c:1007 +msgid "--orphan cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:1017 +msgid "git checkout: -f and -m are incompatible" +msgstr "" + +#: builtin/checkout.c:1051 +msgid "invalid path specification" +msgstr "" + +#: builtin/checkout.c:1059 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" + +#: builtin/checkout.c:1061 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "" + +#: builtin/checkout.c:1066 +msgid "git checkout: --detach does not take a path argument" +msgstr "" + +#: builtin/checkout.c:1069 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" + +#: builtin/checkout.c:1088 +msgid "Cannot switch branch to a non-commit." +msgstr "" + +#: builtin/checkout.c:1091 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "" + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" + +#: builtin/clean.c:155 builtin/clean.c:176 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:159 builtin/clean.c:179 +#, c-format +msgid "Removing %s\n" +msgstr "" + +#: builtin/clean.c:162 builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" +msgstr "" + +#: builtin/clean.c:166 +#, c-format +msgid "Would not remove %s\n" +msgstr "" + +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" +msgstr "" + +#: builtin/clone.c:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "" + +#: builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "" + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "" + +#: builtin/clone.c:308 builtin/diff.c:75 +#, 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:341 +#, c-format +msgid "failed to unlink '%s'" +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:440 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "" + +#: builtin/clone.c:549 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" + +#: builtin/clone.c:639 +msgid "Too many arguments." +msgstr "" + +#: builtin/clone.c:643 +msgid "You must specify a repository to clone." +msgstr "" + +#: builtin/clone.c:654 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "" + +#: builtin/clone.c:668 +#, c-format +msgid "repository '%s' does not exist" +msgstr "" + +#: builtin/clone.c:673 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:683 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:693 +#, c-format +msgid "working tree '%s' already exists." +msgstr "" + +#: builtin/clone.c:706 builtin/clone.c:720 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" + +#: builtin/clone.c:709 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "" + +#: builtin/clone.c:728 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "" + +#: builtin/clone.c:730 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "" + +#: builtin/clone.c:786 +#, c-format +msgid "Don't know how to clone %s" +msgstr "" + +#: builtin/clone.c:835 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "" + +#: builtin/clone.c:842 +msgid "You appear to have cloned an empty repository." +msgstr "" + +#: builtin/commit.c:42 +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:54 +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:59 +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:205 builtin/reset.c:33 +msgid "merge" +msgstr "" + +#: builtin/commit.c:208 +msgid "cherry-pick" +msgstr "" + +#: builtin/commit.c:325 +msgid "failed to unpack HEAD tree object" +msgstr "" + +#: builtin/commit.c:367 +msgid "unable to create temporary index" +msgstr "" + +#: builtin/commit.c:373 +msgid "interactive add failed" +msgstr "" + +#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 +msgid "unable to write new_index file" +msgstr "" + +#: builtin/commit.c:457 +#, c-format +msgid "cannot do a partial commit during a %s." +msgstr "" + +#: builtin/commit.c:466 +msgid "cannot read the index" +msgstr "" + +#: builtin/commit.c:486 +msgid "unable to write temporary index file" +msgstr "" + +#: builtin/commit.c:550 builtin/commit.c:556 +#, c-format +msgid "invalid commit: %s" +msgstr "" + +#: builtin/commit.c:579 +msgid "malformed --author parameter" +msgstr "" + +#: builtin/commit.c:635 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "" + +#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:682 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "" + +#: builtin/commit.c:684 +msgid "could not read log from standard input" +msgstr "" + +#: builtin/commit.c:688 +#, c-format +msgid "could not read log file '%s'" +msgstr "" + +#: builtin/commit.c:694 +msgid "commit has empty message" +msgstr "" + +#: builtin/commit.c:710 +msgid "could not read MERGE_MSG" +msgstr "" + +#: builtin/commit.c:714 +msgid "could not read SQUASH_MSG" +msgstr "" + +#: builtin/commit.c:718 +#, c-format +msgid "could not read '%s'" +msgstr "" + +#: builtin/commit.c:746 +#, c-format +msgid "could not open '%s'" +msgstr "" + +#: builtin/commit.c:770 +msgid "could not write commit template" +msgstr "" + +#: builtin/commit.c:783 +#, c-format +msgid "" +"\n" +"It looks like you may be committing a %s.\n" +"If this is not correct, please remove the file\n" +"\t%s\n" +"and try again.\n" +msgstr "" + +#: builtin/commit.c:796 +msgid "Please enter the commit message for your changes." +msgstr "" + +#: builtin/commit.c:799 +msgid "" +" Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:804 +msgid "" +" Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:816 +#, c-format +msgid "%sAuthor: %s" +msgstr "" + +#: builtin/commit.c:823 +#, c-format +msgid "%sCommitter: %s" +msgstr "" + +#: builtin/commit.c:843 +msgid "Cannot read index" +msgstr "" + +#: builtin/commit.c:880 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:895 builtin/tag.c:357 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "" + +#: builtin/commit.c:975 +#, c-format +msgid "No existing author found with '%s'" +msgstr "" + +#: builtin/commit.c:990 builtin/commit.c:1182 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "" + +#: builtin/commit.c:1030 +msgid "Using both --reset-author and --author does not make sense" +msgstr "" + +#: builtin/commit.c:1041 +msgid "You have nothing to amend." +msgstr "" + +#: builtin/commit.c:1043 +#, c-format +msgid "You are in the middle of a %s -- cannot amend." +msgstr "" + +#: builtin/commit.c:1045 +msgid "Options --squash and --fixup cannot be used together" +msgstr "" + +#: builtin/commit.c:1055 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "" + +#: builtin/commit.c:1057 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "" + +#: builtin/commit.c:1063 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "" + +#: builtin/commit.c:1080 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" + +#: builtin/commit.c:1082 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:1084 +msgid "Clever... amending the last one with dirty index." +msgstr "" + +#: builtin/commit.c:1086 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" + +#: builtin/commit.c:1096 builtin/tag.c:556 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "" + +#: builtin/commit.c:1101 +msgid "Paths with -a does not make sense." +msgstr "" + +#: builtin/commit.c:1280 +msgid "couldn't look up newly created commit" +msgstr "" + +#: builtin/commit.c:1282 +msgid "could not parse newly created commit" +msgstr "" + +#: builtin/commit.c:1323 +msgid "detached HEAD" +msgstr "" + +#: builtin/commit.c:1325 +msgid " (root-commit)" +msgstr "" + +#: builtin/commit.c:1415 +msgid "could not parse HEAD commit" +msgstr "" + +#: builtin/commit.c:1452 builtin/merge.c:507 +#, c-format +msgid "could not open '%s' for reading" +msgstr "" + +#: builtin/commit.c:1459 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "" + +#: builtin/commit.c:1466 +msgid "could not read MERGE_MODE" +msgstr "" + +#: builtin/commit.c:1485 +#, c-format +msgid "could not read commit message: %s" +msgstr "" + +#: builtin/commit.c:1499 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "" + +#: builtin/commit.c:1514 builtin/merge.c:933 builtin/merge.c:966 +msgid "failed to write commit object" +msgstr "" + +#: builtin/commit.c:1535 +msgid "cannot lock HEAD ref" +msgstr "" + +#: builtin/commit.c:1539 +msgid "cannot update HEAD ref" +msgstr "" + +#: builtin/commit.c:1550 +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/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: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:77 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "" + +#: builtin/diff.c:220 +#, c-format +msgid "invalid option: %s" +msgstr "" + +#: builtin/diff.c:293 +msgid "Not a git repository" +msgstr "" + +#: builtin/diff.c:343 +#, c-format +msgid "invalid object '%s' given." +msgstr "" + +#: builtin/diff.c:348 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "" + +#: builtin/diff.c:358 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "" + +#: builtin/diff.c:366 +#, c-format +msgid "unhandled object '%s' given." +msgstr "" + +#: builtin/fetch.c:200 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:252 +#, c-format +msgid "object %s not found" +msgstr "" + +#: builtin/fetch.c:258 +msgid "[up to date]" +msgstr "" + +#: builtin/fetch.c:272 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "" + +#: builtin/fetch.c:273 builtin/fetch.c:351 +msgid "[rejected]" +msgstr "" + +#: builtin/fetch.c:284 +msgid "[tag update]" +msgstr "" + +#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331 +msgid " (unable to update local ref)" +msgstr "" + +#: builtin/fetch.c:298 +msgid "[new tag]" +msgstr "" + +#: builtin/fetch.c:302 +msgid "[new branch]" +msgstr "" + +#: builtin/fetch.c:347 +msgid "unable to update local ref" +msgstr "" + +#: builtin/fetch.c:347 +msgid "forced update" +msgstr "" + +#: builtin/fetch.c:353 +msgid "(non-fast-forward)" +msgstr "" + +#: builtin/fetch.c:384 builtin/fetch.c:676 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "" + +#: builtin/fetch.c:393 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "" + +#: builtin/fetch.c:479 +#, c-format +msgid "From %.*s\n" +msgstr "" + +#: builtin/fetch.c:490 +#, 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:540 +#, c-format +msgid " (%s will become dangling)\n" +msgstr "" + +#: builtin/fetch.c:541 +#, c-format +msgid " (%s has become dangling)\n" +msgstr "" + +#: builtin/fetch.c:548 +msgid "[deleted]" +msgstr "" + +#: builtin/fetch.c:549 +msgid "(none)" +msgstr "" + +#: builtin/fetch.c:666 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" + +#: builtin/fetch.c:700 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:777 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:780 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "" + +#: builtin/fetch.c:879 +#, c-format +msgid "Fetching %s\n" +msgstr "" + +#: builtin/fetch.c:881 +#, c-format +msgid "Could not fetch %s" +msgstr "" + +#: builtin/fetch.c:898 +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:918 +msgid "You need to specify a tag name." +msgstr "" + +#: builtin/fetch.c:970 +msgid "fetch --all does not take a repository argument" +msgstr "" + +#: builtin/fetch.c:972 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:983 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:991 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "" + +#: builtin/gc.c:103 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "" + +#: builtin/gc.c:223 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:226 +#, 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:256 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +#: builtin/grep.c:216 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "" + +#: builtin/grep.c:402 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:478 builtin/grep.c:512 +#, c-format +msgid "unable to read tree (%s)" +msgstr "" + +#: builtin/grep.c:526 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" + +#: builtin/grep.c:584 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "" + +#: builtin/grep.c:601 +#, c-format +msgid "cannot open '%s'" +msgstr "" + +#: builtin/grep.c:889 +msgid "no pattern given." +msgstr "" + +#: builtin/grep.c:903 +#, c-format +msgid "bad object %s" +msgstr "" + +#: builtin/grep.c:944 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:967 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "" + +#: builtin/grep.c:972 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "" + +#: builtin/grep.c:975 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "" + +#: builtin/grep.c:983 +msgid "both --cached and trees are 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:322 builtin/init-db.c:325 +#, c-format +msgid "%s already exists" +msgstr "" + +#: builtin/init-db.c:354 +#, c-format +msgid "unable to handle file type %d" +msgstr "" + +#: builtin/init-db.c:357 +#, c-format +msgid "unable to move %s to %s" +msgstr "" + +#: builtin/init-db.c:362 +#, 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:419 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "" + +#: builtin/init-db.c:420 +msgid "Reinitialized existing" +msgstr "" + +#: builtin/init-db.c:420 +msgid "Initialized empty" +msgstr "" + +#: builtin/init-db.c:421 +msgid " shared" +msgstr "" + +#: builtin/init-db.c:440 +msgid "cannot tell cwd" +msgstr "" + +#: builtin/init-db.c:521 builtin/init-db.c:528 +#, c-format +msgid "cannot mkdir %s" +msgstr "" + +#: builtin/init-db.c:532 +#, c-format +msgid "cannot chdir to %s" +msgstr "" + +#: builtin/init-db.c:554 +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" + +#: builtin/init-db.c:578 +msgid "Cannot access current working directory" +msgstr "" + +#: builtin/init-db.c:585 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "" + +#: builtin/log.c:185 +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +#: builtin/log.c:393 builtin/log.c:479 +#, c-format +msgid "Could not read object %s" +msgstr "" + +#: builtin/log.c:503 +#, c-format +msgid "Unknown type: %d" +msgstr "" + +#: builtin/log.c:592 +msgid "format.headers without value" +msgstr "" + +#: builtin/log.c:665 +msgid "name of output directory is too long" +msgstr "" + +#: builtin/log.c:676 +#, c-format +msgid "Cannot open patch file %s" +msgstr "" + +#: builtin/log.c:690 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:698 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:735 +msgid "Could not extract email from committer identity." +msgstr "" + +#: builtin/log.c:781 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:875 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "" + +#: builtin/log.c:948 +msgid "Two output directories?" +msgstr "" + +#: builtin/log.c:1169 +#, c-format +msgid "bogus committer info %s" +msgstr "" + +#: builtin/log.c:1214 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1216 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1221 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "" + +#: builtin/log.c:1224 +msgid "--name-only does not make sense" +msgstr "" + +#: builtin/log.c:1226 +msgid "--name-status does not make sense" +msgstr "" + +#: builtin/log.c:1228 +msgid "--check does not make sense" +msgstr "" + +#: builtin/log.c:1251 +msgid "standard output, or directory, which one?" +msgstr "" + +#: builtin/log.c:1253 +#, c-format +msgid "Could not create directory '%s'" +msgstr "" + +#: builtin/log.c:1406 +msgid "Failed to create output files" +msgstr "" + +#: builtin/log.c:1510 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" + +#: builtin/log.c:1526 builtin/log.c:1528 builtin/log.c:1540 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/merge.c:91 +msgid "switch `m' requires a value" +msgstr "" + +#: builtin/merge.c:128 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "" + +#: builtin/merge.c:129 +#, c-format +msgid "Available strategies are:" +msgstr "" + +#: builtin/merge.c:134 +#, c-format +msgid "Available custom strategies are:" +msgstr "" + +#: builtin/merge.c:241 +msgid "could not run stash." +msgstr "" + +#: builtin/merge.c:246 +msgid "stash failed" +msgstr "" + +#: builtin/merge.c:251 +#, c-format +msgid "not a valid object: %s" +msgstr "" + +#: builtin/merge.c:270 builtin/merge.c:287 +msgid "read-tree failed" +msgstr "" + +#: builtin/merge.c:317 +msgid " (nothing to squash)" +msgstr "" + +#: builtin/merge.c:330 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:362 +msgid "Writing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:364 +msgid "Finishing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:435 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "" + +#: builtin/merge.c:534 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "" + +#: builtin/merge.c:627 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:677 +msgid "failed to read the cache" +msgstr "" + +#: builtin/merge.c:694 +msgid "Unable to write index." +msgstr "" + +#: builtin/merge.c:707 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:721 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "" + +#: builtin/merge.c:735 +#, c-format +msgid "unable to write %s" +msgstr "" + +#: builtin/merge.c:874 +#, c-format +msgid "Could not read from '%s'" +msgstr "" + +#: builtin/merge.c:883 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" + +#: builtin/merge.c:889 +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 '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" + +#: builtin/merge.c:913 +msgid "Empty commit message." +msgstr "" + +#: builtin/merge.c:925 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:998 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +#: builtin/merge.c:1014 +#, c-format +msgid "'%s' is not a commit" +msgstr "" + +#: builtin/merge.c:1055 +msgid "No current branch." +msgstr "" + +#: builtin/merge.c:1057 +msgid "No remote for the current branch." +msgstr "" + +#: builtin/merge.c:1059 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1064 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1186 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1202 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:1205 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1209 +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:1212 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1221 +msgid "You cannot combine --squash with --no-ff." +msgstr "" + +#: builtin/merge.c:1226 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "" + +#: builtin/merge.c:1233 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "" + +#: builtin/merge.c:1264 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1267 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:1269 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:1273 builtin/merge.c:1317 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1383 +#, c-format +msgid "Updating %s..%s\n" +msgstr "" + +#: builtin/merge.c:1421 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1428 +#, c-format +msgid "Nope.\n" +msgstr "" + +#: builtin/merge.c:1460 +msgid "Not possible to fast-forward, aborting." +msgstr "" + +#: builtin/merge.c:1483 builtin/merge.c:1560 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1487 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#: builtin/merge.c:1551 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "" + +#: builtin/merge.c:1553 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "" + +#: builtin/merge.c:1562 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1573 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +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 +#, c-format +msgid "renaming '%s' failed" +msgstr "" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:155 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:175 builtin/tag.c:343 +#, c-format +msgid "could not create file '%s'" +msgstr "" + +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" + +#: builtin/notes.c:210 builtin/notes.c:973 +#, c-format +msgid "Removing note for object %s\n" +msgstr "" + +#: builtin/notes.c:215 +msgid "unable to write note object" +msgstr "" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "" + +#: builtin/notes.c:251 builtin/tag.c:521 +#, c-format +msgid "cannot read '%s'" +msgstr "" + +#: builtin/notes.c:253 builtin/tag.c:524 +#, c-format +msgid "could not open or read '%s'" +msgstr "" + +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "" + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: builtin/notes.c:350 +#, 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:377 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "" + +#: builtin/notes.c:456 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "" + +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 +#: builtin/notes.c:1033 +msgid "too many parameters" +msgstr "" + +#: builtin/notes.c:513 builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "" + +#: builtin/notes.c:580 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:585 builtin/notes.c:662 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#: builtin/notes.c:635 +msgid "too few parameters" +msgstr "" + +#: builtin/notes.c:656 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:668 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "" + +#: builtin/notes.c:717 +#, 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:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +#: builtin/notes.c:1103 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/pack-objects.c:2310 +#, c-format +msgid "unsupported index version %s" +msgstr "" + +#: builtin/pack-objects.c:2314 +#, c-format +msgid "bad index version '%s'" +msgstr "" + +#: builtin/pack-objects.c:2322 +#, c-format +msgid "option %s does not accept negative form" +msgstr "" + +#: builtin/pack-objects.c:2326 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "" + +#: builtin/push.c:44 +msgid "tag shorthand without <tag>" +msgstr "" + +#: builtin/push.c:63 +msgid "--delete only accepts plain target ref names" +msgstr "" + +#: builtin/push.c:73 +#, 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:80 +#, 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:88 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "" + +#: builtin/push.c:111 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" + +#: builtin/push.c:131 +#, c-format +msgid "Pushing to %s\n" +msgstr "" + +#: builtin/push.c:135 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:143 +#, c-format +msgid "" +"To prevent you from losing history, non-fast-forward updates were rejected\n" +"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n" +"'Note about fast-forwards' section of 'git push --help' for details.\n" +msgstr "" + +#: builtin/push.c:160 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:161 +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:176 +msgid "--all and --tags are incompatible" +msgstr "" + +#: builtin/push.c:177 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:182 +msgid "--mirror and --tags are incompatible" +msgstr "" + +#: builtin/push.c:183 +msgid "--mirror can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:188 +msgid "--all and --mirror are incompatible" +msgstr "" + +#: builtin/push.c:274 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "" + +#: builtin/push.c:276 +msgid "--delete doesn't make sense without any refs" +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 "keep" +msgstr "" + +#: builtin/reset.c:77 +msgid "You do not have a valid HEAD." +msgstr "" + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "" + +#: builtin/reset.c:85 +#, c-format +msgid "Failed to find tree of %s." +msgstr "" + +#: builtin/reset.c:96 +msgid "Could not write new index file." +msgstr "" + +#: builtin/reset.c:106 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + +#: builtin/reset.c:130 +msgid "Could not read index" +msgstr "" + +#: builtin/reset.c:133 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:223 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "" + +#: builtin/reset.c:297 +#, c-format +msgid "Could not parse object '%s'." +msgstr "" + +#: builtin/reset.c:302 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "" + +#: builtin/reset.c:311 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "" + +#: builtin/reset.c:313 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "" + +#: builtin/reset.c:325 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "" + +#: builtin/reset.c:341 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "" + +#: builtin/revert.c:70 builtin/revert.c:91 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "" + +#: builtin/revert.c:126 +msgid "program error" +msgstr "" + +#: builtin/revert.c:209 +msgid "revert failed" +msgstr "" + +#: builtin/revert.c:224 +msgid "cherry-pick failed" +msgstr "" + +#: builtin/rm.c:109 +#, 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:115 +#, 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:119 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "" + +#: builtin/rm.c:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "" + +#: builtin/tag.c:58 +#, c-format +msgid "malformed object at '%s'" +msgstr "" + +#: builtin/tag.c:205 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "" + +#: builtin/tag.c:210 +#, c-format +msgid "tag '%s' not found." +msgstr "" + +#: builtin/tag.c:225 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "" + +#: builtin/tag.c:237 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "" + +#: builtin/tag.c:247 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" + +#: builtin/tag.c:254 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" +"#\n" +msgstr "" + +#: builtin/tag.c:294 +msgid "unable to sign the tag" +msgstr "" + +#: builtin/tag.c:296 +msgid "unable to write tag file" +msgstr "" + +#: builtin/tag.c:321 +msgid "bad object type." +msgstr "" + +#: builtin/tag.c:334 +msgid "tag header too big." +msgstr "" + +#: builtin/tag.c:366 +msgid "no tag message?" +msgstr "" + +#: builtin/tag.c:372 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "" + +#: builtin/tag.c:421 +msgid "switch 'points-at' requires an object" +msgstr "" + +#: builtin/tag.c:423 +#, c-format +msgid "malformed object name '%s'" +msgstr "" + +#: builtin/tag.c:502 +msgid "-n option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:504 +msgid "--contains option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:506 +msgid "--points-at option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:514 +msgid "only one -F or -m option is allowed." +msgstr "" + +#: builtin/tag.c:534 +msgid "too many params" +msgstr "" + +#: builtin/tag.c:540 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "" + +#: builtin/tag.c:545 +#, c-format +msgid "tag '%s' already exists" +msgstr "" + +#: builtin/tag.c:563 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "" + +#: builtin/tag.c:565 +#, c-format +msgid "%s: cannot update the ref" +msgstr "" + +#: builtin/tag.c:567 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "" + +#: git-am.sh:49 +msgid "You need to set your committer info first" +msgstr "" + +#: git-am.sh:135 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" + +#: git-am.sh:144 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" + +#: git-am.sh:153 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" + +#: git-am.sh:265 +msgid "Only one StGIT patch series can be applied at once" +msgstr "" + +#: git-am.sh:352 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "" + +#: git-am.sh:354 +msgid "Patch format detection failed." +msgstr "" + +#: git-am.sh:406 +msgid "-d option is no longer supported. Do not use." +msgstr "" + +#: git-am.sh:469 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" + +#: git-am.sh:474 +msgid "Please make up your mind. --skip or --abort?" +msgstr "" + +#: git-am.sh:501 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" + +#: git-am.sh:567 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" + +#: git-am.sh:743 +msgid "cannot be interactive without stdin connected to a terminal." +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:754 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "" + +#: git-am.sh:790 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "" + +#: git-am.sh:835 +msgid "No changes -- Patch already applied." +msgstr "" + +#: git-am.sh:861 +msgid "applying to an empty history" +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 "" + +#. 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: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:474 +msgid "We are not bisecting." +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 "" + +#: git-pull.sh:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "" + +#: git-pull.sh:257 +msgid "Cannot rebase onto multiple branches" +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 "" + +#: 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:491 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "" + +#: git-stash.sh:492 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "" + +#: git-stash.sh:499 +msgid "No branch name specified" +msgstr "" + +#: git-stash.sh:570 +msgid "(To restore them type \"git stash apply\")" +msgstr "" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "" + +#: git-submodule.sh:108 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "" + +#: git-submodule.sh:173 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "" + +#: git-submodule.sh:247 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" + +#: git-submodule.sh:264 +#, sh-format +msgid "'$path' already exists in the index" +msgstr "" + +#: git-submodule.sh:281 +#, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "" + +#: git-submodule.sh:295 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "" + +#: git-submodule.sh:300 +#, sh-format +msgid "Failed to add submodule '$path'" +msgstr "" + +#: git-submodule.sh:305 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "" + +#: git-submodule.sh:347 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "" + +#: git-submodule.sh:359 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:401 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:410 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:418 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:420 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "" + +#: git-submodule.sh:519 +#, sh-format +msgid "" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:532 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:551 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:565 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:566 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:571 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:572 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:577 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:578 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:600 git-submodule.sh:923 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "" + +#: git-submodule.sh:708 +msgid "--" +msgstr "" + +#: git-submodule.sh:766 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr "" + +#: git-submodule.sh:769 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr "" + +#: git-submodule.sh:772 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" + +#: git-submodule.sh:797 +msgid "blob" +msgstr "" + +#: git-submodule.sh:798 +msgid "submodule" +msgstr "" + +#: git-submodule.sh:969 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" diff --git a/po/po2msg.sh b/po/po2msg.sh deleted file mode 100644 index 1e9f992..0000000 --- a/po/po2msg.sh +++ /dev/null @@ -1,152 +0,0 @@ -#!/bin/sh -# Tcl ignores the next line -*- tcl -*- \ -exec tclsh "$0" -- "$@" - -# This is a really stupid program, which serves as an alternative to -# msgfmt. It _only_ translates to Tcl mode, does _not_ validate the -# input, and does _not_ output any statistics. - -proc u2a {s} { - set res "" - foreach i [split $s ""] { - scan $i %c c - if {$c<128} { - # escape '[', '\', '$' and ']' - if {$c == 0x5b || $c == 0x5d || $c == 0x24} { - append res "\\" - } - append res $i - } else { - append res \\u[format %04.4x $c] - } - } - return $res -} - -set output_directory "." -set lang "dummy" -set files [list] -set show_statistics 0 - -# parse options -for {set i 0} {$i < $argc} {incr i} { - set arg [lindex $argv $i] - if {$arg == "--statistics"} { - incr show_statistics - continue - } - if {$arg == "--tcl"} { - # we know - continue - } - if {$arg == "-l"} { - incr i - set lang [lindex $argv $i] - continue - } - if {$arg == "-d"} { - incr i - set tmp [lindex $argv $i] - regsub "\[^/\]$" $tmp "&/" output_directory - continue - } - lappend files $arg -} - -proc flush_msg {} { - global msgid msgstr mode lang out fuzzy - global translated_count fuzzy_count not_translated_count - - if {![info exists msgid] || $mode == ""} { - return - } - set mode "" - if {$fuzzy == 1} { - incr fuzzy_count - set fuzzy 0 - return - } - - if {$msgid == ""} { - set prefix "set ::msgcat::header" - } else { - if {$msgstr == ""} { - incr not_translated_count - return - } - set prefix "::msgcat::mcset $lang \"[u2a $msgid]\"" - incr translated_count - } - - puts $out "$prefix \"[u2a $msgstr]\"" -} - -set fuzzy 0 -set translated_count 0 -set fuzzy_count 0 -set not_translated_count 0 -foreach file $files { - regsub "^.*/\(\[^/\]*\)\.po$" $file "$output_directory\\1.msg" outfile - set in [open $file "r"] - fconfigure $in -encoding utf-8 - set out [open $outfile "w"] - - set mode "" - while {[gets $in line] >= 0} { - if {[regexp "^#" $line]} { - if {[regexp ", fuzzy" $line]} { - set fuzzy 1 - } else { - flush_msg - } - continue - } elseif {[regexp "^msgid \"(.*)\"$" $line dummy match]} { - flush_msg - set msgid $match - set mode "msgid" - } elseif {[regexp "^msgstr \"(.*)\"$" $line dummy match]} { - set msgstr $match - set mode "msgstr" - } elseif {$line == ""} { - flush_msg - } elseif {[regexp "^\"(.*)\"$" $line dummy match]} { - if {$mode == "msgid"} { - append msgid $match - } elseif {$mode == "msgstr"} { - append msgstr $match - } else { - puts stderr "I do not know what to do: $match" - } - } else { - puts stderr "Cannot handle $line" - } - } - flush_msg - close $in - close $out -} - -if {$show_statistics} { - set str "" - - append str "$translated_count translated message" - if {$translated_count != 1} { - append str s - } - - if {$fuzzy_count > 1} { - append str ", $fuzzy_count fuzzy translation" - if {$fuzzy_count != 1} { - append str s - } - } - if {$not_translated_count > 0} { - append str ", $not_translated_count untranslated message" - if {$not_translated_count != 1} { - append str s - } - } - - append str . - puts $str -} diff --git a/po/pt_PT.po b/po/pt_PT.po new file mode 100644 index 0000000..517ec29 --- /dev/null +++ b/po/pt_PT.po @@ -0,0 +1,4980 @@ +# Portuguese translations for Git package. +# Copyright (C) 2012 Marco Sousa <marcomsousa AT gmail.com> +# This file is distributed under the same license as the Git package. +# Contributers: +# - Marco Sousa <marcomsousa AT gmail.com> +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2012-05-08 16:06+0800\n" +"PO-Revision-Date: 2012-05-14 21:17+0100\n" +"Last-Translator: Marco Sousa <marcomsousa AT gmail.com>\n" +"Language-Team: Portuguese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: advice.c:40 +#, c-format +msgid "hint: %.*s\n" +msgstr "dica: %.*s\n" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:70 +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 "" + +#: 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 "cabeçalho não reconhecido: %s%s (%d)" + +#: bundle.c:89 +#: builtin/commit.c:753 +#, c-format +msgid "could not open '%s'" +msgstr "não é possivel abrir '%s'" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "" + +#: bundle.c:164 +#: sequencer.c:533 +#: sequencer.c:965 +#: builtin/log.c:289 +#: builtin/log.c:719 +#: builtin/log.c:1335 +#: builtin/log.c:1554 +#: builtin/merge.c:347 +#: builtin/shortlog.c:181 +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 +#, c-format +msgid "The bundle requires this ref" +msgid_plural "The bundle requires these %d refs" +msgstr[0] "" +msgstr[1] "" + +#: bundle.c:290 +msgid "rev-list died" +msgstr "rev-list morreu" + +#: bundle.c:296 +#: builtin/log.c:1231 +#: builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "argumento não reconhecido: %s" + +#: bundle.c:331 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "" + +#: bundle.c:376 +msgid "Refusing to create empty bundle." +msgstr "" + +#: bundle.c:394 +msgid "Could not spawn pack-objects" +msgstr "Não foi possível pawn pack-objects" + +#: bundle.c:412 +msgid "pack-objects died" +msgstr "" + +#: bundle.c:415 +#, c-format +msgid "cannot create '%s'" +msgstr "não consegue crear '%s'" + +#: bundle.c:437 +msgid "index-pack died" +msgstr "" + +#: commit.c:48 +#, c-format +msgid "could not parse %s" +msgstr "não consigo parsear %s" + +#: commit.c:50 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s não é um commit!" + +#: compat/obstack.c:406 +#: compat/obstack.c:408 +msgid "memory exhausted" +msgstr "memória esgotada" + +#: connected.c:39 +msgid "Could not run 'git rev-list'" +msgstr "Não foi possível executar 'git rev-list'" + +#: 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:105 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" + +#: diff.c:110 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr "" + +#: diff.c:210 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" + +#: diff.c:1400 +msgid " 0 files changed\n" +msgstr " 0 ficheros modificados\n" + +#: diff.c:1404 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] " %d ficheiro modificado" +msgstr[1] " %d ficheiros modificados" + +#: diff.c:1421 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] ", %d adição(+)" +msgstr[1] ", %d adições(+)" + +#: diff.c:1432 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] ", %d eliminado(-)" +msgstr[1] ", %d eliminados(-)" + +#: diff.c:3478 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#: gpg-interface.c:59 +msgid "could not run gpg." +msgstr "não consegue ejecutar gpg." + +#: gpg-interface.c:71 +msgid "gpg did not accept the data" +msgstr "" + +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "" + +#: grep.c:1280 +#, c-format +msgid "'%s': unable to read %s" +msgstr "" + +#: grep.c:1297 +#, c-format +msgid "'%s': %s" +msgstr "'%s': %s" + +#: grep.c:1308 +#, c-format +msgid "'%s': short read %s" +msgstr "" + +#: help.c:207 +#, c-format +msgid "available git commands in '%s'" +msgstr "" + +#: help.c:214 +msgid "git commands available from elsewhere on your $PATH" +msgstr "" + +#: help.c:270 +#, 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:327 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "" + +#: help.c:349 +#, 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:354 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "" + +#: help.c:361 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "" + +#: help.c:365 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +msgstr[1] "" + +#: remote.c:1607 +#, 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] "A sua rama está à frente de '%s' pelo commit %d.\n" +msgstr[1] "A sua rama está à frente de '%s' pelos commites %d.\n" + +#: remote.c:1613 +#, 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:1621 +#, 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] "" + +#: sequencer.c:121 +#: builtin/merge.c:865 +#: builtin/merge.c:978 +#: builtin/merge.c:1088 +#: builtin/merge.c:1098 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "" + +#: sequencer.c:123 +#: builtin/merge.c:333 +#: builtin/merge.c:868 +#: builtin/merge.c:1090 +#: builtin/merge.c:1103 +#, c-format +msgid "Could not write to '%s'" +msgstr "Não foi possível escrever para '%s'" + +#: sequencer.c:144 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" + +#: sequencer.c:147 +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:160 +#: sequencer.c:741 +#: sequencer.c:824 +#, c-format +msgid "Could not write to %s" +msgstr "Não foi possível gravar para %s" + +#: sequencer.c:163 +#, c-format +msgid "Error wrapping up %s" +msgstr "" + +#: sequencer.c:178 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "" + +#: sequencer.c:180 +msgid "Your local changes would be overwritten by revert." +msgstr "" + +#: sequencer.c:183 +msgid "Commit your changes or stash them to proceed." +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:233 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "" + +#: sequencer.c:261 +msgid "Could not resolve HEAD commit\n" +msgstr "" + +#: sequencer.c:282 +msgid "Unable to update cache tree\n" +msgstr "" + +#: sequencer.c:323 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "Não foi possível analisar commit %s\n" + +#: sequencer.c:328 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "Não foi possível analisar commit parent %s\n" + +#: sequencer.c:358 +msgid "Your index file is unmerged." +msgstr "O seu ficheiro de índice é não fundido." + +#: sequencer.c:361 +msgid "You do not have a valid HEAD" +msgstr "Você não tem uma HEAD válida" + +#: sequencer.c:376 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" + +#: sequencer.c:384 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "" + +#: sequencer.c:388 +#, 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:399 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "" + +#: sequencer.c:403 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Não é possível obter mensagem commit para %s" + +#: sequencer.c:491 +#, c-format +msgid "could not revert %s... %s" +msgstr "" + +#: sequencer.c:492 +#, c-format +msgid "could not apply %s... %s" +msgstr "" + +#: sequencer.c:536 +msgid "empty commit set passed" +msgstr "passado commit com o set vazio" + +#: sequencer.c:544 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: sequencer.c:549 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "" + +#: sequencer.c:607 +#, c-format +msgid "Cannot %s during a %s" +msgstr "Não foi possível abrir %s durante um %s" + +#: sequencer.c:629 +#, c-format +msgid "Could not parse line %d." +msgstr "Não foi possível parsear linha %d." + +#: sequencer.c:634 +msgid "No commits parsed." +msgstr "Nenhum commit parseado." + +#: sequencer.c:647 +#, c-format +msgid "Could not open %s" +msgstr "Não foi possível abrir %s" + +#: sequencer.c:651 +#, c-format +msgid "Could not read %s." +msgstr "Não foi possível ler %s." + +#: sequencer.c:658 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "" + +#: sequencer.c:686 +#, c-format +msgid "Invalid key: %s" +msgstr "" + +#: sequencer.c:689 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Valor inválido para %s: %s" + +#: sequencer.c:701 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "" + +#: sequencer.c:722 +msgid "a cherry-pick or revert is already in progress" +msgstr "" + +#: sequencer.c:723 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "" + +#: sequencer.c:727 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "" + +#: sequencer.c:743 +#: sequencer.c:828 +#, c-format +msgid "Error wrapping up %s." +msgstr "" + +#: sequencer.c:762 +#: sequencer.c:896 +msgid "no cherry-pick or revert in progress" +msgstr "" + +#: sequencer.c:764 +msgid "cannot resolve HEAD" +msgstr "" + +#: sequencer.c:766 +msgid "cannot abort from a branch yet to be born" +msgstr "" + +#: sequencer.c:788 +#: builtin/apply.c:3682 +#, c-format +msgid "cannot open %s: %s" +msgstr "não foi possível abrir %s: %s" + +#: sequencer.c:791 +#, c-format +msgid "cannot read %s: %s" +msgstr "não foi possível ler %s: %s" + +#: sequencer.c:792 +msgid "unexpected end of file" +msgstr "" + +#: sequencer.c:798 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "" + +#: sequencer.c:821 +#, c-format +msgid "Could not format %s." +msgstr "Não foi possível formatear %s." + +#: sequencer.c:983 +msgid "Can't revert as initial commit" +msgstr "" + +#: sequencer.c:984 +msgid "Can't cherry-pick into empty head" +msgstr "" + +#: sha1_name.c:864 +msgid "HEAD does not point to a branch" +msgstr "" + +#: sha1_name.c:867 +#, c-format +msgid "No such branch: '%s'" +msgstr "Não existe rama '%s'" + +#: sha1_name.c:869 +#, c-format +msgid "No upstream configured for branch '%s'" +msgstr "" + +#: sha1_name.c:872 +#, c-format +msgid "Upstream branch '%s' not stored as a remote-tracking branch" +msgstr "" + +#: wt-status.c:135 +msgid "Unmerged paths:" +msgstr "caminhos não fundidos:" + +#: wt-status.c:141 +#: wt-status.c:158 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr "" + +#: wt-status.c:143 +#: wt-status.c:160 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr "" + +#: wt-status.c:144 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr " (usa \"git add/rm <ficheiro>...\" para marcar como resolvido)" + +#: wt-status.c:152 +msgid "Changes to be committed:" +msgstr "Mudanças a serem commitadas" + +#: wt-status.c:170 +msgid "Changes not staged for commit:" +msgstr "" + +#: wt-status.c:174 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr " (usa \"git add <ficheiro>...\" para actualizar o que vai ser commitado)" + +#: wt-status.c:176 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr " (usa \"git add/rm <ficheiro>...\" para actualizar o que vai ser commitado)" + +#: wt-status.c:177 +msgid " (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr "" + +#: wt-status.c:179 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr "" + +#: wt-status.c:188 +#, c-format +msgid "%s files:" +msgstr "%s ficheros:" + +#: wt-status.c:191 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr "" + +#: wt-status.c:208 +msgid "bug" +msgstr "erro" + +#: wt-status.c:213 +msgid "both deleted:" +msgstr "eliminados em ambos:" + +#: wt-status.c:214 +msgid "added by us:" +msgstr "adicionado por nós:" + +#: wt-status.c:215 +msgid "deleted by them:" +msgstr "eliminados por eles:" + +#: wt-status.c:216 +msgid "added by them:" +msgstr "adicionados por eles:" + +#: wt-status.c:217 +msgid "deleted by us:" +msgstr "eliminados por nós:" + +#: wt-status.c:218 +msgid "both added:" +msgstr "adicionados em ambos:" + +#: wt-status.c:219 +msgid "both modified:" +msgstr "modificados em ambos:" + +#: wt-status.c:249 +msgid "new commits, " +msgstr "novos commits, " + +#: wt-status.c:251 +msgid "modified content, " +msgstr "conteúdo modificado, " + +#: wt-status.c:253 +msgid "untracked content, " +msgstr "conteúdo não seguido" + +#: wt-status.c:267 +#, c-format +msgid "new file: %s" +msgstr "novo ficheiro: %s" + +#: wt-status.c:270 +#, c-format +msgid "copied: %s -> %s" +msgstr "copiado: %s -> %s" + +#: wt-status.c:273 +#, c-format +msgid "deleted: %s" +msgstr "eliminado: %s" + +#: wt-status.c:276 +#, c-format +msgid "modified: %s" +msgstr "modificado: %s" + +#: wt-status.c:279 +#, c-format +msgid "renamed: %s -> %s" +msgstr "mudado de nome: %s -> %s" + +#: wt-status.c:282 +#, c-format +msgid "typechange: %s" +msgstr "" + +#: wt-status.c:285 +#, c-format +msgid "unknown: %s" +msgstr "desconhecido: %s" + +#: wt-status.c:288 +#, c-format +msgid "unmerged: %s" +msgstr "não fundidos: %s" + +#: wt-status.c:291 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "" + +#: wt-status.c:737 +msgid "On branch " +msgstr "Na rama" + +#: wt-status.c:744 +msgid "Not currently on any branch." +msgstr "Não está em nenhuma rama." + +#: wt-status.c:755 +msgid "Initial commit" +msgstr "Commit inicial" + +#: wt-status.c:769 +msgid "Untracked" +msgstr "Não seguido" + +#: wt-status.c:771 +msgid "Ignored" +msgstr "Ignorado" + +#: wt-status.c:773 +#, c-format +msgid "Untracked files not listed%s" +msgstr "" + +#: wt-status.c:775 +msgid " (use -u option to show untracked files)" +msgstr "" + +#: wt-status.c:781 +msgid "No changes" +msgstr "Sem mudanças" + +#: wt-status.c:785 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "nenhuma alteração adicionado ao commit%s\n" + +#: wt-status.c:787 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr " (usa \"git add\" e/ou \"git commit -a\")" + +#: wt-status.c:789 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "" + +#: wt-status.c:791 +msgid " (use \"git add\" to track)" +msgstr " (usa \"git add\" para seguir)" + +#: wt-status.c:793 +#: wt-status.c:796 +#: wt-status.c:799 +#, c-format +msgid "nothing to commit%s\n" +msgstr "nada para fazer commit%s\n" + +#: wt-status.c:794 +msgid " (create/copy files and use \"git add\" to track)" +msgstr "" + +#: wt-status.c:797 +msgid " (use -u to show untracked files)" +msgstr "" + +#: wt-status.c:800 +msgid " (working directory clean)" +msgstr " (directório de trabalho vacio)" + +#: wt-status.c:908 +msgid "HEAD (no branch)" +msgstr "HEAD (Não é rama)" + +#: wt-status.c:914 +msgid "Initial commit on " +msgstr "Commit inicial em " + +#: wt-status.c:929 +msgid "behind " +msgstr "atrás " + +#: wt-status.c:932 +#: wt-status.c:935 +msgid "ahead " +msgstr "a frente " + +#: wt-status.c:937 +msgid ", behind " +msgstr ", atrás " + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "" + +#: builtin/add.c:67 +#: builtin/commit.c:282 +msgid "updating files failed" +msgstr "Falou a atualização dos ficheiros" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "eliminar '%s'\n" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "" + +#: builtin/add.c:195 +#: builtin/add.c:456 +#: builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "Não foi possível ler o indíce" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Não foi possível abrir '%s' para escrever." + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "Não consegue escrever patch" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "Patch vazio. Aborted." + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "Não foi possível aplicar o '%s'" + +#: builtin/add.c:312 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" + +#: builtin/add.c:352 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "" + +#: builtin/add.c:353 +msgid "no files added" +msgstr "nenhum ficheiros adicionado" + +#: builtin/add.c:359 +msgid "adding files failed" +msgstr "falhou a adicionar ficheiros" + +#: builtin/add.c:391 +msgid "-A and -u are mutually incompatible" +msgstr "" + +#: builtin/add.c:393 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "" + +#: builtin/add.c:413 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "" + +#: builtin/add.c:414 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "" + +#: builtin/add.c:420 +#: builtin/clean.c:95 +#: builtin/commit.c:342 +#: builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "ficheiro index corrupto" + +#: builtin/add.c:476 +#: builtin/apply.c:4093 +#: builtin/mv.c:229 +#: builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "" + +#: builtin/apply.c:106 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "espaço em braco não reconhecido: '%s'" + +#: builtin/apply.c:121 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "" + +#: builtin/apply.c:815 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "" + +#: builtin/apply.c:824 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "" + +#: builtin/apply.c:905 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "" + +#: builtin/apply.c:934 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "" + +#: builtin/apply.c:937 +#, c-format +msgid "git apply: bad git-diff - inconsistent %s filename on line %d" +msgstr "" + +#: builtin/apply.c:944 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "" + +#: builtin/apply.c:1387 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "" + +#: builtin/apply.c:1444 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "" + +#: builtin/apply.c:1461 +#, 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:1621 +msgid "new file depends on old contents" +msgstr "" + +#: builtin/apply.c:1623 +msgid "deleted file still has contents" +msgstr "" + +#: builtin/apply.c:1649 +#, c-format +msgid "corrupt patch at line %d" +msgstr "" + +#: builtin/apply.c:1685 +#, c-format +msgid "new file %s depends on old contents" +msgstr "" + +#: builtin/apply.c:1687 +#, c-format +msgid "deleted file %s still has contents" +msgstr "" + +#: builtin/apply.c:1690 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "" + +#: builtin/apply.c:1836 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1865 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "" + +#: builtin/apply.c:1951 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "" + +#: builtin/apply.c:2041 +#, c-format +msgid "unable to read symlink %s" +msgstr "" + +#: builtin/apply.c:2045 +#, c-format +msgid "unable to open or read %s" +msgstr "Não foi possível abrir o ler %s" + +#: builtin/apply.c:2116 +msgid "oops" +msgstr "" + +#: builtin/apply.c:2638 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "começo de linha inválido: '%c'" + +#: builtin/apply.c:2756 +#, 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:2768 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "" + +#: builtin/apply.c:2774 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" + +#: builtin/apply.c:2793 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "" + +#: builtin/apply.c:2896 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "" + +#: builtin/apply.c:2902 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" + +#: builtin/apply.c:2923 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "" + +#: builtin/apply.c:3038 +#, c-format +msgid "patch %s has been renamed/deleted" +msgstr "" + +#: builtin/apply.c:3045 +#: builtin/apply.c:3062 +#, c-format +msgid "read of %s failed" +msgstr "ler %s falhou" + +#: builtin/apply.c:3077 +msgid "removal patch leaves file contents" +msgstr "" + +#: builtin/apply.c:3098 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: já existe no espaço de trabalho" + +#: builtin/apply.c:3136 +#, c-format +msgid "%s: has been deleted/renamed" +msgstr "" + +#: builtin/apply.c:3141 +#: builtin/apply.c:3172 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: builtin/apply.c:3152 +#, c-format +msgid "%s: does not exist in index" +msgstr "" + +#: builtin/apply.c:3166 +#, c-format +msgid "%s: does not match index" +msgstr "%s: não tem correspondencia ao index" + +#: builtin/apply.c:3183 +#, c-format +msgid "%s: wrong type" +msgstr "" + +#: builtin/apply.c:3185 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "" + +#: builtin/apply.c:3240 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: já existe no indíce" + +#: builtin/apply.c:3259 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)%s%s" +msgstr "" + +#: builtin/apply.c:3265 +#, c-format +msgid "%s: patch does not apply" +msgstr "" + +#: builtin/apply.c:3278 +#, c-format +msgid "Checking patch %s..." +msgstr "" + +#: builtin/apply.c:3333 +#: builtin/checkout.c:212 +#: builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: builtin/apply.c:3476 +#, c-format +msgid "unable to remove %s from index" +msgstr "" + +#: builtin/apply.c:3503 +#, c-format +msgid "corrupt patch for subproject %s" +msgstr "" + +#: builtin/apply.c:3507 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "não é possivel 'stat' o novo ficheiro creado '%s'" + +#: builtin/apply.c:3512 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "" + +#: builtin/apply.c:3515 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "" + +#: builtin/apply.c:3548 +#, c-format +msgid "closing file '%s'" +msgstr "fechar fichero '%s'" + +#: builtin/apply.c:3597 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "" + +#: builtin/apply.c:3653 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "" + +#: builtin/apply.c:3661 +msgid "internal error" +msgstr "" + +#. Say this even without --verbose +#: builtin/apply.c:3664 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:3674 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "" + +#: builtin/apply.c:3695 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "" + +#: builtin/apply.c:3698 +#, c-format +msgid "Rejected hunk #%d." +msgstr "" + +#: builtin/apply.c:3829 +msgid "unrecognized input" +msgstr "entrada não reconhecida" + +#: builtin/apply.c:3840 +msgid "unable to read index file" +msgstr "Não foi possível ler o fichero indíce" + +#: builtin/apply.c:4035 +msgid "--index outside a repository" +msgstr "--index fora de um repositorio" + +#: builtin/apply.c:4038 +msgid "--cached outside a repository" +msgstr "--cached fora de um repositorio" + +#: builtin/apply.c:4054 +#, c-format +msgid "can't open patch '%s'" +msgstr "não é possivel abrir patch '%s'" + +#: builtin/apply.c:4068 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:4074 +#: builtin/apply.c:4084 +#, 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 "erro remoto: %s" + +#: builtin/archive.c:66 +msgid "git archive: protocol error" +msgstr "" + +#: builtin/archive.c:71 +msgid "git archive: expected a flush" +msgstr "" + +#: builtin/branch.c:144 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" + +#: builtin/branch.c:148 +#, 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:180 +msgid "cannot use -a with -d" +msgstr "Não é possível usar -a com um -d" + +#: builtin/branch.c:186 +msgid "Couldn't look up commit object for HEAD" +msgstr "" + +#: builtin/branch.c:191 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "" + +#: builtin/branch.c:202 +#, c-format +msgid "remote branch '%s' not found." +msgstr "rama remota '%s não encontrada." + +#: builtin/branch.c:203 +#, c-format +msgid "branch '%s' not found." +msgstr "rama '%s' não encontrado." + +#: builtin/branch.c:210 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: builtin/branch.c:216 +#, 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:225 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "" + +#: builtin/branch.c:226 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "Erro a eliminar rama '%s'" + +#: builtin/branch.c:233 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "" + +#: builtin/branch.c:234 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Eliminar rama %s (era %s).\n" + +#: builtin/branch.c:239 +msgid "Update of config-file failed" +msgstr "" + +#: builtin/branch.c:337 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "" + +#: builtin/branch.c:409 +#, c-format +msgid "behind %d] " +msgstr "atrás %d] " + +#: builtin/branch.c:411 +#, c-format +msgid "ahead %d] " +msgstr "a frente %d] " + +#: builtin/branch.c:413 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "a frente %d, atrás %d] " + +#: builtin/branch.c:521 +msgid "(no branch)" +msgstr "(não é rama)" + +#: builtin/branch.c:586 +msgid "some refs could not be read" +msgstr "" + +#: builtin/branch.c:599 +msgid "cannot rename the current branch while not on any." +msgstr "" + +#: builtin/branch.c:609 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Nome da rama inválida: '%s'" + +#: builtin/branch.c:624 +msgid "Branch rename failed" +msgstr "Falhou renomeação da rama" + +#: builtin/branch.c:628 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Renomeado uma rama erronea '%s'" + +#: builtin/branch.c:632 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "" + +#: builtin/branch.c:639 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:654 +#, c-format +msgid "malformed object name %s" +msgstr "" + +#: builtin/branch.c:678 +#, c-format +msgid "could not write branch description template: %s" +msgstr "" + +#: builtin/branch.c:769 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:774 +#: builtin/clone.c:558 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:794 +msgid "--column and --verbose are incompatible" +msgstr "--column e --verbose são incompatíveis" + +#: builtin/branch.c:843 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s está bem\n" + +#: 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/checkout.c:113 +#: builtin/checkout.c:146 +#, c-format +msgid "path '%s' does not have our version" +msgstr "" + +#: builtin/checkout.c:115 +#: builtin/checkout.c:148 +#, c-format +msgid "path '%s' does not have their version" +msgstr "" + +#: builtin/checkout.c:131 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "" + +#: builtin/checkout.c:175 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "" + +#: builtin/checkout.c:192 +#, c-format +msgid "path '%s': cannot merge" +msgstr "" + +#: builtin/checkout.c:209 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "" + +#: builtin/checkout.c:234 +#: builtin/checkout.c:392 +msgid "corrupt index file" +msgstr "ficheiro index corrupto" + +#: builtin/checkout.c:264 +#: builtin/checkout.c:271 +#, c-format +msgid "path '%s' is unmerged" +msgstr "" + +#: builtin/checkout.c:302 +#: builtin/checkout.c:498 +#: builtin/clone.c:583 +#: builtin/merge.c:812 +msgid "unable to write new index file" +msgstr "" + +#: builtin/checkout.c:319 +#: builtin/diff.c:302 +#: builtin/merge.c:408 +msgid "diff_setup_done failed" +msgstr "" + +#: builtin/checkout.c:414 +msgid "you need to resolve your current index first" +msgstr "" + +#: builtin/checkout.c:533 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "" + +#: builtin/checkout.c:566 +msgid "HEAD is now at" +msgstr "HEAD é agora em " + +#: builtin/checkout.c:573 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Reset rama '%s'\n" + +#: builtin/checkout.c:576 +#, c-format +msgid "Already on '%s'\n" +msgstr "Já em '%s'\n" + +#: builtin/checkout.c:580 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:582 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Mudado para a nova rama '%s'\n" + +#: builtin/checkout.c:584 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Mudado para a rama '%s'\n" + +#: builtin/checkout.c:640 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... e %d mais.\n" + +#. The singular version +#: builtin/checkout.c:646 +#, 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:664 +#, 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:693 +msgid "internal error in revision walk" +msgstr "" + +#: builtin/checkout.c:697 +msgid "Previous HEAD position was" +msgstr "" + +#: builtin/checkout.c:723 +msgid "You are on a branch yet to be born" +msgstr "" + +#. case (1) +#: builtin/checkout.c:854 +#, c-format +msgid "invalid reference: %s" +msgstr "" + +#. case (1): want a tree +#: builtin/checkout.c:893 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:973 +msgid "-B cannot be used with -b" +msgstr "" + +#: builtin/checkout.c:982 +msgid "--patch is incompatible with all other options" +msgstr "" + +#: builtin/checkout.c:985 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "" + +#: builtin/checkout.c:987 +msgid "--detach cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:993 +msgid "--track needs a branch name" +msgstr "" + +#: builtin/checkout.c:1000 +msgid "Missing branch name; try -b" +msgstr "" + +#: builtin/checkout.c:1006 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "" + +#: builtin/checkout.c:1008 +msgid "--orphan cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:1018 +msgid "git checkout: -f and -m are incompatible" +msgstr "" + +#: builtin/checkout.c:1052 +msgid "invalid path specification" +msgstr "" + +#: builtin/checkout.c:1060 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" + +#: builtin/checkout.c:1062 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "" + +#: builtin/checkout.c:1067 +msgid "git checkout: --detach does not take a path argument" +msgstr "" + +#: builtin/checkout.c:1070 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" + +#: builtin/checkout.c:1089 +msgid "Cannot switch branch to a non-commit." +msgstr "" + +#: builtin/checkout.c:1092 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "" + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clean.c:82 +msgid "clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" + +#: builtin/clean.c:85 +msgid "clean.requireForce defaults to true and neither -n nor -f given; refusing to clean" +msgstr "" + +#: builtin/clean.c:155 +#: builtin/clean.c:176 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:159 +#: builtin/clean.c:179 +#, c-format +msgid "Removing %s\n" +msgstr "Eliminando %s\n" + +#: builtin/clean.c:162 +#: builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" +msgstr "" + +#: builtin/clean.c:166 +#, c-format +msgid "Would not remove %s\n" +msgstr "" + +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" +msgstr "" + +#: builtin/clone.c:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "" + +#: builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "falhou a abrir '%s'" + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "falhou a criar o directório '%s'" + +#: builtin/clone.c:308 +#: builtin/diff.c:75 +#, 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:341 +#, c-format +msgid "failed to unlink '%s'" +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 "falhou a copiar o ficheiro para '%s'" + +#: builtin/clone.c:373 +#, c-format +msgid "done.\n" +msgstr "terminado.\n" + +#: builtin/clone.c:440 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "" + +#: builtin/clone.c:549 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" + +#: builtin/clone.c:639 +msgid "Too many arguments." +msgstr "Demasiados parametros." + +#: builtin/clone.c:643 +msgid "You must specify a repository to clone." +msgstr "" + +#: builtin/clone.c:654 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "" + +#: builtin/clone.c:668 +#, c-format +msgid "repository '%s' does not exist" +msgstr "" + +#: builtin/clone.c:673 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:683 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:693 +#, c-format +msgid "working tree '%s' already exists." +msgstr "" + +#: builtin/clone.c:706 +#: builtin/clone.c:720 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" + +#: builtin/clone.c:709 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "" + +#: builtin/clone.c:728 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "Clonando em um repositorio nu (bare) '%s'...\n" + +#: builtin/clone.c:730 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "Clonar em '%s'...\n" + +#: builtin/clone.c:786 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Não sei como clonar %s" + +#: builtin/clone.c:835 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "" + +#: builtin/clone.c:842 +msgid "You appear to have cloned an empty repository." +msgstr "" + +#: builtin/column.c:51 +msgid "--command must be the first argument" +msgstr "" + +#: builtin/commit.c:43 +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 "" +"O seu nome e endereço de e-mail foram configurados automaticamente com base\n" +"no o seu usuario e nome da maquina. Por favor, verifique se eles são precisos.\n" +"Você pode suprimir esta mensagem, configurando-los explicitamente:\n" +"\n" +" git config --global user.name \"O teu Nome\"\n" +" git config --global user.email tu@examplo.com\n" +"\n" +"Após fazer isso, você pode corregir a identidade usada em este commit com:\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:55 +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:60 +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:309 +msgid "failed to unpack HEAD tree object" +msgstr "" + +#: builtin/commit.c:351 +msgid "unable to create temporary index" +msgstr "" + +#: builtin/commit.c:357 +msgid "interactive add failed" +msgstr "falhou adicionar interativo" + +#: builtin/commit.c:390 +#: builtin/commit.c:411 +#: builtin/commit.c:461 +msgid "unable to write new_index file" +msgstr "" + +#: builtin/commit.c:442 +msgid "cannot do a partial commit during a merge." +msgstr "" + +#: builtin/commit.c:444 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "" + +#: builtin/commit.c:454 +msgid "cannot read the index" +msgstr "não foi possível ler o indíce" + +#: builtin/commit.c:474 +msgid "unable to write temporary index file" +msgstr "" + +#: builtin/commit.c:549 +#: builtin/commit.c:555 +#, c-format +msgid "invalid commit: %s" +msgstr "commit inválido: %s" + +#: builtin/commit.c:578 +msgid "malformed --author parameter" +msgstr "" + +#: builtin/commit.c:639 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "" + +#: builtin/commit.c:677 +#: builtin/commit.c:710 +#: builtin/commit.c:1024 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:689 +#: builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "" + +#: builtin/commit.c:691 +msgid "could not read log from standard input" +msgstr "" + +#: builtin/commit.c:695 +#, c-format +msgid "could not read log file '%s'" +msgstr "não é possivel ler o ficheiro de log '%s'" + +#: builtin/commit.c:701 +msgid "commit has empty message" +msgstr "a mensagem do commit está vazia" + +#: builtin/commit.c:717 +msgid "could not read MERGE_MSG" +msgstr "não é possivel ler MERGE_MSG" + +#: builtin/commit.c:721 +msgid "could not read SQUASH_MSG" +msgstr "não é possivel ler SQUASH_MSG" + +#: builtin/commit.c:725 +#, c-format +msgid "could not read '%s'" +msgstr "não é possivel ler '%s'" + +#: builtin/commit.c:777 +msgid "could not write commit template" +msgstr "" + +#: builtin/commit.c:788 +#, 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:793 +#, 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:805 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:810 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:823 +#, c-format +msgid "%sAuthor: %s" +msgstr "%sAutor: %s" + +#: builtin/commit.c:830 +#, c-format +msgid "%sCommitter: %s" +msgstr "%sCommitador: %s" + +#: builtin/commit.c:850 +msgid "Cannot read index" +msgstr "" + +#: builtin/commit.c:887 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:902 +#: builtin/tag.c:361 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "" + +#: builtin/commit.c:999 +#, c-format +msgid "No existing author found with '%s'" +msgstr "" + +#: builtin/commit.c:1014 +#: builtin/commit.c:1214 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "" + +#: builtin/commit.c:1054 +msgid "Using both --reset-author and --author does not make sense" +msgstr "" + +#: builtin/commit.c:1065 +msgid "You have nothing to amend." +msgstr "Você não tem nada a corregir." + +#: builtin/commit.c:1068 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "" + +#: builtin/commit.c:1070 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "" + +#: builtin/commit.c:1073 +msgid "Options --squash and --fixup cannot be used together" +msgstr "" + +#: builtin/commit.c:1083 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "" + +#: builtin/commit.c:1085 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "" + +#: builtin/commit.c:1093 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "" + +#: builtin/commit.c:1110 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" + +#: builtin/commit.c:1112 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:1114 +msgid "Clever... amending the last one with dirty index." +msgstr "" + +#: builtin/commit.c:1116 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" + +#: builtin/commit.c:1126 +#: builtin/tag.c:577 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "" + +#: builtin/commit.c:1131 +msgid "Paths with -a does not make sense." +msgstr "" + +#: builtin/commit.c:1315 +msgid "couldn't look up newly created commit" +msgstr "" + +#: builtin/commit.c:1317 +msgid "could not parse newly created commit" +msgstr "" + +#: builtin/commit.c:1358 +msgid "detached HEAD" +msgstr "" + +#: builtin/commit.c:1360 +msgid " (root-commit)" +msgstr " (root-commit)" + +#: builtin/commit.c:1450 +msgid "could not parse HEAD commit" +msgstr "" + +#: builtin/commit.c:1487 +#: builtin/merge.c:509 +#, c-format +msgid "could not open '%s' for reading" +msgstr "" + +#: builtin/commit.c:1494 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "" + +#: builtin/commit.c:1501 +msgid "could not read MERGE_MODE" +msgstr "" + +#: builtin/commit.c:1520 +#, c-format +msgid "could not read commit message: %s" +msgstr "" + +#: builtin/commit.c:1534 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "" + +#: builtin/commit.c:1539 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "" + +#: builtin/commit.c:1554 +#: builtin/merge.c:936 +#: builtin/merge.c:961 +msgid "failed to write commit object" +msgstr "" + +#: builtin/commit.c:1575 +msgid "cannot lock HEAD ref" +msgstr "" + +#: builtin/commit.c:1579 +msgid "cannot update HEAD ref" +msgstr "" + +#: builtin/commit.c:1590 +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/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:436 +msgid "--long is incompatible with --abbrev=0" +msgstr "" + +#: builtin/describe.c:462 +msgid "No names found, cannot describe anything." +msgstr "Nenhum nome encontrado, não descreve nada." + +#: builtin/describe.c:482 +msgid "--dirty is incompatible with committishes" +msgstr "" + +#: builtin/diff.c:77 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "" + +#: builtin/diff.c:220 +#, c-format +msgid "invalid option: %s" +msgstr "" + +#: builtin/diff.c:297 +msgid "Not a git repository" +msgstr "Não é um repositorio git" + +#: builtin/diff.c:347 +#, c-format +msgid "invalid object '%s' given." +msgstr "" + +#: builtin/diff.c:352 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "" + +#: builtin/diff.c:362 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "" + +#: builtin/diff.c:370 +#, c-format +msgid "unhandled object '%s' given." +msgstr "" + +#: builtin/fetch.c:200 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:253 +#, c-format +msgid "object %s not found" +msgstr "objecto %s não encontrado" + +#: builtin/fetch.c:259 +msgid "[up to date]" +msgstr "[Actualizada]" + +#: builtin/fetch.c:273 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "" + +#: builtin/fetch.c:274 +#: builtin/fetch.c:360 +msgid "[rejected]" +msgstr "[rejeitado]" + +#: builtin/fetch.c:285 +msgid "[tag update]" +msgstr "[etiqueta actualizada]" + +#: builtin/fetch.c:287 +#: builtin/fetch.c:322 +#: builtin/fetch.c:340 +msgid " (unable to update local ref)" +msgstr "" + +#: builtin/fetch.c:305 +msgid "[new tag]" +msgstr "[nova etiqueta]" + +#: builtin/fetch.c:308 +msgid "[new branch]" +msgstr "[nova rama]" + +#: builtin/fetch.c:311 +msgid "[new ref]" +msgstr "[nova ref]" + +#: builtin/fetch.c:356 +msgid "unable to update local ref" +msgstr "" + +#: builtin/fetch.c:356 +msgid "forced update" +msgstr "actualização forçada" + +#: builtin/fetch.c:362 +msgid "(non-fast-forward)" +msgstr "(non-fast-forward)" + +#: builtin/fetch.c:393 +#: builtin/fetch.c:685 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "não é possivel abrir %s: %s\n" + +#: builtin/fetch.c:402 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "" + +#: builtin/fetch.c:488 +#, c-format +msgid "From %.*s\n" +msgstr "Para %.*s\n" + +#: builtin/fetch.c:499 +#, 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:549 +#, c-format +msgid " (%s will become dangling)" +msgstr "" + +#: builtin/fetch.c:550 +#, c-format +msgid " (%s has become dangling)" +msgstr "" + +#: builtin/fetch.c:557 +msgid "[deleted]" +msgstr "[eliminado]" + +#: builtin/fetch.c:558 +#: builtin/remote.c:1055 +msgid "(none)" +msgstr "(nenhum)" + +#: builtin/fetch.c:675 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" + +#: builtin/fetch.c:709 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:786 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:789 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "" + +#: builtin/fetch.c:888 +#, c-format +msgid "Fetching %s\n" +msgstr "Baixando %s\n" + +#: builtin/fetch.c:890 +#: builtin/remote.c:100 +#, c-format +msgid "Could not fetch %s" +msgstr "" + +#: builtin/fetch.c:907 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" +"Nenhum repositório remoto especificado. Por favor, especifique um URL ou o\n" +"nome remoto a partir do qual novas revisões devem ser obtida." + +#: builtin/fetch.c:927 +msgid "You need to specify a tag name." +msgstr "Você precisa especificar um nome da etiqueta." + +#: builtin/fetch.c:979 +msgid "fetch --all does not take a repository argument" +msgstr "" + +#: builtin/fetch.c:981 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:992 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:1000 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "Inválido %s: '%s'" + +#: builtin/gc.c:90 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "" + +#: builtin/gc.c:221 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:224 +#, 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:251 +msgid "There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +#: builtin/grep.c:216 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "" + +#: builtin/grep.c:402 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:478 +#: builtin/grep.c:512 +#, c-format +msgid "unable to read tree (%s)" +msgstr "" + +#: builtin/grep.c:526 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" + +#: builtin/grep.c:584 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "" + +#: builtin/grep.c:601 +#, c-format +msgid "cannot open '%s'" +msgstr "" + +#: builtin/grep.c:888 +msgid "no pattern given." +msgstr "" + +#: builtin/grep.c:902 +#, c-format +msgid "bad object %s" +msgstr "" + +#: builtin/grep.c:943 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:966 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "" + +#: builtin/grep.c:971 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "" + +#: builtin/grep.c:974 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "" + +#: builtin/grep.c:982 +msgid "both --cached and trees are given." +msgstr "" + +#: builtin/help.c:59 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "formato ajuda não reconhecido '%s'" + +#: builtin/help.c:87 +msgid "Failed to start emacsclient." +msgstr "" + +#: builtin/help.c:100 +msgid "Failed to parse emacsclient version." +msgstr "" + +#: builtin/help.c:108 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "" + +#: builtin/help.c:126 +#: builtin/help.c:154 +#: builtin/help.c:163 +#: builtin/help.c:171 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "" + +#: builtin/help.c:211 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "" + +#: builtin/help.c:223 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "" + +#: builtin/help.c:287 +msgid "The most commonly used git commands are:" +msgstr "" + +#: builtin/help.c:355 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "" + +#: builtin/help.c:372 +msgid "no man viewer handled the request" +msgstr "" + +#: builtin/help.c:380 +msgid "no info viewer handled the request" +msgstr "" + +#: builtin/help.c:391 +#, c-format +msgid "'%s': not a documentation directory." +msgstr "" + +#: builtin/help.c:432 +#: builtin/help.c:439 +#, c-format +msgid "usage: %s%s" +msgstr "" + +#: builtin/help.c:453 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "" + +#: builtin/index-pack.c:84 +#, c-format +msgid "object type mismatch at %s" +msgstr "" + +#: builtin/index-pack.c:104 +msgid "object of unexpected type" +msgstr "" + +#: builtin/index-pack.c:141 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:151 +msgid "early EOF" +msgstr "" + +#: builtin/index-pack.c:152 +msgid "read error on input" +msgstr "" + +#: builtin/index-pack.c:164 +msgid "used more bytes than were available" +msgstr "" + +#: builtin/index-pack.c:171 +msgid "pack too large for current definition of off_t" +msgstr "" + +#: builtin/index-pack.c:187 +#, c-format +msgid "unable to create '%s'" +msgstr "não é possivel crear '%s'" + +#: builtin/index-pack.c:192 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "Não é possivel abrir o ficheiro packfile '%s'" + +#: builtin/index-pack.c:206 +msgid "pack signature mismatch" +msgstr "" + +#: builtin/index-pack.c:226 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "" + +#: builtin/index-pack.c:300 +#, c-format +msgid "inflate returned %d" +msgstr "" + +#: builtin/index-pack.c:345 +msgid "offset value overflow for delta base object" +msgstr "" + +#: builtin/index-pack.c:353 +msgid "delta base offset is out of bound" +msgstr "" + +#: builtin/index-pack.c:361 +#, c-format +msgid "unknown object type %d" +msgstr "ojecto com tipo desconhecido %d" + +#: builtin/index-pack.c:390 +msgid "cannot pread pack file" +msgstr "Não é possivel pread pack file" + +#: builtin/index-pack.c:392 +#, 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:405 +msgid "serious inflate inconsistency" +msgstr "" + +#: builtin/index-pack.c:476 +#, c-format +msgid "cannot read existing object %s" +msgstr "não foi possível ler objecto existente %s" + +#: builtin/index-pack.c:479 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "" + +#: builtin/index-pack.c:488 +#, c-format +msgid "invalid blob object %s" +msgstr "inválido objecto blob %s" + +#: builtin/index-pack.c:500 +#, c-format +msgid "invalid %s" +msgstr "inválido: %s" + +#: builtin/index-pack.c:502 +msgid "Error in object" +msgstr "" + +#: builtin/index-pack.c:504 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "" + +#: builtin/index-pack.c:576 +#: builtin/index-pack.c:602 +msgid "failed to apply delta" +msgstr "" + +#: builtin/index-pack.c:706 +msgid "Receiving objects" +msgstr "" + +#: builtin/index-pack.c:706 +msgid "Indexing objects" +msgstr "" + +#: builtin/index-pack.c:728 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "" + +#: builtin/index-pack.c:733 +msgid "cannot fstat packfile" +msgstr "Não é possivel fstat packfile" + +#: builtin/index-pack.c:736 +msgid "pack has junk at the end" +msgstr "" + +#: builtin/index-pack.c:754 +msgid "Resolving deltas" +msgstr "Resolvendo deltas" + +#: builtin/index-pack.c:787 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "" + +#: builtin/index-pack.c:866 +#, c-format +msgid "local object %s is corrupt" +msgstr "" + +#: builtin/index-pack.c:890 +msgid "error while closing pack file" +msgstr "" + +#: builtin/index-pack.c:903 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "não é possivel escrever o fichero kepp '%s'" + +#: builtin/index-pack.c:911 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "Não é possivel fechar o fichero escrito '%s'" + +#: builtin/index-pack.c:924 +msgid "cannot store pack file" +msgstr "Não é possivel guardar o fichero pack" + +#: builtin/index-pack.c:935 +msgid "cannot store index file" +msgstr "Não é possivel guardar fichero index" + +#: builtin/index-pack.c:1024 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Não é possivel abrir o existente ficheiro pack %s" + +#: builtin/index-pack.c:1026 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "Não é possivel abrir o ficheiro 'pack idx' para '%s'" + +#: builtin/index-pack.c:1073 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:1080 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:1107 +msgid "Cannot come back to cwd" +msgstr "" + +#: builtin/index-pack.c:1140 +#: builtin/index-pack.c:1143 +#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1159 +#, c-format +msgid "bad %s" +msgstr "inválido %s" + +#: builtin/index-pack.c:1173 +msgid "--fix-thin cannot be used without --stdin" +msgstr "" + +#: builtin/index-pack.c:1177 +#: builtin/index-pack.c:1187 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "" + +#: builtin/index-pack.c:1196 +msgid "--verify with no packfile name given" +msgstr "" + +#: builtin/index-pack.c:1220 +msgid "confusion beyond insanity" +msgstr "" + +#: builtin/index-pack.c:1239 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "" +msgstr[1] "" + +#: 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:322 +#: builtin/init-db.c:325 +#, c-format +msgid "%s already exists" +msgstr "%s já existe" + +#: builtin/init-db.c:354 +#, c-format +msgid "unable to handle file type %d" +msgstr "" + +#: builtin/init-db.c:357 +#, c-format +msgid "unable to move %s to %s" +msgstr "" + +#: builtin/init-db.c:362 +#, 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:419 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "" + +#: builtin/init-db.c:420 +msgid "Reinitialized existing" +msgstr "" + +#: builtin/init-db.c:420 +msgid "Initialized empty" +msgstr "Inicializada vazio" + +#: builtin/init-db.c:421 +msgid " shared" +msgstr " partilhado" + +#: builtin/init-db.c:440 +msgid "cannot tell cwd" +msgstr "" + +#: builtin/init-db.c:521 +#: builtin/init-db.c:528 +#, c-format +msgid "cannot mkdir %s" +msgstr "" + +#: builtin/init-db.c:532 +#, c-format +msgid "cannot chdir to %s" +msgstr "" + +#: builtin/init-db.c:554 +#, c-format +msgid "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-dir=<directory>)" +msgstr "" + +#: builtin/init-db.c:578 +msgid "Cannot access current working directory" +msgstr "" + +#: builtin/init-db.c:585 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "" + +#: builtin/log.c:188 +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +#: builtin/log.c:401 +#: builtin/log.c:489 +#, c-format +msgid "Could not read object %s" +msgstr "" + +#: builtin/log.c:513 +#, c-format +msgid "Unknown type: %d" +msgstr "Tipo desconhecido: %d" + +#: builtin/log.c:602 +msgid "format.headers without value" +msgstr "" + +#: builtin/log.c:675 +msgid "name of output directory is too long" +msgstr "nome do diretório de saída é demasiado longo" + +#: builtin/log.c:686 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Não é possivel abrir o ficheiro patch %s" + +#: builtin/log.c:700 +msgid "Need exactly one range." +msgstr "Necessita de exatamente um intervalo." + +#: builtin/log.c:708 +msgid "Not a range." +msgstr "Não é um intervalo." + +#: builtin/log.c:745 +msgid "Could not extract email from committer identity." +msgstr "Não foi possível extrair a identidade do committer do e-mail." + +#: builtin/log.c:791 +msgid "Cover letter needs email format" +msgstr "Carta de apresentação necessita um modelo de e-mail" + +#: builtin/log.c:885 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "" + +#: builtin/log.c:958 +msgid "Two output directories?" +msgstr "Dois diretórios de saída?" + +#: builtin/log.c:1179 +#, c-format +msgid "bogus committer info %s" +msgstr "" + +#: builtin/log.c:1224 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1226 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1234 +msgid "--name-only does not make sense" +msgstr "" + +#: builtin/log.c:1236 +msgid "--name-status does not make sense" +msgstr "" + +#: builtin/log.c:1238 +msgid "--check does not make sense" +msgstr "" + +#: builtin/log.c:1261 +msgid "standard output, or directory, which one?" +msgstr "saída padrão, ou diretório, qual deles?" + +#: builtin/log.c:1263 +#, c-format +msgid "Could not create directory '%s'" +msgstr "" + +#: builtin/log.c:1416 +msgid "Failed to create output files" +msgstr "Falhou ao criar ficheiros de saída" + +#: builtin/log.c:1520 +#, c-format +msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" + +#: builtin/log.c:1536 +#: builtin/log.c:1538 +#: builtin/log.c:1550 +#, c-format +msgid "Unknown commit %s" +msgstr "Commit desconhecido %s" + +#: 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 "As estratégias disponíveis são:" + +#: builtin/merge.c:133 +#, c-format +msgid "Available custom strategies are:" +msgstr "Estratégias personalizadas disponíveis são:" + +#: builtin/merge.c:240 +msgid "could not run stash." +msgstr "" + +#: builtin/merge.c:245 +msgid "stash failed" +msgstr "falhou o stash" + +#: 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 " (nada para squash)" + +#: builtin/merge.c:329 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:361 +msgid "Writing SQUASH_MSG" +msgstr "Escrevendo SQUASH_MSG" + +#: builtin/merge.c:363 +msgid "Finishing SQUASH_MSG" +msgstr "Terminando SQUASH_MSG" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:437 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "" + +#: builtin/merge.c:536 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "" + +#: builtin/merge.c:629 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:679 +msgid "failed to read the cache" +msgstr "" + +#: builtin/merge.c:697 +msgid "Unable to write index." +msgstr "" + +#: builtin/merge.c:710 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:724 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "" + +#: builtin/merge.c:738 +#, c-format +msgid "unable to write %s" +msgstr "" + +#: builtin/merge.c:877 +#, c-format +msgid "Could not read from '%s'" +msgstr "" + +#: builtin/merge.c:886 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "Não commitando um merge; usa 'git commit' para completar o merge.\n" + +#: builtin/merge.c:892 +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 '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" + +#: builtin/merge.c:916 +msgid "Empty commit message." +msgstr "Mensagem de commit vazia." + +#: builtin/merge.c:928 +#, c-format +msgid "Wonderful.\n" +msgstr "Fastastico.\n" + +#: builtin/merge.c:993 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +#: builtin/merge.c:1009 +#, c-format +msgid "'%s' is not a commit" +msgstr "'%s' não é um commit" + +#: builtin/merge.c:1050 +msgid "No current branch." +msgstr "Nenhuma rama actual" + +#: builtin/merge.c:1052 +msgid "No remote for the current branch." +msgstr "" + +#: builtin/merge.c:1054 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1059 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1146 +#: builtin/merge.c:1303 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1214 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1230 +#: 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:1233 +#: git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1237 +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:1240 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1249 +msgid "You cannot combine --squash with --no-ff." +msgstr "" + +#: builtin/merge.c:1254 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "" + +#: builtin/merge.c:1261 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "" + +#: builtin/merge.c:1293 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1296 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:1298 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:1413 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Actualizando %s..%s\n" + +#: builtin/merge.c:1451 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1458 +#, c-format +msgid "Nope.\n" +msgstr "Não.\n" + +#: builtin/merge.c:1490 +msgid "Not possible to fast-forward, aborting." +msgstr "" + +#: builtin/merge.c:1513 +#: builtin/merge.c:1592 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1517 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#: builtin/merge.c:1583 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "" + +#: builtin/merge.c:1585 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Fundir com a estratégia %s falhou.\n" + +#: builtin/merge.c:1594 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1606 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" + +#: builtin/mv.c:108 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "" + +#: builtin/mv.c:112 +msgid "bad source" +msgstr "fonte inválida" + +#: 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 "o directorio fonte está vazio" + +#: builtin/mv.c:171 +msgid "not under version control" +msgstr "não está no controlo de versões" + +#: builtin/mv.c:173 +msgid "destination exists" +msgstr "existe destino" + +#: builtin/mv.c:181 +#, c-format +msgid "overwriting '%s'" +msgstr "subscrevendo '%s'" + +#: builtin/mv.c:184 +msgid "Cannot overwrite" +msgstr "Não consegue subscrever" + +#: builtin/mv.c:187 +msgid "multiple sources for the same target" +msgstr "múltiplas fontes para o mesmo alvo" + +#: 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 "Mudar de nome %s para %s\n" + +#: builtin/mv.c:215 +#: builtin/remote.c:731 +#, c-format +msgid "renaming '%s' failed" +msgstr "mudar de nome '%s' falhou" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:155 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:175 +#: builtin/tag.c:347 +#, c-format +msgid "could not create file '%s'" +msgstr "" + +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" + +#: builtin/notes.c:210 +#: builtin/notes.c:973 +#, c-format +msgid "Removing note for object %s\n" +msgstr "" + +#: builtin/notes.c:215 +msgid "unable to write note object" +msgstr "" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "" + +#: builtin/notes.c:251 +#: builtin/tag.c:542 +#, c-format +msgid "cannot read '%s'" +msgstr "não consegue ler '%s'" + +#: builtin/notes.c:253 +#: builtin/tag.c:545 +#, c-format +msgid "could not open or read '%s'" +msgstr "" + +#: builtin/notes.c:272 +#: builtin/notes.c:445 +#: builtin/notes.c:447 +#: builtin/notes.c:507 +#: builtin/notes.c:561 +#: builtin/notes.c:644 +#: builtin/notes.c:649 +#: builtin/notes.c:724 +#: builtin/notes.c:766 +#: builtin/notes.c:968 +#: builtin/reset.c:293 +#: builtin/tag.c:558 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "" + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: builtin/notes.c:350 +#, 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:377 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Inválido %s valor: '%s'" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "" + +#: builtin/notes.c:456 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "" + +#: builtin/notes.c:500 +#: builtin/notes.c:554 +#: builtin/notes.c:627 +#: builtin/notes.c:639 +#: builtin/notes.c:712 +#: builtin/notes.c:759 +#: builtin/notes.c:1033 +msgid "too many parameters" +msgstr "demasiado parametros" + +#: builtin/notes.c:513 +#: builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "Nenhuma nota encontrada para o objecto %s." + +#: builtin/notes.c:580 +#, c-format +msgid "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite existing notes" +msgstr "" + +#: builtin/notes.c:585 +#: builtin/notes.c:662 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#: builtin/notes.c:635 +msgid "too few parameters" +msgstr "" + +#: builtin/notes.c:656 +#, c-format +msgid "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite existing notes" +msgstr "" + +#: builtin/notes.c:668 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "" + +#: builtin/notes.c:717 +#, 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:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +#: builtin/notes.c:1103 +#: builtin/remote.c:1598 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/pack-objects.c:2315 +#, c-format +msgid "unsupported index version %s" +msgstr "" + +#: builtin/pack-objects.c:2319 +#, c-format +msgid "bad index version '%s'" +msgstr "" + +#: builtin/pack-objects.c:2342 +#, c-format +msgid "option %s does not accept negative form" +msgstr "opção %s não aceita formato negativo" + +#: builtin/pack-objects.c:2346 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "" + +#: builtin/push.c:45 +msgid "tag shorthand without <tag>" +msgstr "" + +#: builtin/push.c:64 +msgid "--delete only accepts plain target ref names" +msgstr "--delete só aceita nomes simples para o ref de destino" + +#: 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:174 +msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" + +#: builtin/push.c:181 +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:187 +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\n" +"variable to 'current' or 'upstream' to push only the current branch." +msgstr "" + +#: builtin/push.c:193 +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:233 +#, c-format +msgid "Pushing to %s\n" +msgstr "Pushing para %s\n" + +#: builtin/push.c:237 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:269 +#, c-format +msgid "bad repository '%s'" +msgstr "repositorio inválido '%s'" + +#: builtin/push.c:270 +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:285 +msgid "--all and --tags are incompatible" +msgstr "--all e --tags are são incompatíveis" + +#: builtin/push.c:286 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:291 +msgid "--mirror and --tags are incompatible" +msgstr "" + +#: builtin/push.c:292 +msgid "--mirror can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:297 +msgid "--all and --mirror are incompatible" +msgstr "" + +#: builtin/push.c:385 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "" + +#: builtin/push.c:387 +msgid "--delete doesn't make sense without any refs" +msgstr "" + +#: builtin/remote.c:98 +#, c-format +msgid "Updating %s" +msgstr "Actualizando %s" + +#: 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 "argumento mirror não conhecido: %s" + +#: 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 "o remoto %s já existe" + +#: builtin/remote.c:199 +#: builtin/remote.c:650 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' não é um nombe remoto valido" + +#: builtin/remote.c:243 +#, c-format +msgid "Could not setup master '%s'" +msgstr "Não foi possível configurar a rama master '%s'" + +#: 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 "(eliminado)" + +#: builtin/remote.c:595 +#: builtin/remote.c:601 +#: builtin/remote.c:607 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "Não foi possível adicionar o '%s' para o '%s'" + +#: 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 "Não foi possível renombrar a secção da configuração de '%s' para '%s'" + +#: builtin/remote.c:662 +#: builtin/remote.c:799 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Não foi possível remover a secção da configuração '%s'" + +#: builtin/remote.c:677 +#, c-format +msgid "" +"Not updating non-default fetch respec\n" +"\t%s\n" +"\tPlease update the configuration manually if necessary." +msgstr "" + +#: builtin/remote.c:683 +#, c-format +msgid "Could not append '%s'" +msgstr "Não foi possível adicionar '%s'" + +#: builtin/remote.c:694 +#, c-format +msgid "Could not set '%s'" +msgstr "Não foi possível atribuir '%s'" + +#: builtin/remote.c:716 +#, c-format +msgid "deleting '%s' failed" +msgstr "falhou eliminar '%s'" + +#: builtin/remote.c:750 +#, c-format +msgid "creating '%s' failed" +msgstr "falhou a criar '%s'" + +#: builtin/remote.c:764 +#, c-format +msgid "Could not remove branch %s" +msgstr "Não foi possível remover rama %s" + +#: 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 "seguido" + +#: 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 "Fundir com servidor remoto %s" + +#: builtin/remote.c:1002 +msgid " and with remote" +msgstr " e com remoto" + +#: builtin/remote.c:1004 +#, c-format +msgid "merges with remote %s" +msgstr "Fundir com servidor remoto %s" + +#: builtin/remote.c:1005 +msgid " and with remote" +msgstr " e com remoto" + +#: builtin/remote.c:1051 +msgid "create" +msgstr "creado" + +#: builtin/remote.c:1054 +msgid "delete" +msgstr "eliminado" + +#: builtin/remote.c:1058 +msgid "up to date" +msgstr "actualizado" + +#: builtin/remote.c:1061 +msgid "fast-forwardable" +msgstr "fast-forwardable" + +#: builtin/remote.c:1064 +msgid "local out of date" +msgstr "local desatualizada" + +#: 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:1118 +#, c-format +msgid "* remote %s" +msgstr "* remota %s" + +#: builtin/remote.c:1119 +#, c-format +msgid " Fetch URL: %s" +msgstr "" + +#: builtin/remote.c:1120 +#: builtin/remote.c:1285 +msgid "(no URL)" +msgstr "(nenhum URL)" + +#: 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 "Rama HEAD: %s" + +#: 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] "Rama remota:%s" +msgstr[1] "Ramas remotas:%s'" + +#: 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: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 "Não foi possível abrir %s" + +#: 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 "Não foi possível configurar %s" + +#: 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 "Apagando %s" + +#: builtin/remote.c:1282 +#, c-format +msgid "URL: %s" +msgstr "URL: %s" + +#: builtin/remote.c:1295 +#, c-format +msgid " * [would prune] %s" +msgstr "" + +#: builtin/remote.c:1298 +#, c-format +msgid " * [pruned] %s" +msgstr "" + +#: builtin/remote.c:1387 +#: builtin/remote.c:1461 +#, c-format +msgid "No such remote '%s'" +msgstr "Não existe este remoto '%s'" + +#: builtin/remote.c:1414 +msgid "no remote specified" +msgstr "Nenhum remoto especificado" + +#: 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 "Nenhum URL encontrado: %s" + +#: builtin/remote.c:1497 +msgid "Will not delete all non-push URLs" +msgstr "" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "mistura" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "leve" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "forte" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "juntar" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "manter" + +#: builtin/reset.c:77 +msgid "You do not have a valid HEAD." +msgstr "Não tens a HEAD válida." + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "" + +#: builtin/reset.c:85 +#, c-format +msgid "Failed to find tree of %s." +msgstr "" + +#: builtin/reset.c:96 +msgid "Could not write new index file." +msgstr "" + +#: builtin/reset.c:106 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD é agora em %s" + +#: builtin/reset.c:130 +msgid "Could not read index" +msgstr "" + +#: builtin/reset.c:133 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:223 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "" + +#: builtin/reset.c:297 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Não foi possível analisar objeto '%s'." + +#: builtin/reset.c:302 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "" + +#: builtin/reset.c:311 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "" + +#: builtin/reset.c:313 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "" + +#: builtin/reset.c:325 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "" + +#: builtin/reset.c:341 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "" + +#: builtin/revert.c:70 +#: builtin/revert.c:92 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "" + +#: builtin/revert.c:131 +msgid "program error" +msgstr "erro do programa" + +#: builtin/revert.c:221 +msgid "revert failed" +msgstr "falhou o revert" + +#: builtin/revert.c:236 +msgid "cherry-pick failed" +msgstr "cherry-pick falhou" + +#: builtin/rm.c:109 +#, 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:115 +#, 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:119 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "" + +#: builtin/rm.c:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "Autor em falta: %s" + +#: 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 "etiqueta '%s' não foi encontrada." + +#: 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 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" + +#: builtin/tag.c:256 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you want to.\n" +"#\n" +msgstr "" + +#: builtin/tag.c:298 +msgid "unable to sign the tag" +msgstr "" + +#: builtin/tag.c:300 +msgid "unable to write tag file" +msgstr "" + +#: builtin/tag.c:325 +msgid "bad object type." +msgstr "" + +#: builtin/tag.c:338 +msgid "tag header too big." +msgstr "" + +#: builtin/tag.c:370 +msgid "no tag message?" +msgstr "nenhuma mensaje para a etiqueta?" + +#: builtin/tag.c:376 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "" + +#: builtin/tag.c:425 +msgid "switch 'points-at' requires an object" +msgstr "" + +#: builtin/tag.c:427 +#, c-format +msgid "malformed object name '%s'" +msgstr "" + +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "--column e -n are são incompatíveis" + +#: builtin/tag.c:523 +msgid "-n option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:525 +msgid "--contains option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:527 +msgid "--points-at option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:535 +msgid "only one -F or -m option is allowed." +msgstr "" + +#: builtin/tag.c:555 +msgid "too many params" +msgstr "demasiado parametros" + +#: builtin/tag.c:561 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "" + +#: builtin/tag.c:566 +#, c-format +msgid "tag '%s' already exists" +msgstr "etiqueta '%s' já existe" + +#: builtin/tag.c:584 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "" + +#: builtin/tag.c:586 +#, c-format +msgid "%s: cannot update the ref" +msgstr "" + +#: builtin/tag.c:588 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +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 "Listar, criar ou apagar ramas" + +#: 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 "Gravar alterações para o repositório" + +#: 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 "Mostrado logs de commits" + +#: 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 "Mostrar o estado los ramos das árvores de trabalho" + +#: 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 "Necessitas primeiro de especificiar os teus dados de committer" + +#: git-am.sh:137 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +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:275 +msgid "Only one StGIT patch series can be applied at once" +msgstr "" + +#: git-am.sh:362 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "" + +#: git-am.sh:364 +msgid "Patch format detection failed." +msgstr "Falhou a detecção do formato do patch." + +#: git-am.sh:418 +msgid "-d option is no longer supported. Do not use." +msgstr "" + +#: git-am.sh:481 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" + +#: git-am.sh:486 +msgid "Please make up your mind. --skip or --abort?" +msgstr "" + +#: git-am.sh:513 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" + +#: git-am.sh:579 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" + +#: git-am.sh:755 +msgid "cannot be interactive without stdin connected to a terminal." +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:766 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "Aplicar? Sim[y]/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos " + +#: git-am.sh:802 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "Aplicando: $FIRSTLINE" + +#: git-am.sh:847 +msgid "No changes -- Patch already applied." +msgstr "Nenhuma mudança -- Já foi aplicado o patch." + +#: git-am.sh:873 +msgid "applying to an empty history" +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 "Queres que eu faça por sí [Y/n]?" + +#: 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 "" + +#. 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 "Tens a certeza [Y/n]? " + +#: 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 "Nenhum ficheiro de log dado" + +#: 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:474 +msgid "We are not bisecting." +msgstr "Não estamos a bisseccionar." + +#: 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 "" + +#: git-pull.sh:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "" + +#: git-pull.sh:257 +msgid "Cannot rebase onto multiple branches" +msgstr "Não é possível fazer rebase com várias ramas" + +#: 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 "Tu ainda não tens o commit inicial" + +#: 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 "Não há alterações seleccionadas" + +#: git-stash.sh:143 +msgid "Cannot remove temporary index (can't happen)" +msgstr "" + +#: git-stash.sh:156 +msgid "Cannot record working tree state" +msgstr "" + +#: git-stash.sh:223 +msgid "No local changes to save" +msgstr "Sem alterações locais para guardar" + +#: git-stash.sh:227 +msgid "Cannot initialize stash" +msgstr "Não é possível inicializar o stash" + +#: 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 "nenhum stash encontrado." + +#: 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 "Não foi posivel guardar o index tree" + +#: git-stash.sh:460 +msgid "Cannot unstage modified files" +msgstr "" + +#: git-stash.sh:491 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "Deixado cair ${REV} ($s)" + +#: git-stash.sh:492 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "" + +#: git-stash.sh:499 +msgid "No branch name specified" +msgstr "Nenhum nome para a rama especificado" + +#: git-stash.sh:570 +msgid "(To restore them type \"git stash apply\")" +msgstr "" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "" + +#: git-submodule.sh:109 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "" + +#: git-submodule.sh:150 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "" + +#: git-submodule.sh:160 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "" + +#: git-submodule.sh:249 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" + +#: git-submodule.sh:266 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "" + +#: git-submodule.sh:283 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "" + +#: git-submodule.sh:297 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:302 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:307 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:349 +#, sh-format +msgid "Entering '$prefix$sm_path'" +msgstr "Entrando '$prefix$sm_path'" + +#: git-submodule.sh:363 +#, sh-format +msgid "Stopping at '$sm_path'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:405 +#, sh-format +msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:414 +#, sh-format +msgid "Failed to register url for submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:422 +#, sh-format +msgid "Failed to register update mode for submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:424 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgstr "" + +#: git-submodule.sh:523 +#, sh-format +msgid "" +"Submodule path '$sm_path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:536 +#, sh-format +msgid "Unable to find current revision in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:555 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:569 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:570 +#, sh-format +msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:575 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:576 +#, sh-format +msgid "Submodule path '$sm_path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:581 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:582 +#, sh-format +msgid "Submodule path '$sm_path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:604 +#: git-submodule.sh:927 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:712 +msgid "--" +msgstr "--" + +#: git-submodule.sh:770 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr "" + +#: git-submodule.sh:773 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr "" + +#: git-submodule.sh:776 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" + +#: git-submodule.sh:801 +msgid "blob" +msgstr "blob" + +#: git-submodule.sh:802 +msgid "submodule" +msgstr "submódulos" + +#: git-submodule.sh:973 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" + +#~ msgid "cherry-pick" +#~ msgstr "cherry-pick" + +#~ msgid "Please enter the commit message for your changes." +#~ msgstr "Por favor insira a mensagem de commit das suas alterações." + +#~ msgid "Too many options specified" +#~ msgstr "Demasiadas opções especificadas" diff --git a/po/pt_br.po b/po/pt_br.po deleted file mode 100644 index bad116c..0000000 --- a/po/pt_br.po +++ /dev/null @@ -1,2568 +0,0 @@ -# Translation of git-gui to Brazilian Portuguese -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git-gui package. -# -# Alexandre Erwin Ittner <alexandre@ittner.com.br>, 2010. -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2010-09-18 11:09-0300\n" -"Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n" -"Language-Team: Brazilian Portuguese <>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "git-gui: erro fatal" - -#: git-gui.sh:743 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Fonte inválida indicada em %s:" - -#: git-gui.sh:779 -msgid "Main Font" -msgstr "Fonte principal" - -#: git-gui.sh:780 -msgid "Diff/Console Font" -msgstr "Fonte para o diff/console" - -#: git-gui.sh:794 -msgid "Cannot find git in PATH." -msgstr "Impossível encontrar o git no \"PATH\"" - -#: git-gui.sh:821 -msgid "Cannot parse Git version string:" -msgstr "Impossível interpretar a versão do git:" - -#: git-gui.sh:839 -#, tcl-format -msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" -msgstr "" -"Não foi possível determinar a versão do git:\n" -"\n" -"%s afirmar que sua versão é \"%s\".\n" -"\n" -"%s exige o Git 1.5.0 ou posterior.\n" -"\n" -"Assumir que '%s' é a versão 1.5.0?\n" - -#: git-gui.sh:1128 -msgid "Git directory not found:" -msgstr "Diretório do Git não encontrado:" - -#: git-gui.sh:1146 -msgid "Cannot move to top of working directory:" -msgstr "Impossível mover para o início do diretório de trabalho:" - -#: git-gui.sh:1154 -msgid "Cannot use bare repository:" -msgstr "Impossível usar repositório puro:" - -#: git-gui.sh:1162 -msgid "No working directory" -msgstr "Sem diretório de trabalho" - -#: git-gui.sh:1334 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Atualizando estado dos arquivos..." - -#: git-gui.sh:1390 -msgid "Scanning for modified files ..." -msgstr "Procurando por arquivos modificados ..." - -#: git-gui.sh:1454 -msgid "Calling prepare-commit-msg hook..." -msgstr "Executando hook \"prepare-commit-msg\"..." - -#: git-gui.sh:1471 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "O script \"prepare-commit-msg\" negou a criação de uma nova revisão" - -#: git-gui.sh:1629 lib/browser.tcl:246 -msgid "Ready." -msgstr "Pronto." - -#: git-gui.sh:1787 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Exibindo apenas %s de %s arquivos." - -#: git-gui.sh:1913 -msgid "Unmodified" -msgstr "Não modificado" - -#: git-gui.sh:1915 -msgid "Modified, not staged" -msgstr "Modificado, não marcado" - -#: git-gui.sh:1916 git-gui.sh:1924 -msgid "Staged for commit" -msgstr "Marcado para uma nova revisão" - -#: git-gui.sh:1917 git-gui.sh:1925 -msgid "Portions staged for commit" -msgstr "Trechos marcados para revisão" - -#: git-gui.sh:1918 git-gui.sh:1926 -msgid "Staged for commit, missing" -msgstr "Marcado para revisão, faltando" - -#: git-gui.sh:1920 -msgid "File type changed, not staged" -msgstr "Tipo do arquivo modificado, não marcado" - -#: git-gui.sh:1921 -msgid "File type changed, staged" -msgstr "Tipo do arquivo modificado, marcado" - -#: git-gui.sh:1923 -msgid "Untracked, not staged" -msgstr "Não monitorado, não marcado" - -#: git-gui.sh:1928 -msgid "Missing" -msgstr "Faltando" - -#: git-gui.sh:1929 -msgid "Staged for removal" -msgstr "Marcado para remoção" - -#: git-gui.sh:1930 -msgid "Staged for removal, still present" -msgstr "Marcado para remoção, ainda presente" - -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 -msgid "Requires merge resolution" -msgstr "Requer resolução de conflitos" - -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "Iniciando gitk... Aguarde..." - -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" -msgstr "Impossível encontrar o gitk no PATH" - -#: git-gui.sh:2043 -msgid "Couldn't find git gui in PATH" -msgstr "Impossível encontrar o \"git gui\" no PATH" - -#: git-gui.sh:2455 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Repositório" - -#: git-gui.sh:2456 -msgid "Edit" -msgstr "Editar" - -#: git-gui.sh:2458 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Ramo" - -#: git-gui.sh:2461 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Revisão" - -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Mesclar" - -#: git-gui.sh:2465 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Remoto" - -#: git-gui.sh:2468 -msgid "Tools" -msgstr "Ferramentas" - -#: git-gui.sh:2477 -msgid "Explore Working Copy" -msgstr "Explorar cópia de trabalho" - -#: git-gui.sh:2483 -msgid "Browse Current Branch's Files" -msgstr "Explorar arquivos do ramo atual" - -#: git-gui.sh:2487 -msgid "Browse Branch Files..." -msgstr "Explorar arquivos do ramo..." - -#: git-gui.sh:2492 -msgid "Visualize Current Branch's History" -msgstr "Visualizar histórico do ramo atual" - -#: git-gui.sh:2496 -msgid "Visualize All Branch History" -msgstr "Visualizar histórico de todos os ramos" - -#: git-gui.sh:2503 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Explorar arquivos de %s" - -#: git-gui.sh:2505 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Visualizar histórico de %s" - -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Estatísticas do banco de dados" - -#: git-gui.sh:2513 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Compactar banco de dados" - -#: git-gui.sh:2516 -msgid "Verify Database" -msgstr "Verificar banco de dados" - -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Criar ícone na área de trabalho" - -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Sair" - -#: git-gui.sh:2547 -msgid "Undo" -msgstr "Desfazer" - -#: git-gui.sh:2550 -msgid "Redo" -msgstr "Refazer" - -#: git-gui.sh:2554 git-gui.sh:3109 -msgid "Cut" -msgstr "Recortar" - -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Copiar" - -#: git-gui.sh:2560 git-gui.sh:3115 -msgid "Paste" -msgstr "Colar" - -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Apagar" - -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 -msgid "Select All" -msgstr "Selecionar tudo" - -#: git-gui.sh:2576 -msgid "Create..." -msgstr "Criar..." - -#: git-gui.sh:2582 -msgid "Checkout..." -msgstr "Checkout..." - -#: git-gui.sh:2588 -msgid "Rename..." -msgstr "Renomear..." - -#: git-gui.sh:2593 -msgid "Delete..." -msgstr "Apagar..." - -#: git-gui.sh:2598 -msgid "Reset..." -msgstr "Redefinir..." - -#: git-gui.sh:2608 -msgid "Done" -msgstr "Pronto" - -#: git-gui.sh:2610 -msgid "Commit@@verb" -msgstr "Salvar revisão" - -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "Nova revisão" - -#: git-gui.sh:2627 git-gui.sh:3057 -msgid "Amend Last Commit" -msgstr "Corrigir última revisão" - -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Atualizar" - -#: git-gui.sh:2643 -msgid "Stage To Commit" -msgstr "Marcar para revisão" - -#: git-gui.sh:2649 -msgid "Stage Changed Files To Commit" -msgstr "Marcar arquivos modificados" - -#: git-gui.sh:2655 -msgid "Unstage From Commit" -msgstr "Desmarcar" - -#: git-gui.sh:2661 lib/index.tcl:412 -msgid "Revert Changes" -msgstr "Reverter mudanças" - -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 -msgid "Show Less Context" -msgstr "Mostrar menos contexto" - -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 -msgid "Show More Context" -msgstr "Mostrar mais contexto" - -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 -msgid "Sign Off" -msgstr "Assinar embaixo" - -#: git-gui.sh:2696 -msgid "Local Merge..." -msgstr "Mesclar localmente..." - -#: git-gui.sh:2701 -msgid "Abort Merge..." -msgstr "Abortar mesclagem..." - -#: git-gui.sh:2713 git-gui.sh:2741 -msgid "Add..." -msgstr "Adicionar..." - -#: git-gui.sh:2717 -msgid "Push..." -msgstr "Enviar..." - -#: git-gui.sh:2721 -msgid "Delete Branch..." -msgstr "Apagar ramo..." - -#: git-gui.sh:2731 git-gui.sh:3292 -msgid "Options..." -msgstr "Opções..." - -#: git-gui.sh:2742 -msgid "Remove..." -msgstr "Remover..." - -#: git-gui.sh:2751 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Ajuda" - -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "Sobre o %s" - -#: git-gui.sh:2783 -msgid "Online Documentation" -msgstr "Ajuda online" - -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "Mostrar chave SSH" - -#: git-gui.sh:2893 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"erro fatal: impossível executar \"stat\" em %s: Arquivo ou diretório não " -"encontrado" - -#: git-gui.sh:2926 -msgid "Current Branch:" -msgstr "Ramo atual:" - -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "Mudanças marcadas" - -#: git-gui.sh:2967 -msgid "Unstaged Changes" -msgstr "Mudanças não marcadas" - -#: git-gui.sh:3017 -msgid "Stage Changed" -msgstr "Marcar alterados" - -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "Enviar" - -#: git-gui.sh:3071 -msgid "Initial Commit Message:" -msgstr "Descrição da revisão inicial:" - -#: git-gui.sh:3072 -msgid "Amended Commit Message:" -msgstr "Descrição da revisão corrigida:" - -#: git-gui.sh:3073 -msgid "Amended Initial Commit Message:" -msgstr "Descrição da revisão inicial corrigida:" - -#: git-gui.sh:3074 -msgid "Amended Merge Commit Message:" -msgstr "Descrição da revisão de mescla corrigida:" - -#: git-gui.sh:3075 -msgid "Merge Commit Message:" -msgstr "Descrição da revisão de mescla:" - -#: git-gui.sh:3076 -msgid "Commit Message:" -msgstr "Descrição da revisão:" - -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 -msgid "Copy All" -msgstr "Copiar todos" - -#: git-gui.sh:3149 lib/blame.tcl:104 -msgid "File:" -msgstr "Arquivo:" - -#: git-gui.sh:3255 -msgid "Refresh" -msgstr "Atualizar" - -#: git-gui.sh:3276 -msgid "Decrease Font Size" -msgstr "Reduzir tamanho da fonte" - -#: git-gui.sh:3280 -msgid "Increase Font Size" -msgstr "Aumentar tamanho da fonte" - -#: git-gui.sh:3288 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Codificação" - -#: git-gui.sh:3299 -msgid "Apply/Reverse Hunk" -msgstr "Aplicar/reverter trecho" - -#: git-gui.sh:3304 -msgid "Apply/Reverse Line" -msgstr "Aplicar/reverter linha" - -#: git-gui.sh:3323 -msgid "Run Merge Tool" -msgstr "Executar ferramenta de mescla" - -#: git-gui.sh:3328 -msgid "Use Remote Version" -msgstr "Usar versão remota" - -#: git-gui.sh:3332 -msgid "Use Local Version" -msgstr "Usar versão local" - -#: git-gui.sh:3336 -msgid "Revert To Base" -msgstr "Reverter para a versão-base" - -#: git-gui.sh:3354 -msgid "Visualize These Changes In The Submodule" -msgstr "Visualizar estas mudanças no sub-módulo" - -#: git-gui.sh:3358 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Visualizar histórico do ramo atual no sub-módulo" - -#: git-gui.sh:3362 -msgid "Visualize All Branch History In The Submodule" -msgstr "Visualizar histórico de todos os camos no sub-módulo" - -#: git-gui.sh:3367 -msgid "Start git gui In The Submodule" -msgstr "Iniciar \"git gui\" no sub-módulo" - -#: git-gui.sh:3389 -msgid "Unstage Hunk From Commit" -msgstr "Desmarcar trecho para revisão" - -#: git-gui.sh:3391 -msgid "Unstage Lines From Commit" -msgstr "Desmarcar linhas para revisão" - -#: git-gui.sh:3393 -msgid "Unstage Line From Commit" -msgstr "Desmarcar linha para revisão" - -#: git-gui.sh:3396 -msgid "Stage Hunk For Commit" -msgstr "Marcar trecho para revisão" - -#: git-gui.sh:3398 -msgid "Stage Lines For Commit" -msgstr "Marcar linhas para revisão" - -#: git-gui.sh:3400 -msgid "Stage Line For Commit" -msgstr "Marcar linha para revisão" - -#: git-gui.sh:3424 -msgid "Initializing..." -msgstr "Iniciando..." - -#: git-gui.sh:3541 -#, tcl-format -msgid "" -"Possible environment issues exist.\n" -"\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" -"\n" -msgstr "" -"Possíveis problemas com as variáveis de ambiente.\n" -"\n" -"As seguintes variáveis de ambiente provavelmente serão\n" -"ignoradas por qualquer sub-processo do Git executado por\n" -"%s:\n" - -#: git-gui.sh:3570 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Isto se deve a um problema conhecido com os binários da Tcl \n" -"distribuídos com o Cygwin" - -#: git-gui.sh:3575 -#, tcl-format -msgid "" -"\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\n" -msgstr "" -"\n" -"\n" -"Uma boa alternativa para %s\n" -"é colocar os valores para o nome de usuário e e-mail\n" -"no seu arquivo \"~/.gitconfig\"\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - uma interface gráfica para o Git" - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Visualizador de arquivos" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Revisão:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Copiar revisão" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Procurar texto..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Executar detecção completa de cópias" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Mostrar contexto do histórico" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Anotar revisão anterior" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Lendo %s..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "Carregando anotações de cópia/movimentação..." - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "linhas anotadas" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Carregando anotações originais..." - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Anotação completa." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Ocupado" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "O processo de anotação já está em execução" - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Executando detecção de cópia..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Carregando anotações..." - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Autor:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Revisor:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "Arquivo original:" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Impossível encontrar revisão HEAD:" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Impossível encontrar revisão anterior:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Impossível exibir revisão anterior" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "Erro ao carregar as diferenças:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "Originalmente por:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "No arquivo:" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "Copiado ou movido para cá por:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Efetuar checkout do ramo" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "Checkout" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "Cancelar" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Revisão" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "Opções" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Obter ramo de rastreamento" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Separar do ramo local" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Criar ramo" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Criar novo ramo" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 -msgid "Create" -msgstr "Criar" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Nome do ramo" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "Nome:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Coincidir nome do ramo de rastreamento" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Revisão inicial" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Atualizar ramo existente:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Não" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Somente se for um avanço rápido" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Redefinir" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Efetuar checkout após a criação" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Selecione um ramo de rastreamento." - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "O ramo de rastreamento %s não é um ramo do repositório remoto." - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Indique um nome para o ramo." - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "\"%s\" não é um nome de ramo válido" - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Apagar ramo" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Apagar ramo local" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Ramos locais" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Apagar somente se mesclado em" - -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Forçar exclusão (não verificar se o ramo foi mesclado)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Os ramos seguintes não foram completamente mesclados em %s:" - -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Recuperar ramos apagados é difícil.\n" -"\n" -"Apagar os ramos selecionados?" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Erro ao apagar ramos:\n" -"%s" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Renomear ramo" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Renomear" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Ramo:" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Novo nome:" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Selecione um ramo para renomear." - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "O ramo \"%s\" já existe." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Erro ao renomear \"%s\"." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Inciando..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "Navegador de arquivos" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Carregando %s..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Subir]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Explorar arquivos do ramo" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "Explorar" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Obtendo %s de %s" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "Erro fatal: impossível resolver %s" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Fechar" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "O ramo \"%s\" não existe." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Erro ao configurar git-pull simplificado para \"%s\"." - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"O ramo \"%s\" já existe.\n" -"\n" -"Não é possível avançá-lo para %s.\n" -"É preciso mesclar." - -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Estratégia de mesclagem \"%s\" não suportada." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Erro ao atualizar \"%s\"." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "A área de marcação (staging area, index) já está bloqueada." - -#: lib/checkout_op.tcl:289 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"O último estado lido não confere com o estado atual.\n" -"\n" -"Outro programa do Git modificou o repositório desde a última leitura. Uma " -"atualização deve ser executada antes de alterar o ramo atual.\n" -"\n" -"A atualização começará automaticamente agora.\n" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Atualizando diretório de trabalho para \"%s\"..." - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "arquivos retirados" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "Checkout de \"%s\" abortado (é preciso mesclar alguns arquivos)" - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Mesclagem de arquivos necessária." - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Permanecendo no ramo \"%s\"." - -#: lib/checkout_op.tcl:452 -msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." -msgstr "" -"Você não está mais em um ramo local\n" -"\n" -"Se você deseja um ramo, crie um agora a partir deste checkout." - -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Checkout de \"%s\" concluído." - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Redefinir \"%s\" para \"%s\" provocará a perda das seguintes revisões:" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Recuperar revisões perdidas pode não ser fácil." - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Redefinir \"%s\"?" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Visualizar" - -#: lib/checkout_op.tcl:635 -#, tcl-format -msgid "" -"Failed to set current branch.\n" -"\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" -"\n" -"This should not have occurred. %s will now close and give up." -msgstr "" -"Erro ao definir o ramo atual.\n" -"\n" -"Este diretório de trabalho está incompleto. Foi possível atualizar seus " -"arquivos, mas houve uma falha ao atualizar os arquivos internos do Git.\n" -"\n" -"Isto não deveria ter acontecido, %s terminará agora." - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Selecionar" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Tipo da fonte" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Tamanho da fonte" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Exemplo" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Este é um texto de exemplo.\n" -"Se você gostar deste texto, esta pode ser sua fonte." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" -msgstr "Criar novo repositório" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Novo..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" -msgstr "Clonar repositório existente" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Clonar..." - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" -msgstr "Abrir repositório existente" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Abrir..." - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Repositórios recentes" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Abrir repositório recente:" - -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Erro ao criar repositório %s:" - -#: lib/choose_repository.tcl:391 -msgid "Directory:" -msgstr "Diretório:" - -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" -msgstr "Repositório Git" - -#: lib/choose_repository.tcl:448 -#, tcl-format -msgid "Directory %s already exists." -msgstr "O diretório %s já existe." - -#: lib/choose_repository.tcl:452 -#, tcl-format -msgid "File %s already exists." -msgstr "O arquivo %s já existe." - -#: lib/choose_repository.tcl:466 -msgid "Clone" -msgstr "Clonar" - -#: lib/choose_repository.tcl:479 -msgid "Source Location:" -msgstr "Origem:" - -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" -msgstr "Diretório de destino:" - -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" -msgstr "Tipo de clonagem:" - -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Padrão (rápida, semi-redundante, com hardlinks)" - -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Cópia completa (mais lenta, backup redundante)" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Compartilhada (A mais rápida, não recomendada, sem backup)" - -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Este não é um repositório do Git: %s" - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "Clonagens padrões só são possíveis em repositórios locais." - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "Clonagens parciais só são possíveis em repositórios locais." - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "O local %s já existe." - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "Erro ao configurar origem" - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "Contando objetos" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "buckets" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Erro ao copiar objetos ou informações adicionais: %s" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Não há nada para clonar em %s." - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "O ramo \"master\" não foi inicializado." - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Não foi possível criar hardlinks, usando cópias convencionais." - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "Clonando de %s" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "Copiando objetos" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Não foi possível copiar o objeto: %s" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "Ligando objetos" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "objetos" - -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Não foi possível ligar o objeto: %s" - -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Não foi possível receber ramos ou objetos. Veja a saída do console para " -"detalhes." - -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "" -"Não foi possível receber as etiquetas. Veja a saída do console para detalhes." - -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Não foi possível determinar a etiqueta HEAD. Veja a saída do console para " -"detalhes." - -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Não foi possível limpar %s" - -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "A clonagem falhou." - -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "O ramo padrão não foi recebido." - -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Não foi possível resolver %s como uma revisão." - -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "Criando diretório de trabalho." - -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "arquivos" - -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "Erro ao efetuar checkout inicial." - -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "Abrir" - -#: lib/choose_repository.tcl:1021 -msgid "Repository:" -msgstr "Repositório:" - -#: lib/choose_repository.tcl:1072 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Erro ao abrir o repositório %s:" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "Este checkout" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Expressão de revisão:" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "Ramo local" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "Ramo de rastreamento" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "Etiqueta" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Revisão inválida: %s" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "Nenhuma revisão selecionada." - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "A expressão de revisão está vazia." - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "Atualizado" - -#: lib/choose_rev.tcl:559 -msgid "URL" -msgstr "URL" - -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" -msgstr "" -"Não há nada para corrigir.\n" -"\n" -"Você está prestes a criar uma revisão inicial. Não há revisão anterior para " -"corrigir.\n" - -#: lib/commit.tcl:18 -msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" -msgstr "" -"Não é possível corrigir durante uma mesclagem.\n" -"\n" -"Você está em meio a uma operação de mesclagem que não foi completada. Não é " -"possível corrigir a revisão anterior a menos que você aborte a mescla atual " -"antes.\n" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Erro ao carregar dados da revisão para corrigir:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Não foi possível obter a sua identidade:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Variável \"GIT_COMMITTER_IDENT\" inválida:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "aviso: O Tcl não suporta a codificação \"%s\"." - -#: lib/commit.tcl:149 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"O último estado lido não confere com o estado atual.\n" -"\n" -"Outro programa do Git modificou o repositório desde a última leitura. Uma " -"atualização deve ser executada antes de criar outra revisão.\n" -"\n" -"A atualização começará automaticamente agora.\n" - -#: lib/commit.tcl:172 -#, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" -"\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" -msgstr "" -"Não é possível salvar revisões para arquivos não mesclados.\n" -"\n" -"O arquivo %s possui conflitos de mesclagem. Você deve resolvê-los e marcar o " -"arquivo antes de salvar a revisão.\n" - -#: lib/commit.tcl:180 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Estado desconhecido detectado para o arquivo %s.\n" -"\n" -"Este programa não pode salvar uma revisão para o arquivo %s.\n" - -#: lib/commit.tcl:188 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Não há mudanças para salvar.\n" -"\n" -"Você deve marcar ao menos um arquivo antes de salvar a revisão.\n" - -#: lib/commit.tcl:203 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" -msgstr "" -"Por favor, indique uma descrição para a revisão.\n" -"\n" -"Uma boa descrição tem o seguinte formato:\n" -"\n" -"- Primeira linha: descreve, em uma única frase, o que você fez.\n" -"- Segunda linha: em branco.\n" -"- Demais linhas: Descreve detalhadamente a revisão.\n" - -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." -msgstr "Executando script \"pre-commit\"..." - -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "A revisão foi bloqueada pelo script \"pre-commit\"." - -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "Executando script \"commit-msg\"..." - -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "Revisão bloqueada pelo script \"commit-msg\"." - -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "Salvando revisão..." - -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "write-tree falhou:" - -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "A revisão falhou." - -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "A revisão %s parece estar corrompida." - -#: lib/commit.tcl:339 -msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" -msgstr "" -"Não há alterações para salvar.\n" -"\n" -"Nenhum arquivo foi modificado e esta não é uma revisão de mesclagem.\n" -"\n" -"Uma atualização será executada automaticamente agora.\n" - -#: lib/commit.tcl:346 -msgid "No changes to commit." -msgstr "Não há alterações para salvar." - -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "commit-tree falhou:" - -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "update-ref falhou:" - -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Revisão %s criada: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Trabalhando... aguarde..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Sucesso" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Erro: o comando falhou" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "Número de objetos soltos" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "Espaço ocupado pelos objetos soltos" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "Número de objetos compactados" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "Número de pacotes" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "Espaço ocupado pelos objetos compactados" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "Objetos compactados aguardando eliminação" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "Arquivos de lixo" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Compactando banco de dados de objetos" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Verificando banco de dados de objetos com fsck-objects" - -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"Este repositório possui aproximadamente %i objetos soltos.\n" -"\n" -"Para manter o desempenho ótimo é altamente recomendado que você compacte o " -"banco de dados.\n" -"\n" -"Compactar o banco de dados agora?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Data inválida recebida do Git: %s" - -#: lib/diff.tcl:64 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." -msgstr "" -"Nenhuma diferença foi detectada.\n" -"\n" -"%s não possui mudanças.\n" -"\n" -"A data de modificação deste arquivo foi atualizada por outro aplicativo, mas " -"o conteúdo do arquivo não foi alterado.\n" -"\n" -"Uma atualização ser executada para encontrar outros arquivos que possam ter " -"o mesmo estado." - -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Carregando diferenças de %s..." - -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"Local: apagado\n" -"Remoto:\n" - -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"Remoto: apagado\n" -"Local:\n" - -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "Local:\n" - -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "Remoto:\n" - -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" -msgstr "Impossível exibir %s" - -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "Erro ao carregar o arquivo:" - -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Repositório Git (sub-projeto)" - -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* Arquivo binário (conteúdo não exibido)." - -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* O arquivo não rastreado possui %d bytes.\n" -"* Exibindo apenas os primeiros %d bytes.\n" - -#: lib/diff.tcl:233 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* O arquivo não rastreado foi cortado aqui por %s.\n" -"* Para ver o arquivo completo, use um editor externo.\n" - -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." -msgstr "Erro ao desmarcar o trecho selecionado." - -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "Erro ao marcar o trecho selecionado." - -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "Erro ao desmarcar a linha selecionada." - -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "Erro ao marcar a linha selecionada." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Padrão" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Sistema (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Outro" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "Erro" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "aviso" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Você precisa corrigir os erros acima antes de salvar a revisão." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Impossível desbloquear o índice." - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Erro no índice" - -#: lib/index.tcl:17 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"A atualização do índice do Git falhou. Uma atualização será executada " -"automaticamente para ressincronizar o Git GUI" - -#: lib/index.tcl:28 -msgid "Continue" -msgstr "Continuar" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Desbloquear índice" - -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Desmarcando %s para revisão" - -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "Pronto para salvar a revisão." - -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "Adicionando %s" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Reverter as alterações no arquivo %s?" - -#: lib/index.tcl:400 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Reverter as alterações nestes %i arquivos?" - -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Qualquer alteração não marcada será permanentemente perdida na reversão." - -#: lib/index.tcl:411 -msgid "Do Nothing" -msgstr "Não fazer nada" - -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "Revertendo os arquivos selecionados" - -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "Revertendo %s" - -#: lib/merge.tcl:13 -msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" -msgstr "" -"Não é possível mesclar durante uma correção.\n" -"\n" -"Você deve concluir a correção antes de começar qualquer mesclagem.\n" - -#: lib/merge.tcl:27 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"O último estado lido não confere com o estado atual.\n" -"\n" -"Outro programa do Git modificou o repositório desde a última leitura. Uma " -"atualização deve ser executada antes de efetuar uma mesclagem.\n" -"\n" -"A atualização começará automaticamente agora.\n" - -#: lib/merge.tcl:45 -#, tcl-format -msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" -msgstr "" -"Há uma mesclagem com conflitos em progresso.\n" -"\n" -"O arquivo %s possui conflitos de mesclagem.\n" -"\n" -"Você deve resolvê-los, marcar o arquivo e salvar a revisão para completar a " -"mesclagem atual. Só então você poderá começar outra.\n" - -#: lib/merge.tcl:55 -#, tcl-format -msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" -msgstr "" -"Você está em meio a uma mudança.\n" -"\n" -"O arquivo %s foi modificado.\n" -"\n" -"Você deve completar e salvar a revisão atual antes de começar uma mesclagem. " -"Ao fazê-lo, você poderá abortar a mesclagem caso haja algum erro.\n" - -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s de %s" - -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Mesclando %s e %s..." - -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "Mesclagem completada com sucesso." - -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "A mesclagem falhou. É necessário resolver conflitos." - -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "Mesclar em %s" - -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Revisão para mesclar" - -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Não é possível abortar durante uma correção.\n" -"\n" -"Você precisa finalizar a correção desta revisão.\n" - -#: lib/merge.tcl:222 -msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" -msgstr "" -"Abortar mesclagem?\n" -"\n" -"Abortar a mesclagem atual implicará na perda de *TODAS* as mudanças não " -"salvas.\n" -"\n" -"Abortar a mesclagem atual?" - -#: lib/merge.tcl:228 -msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" -msgstr "" -"Descartar as mudanças?\n" -"\n" -"Ao fazê-lo, *TODAS* as alterações não salvas serão perdidas.\n" -"\n" -"Continuar e descartar as mudanças atuais?" - -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Abortando" - -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "arquivos redefindos" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "A tentativa de abortar a operação falhou" - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Operação abortada com sucesso. Pronto." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Forçar a resolução para a versão base?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Forçar resolução para este ramo?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Forçar resolução para o outro ramo?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Note que o diff mostra apenas as mudanças conflitantes.\n" -"\n" -"%s será sobrescrito.\n" -"\n" -"Caso necessário, será preciso reiniciar a mesclagem para desfazer esta " -"operação." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "O arquivo %s parece ter conflitos não resolvidos. Marcar mesmo assim?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Adicionando resolução para %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" -"Impossível resolver conflitos envolvendo exclusão ou links de arquivos com " -"esta ferramenta." - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "O arquivo conflitante não existe" - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Não é uma ferramenta de mesclagem gráfica: \"%s\"" - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Ferramenta de mesclagem não suportada \"%s\"" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "A ferramenta de mesclagem já está em execução. Finalizar?" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Erro ao obter as versões:\n" -"%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Não foi possível iniciar a ferramenta de mesclagem:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "Executando ferramenta de mesclagem..." - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "Ferramenta de mesclagem falhou." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Codificação global inválida \"%s\"" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Codificação do repositório inválida \"%s\"" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Restaurar padrões" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Salvar" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "Repositório %s" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Global (todos os repositórios)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Nome do usuário" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Endereço de e-mail" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Exibir sumário das revisões de mesclagem" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Nível de detalhamento da mesclagem" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Exibir estatísticas após mesclagens" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Usar ferramenta de mesclagem" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "Confiar nas datas de modificação dos arquivos" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "Eliminar ramos de rastreamento ao receber" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "Coincidir ramos de rastreamento" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "Detectar cópias somente em arquivos modificados" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "Número mínimo de letras para detectar cópias" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Extensão do contexto de detecção (em dias)" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Número de linhas para o diff contextual" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Largura do texto da descrição da revisão" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Modelo de nome para novos ramos" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Codificação padrão dos arquivos" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Alterar" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Dicionário para o verificador ortográfico:" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Mudar fonte" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "Escolher %s" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Preferências" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "Houve um erro ao salvar as opções:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Excluir" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Limpar de" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Receber de" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Enviar para" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Adicionar repositório remoto" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Adicionar novo repositório remoto" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Adicionar" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Detalhes do repositório remoto" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Local:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Ações adicionais" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Receber imediatamente" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Inicializar repositório remoto e enviar" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Não fazer nada agora" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Por favor, indique um nome para o repositório remoto." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "\"%s\" não é um nome válido para um repositório remoto." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Erro ao adicionar repositório remoto \"%s\" do local \"%s\":" - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "receber %s" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "Recebendo o %s" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Não sabe como inicializar o repositório remoto em \"%s\"." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "enviar %s" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Configurando %s (em %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Apagar ramo remoto" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Do repositório" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "Remoto:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "Outro local:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "Ramos" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Apagar somente se" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Mesclado em:" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "É preciso indicar um ramo para \"Mesclado em\"." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Os seguintes ramos não estão inteiramente mesclados em %s:\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:189 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "" -"Um ou mais testes de mesclagem falharam porque você não possui as revisões " -"necessárias. Tente receber revisões de %s primeiro." - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Por favor selecione um ou mais ramos para apagar." - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Apagar ramos de %s" - -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "Nenhum repositório foi selecionado." - -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "Atualizando %s..." - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Encontrar:" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "Próximo" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Anterior" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Sensível a maiúsculas/minúsculas" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Não foi possível gravar o atalho:" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Não foi possível gravar o ícone:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Verificador ortográfico não suportado" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Verificação ortográfica indisponível" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Configuração do verificador ortográfico inválida" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Revertendo dicionário para %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "O verificador ortográfico falhou sem relatar nenhum erro" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Verificador ortográfico não reconhecido" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Sem sugestões" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Final de arquivo inesperado recebido do verificador ortográfico" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "A verificação ortográfica falhou" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Nenhuma chave encontrada" - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Chave pública encontrada em: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Gerar chave" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Copiar para a área de transferência" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "Sua chave pública OpenSSH" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Gerando..." - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Impossível iniciar ssh-keygen:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "A geração da chave falhou." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "A geração da chave foi bem-sucedida, mas nenhuma chave foi encontrada." - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Sua chave em: %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i de %*i %s (%3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "É preciso selecionar um arquivo para executar %s." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Você tem certeza que deseja executar %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Ferramenta: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Executando: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Execução completada com sucesso: %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Ferramenta falhou: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Adicionar ferramenta" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Adicionar novo comando de ferramenta" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Adicionar globalmente" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Detalhes da ferramenta" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Use o separador \"/\" para criar uma árvore de sub-menus:" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Comando:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Exibir uma caixa de diálogo antes de executar" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Solicitar a seleção de uma revisão (a variável $REVISION)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Solicitar argumentos adicionais (define a variável $ARGS)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Não exibir a janela de saída do comando" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Executar apenas se houver um diff selecionado ($FILENAME não-vazio)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Por favor, indique um nome para a ferramenta." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "A ferramenta \"%s\" já existe." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Não foi possível adicionar a ferramenta:\n" -"%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Excluir ferramenta" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Excluir comando de ferramenta" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Excluir" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Azul indica ferramentas do repositório local)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Executar comando: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Argumentos" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Recebendo novas mudanças de %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "Limpar %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Limpando ramos excluídos de %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Enviando mudanças para %s" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Duplicando para %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Enviando %s %s para %s" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "Enviar ramos" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "Ramos de origem" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Repositório de destino" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "Opções de transferência" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Sobrescrever ramos existentes (pode descartar mudanças)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "Usar compactação minimalista (para redes lentas)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "Incluir etiquetas" diff --git a/po/ru.po b/po/ru.po deleted file mode 100644 index ca4343b..0000000 --- a/po/ru.po +++ /dev/null @@ -1,2564 +0,0 @@ -# Translation of git-gui to russian -# Copyright (C) 2007 Shawn Pearce -# This file is distributed under the same license as the git-gui package. -# Irina Riesen <irina.riesen@gmail.com>, 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2007-10-22 22:30-0200\n" -"Last-Translator: Alex Riesen <raa.lkml@gmail.com>\n" -"Language-Team: Russian Translation <git@vger.kernel.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "git-gui: критическая ошибка" - -#: git-gui.sh:743 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "В %s установлен неверный шрифт:" - -#: git-gui.sh:779 -msgid "Main Font" -msgstr "Шрифт интерфейса" - -#: git-gui.sh:780 -msgid "Diff/Console Font" -msgstr "Шрифт консоли и изменений (diff)" - -#: git-gui.sh:794 -msgid "Cannot find git in PATH." -msgstr "git не найден в PATH." - -#: git-gui.sh:821 -msgid "Cannot parse Git version string:" -msgstr "Невозможно распознать строку версии Git: " - -#: git-gui.sh:839 -#, tcl-format -msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" -msgstr "" -"Невозможно определить версию Git\n" -"\n" -"%s указывает на версию '%s'.\n" -"\n" -"для %s требуется версия Git, начиная с 1.5.0\n" -"\n" -"Принять '%s' как версию 1.5.0?\n" - -#: git-gui.sh:1128 -msgid "Git directory not found:" -msgstr "Каталог Git не найден:" - -#: git-gui.sh:1146 -msgid "Cannot move to top of working directory:" -msgstr "Невозможно перейти к корню рабочего каталога репозитория: " - -#: git-gui.sh:1154 -msgid "Cannot use bare repository:" -msgstr "Невозможно использование репозитория без рабочего каталога:" - -#: git-gui.sh:1162 -msgid "No working directory" -msgstr "Отсутствует рабочий каталог" - -#: git-gui.sh:1334 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Обновление информации о состоянии файлов..." - -#: git-gui.sh:1390 -msgid "Scanning for modified files ..." -msgstr "Поиск измененных файлов..." - -#: git-gui.sh:1454 -msgid "Calling prepare-commit-msg hook..." -msgstr "Вызов программы поддержки репозитория prepare-commit-msg..." - -#: git-gui.sh:1471 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "" -"Сохранение прервано программой поддержки репозитория prepare-commit-msg" - -#: git-gui.sh:1629 lib/browser.tcl:246 -msgid "Ready." -msgstr "Готово." - -#: git-gui.sh:1787 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Показано %s из %s файлов." - -#: git-gui.sh:1913 -msgid "Unmodified" -msgstr "Не изменено" - -#: git-gui.sh:1915 -msgid "Modified, not staged" -msgstr "Изменено, не подготовлено" - -#: git-gui.sh:1916 git-gui.sh:1924 -msgid "Staged for commit" -msgstr "Подготовлено для сохранения" - -#: git-gui.sh:1917 git-gui.sh:1925 -msgid "Portions staged for commit" -msgstr "Части, подготовленные для сохранения" - -#: git-gui.sh:1918 git-gui.sh:1926 -msgid "Staged for commit, missing" -msgstr "Подготовлено для сохранения, отсутствует" - -#: git-gui.sh:1920 -msgid "File type changed, not staged" -msgstr "Тип файла изменён, не подготовлено" - -#: git-gui.sh:1921 -msgid "File type changed, staged" -msgstr "Тип файла изменён, подготовлено" - -#: git-gui.sh:1923 -msgid "Untracked, not staged" -msgstr "Не отслеживается, не подготовлено" - -#: git-gui.sh:1928 -msgid "Missing" -msgstr "Отсутствует" - -#: git-gui.sh:1929 -msgid "Staged for removal" -msgstr "Подготовлено для удаления" - -#: git-gui.sh:1930 -msgid "Staged for removal, still present" -msgstr "Подготовлено для удаления, еще не удалено" - -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 -msgid "Requires merge resolution" -msgstr "Требуется разрешение конфликта при слиянии" - -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "Запускается gitk... Подождите, пожалуйста..." - -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" -msgstr "gitk не найден в PATH." - -#: git-gui.sh:2043 -msgid "Couldn't find git gui in PATH" -msgstr "git gui не найден в PATH." - -#: git-gui.sh:2455 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Репозиторий" - -#: git-gui.sh:2456 -msgid "Edit" -msgstr "Редактировать" - -#: git-gui.sh:2458 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Ветвь" - -#: git-gui.sh:2461 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Состояние" - -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Слияние" - -#: git-gui.sh:2465 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Внешние репозитории" - -#: git-gui.sh:2468 -msgid "Tools" -msgstr "Вспомогательные операции" - -#: git-gui.sh:2477 -msgid "Explore Working Copy" -msgstr "Просмотр рабочего каталога" - -#: git-gui.sh:2483 -msgid "Browse Current Branch's Files" -msgstr "Просмотреть файлы текущей ветви" - -#: git-gui.sh:2487 -msgid "Browse Branch Files..." -msgstr "Показать файлы ветви..." - -#: git-gui.sh:2492 -msgid "Visualize Current Branch's History" -msgstr "Показать историю текущей ветви" - -#: git-gui.sh:2496 -msgid "Visualize All Branch History" -msgstr "Показать историю всех ветвей" - -#: git-gui.sh:2503 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Показать файлы ветви %s" - -#: git-gui.sh:2505 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Показать историю ветви %s" - -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Статистика базы данных" - -#: git-gui.sh:2513 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Сжать базу данных" - -#: git-gui.sh:2516 -msgid "Verify Database" -msgstr "Проверить базу данных" - -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Создать ярлык на рабочем столе" - -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Выход" - -#: git-gui.sh:2547 -msgid "Undo" -msgstr "Отменить" - -#: git-gui.sh:2550 -msgid "Redo" -msgstr "Повторить" - -#: git-gui.sh:2554 git-gui.sh:3109 -msgid "Cut" -msgstr "Вырезать" - -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Копировать" - -#: git-gui.sh:2560 git-gui.sh:3115 -msgid "Paste" -msgstr "Вставить" - -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Удалить" - -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 -msgid "Select All" -msgstr "Выделить все" - -#: git-gui.sh:2576 -msgid "Create..." -msgstr "Создать..." - -#: git-gui.sh:2582 -msgid "Checkout..." -msgstr "Перейти..." - -#: git-gui.sh:2588 -msgid "Rename..." -msgstr "Переименовать..." - -#: git-gui.sh:2593 -msgid "Delete..." -msgstr "Удалить..." - -#: git-gui.sh:2598 -msgid "Reset..." -msgstr "Сбросить..." - -#: git-gui.sh:2608 -msgid "Done" -msgstr "Завершено" - -#: git-gui.sh:2610 -msgid "Commit@@verb" -msgstr "Сохранить" - -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "Новое состояние" - -#: git-gui.sh:2627 git-gui.sh:3057 -msgid "Amend Last Commit" -msgstr "Исправить последнее состояние" - -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Перечитать" - -#: git-gui.sh:2643 -msgid "Stage To Commit" -msgstr "Подготовить для сохранения" - -#: git-gui.sh:2649 -msgid "Stage Changed Files To Commit" -msgstr "Подготовить измененные файлы для сохранения" - -#: git-gui.sh:2655 -msgid "Unstage From Commit" -msgstr "Убрать из подготовленного" - -#: git-gui.sh:2661 lib/index.tcl:412 -msgid "Revert Changes" -msgstr "Отменить изменения" - -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 -msgid "Show Less Context" -msgstr "Меньше контекста" - -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 -msgid "Show More Context" -msgstr "Больше контекста" - -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 -msgid "Sign Off" -msgstr "Вставить Signed-off-by" - -#: git-gui.sh:2696 -msgid "Local Merge..." -msgstr "Локальное слияние..." - -#: git-gui.sh:2701 -msgid "Abort Merge..." -msgstr "Прервать слияние..." - -#: git-gui.sh:2713 git-gui.sh:2741 -msgid "Add..." -msgstr "Добавить..." - -#: git-gui.sh:2717 -msgid "Push..." -msgstr "Отправить..." - -#: git-gui.sh:2721 -msgid "Delete Branch..." -msgstr "Удалить ветвь..." - -#: git-gui.sh:2731 git-gui.sh:3292 -msgid "Options..." -msgstr "Настройки..." - -#: git-gui.sh:2742 -msgid "Remove..." -msgstr "Удалить..." - -#: git-gui.sh:2751 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Помощь" - -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "О %s" - -#: git-gui.sh:2783 -msgid "Online Documentation" -msgstr "Документация в интернете" - -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "Показать ключ SSH" - -#: git-gui.sh:2893 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "критическая ошибка: %s: нет такого файла или каталога" - -#: git-gui.sh:2926 -msgid "Current Branch:" -msgstr "Текущая ветвь:" - -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "Подготовлено (будет сохранено)" - -#: git-gui.sh:2967 -msgid "Unstaged Changes" -msgstr "Изменено (не будет сохранено)" - -#: git-gui.sh:3017 -msgid "Stage Changed" -msgstr "Подготовить все" - -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "Отправить" - -#: git-gui.sh:3071 -msgid "Initial Commit Message:" -msgstr "Комментарий к первому состоянию:" - -#: git-gui.sh:3072 -msgid "Amended Commit Message:" -msgstr "Комментарий к исправленному состоянию:" - -#: git-gui.sh:3073 -msgid "Amended Initial Commit Message:" -msgstr "Комментарий к исправленному первоначальному состоянию:" - -#: git-gui.sh:3074 -msgid "Amended Merge Commit Message:" -msgstr "Комментарий к исправленному слиянию:" - -#: git-gui.sh:3075 -msgid "Merge Commit Message:" -msgstr "Комментарий к слиянию:" - -#: git-gui.sh:3076 -msgid "Commit Message:" -msgstr "Комментарий к состоянию:" - -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 -msgid "Copy All" -msgstr "Копировать все" - -#: git-gui.sh:3149 lib/blame.tcl:104 -msgid "File:" -msgstr "Файл:" - -#: git-gui.sh:3255 -msgid "Refresh" -msgstr "Обновить" - -#: git-gui.sh:3276 -msgid "Decrease Font Size" -msgstr "Уменьшить размер шрифта" - -#: git-gui.sh:3280 -msgid "Increase Font Size" -msgstr "Увеличить размер шрифта" - -#: git-gui.sh:3288 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Кодировка" - -#: git-gui.sh:3299 -msgid "Apply/Reverse Hunk" -msgstr "Применить/Убрать изменение" - -#: git-gui.sh:3304 -msgid "Apply/Reverse Line" -msgstr "Применить/Убрать строку" - -#: git-gui.sh:3323 -msgid "Run Merge Tool" -msgstr "Запустить программу слияния" - -#: git-gui.sh:3328 -msgid "Use Remote Version" -msgstr "Взять внешнюю версию" - -#: git-gui.sh:3332 -msgid "Use Local Version" -msgstr "Взять локальную версию" - -#: git-gui.sh:3336 -msgid "Revert To Base" -msgstr "Отменить изменения" - -#: git-gui.sh:3354 -msgid "Visualize These Changes In The Submodule" -msgstr "" - -#: git-gui.sh:3358 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Показать историю текущей ветви подмодуля" - -#: git-gui.sh:3362 -msgid "Visualize All Branch History In The Submodule" -msgstr "Показать историю всех ветвей подмодуля" - -#: git-gui.sh:3367 -msgid "Start git gui In The Submodule" -msgstr "" - -#: git-gui.sh:3389 -msgid "Unstage Hunk From Commit" -msgstr "Не сохранять часть" - -#: git-gui.sh:3391 -msgid "Unstage Lines From Commit" -msgstr "Убрать строки из подготовленного" - -#: git-gui.sh:3393 -msgid "Unstage Line From Commit" -msgstr "Убрать строку из подготовленного" - -#: git-gui.sh:3396 -msgid "Stage Hunk For Commit" -msgstr "Подготовить часть для сохранения" - -#: git-gui.sh:3398 -msgid "Stage Lines For Commit" -msgstr "Подготовить строки для сохранения" - -#: git-gui.sh:3400 -msgid "Stage Line For Commit" -msgstr "Подготовить строку для сохранения" - -#: git-gui.sh:3424 -msgid "Initializing..." -msgstr "Инициализация..." - -#: git-gui.sh:3541 -#, tcl-format -msgid "" -"Possible environment issues exist.\n" -"\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" -"\n" -msgstr "" -"Возможны ошибки в переменных окружения.\n" -"\n" -"Переменные окружения, которые возможно\n" -"будут проигнорированы командами Git,\n" -"запущенными из %s\n" -"\n" - -#: git-gui.sh:3570 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Это известная проблема с Tcl,\n" -"распространяемым Cygwin." - -#: git-gui.sh:3575 -#, tcl-format -msgid "" -"\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\n" -msgstr "" -"\n" -"\n" -"Вместо использования %s можно\n" -"сохранить значения user.name и\n" -"user.email в Вашем персональном\n" -"файле ~/.gitconfig.\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - графический пользовательский интерфейс к Git." - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Просмотр файла" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Сохраненное состояние:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Скопировать SHA-1" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Найти текст..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Провести полный поиск копий" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Показать исторический контекст" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Рассмотреть состояние предка" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Чтение %s..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "Загрузка аннотации копирований/переименований..." - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "строк прокомментировано" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Загрузка аннотаций первоначального положения объекта..." - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Аннотация завершена." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Занят" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "Аннотация уже запущена" - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Выполнение полного поиска копий..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Загрузка аннотации..." - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Автор:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Сохранил:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "Исходный файл:" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Невозможно найти текущее состояние:" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Невозможно найти состояние предка:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Не могу показать предка" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "Ошибка загрузки изменений:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "Источник:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "Файл:" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "Скопировано/перемещено в:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Перейти на ветвь" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "Перейти" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "Отмена" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Версия" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "Настройки" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Получить изменения из внешней ветви" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Отсоединить от локальной ветви" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Создание ветви" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Создать новую ветвь" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 -msgid "Create" -msgstr "Создать" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Название ветви" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "Название:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Взять из имен ветвей слежения" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Начальная версия" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Обновить имеющуюся ветвь:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Нет" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Только Fast Forward" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Сброс" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "После создания сделать текущей" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Укажите ветвь слежения." - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Ветвь слежения %s не является ветвью во внешнем репозитории." - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Укажите название ветви." - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "Недопустимое название ветви '%s'." - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Удаление ветви" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Удалить локальную ветвь" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Локальные ветви" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Удалить только в случае, если было слияние с" - -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Всегда (не выполнять проверку на слияние)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Ветви, которые не полностью сливаются с %s:" - -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Восстановить удаленные ветви сложно.\n" -"\n" -"Продолжить?" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Не удалось удалить ветви:\n" -"%s" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Переименование ветви" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Переименовать" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Ветвь:" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Новое название:" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Укажите ветвь для переименования." - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Ветвь '%s' уже существует." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Не удалось переименовать '%s'. " - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Запуск..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "Просмотр списка файлов" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Загрузка %s..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[На уровень выше]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Показать файлы ветви" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "Показать" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Получение %s из %s " - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "критическая ошибка: невозможно разрешить %s" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Закрыть" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Ветвь '%s' не существует " - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Ошибка создания упрощённой конфигурации git pull для '%s'." - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"Ветвь '%s' уже существует.\n" -"\n" -"Она не может быть прокручена(fast-forward) к %s.\n" -"Требуется слияние." - -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Неизвестная стратегия слияния: '%s'." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Не удалось обновить '%s'." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "Рабочая область заблокирована другим процессом." - -#: lib/checkout_op.tcl:289 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"Последнее прочитанное состояние репозитория не соответствует текущему.\n" -"\n" -"С момента последней проверки репозиторий был изменен другой программой Git. " -"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь.\n" -"\n" -"Это будет сделано сейчас автоматически.\n" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Обновление рабочего каталога из '%s'..." - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "файлы извлечены" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "Прерван переход на '%s' (требуется слияние содержания файлов)" - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Требуется слияние содержания файлов." - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Ветвь '%s' остается текущей." - -#: lib/checkout_op.tcl:452 -msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." -msgstr "" -"Вы находитесь не в локальной ветви.\n" -"\n" -"Если вы хотите снова вернуться к какой-нибудь ветви, создайте ее сейчас, " -"начиная с 'Текущего отсоединенного состояния'." - -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Ветвь '%s' сделана текущей." - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Сброс '%s' в '%s' приведет к потере следующих сохраненных состояний: " - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Восстановить потерянные сохраненные состояния будет сложно." - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Сбросить '%s'?" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Наглядно" - -#: lib/checkout_op.tcl:635 -#, tcl-format -msgid "" -"Failed to set current branch.\n" -"\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" -"\n" -"This should not have occurred. %s will now close and give up." -msgstr "" -"Не удалось установить текущую ветвь.\n" -"\n" -"Ваш рабочий каталог обновлен только частично. Были обновлены все файлы кроме " -"служебных файлов Git. \n" -"\n" -"Этого не должно было произойти. %s завершается." - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Выбрать" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Шрифт" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Размер шрифта" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Пример текста" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Это пример текста.\n" -"Если Вам нравится этот текст, это может быть Ваш шрифт." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" -msgstr "Создать новый репозиторий" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Новый..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" -msgstr "Склонировать существующий репозиторий" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Склонировать..." - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" -msgstr "Выбрать существующий репозиторий" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Открыть..." - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Недавние репозитории" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Открыть последний репозиторий" - -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Не удалось создать репозиторий %s:" - -#: lib/choose_repository.tcl:391 -msgid "Directory:" -msgstr "Каталог:" - -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" -msgstr "Репозиторий" - -#: lib/choose_repository.tcl:448 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Каталог '%s' уже существует." - -#: lib/choose_repository.tcl:452 -#, tcl-format -msgid "File %s already exists." -msgstr "Файл '%s' уже существует." - -#: lib/choose_repository.tcl:466 -msgid "Clone" -msgstr "Склонировать" - -#: lib/choose_repository.tcl:479 -msgid "Source Location:" -msgstr "Исходное положение:" - -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" -msgstr "Каталог назначения:" - -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" -msgstr "Тип клона:" - -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Стандартный (Быстрый, полуизбыточный, \"жесткие\" ссылки)" - -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Полная копия (Медленный, создает резервную копию)" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Общий (Самый быстрый, не рекомендуется, без резервной копии)" - -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Каталог не является репозиторием: %s" - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "Стандартный клон возможен только для локального репозитория." - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "Общий клон возможен только для локального репозитория." - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "Путь '%s' уже существует." - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "Не могу сконфигурировать исходный репозиторий." - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "Считаю объекты" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Не могу скопировать objects/info/alternates: %s" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Нечего клонировать с %s." - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "Не инициализирована ветвь 'master'." - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "\"Жесткие ссылки\" недоступны. Будет использовано копирование." - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "Клонирование %s" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "Копирование objects" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "КБ" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Не могу скопировать объект: %s" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "Создание ссылок на objects" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "объекты" - -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Не могу \"жестко связать\" объект: %s" - -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Не могу получить ветви и объекты. Дополнительная информация на консоли." - -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "Не могу получить метки. Дополнительная информация на консоли." - -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "Не могу определить HEAD. Дополнительная информация на консоли." - -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Не могу очистить %s" - -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "Клонирование не удалось." - -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "Не было получено ветви по умолчанию." - -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Не могу распознать %s как состояние." - -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "Создаю рабочий каталог" - -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "файлов" - -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "Не удалось получить начальное состояние файлов репозитория." - -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "Открыть" - -#: lib/choose_repository.tcl:1021 -msgid "Repository:" -msgstr "Репозиторий:" - -#: lib/choose_repository.tcl:1072 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Не удалось открыть репозиторий %s:" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "Текущее отсоединенное состояние" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Выражение для определения версии:" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "Локальная ветвь:" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "Ветвь слежения" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "Метка" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Неверная версия: %s" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "Версия не указана." - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "Пустое выражение для определения версии." - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "Обновлено" - -#: lib/choose_rev.tcl:559 -msgid "URL" -msgstr "Ссылка" - -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" -msgstr "" -"Отсутствует состояние для исправления.\n" -"\n" -"Вы создаете первое состояние в репозитории, здесь еще нечего исправлять.\n" - -#: lib/commit.tcl:18 -msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" -msgstr "" -"Невозможно исправить состояние во время операции слияния.\n" -"\n" -"Текущее слияние не завершено. Невозможно исправить предыдущее сохраненное " -"состояние, не прерывая эту операцию.\n" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Ошибка при загрузке данных для исправления сохраненного состояния:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Невозможно получить информацию об авторстве:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Неверный GIT_COMMITTER_IDENT:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "предупреждение: Tcl не поддерживает кодировку '%s'." - -#: lib/commit.tcl:149 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"Последнее прочитанное состояние репозитория не соответствует текущему.\n" -"\n" -"С момента последней проверки репозиторий был изменен другой программой Git. " -"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь. \n" -"\n" -"Это будет сделано сейчас автоматически.\n" - -#: lib/commit.tcl:172 -#, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" -"\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" -msgstr "" -"Нельзя сохранить файлы с незавершённой операцией слияния.\n" -"\n" -"Для файла %s возник конфликт слияния. Разрешите конфликт и добавьте к " -"подготовленным файлам перед сохранением.\n" - -#: lib/commit.tcl:180 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Обнаружено неизвестное состояние файла %s.\n" -"\n" -"Файл %s не может быть сохранен данной программой.\n" - -#: lib/commit.tcl:188 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Отсутствуют изменения для сохранения.\n" -"\n" -"Подготовьте хотя бы один файл до создания сохраненного состояния.\n" - -#: lib/commit.tcl:203 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" -msgstr "" -"Напишите комментарий к сохраненному состоянию.\n" -"\n" -"Рекомендуется следующий формат комментария:\n" -"\n" -"- первая строка: краткое описание сделанных изменений.\n" -"- вторая строка пустая\n" -"- оставшиеся строки: опишите, что дают ваши изменения.\n" - -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." -msgstr "Вызов программы поддержки репозитория pre-commit..." - -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "Сохранение прервано программой поддержки репозитория pre-commit" - -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "Вызов программы поддержки репозитория commit-msg..." - -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "Сохранение прервано программой поддержки репозитория commit-msg" - -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "Сохранение изменений..." - -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "Программа write-tree завершилась с ошибкой:" - -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "Сохранить состояние не удалось." - -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Состояние %s выглядит поврежденным" - -#: lib/commit.tcl:339 -msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" -msgstr "" -"Отсутствуют изменения для сохранения.\n" -"\n" -"Ни один файл не был изменен и не было слияния.\n" -"\n" -"Сейчас автоматически запустится перечитывание репозитория.\n" - -#: lib/commit.tcl:346 -msgid "No changes to commit." -msgstr "Отсутствуют изменения для сохранения." - -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "Программа commit-tree завершилась с ошибкой:" - -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "Программа update-ref завершилась с ошибкой:" - -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Создано состояние %s: %s " - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "В процессе... пожалуйста, ждите..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Процесс успешно завершен" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Ошибка: не удалось выполнить команду" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "Количество несвязанных объектов" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "Объем дискового пространства, занятый несвязанными объектами" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "Количество упакованных объектов" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "Количество pack-файлов" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "Объем дискового пространства, занятый упакованными объектами" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "Несвязанные объекты, которые можно удалить" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "Мусор" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Сжатие базы объектов" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Проверка базы объектов при помощи fsck" - -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"Этот репозиторий сейчас содержит примерно %i свободных объектов\n" -"\n" -"Для лучшей производительности рекомендуется сжать базу данных.\n" -"\n" -"Сжать базу данных сейчас?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Неправильная дата в репозитории: %s" - -#: lib/diff.tcl:64 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." -msgstr "" -"Изменений не обнаружено.\n" -"\n" -"в %s отсутствуют изменения.\n" -"\n" -"Дата изменения файла была обновлена другой программой, но содержимое файла " -"осталось прежним.\n" -"\n" -"Сейчас будет запущено перечитывание репозитория, чтобы найти подобные файлы." - -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Загрузка изменений в %s..." - -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"ЛОКАЛЬНО: удалён\n" -"ВНЕШНИЙ:\n" - -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"ВНЕШНИЙ: удалён\n" -"ЛОКАЛЬНО:\n" - -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "ЛОКАЛЬНО:\n" - -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "ВНЕШНИЙ:\n" - -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" -msgstr "Не могу показать %s" - -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "Ошибка загрузки файла:" - -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Репозиторий Git (подпроект)" - -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* Двоичный файл (содержимое не показано)" - -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Размер неподготовленного файла %d байт.\n" -"* Показано первых %d байт.\n" - -#: lib/diff.tcl:233 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Неподготовленный файл обрезан: %s.\n" -"* Чтобы увидеть весь файл, используйте программу-редактор.\n" - -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." -msgstr "Не удалось исключить выбранную часть." - -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "Не удалось подготовить к сохранению выбранную часть." - -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "Не удалось исключить выбранную строку." - -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "Не удалось подготовить к сохранению выбранную строку." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "По умолчанию" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Системная (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Другая" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "ошибка" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "предупреждение" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Прежде чем сохранить, исправьте вышеуказанные ошибки." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Не удалось разблокировать индекс" - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Ошибка в индексе" - -#: lib/index.tcl:17 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Не удалось обновить индекс Git. Состояние репозитория будет перечитано " -"автоматически." - -#: lib/index.tcl:28 -msgid "Continue" -msgstr "Продолжить" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Разблокировать индекс" - -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Удаление %s из подготовленного" - -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "Подготовлено для сохранения" - -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "Добавление %s..." - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Отменить изменения в файле %s?" - -#: lib/index.tcl:400 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Отменить изменения в %i файле(-ах)?" - -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Любые изменения, не подготовленные к сохранению, будут потеряны при данной " -"операции." - -#: lib/index.tcl:411 -msgid "Do Nothing" -msgstr "Ничего не делать" - -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "Удаление изменений в выбранных файлах" - -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "Отмена изменений в %s" - -#: lib/merge.tcl:13 -msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" -msgstr "" -"Невозможно выполнить слияние во время исправления.\n" -"\n" -"Завершите исправление данного состояния перед выполнением операции слияния.\n" - -#: lib/merge.tcl:27 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"Последнее прочитанное состояние репозитория не соответствует текущему.\n" -"\n" -"С момента последней проверки репозиторий был изменен другой программой Git. " -"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь.\n" -"\n" -"Это будет сделано сейчас автоматически.\n" - -#: lib/merge.tcl:45 -#, tcl-format -msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" -msgstr "" -"Предыдущее слияние не завершено из-за конфликта.\n" -"\n" -"Для файла %s возник конфликт слияния.\n" -"\n" -"Разрешите конфликт, подготовьте файл и сохраните. Только после этого можно " -"начать следующее слияние.\n" - -#: lib/merge.tcl:55 -#, tcl-format -msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" -msgstr "" -"Изменения не сохранены.\n" -"\n" -"Файл %s изменен.\n" -"\n" -"Подготовьте и сохраните изменения перед началом слияния. В случае " -"необходимости это позволит прервать операцию слияния.\n" - -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s из %s" - -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Слияние %s и %s..." - -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "Слияние успешно завершено." - -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "Не удалось завершить слияние. Требуется разрешение конфликта." - -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "Слияние с %s" - -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Версия, с которой провести слияние" - -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Невозможно прервать исправление.\n" -"\n" -"Завершите текущее исправление сохраненного состояния.\n" - -#: lib/merge.tcl:222 -msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" -msgstr "" -"Прервать операцию слияния?\n" -"\n" -"Прерывание этой операции приведет к потере *ВСЕХ* несохраненных изменений.\n" -"\n" -"Продолжить?" - -#: lib/merge.tcl:228 -msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" -msgstr "" -"Прервать операцию слияния?\n" -"\n" -"Прерывание этой операции приведет к потере *ВСЕХ* несохраненных изменений.\n" -"\n" -"Продолжить?" - -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Прерываю" - -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "изменения в файлах отменены" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "Прервать не удалось." - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Прервано." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Использовать базовую версию для разрешения конфликта?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Использовать версию этой ветви для разрешения конфликта?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Использовать версию другой ветви для разрешения конфликта?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Внимание! Список изменений показывает только конфликтующие отличия.\n" -"\n" -"%s будет переписан.\n" -"\n" -"Это действие можно отменить только перезапуском операции слияния." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" -"Файл %s, похоже, содержит необработанные конфликты. Продолжить подготовку к " -"сохранению?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Добавляю результат разрешения для %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" -"Программа слияния не обрабатывает конфликты с удалением или участием ссылок" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Конфликтующий файл не существует" - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "'%s' не является программой слияния" - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Неизвестная программа слияния '%s'" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "Программа слияния уже работает. Прервать?" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Ошибка получения версий:\n" -"%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Ошибка запуска программы слияния:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "Запуск программы слияния..." - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "Ошибка выполнения программы слияния." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Ошибка в глобальной установке кодировки '%s'" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Неверная кодировка репозитория: '%s'" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Восстановить настройки по умолчанию" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Сохранить" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "Для репозитория %s" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Общие (для всех репозиториев)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Имя пользователя" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Адрес электронной почты" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Суммарный комментарий при слиянии" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Уровень детальности сообщений при слиянии" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Показать отчет об изменениях после слияния" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Использовать для слияния программу" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "Доверять времени модификации файла" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "Чистка ветвей слежения при получении изменений" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "Имя новой ветви взять из имен ветвей слежения" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "Поиск копий только в изменённых файлах" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "Минимальное количество символов для поиска копий" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Радиус исторического контекста (в днях)" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Число строк в контексте diff" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Ширина текста комментария" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Шаблон для имени новой ветви" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Кодировка содержания файла по умолчанию" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Изменить" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Словарь для проверки правописания:" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Изменить" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "Выберите %s" - -# carbon copy -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Настройки" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "Не удалось полностью сохранить настройки:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Удалить ссылку на внешний репозиторий" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Чистка" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Получение из" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Отправить" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Зарегистрировать внешний репозиторий" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Добавить внешний репозиторий" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Информация о внешнем репозитории" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Положение:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Следующая операция" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Скачать сразу" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Инициализировать внешний репозиторий и отправить" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Больше ничего не делать" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Укажите название внешнего репозитория." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "Недопустимое название внешнего репозитория '%s'." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Не удалось добавить '%s' из '%s'. " - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "получение %s" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "Получение %s" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Невозможно инициализировать репозиторий в '%s'." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "отправить %s" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Настройка %s (в %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Удаление ветви во внешнем репозитории" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Из репозитория" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "внешний:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "Указанное положение:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "Ветви" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Удалить только в случае, если" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Слияние с:" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "Для опции 'Слияние с' требуется указать ветвь." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Следующие ветви могут быть объединены с %s при помощи операции слияния:\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:189 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "" -"Некоторые тесты на слияние не прошли, потому что Вы не получили необходимые " -"состояния. Попытайтесь получить их из %s." - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Укажите одну или несколько ветвей для удаления." - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Удаление ветвей из %s" - -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "Не указан репозиторий." - -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "Перечитывание %s... " - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Поиск:" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "Дальше" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Обратно" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Игн. большие/маленькие" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Невозможно записать ссылку:" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Невозможно записать значок:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Неподдерживаемая программа проверки правописания" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Проверка правописания не доступна" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Неправильная конфигурация программы проверки правописания" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Словарь вернут к %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Программа проверки правописания не смогла запуститься" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Нераспознанная программа проверки правописания" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Исправлений не найдено" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Программа проверки правописания прервала передачу данных" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Ошибка проверки правописания" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Ключ не найден" - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Публичный ключ из %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Создать ключ" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Скопировать в буфер обмена" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "Ваш публичный ключ OpenSSH" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Создание..." - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Ошибка запуска ssh-keygen:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "Ключ не создан." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "Создание ключа завершилось, но результат не был найден" - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Ваш ключ находится в: %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i из %*i %s (%3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Запуск %s требует выбранного файла." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Действительно запустить %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Вспомогательная операция: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Выполнение: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Программа %s завершилась успешно." - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Ошибка выполнения программы: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Добавить вспомогательную операцию" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Новая вспомогательная операция" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Добавить для всех репозиториев" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Описание вспомогательной операции" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Используйте '/' для создания подменю" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Команда:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Показать диалог перед запуском" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Запрос на выбор версии (устанавливает $REVISION)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Запрос дополнительных аргументов (устанавливает $ARGS)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Не показывать окно вывода команды" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Запуск только если показан список изменений ($FILENAME не пусто)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Укажите название вспомогательной операции." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "Вспомогательная операция '%s' уже существует." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Ошибка добавления программы:\n" -"%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Удалить программу" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Удалить команды программы" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Удалить" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Синим выделены программы локальные репозиторию)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Запуск команды: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Аргументы" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Получение изменений из %s " - -# carbon copy -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "чистка внешнего %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Чистка ветвей слежения, удаленных из %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Отправка изменений в %s " - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Точное копирование в %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Отправка %s %s в %s" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "Отправить изменения в ветвях" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "Исходные ветви" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Репозиторий назначения" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "Настройки отправки" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Намеренно переписать существующую ветвь (возможна потеря изменений)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "Использовать thin pack (для медленных сетевых подключений)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "Передать метки" @@ -1,2605 +1,9536 @@ -# Swedish translation of git-gui. -# Copyright (C) 2007-2008 Shawn Pearce, et al. -# This file is distributed under the same license as the git-gui package. +# Swedish translations for Git. +# Copyright (C) 2010-2012 Peter krefting <peter@softwolves.pp.se> +# This file is distributed under the same license as the Git package. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012. # -# Peter Krefting <peter@softwolves.pp.se>, 2007-2008. -# Mikael Magnusson <mikachu@gmail.com>, 2008. msgid "" msgstr "" -"Project-Id-Version: sv\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-12 21:11+0100\n" -"PO-Revision-Date: 2010-09-12 21:12+0100\n" +"Project-Id-Version: git 1.7.12\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2012-10-16 08:38+0800\n" +"PO-Revision-Date: 2012-10-16 08:36+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: advice.c:40 +#, c-format +msgid "hint: %.*s\n" +msgstr "tips: %.*s\n" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:70 +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 "" +"Rätta dem i din arbetskatalog,\n" +"och använd sedan \"git add/rm <fil>\" som\n" +"lämpligt för att ange lösning och checka in,\n" +"eller använd \"git commit -a\"." + +#: archive.c:10 +msgid "git archive [options] <tree-ish> [<path>...]" +msgstr "git archive [flaggor] <träd-igt> [<sökväg>...]" + +#: archive.c:11 +msgid "git archive --list" +msgstr "git archive --list" + +#: archive.c:12 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +msgstr "" +"git archive --remote <arkiv> [--exec <kmd>] [flaggor] <träd-igt> " +"[<sökväg>...]" + +#: archive.c:13 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" + +#: archive.c:322 +msgid "fmt" +msgstr "fmt" + +#: archive.c:322 +msgid "archive format" +msgstr "arkivformat" + +#: archive.c:323 builtin/log.c:1079 +msgid "prefix" +msgstr "prefix" + +#: archive.c:324 +msgid "prepend prefix to each pathname in the archive" +msgstr "lägg till prefix till varje sökväg i arkivet" + +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389 +#: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642 +#: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 +#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "fil" + +#: archive.c:326 builtin/archive.c:92 +msgid "write the archive to this file" +msgstr "skriv arkivet till filen" + +#: archive.c:328 +msgid "read .gitattributes in working directory" +msgstr "läs .gitattributes i arbetskatalogen" + +#: archive.c:329 +msgid "report archived files on stderr" +msgstr "rapportera arkiverade filer på standard fel" + +#: archive.c:330 +msgid "store only" +msgstr "endast spara" + +#: archive.c:331 +msgid "compress faster" +msgstr "komprimera snabbare" + +#: archive.c:339 +msgid "compress better" +msgstr "komprimera bättre" + +#: archive.c:342 +msgid "list supported archive formats" +msgstr "visa understödda arkivformat" + +#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +msgid "repo" +msgstr "arkiv" + +#: archive.c:345 builtin/archive.c:94 +msgid "retrieve the archive from remote repository <repo>" +msgstr "hämta arkivet från fjärrarkivet <arkiv>" + +#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619 +msgid "command" +msgstr "kommando" + +#: archive.c:347 builtin/archive.c:96 +msgid "path to the remote git-upload-archive command" +msgstr "sökväg till kommandot git-upload-archive på fjärren" + +#: bundle.c:36 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "'%s' ser inte ut som en v2-bundle-fil" + +#: bundle.c:63 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "okänt huvud: %s%s (%d)" + +#: bundle.c:89 builtin/commit.c:672 +#, c-format +msgid "could not open '%s'" +msgstr "kunde inte öppna \"%s\"" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "Arkivet saknar dessa nödvändiga incheckningar:" + +#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "misslyckades skapa revisionstraversering" + +#: bundle.c:186 +#, c-format +msgid "The bundle contains %d ref" +msgid_plural "The bundle contains %d refs" +msgstr[0] "Paketet (bundlen) innehåller %d referens" +msgstr[1] "Paketet (bundlen) innehåller %d referenser" + +#: bundle.c:192 +msgid "The bundle records a complete history." +msgstr "Paketet (bundlen) beskriver en komplett historik." + +#: bundle.c:195 +#, c-format +msgid "The bundle requires this ref" +msgid_plural "The bundle requires these %d refs" +msgstr[0] "Paketet (bundlen) kräver denna referens" +msgstr[1] "Paketet (bundlen) kräver dessa %d referenser" + +#: bundle.c:294 +msgid "rev-list died" +msgstr "rev-list dog" + +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "okänt argument: %s" + +#: bundle.c:335 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" + +#: bundle.c:380 +msgid "Refusing to create empty bundle." +msgstr "Vägrar skapa ett tomt paket (bundle)." + +#: bundle.c:398 +msgid "Could not spawn pack-objects" +msgstr "Kunde inte starta pack-objects" + +#: bundle.c:416 +msgid "pack-objects died" +msgstr "pack-objects misslyckades" + +#: bundle.c:419 +#, c-format +msgid "cannot create '%s'" +msgstr "kan inte skapa \"%s\"" + +#: bundle.c:441 +msgid "index-pack died" +msgstr "index-pack dog" + +#: commit.c:50 +#, c-format +msgid "could not parse %s" +msgstr "kunde inte tolka %s" + +#: commit.c:52 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s är inte en incheckning!" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "minnet slut" + +#: connected.c:39 +msgid "Could not run 'git rev-list'" +msgstr "Kunde inte köra \"git rev-list\"" + +#: connected.c:48 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "kunde inte skriva till rev-list: %s" + +#: connected.c:56 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "kunde inte stänga rev-list:s standard in: %s" + +#: date.c:95 +msgid "in the future" +msgstr "i framtiden" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "%lu sekund sedan" +msgstr[1] "%lu sekunder sedan" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "%lu minut sedan" +msgstr[1] "%lu minuter sedan" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "%lu timme sedan" +msgstr[1] "%lu timmar sedan" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "%lu dag sedan" +msgstr[1] "%lu dagar sedan" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "%lu vecka sedan" +msgstr[1] "%lu veckor sedan" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "%lu månad sedan" +msgstr[1] "%lu månader sedan" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "%lu år" +msgstr[1] "%lu år" + +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "%s, %lu månad sedan" +msgstr[1] "%s, %lu månader sedan" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "%lu år sedan" +msgstr[1] "%lu år sedan" + +#: diff.c:105 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%.*s\"\n" + +#: diff.c:110 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr " Okänd dirstat-parameter \"%.*s\"\n" + +#: diff.c:210 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" +"%s" + +#: diff.c:3458 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"Misslyckades tolka argument till flaggan --dirstat/-X;\n" +"%s" + +#: gpg-interface.c:59 +msgid "could not run gpg." +msgstr "kunde inte köra gpg." + +#: gpg-interface.c:71 +msgid "gpg did not accept the data" +msgstr "gpg godtog inte data" -#: git-gui.sh:781 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Ogiltigt teckensnitt angivet i %s:" +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "gpg misslyckades signera data" -#: git-gui.sh:831 -msgid "Main Font" -msgstr "Huvudteckensnitt" +#: grep.c:1441 +#, c-format +msgid "'%s': unable to read %s" +msgstr "\"%s\" kunde inte läsa %s" -#: git-gui.sh:832 -msgid "Diff/Console Font" -msgstr "Diff/konsolteckensnitt" +#: grep.c:1458 +#, c-format +msgid "'%s': %s" +msgstr "\"%s\": %s" -#: git-gui.sh:845 git-gui.sh:859 git-gui.sh:872 git-gui.sh:955 git-gui.sh:974 -#: git-gui.sh:2964 -msgid "git-gui: fatal error" -msgstr "git-gui: ödesdigert fel" +#: grep.c:1469 +#, c-format +msgid "'%s': short read %s" +msgstr "\"%s\": kort läsning %s" -#: git-gui.sh:846 -msgid "Cannot find git in PATH." -msgstr "Hittar inte git i PATH." +#: help.c:212 +#, c-format +msgid "available git commands in '%s'" +msgstr "git-kommandon tillgängliga i \"%s\"" -#: git-gui.sh:873 -msgid "Cannot parse Git version string:" -msgstr "Kan inte tolka versionssträng från Git:" +#: help.c:219 +msgid "git commands available from elsewhere on your $PATH" +msgstr "git-kommandon från andra platser i din $PATH" -#: git-gui.sh:891 -#, tcl-format +#: help.c:275 +#, c-format msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" +"'%s' appears to be a git command, but we were not\n" +"able to execute it. Maybe git-%s is broken?" msgstr "" -"Kan inte avgöra Gits version.\n" +"\"%s\" verkar vara ett git-kommando, men vi kan inte\n" +"köra det. Kanske git-%s är trasigt?" + +#: help.c:332 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." + +#: help.c:354 +#, 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 "" +"VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n" +"Fortsätter under förutsättningen att du menade \"%s\"" + +#: help.c:359 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "automatiskt om %0.1f sekunder..." + +#: help.c:366 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." + +#: help.c:370 +msgid "" "\n" -"%s säger att dess version är \"%s\".\n" +"Did you mean this?" +msgid_plural "" "\n" -"%s kräver minst Git 1.5.0 eller senare.\n" +"Did you mean one of these?" +msgstr[0] "" "\n" -"Anta att \"%s\" är version 1.5.0?\n" +"Menade du detta?" +msgstr[1] "" +"\n" +"Menade du ett av dessa?" + +#: merge-recursive.c:190 +#, c-format +msgid "(bad commit)\n" +msgstr "(felaktig incheckning)\n" + +#: merge-recursive.c:206 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" + +#: merge-recursive.c:268 +msgid "error building trees" +msgstr "fel vid byggande av träd" + +#: merge-recursive.c:672 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "misslyckades skapa sökvägen \"%s\"%s" + +#: merge-recursive.c:683 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "Tar bort %s för att göra plats för underkatalog\n" + +#. 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 ": kanske en K/F-konflikt?" + +#: merge-recursive.c:708 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "vägrar förlora ospårad fil vid \"%s\"" + +#: merge-recursive.c:748 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "kan inte läsa objektet %s: \"%s\"" + +#: merge-recursive.c:750 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "blob förväntades för %s \"%s\"" + +#: merge-recursive.c:773 builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "misslyckades öppna \"%s\"" + +#: merge-recursive.c:781 +#, c-format +msgid "failed to symlink '%s'" +msgstr "misslyckades ta skapa symboliska länken \"%s\"" + +#: merge-recursive.c:784 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "vet inte hur %06o %s \"%s\" skall hanteras" + +#: merge-recursive.c:922 +msgid "Failed to execute internal merge" +msgstr "Misslyckades exekvera intern sammanslagning" + +#: merge-recursive.c:926 +#, c-format +msgid "Unable to add %s to database" +msgstr "Kunde inte lägga till %s till databasen" + +#: merge-recursive.c:942 +msgid "unsupported object type in the tree" +msgstr "objekttyp som ej stöds upptäcktes i trädet" + +#: 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 "" +"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " +"i trädet." -#: git-gui.sh:1180 -msgid "Git directory not found:" -msgstr "Git-katalogen hittades inte:" +#: 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 "" +"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " +"i trädet vid %s." -#: git-gui.sh:1201 -msgid "Cannot move to top of working directory:" -msgstr "Kan inte gå till början på arbetskatalogen:" +#: merge-recursive.c:1081 +msgid "rename" +msgstr "namnbyte" -#: git-gui.sh:1209 -msgid "Cannot use bare repository:" -msgstr "Kan inte använda naket arkiv:" +#: merge-recursive.c:1081 +msgid "renamed" +msgstr "namnbytt" -#: git-gui.sh:1217 -msgid "No working directory" -msgstr "Ingen arbetskatalog" +#: merge-recursive.c:1137 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "%s är en katalog i %s lägger till som %s istället" -#: git-gui.sh:1389 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Uppdaterar filstatus..." +#: merge-recursive.c:1159 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" +"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " +"namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: git-gui.sh:1445 -msgid "Scanning for modified files ..." -msgstr "Söker efter ändrade filer..." +#: merge-recursive.c:1164 +msgid " (left unresolved)" +msgstr " (lämnad olöst)" -#: git-gui.sh:1509 -msgid "Calling prepare-commit-msg hook..." +#: merge-recursive.c:1218 +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -"Anropar kroken för förberedelse av incheckningsmeddelande (prepare-commit-" -"msg)..." - -#: git-gui.sh:1526 -msgid "Commit declined by prepare-commit-msg hook." +"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" + +#: merge-recursive.c:1248 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "Byter namn på %s till %s och %s till %s istället" + +#: merge-recursive.c:1447 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s" + +#: merge-recursive.c:1457 +#, c-format +msgid "Adding merged %s" +msgstr "Lägger till sammanslagen %s" + +#: merge-recursive.c:1462 merge-recursive.c:1660 +#, c-format +msgid "Adding as %s instead" +msgstr "Lägger till som %s iställer" + +#: merge-recursive.c:1513 +#, c-format +msgid "cannot read object %s" +msgstr "kan inte läsa objektet %s" + +#: merge-recursive.c:1516 +#, c-format +msgid "object %s is not a blob" +msgstr "objektet %s är inte en blob" + +#: merge-recursive.c:1564 +msgid "modify" +msgstr "ändra" + +#: merge-recursive.c:1564 +msgid "modified" +msgstr "ändrad" + +#: merge-recursive.c:1574 +msgid "content" +msgstr "innehåll" + +#: merge-recursive.c:1581 +msgid "add/add" +msgstr "tillägg/tillägg" + +#: merge-recursive.c:1615 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "Hoppade över %s (sammanslagen samma som befintlig)" + +#: merge-recursive.c:1629 +#, c-format +msgid "Auto-merging %s" +msgstr "Slår ihop %s automatiskt" + +#: merge-recursive.c:1633 git-submodule.sh:869 +msgid "submodule" +msgstr "undermodul" + +#: merge-recursive.c:1634 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" + +#: merge-recursive.c:1724 +#, c-format +msgid "Removing %s" +msgstr "Tar bort %s" + +#: merge-recursive.c:1749 +msgid "file/directory" +msgstr "fil/katalog" + +#: merge-recursive.c:1755 +msgid "directory/file" +msgstr "katalog/fil" + +#: merge-recursive.c:1760 +#, c-format +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -"Incheckningen avvisades av kroken för förberedelse av incheckningsmeddelande " -"(prepare-commit-msg)." +"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: git-gui.sh:1684 lib/browser.tcl:246 -msgid "Ready." -msgstr "Klar." +#: merge-recursive.c:1770 +#, c-format +msgid "Adding %s" +msgstr "Lägger till %s" -#: git-gui.sh:1842 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Visar endast %s av %s filer." +#: merge-recursive.c:1787 +msgid "Fatal merge failure, shouldn't happen." +msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." + +#: merge-recursive.c:1806 +msgid "Already up-to-date!" +msgstr "Redan à jour!" + +#: merge-recursive.c:1815 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "sammanslagning av träden %s och %s misslyckades" + +#: merge-recursive.c:1845 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "Obehandlad sökväg??? %s" + +#: merge-recursive.c:1890 +msgid "Merging:" +msgstr "Slår ihop:" + +#: merge-recursive.c:1903 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "hittade %u gemensam förfader:" +msgstr[1] "hittade %u gemensamma förfäder:" + +#: merge-recursive.c:1940 +msgid "merge returned no commit" +msgstr "sammanslagningen returnerade ingen incheckning" + +#: merge-recursive.c:1997 +#, c-format +msgid "Could not parse object '%s'" +msgstr "Kunde inte tolka objektet \"%s\"" + +#: merge-recursive.c:2009 builtin/merge.c:696 +msgid "Unable to write index." +msgstr "Kunde inte skriva indexet." + +#: parse-options.c:494 +msgid "..." +msgstr "..." + +#: parse-options.c:512 +#, c-format +msgid "usage: %s" +msgstr "användning: %s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:516 +#, c-format +msgid " or: %s" +msgstr " eller: %s" + +#: parse-options.c:519 +#, c-format +msgid " %s" +msgstr " %s" + +#: remote.c:1632 +#, 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] "Din gren ligger före \"%s\" med %d incheckning.\n" +msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" + +#: remote.c:1638 +#, 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] "" +"Din gren ligger efter \"%s\" med %d incheckning, och kan snabbspolas.\n" +msgstr[1] "" +"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" + +#: remote.c:1646 +#, 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] "" +"Din gren och \"%s\" har divergerat,\n" +"och har %d respektive %d olika incheckning.\n" +msgstr[1] "" +"Din gren och \"%s\" har divergerat,\n" +"och har %d respektive %d olika incheckningar.\n" + +#: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Kunde inte öppna \"%s\" för skrivning" + +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:867 +#: builtin/merge.c:1089 builtin/merge.c:1102 +#, c-format +msgid "Could not write to '%s'" +msgstr "Kunde inte skriva till \"%s\"" + +#: sequencer.c:146 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" +"efter att ha löst konflikterna, markera de rättade sökvägarna\n" +"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: git-gui.sh:1968 -msgid "Unmodified" -msgstr "Oförändrade" +#: 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 "" +"efter att ha löst konflikterna, markera de rättade sökvägarna\n" +"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" +"och checka in resultatet med \"git commit\"" + +#: sequencer.c:162 sequencer.c:770 sequencer.c:853 +#, c-format +msgid "Could not write to %s" +msgstr "Kunde inte skriva till %s" + +#: sequencer.c:165 +#, c-format +msgid "Error wrapping up %s" +msgstr "Fel vid ombrytning av %s" + +#: sequencer.c:180 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"." + +#: sequencer.c:182 +msgid "Your local changes would be overwritten by revert." +msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"." + +#: sequencer.c:185 +msgid "Commit your changes or stash them to proceed." +msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta." + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:235 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Kunde inte skriva ny indexfil" + +#: sequencer.c:266 +msgid "Could not resolve HEAD commit\n" +msgstr "Kunde inte bestämma HEAD:s incheckning\n" + +#: sequencer.c:287 +msgid "Unable to update cache tree\n" +msgstr "Kan inte uppdatera cacheträd\n" + +#: sequencer.c:332 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "Kunde inte tolka incheckningen %s\n" + +#: sequencer.c:337 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "Kunde inte tolka föräldraincheckningen %s\n" + +#: sequencer.c:403 +msgid "Your index file is unmerged." +msgstr "Din indexfil har inte slagits ihop." + +#: sequencer.c:406 +msgid "You do not have a valid HEAD" +msgstr "Du har ingen giltig HEAD" + +#: sequencer.c:421 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte." + +#: sequencer.c:429 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "Incheckning %s har inte förälder %d" + +#: sequencer.c:433 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" + +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: sequencer.c:444 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: kan inte tolka föräldraincheckningen %s" + +#: sequencer.c:448 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Kan inte hämta incheckningsmeddelande för %s" + +#: sequencer.c:532 +#, c-format +msgid "could not revert %s... %s" +msgstr "kunde inte ångra %s... %s" + +#: sequencer.c:533 +#, c-format +msgid "could not apply %s... %s" +msgstr "kunde inte tillämpa %s... %s" + +#: sequencer.c:565 +msgid "empty commit set passed" +msgstr "den angivna uppsättningen incheckningar är tom" + +#: sequencer.c:573 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: misslyckades läsa indexet" + +#: sequencer.c:578 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: misslyckades uppdatera indexet" + +#: sequencer.c:636 +#, c-format +msgid "Cannot %s during a %s" +msgstr "kan inte %s under en %s" + +#: sequencer.c:658 +#, c-format +msgid "Could not parse line %d." +msgstr "Kan inte tolka rad %d." + +#: sequencer.c:663 +msgid "No commits parsed." +msgstr "Inga incheckningar lästes." + +#: sequencer.c:676 +#, c-format +msgid "Could not open %s" +msgstr "Kunde inte öppna %s" + +#: sequencer.c:680 +#, c-format +msgid "Could not read %s." +msgstr "kunde inte läsa %s." + +#: sequencer.c:687 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "Oanvändbart manus: %s" + +#: sequencer.c:715 +#, c-format +msgid "Invalid key: %s" +msgstr "Felaktig nyckel: %s" + +#: sequencer.c:718 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Felaktigt värde för %s: %s" + +#: sequencer.c:730 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "Trasigt manus: %s" + +#: sequencer.c:751 +msgid "a cherry-pick or revert is already in progress" +msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" + +#: sequencer.c:752 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" + +#: sequencer.c:756 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" + +#: sequencer.c:772 sequencer.c:857 +#, c-format +msgid "Error wrapping up %s." +msgstr "Fel vid ombrytning av %s." + +#: sequencer.c:791 sequencer.c:925 +msgid "no cherry-pick or revert in progress" +msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" + +#: sequencer.c:793 +msgid "cannot resolve HEAD" +msgstr "kan inte bestämma HEAD" + +#: sequencer.c:795 +msgid "cannot abort from a branch yet to be born" +msgstr "kan inte avbryta från en gren som ännu inte är född" + +#: sequencer.c:817 builtin/apply.c:4005 +#, c-format +msgid "cannot open %s: %s" +msgstr "kan inte öppna %s: %s" + +#: sequencer.c:820 +#, c-format +msgid "cannot read %s: %s" +msgstr "kan inte läsa %s: %s" + +#: sequencer.c:821 +msgid "unexpected end of file" +msgstr "oväntat filslut" + +#: sequencer.c:827 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" + +#: sequencer.c:850 +#, c-format +msgid "Could not format %s." +msgstr "Kunde inte formatera %s." + +#: sequencer.c:1012 +msgid "Can't revert as initial commit" +msgstr "Kan inte ångra som första incheckning" + +#: sequencer.c:1013 +msgid "Can't cherry-pick into empty head" +msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" + +#: sha1_name.c:1044 +msgid "HEAD does not point to a branch" +msgstr "HEAD pekar inte på en gren" + +#: sha1_name.c:1047 +#, c-format +msgid "No such branch: '%s'" +msgstr "Okänd gren: \"%s\"" + +#: sha1_name.c:1049 +#, c-format +msgid "No upstream configured for branch '%s'" +msgstr "Ingen standarduppström angiven för grenen \"%s\"" + +#: sha1_name.c:1052 +#, c-format +msgid "Upstream branch '%s' not stored as a remote-tracking branch" +msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" + +#: wrapper.c:408 +#, c-format +msgid "unable to access '%s': %s" +msgstr "kan inte komma åt \"%s\": %s" + +#: wrapper.c:426 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "kan inte slå upp aktuell användare i passwd-filen: %s" + +#: wrapper.c:427 +msgid "no such user" +msgstr "okänd användare" + +#: wt-status.c:140 +msgid "Unmerged paths:" +msgstr "Ej sammanslagna sökvägar:" + +#: wt-status.c:167 wt-status.c:194 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)" + +#: wt-status.c:169 wt-status.c:196 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)" + +#: wt-status.c:173 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " (använd \"git add <fil>...\" för att ange lösning)" + +#: wt-status.c:175 wt-status.c:179 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)" + +#: wt-status.c:177 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " (använd \"git rm <fil>...\" för att ange lösning)" + +#: wt-status.c:188 +msgid "Changes to be committed:" +msgstr "Ändringar att checka in:" + +#: wt-status.c:206 +msgid "Changes not staged for commit:" +msgstr "Ändringar ej i incheckningskön:" + +#: wt-status.c:210 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr "" +" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)" -#: git-gui.sh:1970 -msgid "Modified, not staged" -msgstr "Förändrade, ej köade" +#: wt-status.c:212 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr "" +" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)" -#: git-gui.sh:1971 git-gui.sh:1979 -msgid "Staged for commit" -msgstr "Köade för incheckning" +#: wt-status.c:213 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr "" +" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i " +"arbetskatalogen)" -#: git-gui.sh:1972 git-gui.sh:1980 -msgid "Portions staged for commit" -msgstr "Delar köade för incheckning" +#: wt-status.c:215 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr "" +" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: git-gui.sh:1973 git-gui.sh:1981 -msgid "Staged for commit, missing" -msgstr "Köade för incheckning, saknade" +#: wt-status.c:227 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr "" +" (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" + +#: wt-status.c:244 +msgid "bug" +msgstr "programfel" + +#: wt-status.c:249 +msgid "both deleted:" +msgstr "borttaget av bägge:" + +#: wt-status.c:250 +msgid "added by us:" +msgstr "tillagt av oss:" + +#: wt-status.c:251 +msgid "deleted by them:" +msgstr "borttaget av dem:" + +#: wt-status.c:252 +msgid "added by them:" +msgstr "tillagt av dem:" + +#: wt-status.c:253 +msgid "deleted by us:" +msgstr "borttaget av oss:" + +#: wt-status.c:254 +msgid "both added:" +msgstr "tillagt av bägge:" + +#: wt-status.c:255 +msgid "both modified:" +msgstr "ändrat av bägge:" + +#: wt-status.c:285 +msgid "new commits, " +msgstr "nya incheckningar, " + +#: wt-status.c:287 +msgid "modified content, " +msgstr "ändrat innehåll, " + +#: wt-status.c:289 +msgid "untracked content, " +msgstr "ospårat innehåll, " + +#: wt-status.c:303 +#, c-format +msgid "new file: %s" +msgstr "ny fil: %s" + +#: wt-status.c:306 +#, c-format +msgid "copied: %s -> %s" +msgstr "kopierad: %s -> %s" + +#: wt-status.c:309 +#, c-format +msgid "deleted: %s" +msgstr "borttagen: %s" + +#: wt-status.c:312 +#, c-format +msgid "modified: %s" +msgstr "ändrad: %s" + +#: wt-status.c:315 +#, c-format +msgid "renamed: %s -> %s" +msgstr "namnbyte: %s -> %s" + +#: wt-status.c:318 +#, c-format +msgid "typechange: %s" +msgstr "typbyte: %s" + +#: wt-status.c:321 +#, c-format +msgid "unknown: %s" +msgstr "okänd: %s" + +#: wt-status.c:324 +#, c-format +msgid "unmerged: %s" +msgstr "osammansl.: %s" + +#: wt-status.c:327 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "programfel: diff-status %c ej hanterad" + +#: wt-status.c:785 +msgid "You have unmerged paths." +msgstr "Du har ej sammanslagna sökvägar." + +#: wt-status.c:788 wt-status.c:912 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (rätta konflikter och kör \"git commit\")" + +#: wt-status.c:791 +msgid "All conflicts fixed but you are still merging." +msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." + +#: wt-status.c:794 +msgid " (use \"git commit\" to conclude merge)" +msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" + +#: wt-status.c:804 +msgid "You are in the middle of an am session." +msgstr "Du är i mitten av en körning av \"git am\"." + +#: wt-status.c:807 +msgid "The current patch is empty." +msgstr "Aktuell patch är tom." + +#: wt-status.c:811 +msgid " (fix conflicts and then run \"git am --resolved\")" +msgstr " (rätta konflikter och kör sedan \"git am --resolved\")" + +#: wt-status.c:813 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (använd \"git am --skip\" för att hoppa över patchen)" + +#: wt-status.c:815 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" + +#: wt-status.c:873 wt-status.c:883 +msgid "You are currently rebasing." +msgstr "Du håller på med en ombasering." + +#: wt-status.c:876 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" + +#: wt-status.c:878 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" + +#: wt-status.c:880 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" + +#: wt-status.c:886 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" + +#: wt-status.c:888 +msgid "You are currently splitting a commit during a rebase." +msgstr "Du håller på att dela upp en incheckning i en ombasering." + +#: wt-status.c:891 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" + +#: wt-status.c:893 +msgid "You are currently editing a commit during a rebase." +msgstr "Du håller på att redigera en incheckning under en ombasering." + +#: wt-status.c:896 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr "" +" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: git-gui.sh:1975 -msgid "File type changed, not staged" -msgstr "Filtyp ändrad, ej köade" +#: wt-status.c:898 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: git-gui.sh:1976 -msgid "File type changed, staged" -msgstr "Filtyp ändrad, köade" +#: wt-status.c:908 +msgid "You are currently cherry-picking." +msgstr "Du håller på med en \"cherry-pick\"." -#: git-gui.sh:1978 -msgid "Untracked, not staged" -msgstr "Ej spårade, ej köade" +#: wt-status.c:915 +msgid " (all conflicts fixed: run \"git commit\")" +msgstr " (alla konflikter har rättats: kör \"git commit\")" -#: git-gui.sh:1983 -msgid "Missing" -msgstr "Saknade" +#: wt-status.c:924 +msgid "You are currently bisecting." +msgstr "Du håller på med en \"bisect\"." -#: git-gui.sh:1984 -msgid "Staged for removal" -msgstr "Köade för borttagning" +#: wt-status.c:927 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr "" +" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: git-gui.sh:1985 -msgid "Staged for removal, still present" -msgstr "Köade för borttagning, fortfarande närvarande" +#: wt-status.c:978 +msgid "On branch " +msgstr "På grenen " -#: git-gui.sh:1987 git-gui.sh:1988 git-gui.sh:1989 git-gui.sh:1990 -#: git-gui.sh:1991 git-gui.sh:1992 -msgid "Requires merge resolution" -msgstr "Kräver konflikthantering efter sammanslagning" +#: wt-status.c:985 +msgid "Not currently on any branch." +msgstr "Inte på någon gren för närvarande." -#: git-gui.sh:2027 -msgid "Starting gitk... please wait..." -msgstr "Startar gitk... vänta..." +#: wt-status.c:997 +msgid "Initial commit" +msgstr "Första incheckning" -#: git-gui.sh:2039 -msgid "Couldn't find gitk in PATH" -msgstr "Hittade inte gitk i PATH." +#: wt-status.c:1011 +msgid "Untracked files" +msgstr "Ospårade filer" -#: git-gui.sh:2098 -msgid "Couldn't find git gui in PATH" -msgstr "Hittade inte git gui i PATH." +#: wt-status.c:1013 +msgid "Ignored files" +msgstr "Ignorerade filer" -#: git-gui.sh:2515 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Arkiv" - -#: git-gui.sh:2516 -msgid "Edit" -msgstr "Redigera" - -#: git-gui.sh:2518 lib/choose_rev.tcl:566 -msgid "Branch" -msgstr "Gren" - -#: git-gui.sh:2521 lib/choose_rev.tcl:553 -msgid "Commit@@noun" -msgstr "Incheckning" - -#: git-gui.sh:2524 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Slå ihop" - -#: git-gui.sh:2525 lib/choose_rev.tcl:562 -msgid "Remote" -msgstr "Fjärrarkiv" - -#: git-gui.sh:2528 -msgid "Tools" -msgstr "Verktyg" - -#: git-gui.sh:2537 -msgid "Explore Working Copy" -msgstr "Utforska arbetskopia" - -#: git-gui.sh:2543 -msgid "Browse Current Branch's Files" -msgstr "Bläddra i grenens filer" - -#: git-gui.sh:2547 -msgid "Browse Branch Files..." -msgstr "Bläddra filer på gren..." - -#: git-gui.sh:2552 -msgid "Visualize Current Branch's History" -msgstr "Visualisera grenens historik" - -#: git-gui.sh:2556 -msgid "Visualize All Branch History" -msgstr "Visualisera alla grenars historik" - -#: git-gui.sh:2563 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Bläddra i filer för %s" - -#: git-gui.sh:2565 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Visualisera historik för %s" - -#: git-gui.sh:2570 lib/database.tcl:40 lib/database.tcl:66 -msgid "Database Statistics" -msgstr "Databasstatistik" - -#: git-gui.sh:2573 lib/database.tcl:33 -msgid "Compress Database" -msgstr "Komprimera databas" - -#: git-gui.sh:2576 -msgid "Verify Database" -msgstr "Verifiera databas" - -#: git-gui.sh:2583 git-gui.sh:2587 git-gui.sh:2591 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Skapa skrivbordsikon" - -#: git-gui.sh:2599 lib/choose_repository.tcl:188 lib/choose_repository.tcl:196 -msgid "Quit" -msgstr "Avsluta" - -#: git-gui.sh:2607 -msgid "Undo" -msgstr "Ångra" - -#: git-gui.sh:2610 -msgid "Redo" -msgstr "Gör om" - -#: git-gui.sh:2614 git-gui.sh:3190 -msgid "Cut" -msgstr "Klipp ut" - -#: git-gui.sh:2617 git-gui.sh:3193 git-gui.sh:3267 git-gui.sh:3340 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Kopiera" - -#: git-gui.sh:2620 git-gui.sh:3196 -msgid "Paste" -msgstr "Klistra in" - -#: git-gui.sh:2623 git-gui.sh:3199 lib/branch_delete.tcl:28 -#: lib/remote_branch_delete.tcl:39 -msgid "Delete" -msgstr "Ta bort" - -#: git-gui.sh:2627 git-gui.sh:3203 git-gui.sh:3344 lib/console.tcl:71 -msgid "Select All" -msgstr "Markera alla" - -#: git-gui.sh:2636 -msgid "Create..." -msgstr "Skapa..." - -#: git-gui.sh:2642 -msgid "Checkout..." -msgstr "Checka ut..." - -#: git-gui.sh:2648 -msgid "Rename..." -msgstr "Byt namn..." - -#: git-gui.sh:2653 -msgid "Delete..." -msgstr "Ta bort..." - -#: git-gui.sh:2658 -msgid "Reset..." -msgstr "Återställ..." - -#: git-gui.sh:2668 -msgid "Done" -msgstr "Färdig" - -#: git-gui.sh:2670 -msgid "Commit@@verb" -msgstr "Checka in" - -#: git-gui.sh:2679 git-gui.sh:3131 -msgid "New Commit" -msgstr "Ny incheckning" - -#: git-gui.sh:2687 git-gui.sh:3138 -msgid "Amend Last Commit" -msgstr "Lägg till föregående incheckning" - -#: git-gui.sh:2697 git-gui.sh:3092 lib/remote_branch_delete.tcl:101 -msgid "Rescan" -msgstr "Sök på nytt" - -#: git-gui.sh:2703 -msgid "Stage To Commit" -msgstr "Köa för incheckning" +# %s är nästa sträng eller tom. +#: wt-status.c:1015 +#, c-format +msgid "Untracked files not listed%s" +msgstr "Ospårade filer visas ej%s" -#: git-gui.sh:2709 -msgid "Stage Changed Files To Commit" -msgstr "Köa ändrade filer för incheckning" +#: wt-status.c:1017 +msgid " (use -u option to show untracked files)" +msgstr " (använd flaggan -u för att visa ospårade filer)" -#: git-gui.sh:2715 -msgid "Unstage From Commit" -msgstr "Ta bort från incheckningskö" +#: wt-status.c:1023 +msgid "No changes" +msgstr "Inga ändringar" -#: git-gui.sh:2721 lib/index.tcl:415 -msgid "Revert Changes" -msgstr "Återställ ändringar" +#: wt-status.c:1028 +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "" +"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" +"\")\n" -#: git-gui.sh:2729 git-gui.sh:3391 git-gui.sh:3422 -msgid "Show Less Context" -msgstr "Visa mindre sammanhang" +#: wt-status.c:1031 +#, c-format +msgid "no changes added to commit\n" +msgstr "inga ändringar att checka in\n" -#: git-gui.sh:2733 git-gui.sh:3395 git-gui.sh:3426 -msgid "Show More Context" -msgstr "Visa mer sammanhang" +#: wt-status.c:1034 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" +"inget köat för incheckning, men ospårade filer finns (spåra med \"git add" +"\")\n" + +#: wt-status.c:1037 +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "inget köat för incheckning, men ospårade filer finns\n" + +#: wt-status.c:1040 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" + +#: wt-status.c:1043 wt-status.c:1048 +#, c-format +msgid "nothing to commit\n" +msgstr "inget att checka in\n" + +#: wt-status.c:1046 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" + +#: wt-status.c:1050 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "inget att checka in, arbetskatalogen ren\n" + +#: wt-status.c:1158 +msgid "HEAD (no branch)" +msgstr "HEAD (ingen gren)" + +#: wt-status.c:1164 +msgid "Initial commit on " +msgstr "Första incheckning på " + +#: wt-status.c:1179 +msgid "behind " +msgstr "efter " + +#: wt-status.c:1182 wt-status.c:1185 +msgid "ahead " +msgstr "före " + +#: wt-status.c:1187 +msgid ", behind " +msgstr ", efter " + +#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "misslyckades ta bort länken \"%s\"" + +#: builtin/add.c:19 +msgid "git add [options] [--] <filepattern>..." +msgstr "git add [flaggor] [--] <filmönster>..." + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "diff-status %c förväntades inte" + +#: builtin/add.c:67 builtin/commit.c:230 +msgid "updating files failed" +msgstr "misslyckades uppdatera filer" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "ta bort \"%s\"\n" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" + +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "\"%s\" är på andra sidan av en symbolisk länk" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "Kunde inte läsa indexet" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Kunde inte öppna \"%s\" för skrivning" + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "Kunde inte skriva patch" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "Kunde inte ta status på \"%s\"" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "Tom patch. Avbryter." + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "Kunde inte tillämpa \"%s\"" + +#: builtin/add.c:313 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" + +#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 +#: builtin/rm.c:133 +msgid "dry run" +msgstr "testkörning" + +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1154 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477 +#: builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "var pratsam" + +#: builtin/add.c:322 +msgid "interactive picking" +msgstr "plocka interaktivt" + +#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248 +msgid "select hunks interactively" +msgstr "välj stycken interaktivt" + +#: builtin/add.c:324 +msgid "edit current diff and apply" +msgstr "redigera aktuell diff och applicera" + +#: builtin/add.c:325 +msgid "allow adding otherwise ignored files" +msgstr "tillåt lägga till annars ignorerade filer" + +#: builtin/add.c:326 +msgid "update tracked files" +msgstr "uppdatera spårade filer" + +#: builtin/add.c:327 +msgid "record only the fact that the path will be added later" +msgstr "registrera endast att sökvägen kommer läggas till senare" + +#: builtin/add.c:328 +msgid "add changes from all tracked and untracked files" +msgstr "lägg till ändringar från alla spårade och ospårade filer" + +#: builtin/add.c:329 +msgid "don't add, only refresh the index" +msgstr "lägg inte till, uppdatera endast indexet" + +#: builtin/add.c:330 +msgid "just skip files which cannot be added because of errors" +msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" + +#: builtin/add.c:331 +msgid "check if - even missing - files are ignored in dry run" +msgstr "se om - även saknade - filer ignoreras i testkörning" + +#: builtin/add.c:353 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Använd -f om du verkligen vill lägga till dem.\n" + +#: builtin/add.c:354 +msgid "no files added" +msgstr "inga filer har lagts till" + +#: builtin/add.c:360 +msgid "adding files failed" +msgstr "misslyckades lägga till filer" + +#: builtin/add.c:392 +msgid "-A and -u are mutually incompatible" +msgstr "-A och -u är ömsesidigt inkompatibla" + +#: builtin/add.c:394 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" + +#: builtin/add.c:414 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Inget angivet, inget tillagt.\n" + +#: builtin/add.c:415 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Kanske menade du att skriva \"git add .\"?\n" + +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:290 builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "indexfilen trasig" + +#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "Kunde inte skriva ny indexfil" + +#: builtin/apply.c:57 +msgid "git apply [options] [<patch>...]" +msgstr "git apply [flaggor] [<patch>...]" + +#: builtin/apply.c:110 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "okänt alternativ för whitespace: \"%s\"" + +#: builtin/apply.c:125 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "okänt alternativ för ignore-whitespace: \"%s\"" + +#: builtin/apply.c:823 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" + +#: builtin/apply.c:832 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec returnerade %d för indata: %s" + +#: builtin/apply.c:913 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "kan inte hitta filnamn i patchen på rad %d" + +#: builtin/apply.c:945 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" + +#: builtin/apply.c:949 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" + +#: builtin/apply.c:950 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" + +#: builtin/apply.c:957 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" + +#: builtin/apply.c:1420 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: förväntade rad: %.*s" + +#: builtin/apply.c:1477 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "patch-fragment utan huvud på rad %d: %.*s" + +#: builtin/apply.c:1494 +#, 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] "" +"git-diff-huvudet saknar filnamnsinformation när %d ledande sökvägskomponent\n" +"tas bort (rad %d)" +msgstr[1] "" +"git-diff-huvudet saknar filnamnsinformation när %d ledande " +"sökvägskomponenter\n" +"tas bort (rad %d)" + +#: builtin/apply.c:1654 +msgid "new file depends on old contents" +msgstr "ny fil beror på gammalt innehåll" + +#: builtin/apply.c:1656 +msgid "deleted file still has contents" +msgstr "borttagen fil har fortfarande innehåll" + +#: builtin/apply.c:1682 +#, c-format +msgid "corrupt patch at line %d" +msgstr "trasig patch på rad %d" + +#: builtin/apply.c:1718 +#, c-format +msgid "new file %s depends on old contents" +msgstr "nya filen %s beror på gammalt innehåll" + +#: builtin/apply.c:1720 +#, c-format +msgid "deleted file %s still has contents" +msgstr "borttagna filen %s har fortfarande innehåll" + +#: builtin/apply.c:1723 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** varning: filen %s blir tom men har inte tagits bort" + +#: builtin/apply.c:1869 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "trasig binärpatch på rad %d: %.*s" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1898 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "binärpatchen på rad %d känns inte igen" + +#: builtin/apply.c:1984 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "patch med bara skräp på rad %d" + +#: builtin/apply.c:2074 +#, c-format +msgid "unable to read symlink %s" +msgstr "kunde inte läsa symboliska länken %s" + +#: builtin/apply.c:2078 +#, c-format +msgid "unable to open or read %s" +msgstr "kunde inte öppna eller läsa %s" + +#: builtin/apply.c:2149 +msgid "oops" +msgstr "hoppsan" + +#: builtin/apply.c:2671 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "felaktig inledning på rad: \"%c\"" + +#: builtin/apply.c:2789 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." +msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." + +#: builtin/apply.c:2801 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" + +#: builtin/apply.c:2807 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"vid sökning efter:\n" +"%.*s" + +#: builtin/apply.c:2826 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "saknar binära patchdata för \"%s\"" + +#: builtin/apply.c:2929 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "binärpatchen kan inte tillämpas på \"%s\"" + +#: builtin/apply.c:2935 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" + +#: builtin/apply.c:2956 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "patch misslyckades: %s:%ld" + +#: builtin/apply.c:3078 +#, c-format +msgid "cannot checkout %s" +msgstr "kan inte checka ut %s" + +#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#, c-format +msgid "read of %s failed" +msgstr "misslyckades läsa %s" + +#: builtin/apply.c:3156 builtin/apply.c:3378 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "sökvägen %s har ändrat namn/tagits bort" + +#: builtin/apply.c:3237 builtin/apply.c:3392 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: finns inte i indexet" + +#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: builtin/apply.c:3246 builtin/apply.c:3400 +#, c-format +msgid "%s: does not match index" +msgstr "%s: motsvarar inte indexet" + +#: builtin/apply.c:3348 +msgid "removal patch leaves file contents" +msgstr "patch för borttagning lämnar kvar filinnehåll" + +#: builtin/apply.c:3417 +#, c-format +msgid "%s: wrong type" +msgstr "%s: fel typ" + +#: builtin/apply.c:3419 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s har typen %o, förväntade %o" + +#: builtin/apply.c:3520 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: finns redan i indexet" + +#: builtin/apply.c:3523 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: finns redan i arbetskatalogen" + +#: builtin/apply.c:3543 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" + +#: builtin/apply.c:3548 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" + +#: builtin/apply.c:3556 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: patchen kan inte tillämpas" + +#: builtin/apply.c:3569 +#, c-format +msgid "Checking patch %s..." +msgstr "Kontrollerar patchen %s..." + +#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" + +#: builtin/apply.c:3767 +#, c-format +msgid "unable to remove %s from index" +msgstr "kan inte ta bort %s från indexet" + +#: builtin/apply.c:3795 +#, c-format +msgid "corrupt patch for subproject %s" +msgstr "trasig patch för underprojektet %s" + +#: builtin/apply.c:3799 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "kan inte ta status på nyligen skapade filen \"%s\"" + +#: builtin/apply.c:3804 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" + +#: builtin/apply.c:3807 builtin/apply.c:3915 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "kan inte lägga till cachepost för %s" + +#: builtin/apply.c:3840 +#, c-format +msgid "closing file '%s'" +msgstr "stänger filen \"%s\"" + +#: builtin/apply.c:3889 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "kan inte skriva filen \"%s\" läge %o" + +#: builtin/apply.c:3976 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Tillämpade patchen %s rent." + +#: builtin/apply.c:3984 +msgid "internal error" +msgstr "internt fel" + +#. Say this even without --verbose +#: builtin/apply.c:3987 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "Tillämpade patchen %%s med %d refuserad..." +msgstr[1] "Tillämpade patchen %%s med %d refuserade..." + +#: builtin/apply.c:3997 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "trunkerar .rej-filnamnet till %.*s.rej" + +#: builtin/apply.c:4018 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Stycke %d tillämpades rent." + +#: builtin/apply.c:4021 +#, c-format +msgid "Rejected hunk #%d." +msgstr "Refuserar stycke %d." + +#: builtin/apply.c:4171 +msgid "unrecognized input" +msgstr "indata känns inte igen" + +#: builtin/apply.c:4182 +msgid "unable to read index file" +msgstr "kan inte läsa indexfilen" + +#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/fetch.c:63 +msgid "path" +msgstr "sökväg" + +#: builtin/apply.c:4302 +msgid "don't apply changes matching the given path" +msgstr "tillämpa inte ändringar som motsvarar given sökväg" + +#: builtin/apply.c:4305 +msgid "apply changes matching the given path" +msgstr "tillämpa ändringar som motsvarar given sökväg" + +#: builtin/apply.c:4307 +msgid "num" +msgstr "antal" + +#: builtin/apply.c:4308 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" + +#: builtin/apply.c:4311 +msgid "ignore additions made by the patch" +msgstr "ignorera tillägg gjorda av patchen" + +#: builtin/apply.c:4313 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" + +#: builtin/apply.c:4317 +msgid "show number of added and deleted lines in decimal notation" +msgstr "visa antal tillagda och borttagna rader decimalt" + +#: builtin/apply.c:4319 +msgid "instead of applying the patch, output a summary for the input" +msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" + +#: builtin/apply.c:4321 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" + +#: builtin/apply.c:4323 +msgid "make sure the patch is applicable to the current index" +msgstr "se till att patchen kan tillämpas på aktuellt index" + +#: builtin/apply.c:4325 +msgid "apply a patch without touching the working tree" +msgstr "tillämpa en patch utan att röra arbetskatalogen" + +#: builtin/apply.c:4327 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" + +#: builtin/apply.c:4329 +msgid "attempt three-way merge if a patch does not apply" +msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" + +#: builtin/apply.c:4331 +msgid "build a temporary index based on embedded index information" +msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" + +#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +msgid "paths are separated with NUL character" +msgstr "sökvägar avdelas med NUL-tecken" + +#: builtin/apply.c:4336 +msgid "ensure at least <n> lines of context match" +msgstr "se till att åtminstone <n> rader sammanhang är lika" + +#: builtin/apply.c:4337 +msgid "action" +msgstr "åtgärd" + +#: builtin/apply.c:4338 +msgid "detect new or modified lines that have whitespace errors" +msgstr "detektera nya eller ändrade rader som har fel i blanktecken" + +#: builtin/apply.c:4341 builtin/apply.c:4344 +msgid "ignore changes in whitespace when finding context" +msgstr "ignorera ändringar i blanktecken för sammanhang" + +#: builtin/apply.c:4347 +msgid "apply the patch in reverse" +msgstr "tillämpa patchen baklänges" + +#: builtin/apply.c:4349 +msgid "don't expect at least one line of context" +msgstr "förvänta inte minst en rad sammanhang" + +#: builtin/apply.c:4351 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "lämna refuserade stycken i motsvarande *.rej-filer" + +#: builtin/apply.c:4353 +msgid "allow overlapping hunks" +msgstr "tillåt överlappande stycken" + +#: builtin/apply.c:4356 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" + +#: builtin/apply.c:4359 +msgid "do not trust the line counts in the hunk headers" +msgstr "lite inte på antalet linjer i styckehuvuden" + +#: builtin/apply.c:4361 +msgid "root" +msgstr "rot" + +#: builtin/apply.c:4362 +msgid "prepend <root> to all filenames" +msgstr "lägg till <rot> i alla filnamn" + +#: builtin/apply.c:4384 +msgid "--3way outside a repository" +msgstr "--3way utanför arkiv" + +#: builtin/apply.c:4392 +msgid "--index outside a repository" +msgstr "--index utanför arkiv" + +#: builtin/apply.c:4395 +msgid "--cached outside a repository" +msgstr "--cached utanför arkiv" + +#: builtin/apply.c:4411 +#, c-format +msgid "can't open patch '%s'" +msgstr "kan inte öppna patchen \"%s\"" + +#: builtin/apply.c:4425 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "undertryckte %d fel i blanksteg" +msgstr[1] "undertryckte %d fel i blanksteg" + +#: builtin/apply.c:4431 builtin/apply.c:4441 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d rad lägger till fel i blanksteg." +msgstr[1] "%d rader lägger till fel i blanksteg." + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "Kunde inte skapa arkivfilen \"%s\"" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "kunde inte omdirigera utdata" + +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" +msgstr "git archive: Fjärr utan URL" + +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive: förväntade ACK/NAK, fick EOF" + +#: builtin/archive.c:63 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:65 +#, c-format +msgid "remote error: %s" +msgstr "fjärrfel: %s" + +#: builtin/archive.c:66 +msgid "git archive: protocol error" +msgstr "git archive: protokollfel" + +#: builtin/archive.c:71 +msgid "git archive: expected a flush" +msgstr "git archive: förväntade en tömning (flush)" + +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "utför 'git bisect next'" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" + +#: builtin/blame.c:25 +msgid "git blame [options] [rev-opts] [rev] [--] file" +msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil" + +#: builtin/blame.c:30 builtin/shortlog.c:15 +msgid "[rev-opts] are documented in git-rev-list(1)" +msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)" + +#: builtin/blame.c:2373 +msgid "Show blame entries as we find them, incrementally" +msgstr "Visa klandringsposter när vi hittar dem, interaktivt" + +#: builtin/blame.c:2374 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" + +#: builtin/blame.c:2375 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" + +#: builtin/blame.c:2376 +msgid "Show work cost statistics" +msgstr "Visa statistik över arbetskostnad" + +#: builtin/blame.c:2377 +msgid "Show output score for blame entries" +msgstr "Visa utdatapoäng för klandringsposter" + +#: builtin/blame.c:2378 +msgid "Show original filename (Default: auto)" +msgstr "Visa originalfilnamn (Standard: auto)" + +#: builtin/blame.c:2379 +msgid "Show original linenumber (Default: off)" +msgstr "Visa ursprungligt radnummer (Standard: av)" + +#: builtin/blame.c:2380 +msgid "Show in a format designed for machine consumption" +msgstr "Visa i ett format avsett för maskinkonsumtion" + +#: builtin/blame.c:2381 +msgid "Show porcelain format with per-line commit information" +msgstr "Visa porslinsformat med per-rad-incheckningsinformation" + +#: builtin/blame.c:2382 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "Använd samma utdataläge som git-annotate (Standard: av)" + +#: builtin/blame.c:2383 +msgid "Show raw timestamp (Default: off)" +msgstr "Visa rå tidsstämpel (Standard: av)" -#: git-gui.sh:2740 git-gui.sh:3105 git-gui.sh:3214 -msgid "Sign Off" -msgstr "Skriv under" +#: builtin/blame.c:2384 +msgid "Show long commit SHA1 (Default: off)" +msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: git-gui.sh:2756 -msgid "Local Merge..." -msgstr "Lokal sammanslagning..." +#: builtin/blame.c:2385 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: git-gui.sh:2761 -msgid "Abort Merge..." -msgstr "Avbryt sammanslagning..." +#: builtin/blame.c:2386 +msgid "Show author email instead of name (Default: off)" +msgstr "Visa författarens e-post istället för namn (Standard: av)" -#: git-gui.sh:2773 git-gui.sh:2801 -msgid "Add..." -msgstr "Lägg till..." +#: builtin/blame.c:2387 +msgid "Ignore whitespace differences" +msgstr "Ignorera ändringar i blanksteg" -#: git-gui.sh:2777 -msgid "Push..." -msgstr "Sänd..." +#: builtin/blame.c:2388 +msgid "Spend extra cycles to find better match" +msgstr "Slösa extra cykler med att hitta bättre träff" -#: git-gui.sh:2781 -msgid "Delete Branch..." -msgstr "Ta bort gren..." +#: builtin/blame.c:2389 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" -#: git-gui.sh:2791 git-gui.sh:3373 -msgid "Options..." -msgstr "Alternativ..." +#: builtin/blame.c:2390 +msgid "Use <file>'s contents as the final image" +msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: git-gui.sh:2802 -msgid "Remove..." -msgstr "Ta bort..." +#: builtin/blame.c:2391 builtin/blame.c:2392 +msgid "score" +msgstr "poäng" -#: git-gui.sh:2811 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Hjälp" +#: builtin/blame.c:2391 +msgid "Find line copies within and across files" +msgstr "Hitta kopierade rader inuti och mellan filer" -#: git-gui.sh:2815 git-gui.sh:2819 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "Om %s" +#: builtin/blame.c:2392 +msgid "Find line movements within and across files" +msgstr "Hitta flyttade rader inuti och mellan filer" -#: git-gui.sh:2843 -msgid "Online Documentation" -msgstr "Webbdokumentation" +#: builtin/blame.c:2393 +msgid "n,m" +msgstr "n,m" -#: git-gui.sh:2846 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "Visa SSH-nyckel" +#: builtin/blame.c:2393 +msgid "Process only line range n,m, counting from 1" +msgstr "Behandla endast radintervallet n,m, med början på 1" -#: git-gui.sh:2965 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"ödesdigert: kunde inte ta status på sökvägen %s: Fil eller katalog saknas" +#: builtin/branch.c:23 +msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [flaggor] [-r | -a] [--merged | --no-merged]" -#: git-gui.sh:2997 -msgid "Current Branch:" -msgstr "Aktuell gren:" +#: builtin/branch.c:24 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgstr "git branch [flaggor] [-l] [-f] <grennamn> [<startpunkt>]" -#: git-gui.sh:3023 -msgid "Staged Changes (Will Commit)" -msgstr "Köade ändringar (kommer att checkas in)" +#: builtin/branch.c:25 +msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..." -#: git-gui.sh:3043 -msgid "Unstaged Changes" -msgstr "Oköade ändringar" +#: builtin/branch.c:26 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgstr "git branch [flaggor] (-m | -M) [<gammal_gren>] <ny_gren>" -#: git-gui.sh:3098 -msgid "Stage Changed" -msgstr "Köa ändrade" +#: builtin/branch.c:145 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" +"tar bort grenen \"%s\" som har slagits ihop med\n" +" \"%s\", men ännu inte slagits ihop med HEAD." -#: git-gui.sh:3117 lib/transport.tcl:107 lib/transport.tcl:196 -msgid "Push" -msgstr "Sänd" +#: 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 "" +"tar inte bort grenen \"%s\" som inte har slagits ihop med\n" +" \"%s\", trots att den har slagits ihop med HEAD." + +#: builtin/branch.c:181 +msgid "cannot use -a with -d" +msgstr "kan inte ange -a med -d" + +#: builtin/branch.c:187 +msgid "Couldn't look up commit object for HEAD" +msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" + +#: builtin/branch.c:192 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande." + +#: builtin/branch.c:203 +#, c-format +msgid "remote branch '%s' not found." +msgstr "fjärrgrenen \"%s\" hittades inte." + +#: builtin/branch.c:204 +#, c-format +msgid "branch '%s' not found." +msgstr "grenen \"%s\" hittades inte." + +#: builtin/branch.c:211 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" + +#: builtin/branch.c:217 +#, 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 "" +"Grenen \"%s\" har inte slagits samman i sin helhet.\n" +"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." + +#: builtin/branch.c:226 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "Fel vid borttagning av fjärrgrenen \"%s\"" + +#: builtin/branch.c:227 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "Fel vid borttagning av grenen \"%s\"" + +#: builtin/branch.c:234 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "Tog bort fjärrgrenen %s (var %s).\n" + +#: builtin/branch.c:235 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Tog bort grenen %s (var %s).\n" + +#: builtin/branch.c:240 +msgid "Update of config-file failed" +msgstr "Misslyckades uppdatera konfigurationsfil" + +#: builtin/branch.c:338 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "grenen \"%s\" pekar inte på en incheckning" + +#: builtin/branch.c:410 +#, c-format +msgid "[%s: behind %d]" +msgstr "[%s: bakom %d] " + +#: builtin/branch.c:412 +#, c-format +msgid "[behind %d]" +msgstr "[bakom %d] " + +#: builtin/branch.c:416 +#, c-format +msgid "[%s: ahead %d]" +msgstr "[%s: före %d] " + +#: builtin/branch.c:418 +#, c-format +msgid "[ahead %d]" +msgstr "[före %d] " + +#: builtin/branch.c:421 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "[%s: före %d, bakom %d] " + +#: builtin/branch.c:424 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "[före %d, bakom %d] " + +#: builtin/branch.c:537 +msgid "(no branch)" +msgstr "(ingen gren)" + +#: builtin/branch.c:602 +msgid "some refs could not be read" +msgstr "vissa referenser kunde inte läsas" + +#: builtin/branch.c:615 +msgid "cannot rename the current branch while not on any." +msgstr "" +"kunde inte byta namn på aktuell gren när du inte befinner dig på någon." + +#: builtin/branch.c:625 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Felaktigt namn på gren: \"%s\"" + +#: builtin/branch.c:640 +msgid "Branch rename failed" +msgstr "Misslyckades byta namn på gren" + +#: builtin/branch.c:644 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" + +#: builtin/branch.c:648 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" + +#: builtin/branch.c:655 +msgid "Branch is renamed, but update of config-file failed" +msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" + +#: builtin/branch.c:670 +#, c-format +msgid "malformed object name %s" +msgstr "felformat objektnamn %s" + +#: builtin/branch.c:694 +#, c-format +msgid "could not write branch description template: %s" +msgstr "kunde inte skriva grenbeskrivningsmall: %s" + +#: builtin/branch.c:724 +msgid "Generic options" +msgstr "Allmänna flaggor" + +#: builtin/branch.c:726 +msgid "show hash and subject, give twice for upstream branch" +msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" + +#: builtin/branch.c:727 +msgid "suppress informational messages" +msgstr "undertryck informationsmeddelanden" + +#: builtin/branch.c:728 +msgid "set up tracking mode (see git-pull(1))" +msgstr "ställ in spårningsläge (se git-pull(1))" + +#: builtin/branch.c:730 +msgid "change upstream info" +msgstr "ändra uppströmsinformation" + +#: builtin/branch.c:734 +msgid "use colored output" +msgstr "använd färgad utdata" + +#: builtin/branch.c:735 +msgid "act on remote-tracking branches" +msgstr "arbeta på fjärrspårande grenar" + +#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765 +#: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363 +#: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470 +msgid "commit" +msgstr "incheckning" + +#: builtin/branch.c:739 builtin/branch.c:745 +msgid "print only branches that contain the commit" +msgstr "visa endast grenar som innehåller incheckningen" + +#: builtin/branch.c:751 +msgid "Specific git-branch actions:" +msgstr "Specifika git-branch-åtgärder:" + +#: builtin/branch.c:752 +msgid "list both remote-tracking and local branches" +msgstr "visa både fjärrspårande och lokala grenar" + +#: builtin/branch.c:754 +msgid "delete fully merged branch" +msgstr "ta bort helt sammanslagen gren" + +#: builtin/branch.c:755 +msgid "delete branch (even if not merged)" +msgstr "ta bort gren (även om inte helt sammanslagen)" + +#: builtin/branch.c:756 +msgid "move/rename a branch and its reflog" +msgstr "flytta/ta bort en gren och dess reflogg" + +#: builtin/branch.c:757 +msgid "move/rename a branch, even if target exists" +msgstr "flytta/ta bort en gren, även om målet finns" + +#: builtin/branch.c:758 +msgid "list branch names" +msgstr "lista namn på grenar" + +#: builtin/branch.c:759 +msgid "create the branch's reflog" +msgstr "skapa grenens reflogg" + +#: builtin/branch.c:761 +msgid "edit the description for the branch" +msgstr "redigera beskrivning för grenen" + +#: builtin/branch.c:762 +msgid "force creation (when already exists)" +msgstr "tvinga skapande (när den redan finns)" + +#: builtin/branch.c:765 +msgid "print only not merged branches" +msgstr "visa endast ej sammanslagna grenar" + +#: builtin/branch.c:771 +msgid "print only merged branches" +msgstr "visa endast sammanslagna grenar" + +#: builtin/branch.c:775 +msgid "list branches in columns" +msgstr "visa grenar i spalter" + +#: builtin/branch.c:788 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Misslyckades slå upp HEAD som giltig referens" + +#: builtin/branch.c:793 builtin/clone.c:561 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD hittades inte under refs/heads!" + +#: builtin/branch.c:813 +msgid "--column and --verbose are incompatible" +msgstr "--column och --verbose är inkompatibla" + +#: builtin/branch.c:864 +#, c-format +msgid "branch '%s' does not exist" +msgstr "grenen \"%s\" finns inte" + +#: builtin/branch.c:876 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: git-gui.sh:3152 -msgid "Initial Commit Message:" -msgstr "Inledande incheckningsmeddelande:" +#: builtin/branch.c:891 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" +"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " +"grennamn" -#: git-gui.sh:3153 -msgid "Amended Commit Message:" -msgstr "Utökat incheckningsmeddelande:" +#: builtin/branch.c:894 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" +msgstr "" +"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " +"eller --set-upstream-to\n" -#: git-gui.sh:3154 -msgid "Amended Initial Commit Message:" -msgstr "Utökat inledande incheckningsmeddelande:" +#: builtin/branch.c:911 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" +"\n" +"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" +"\n" -#: git-gui.sh:3155 -msgid "Amended Merge Commit Message:" -msgstr "Utökat incheckningsmeddelande för sammanslagning:" +#: builtin/branch.c:912 +#, c-format +msgid " git branch -d %s\n" +msgstr " git branch -d %s\n" -#: git-gui.sh:3156 -msgid "Merge Commit Message:" -msgstr "Incheckningsmeddelande för sammanslagning:" +#: builtin/branch.c:913 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" -#: git-gui.sh:3157 -msgid "Commit Message:" -msgstr "Incheckningsmeddelande:" +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s är okej\n" -#: git-gui.sh:3206 git-gui.sh:3348 lib/console.tcl:73 -msgid "Copy All" -msgstr "Kopiera alla" +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." -#: git-gui.sh:3230 lib/blame.tcl:104 -msgid "File:" -msgstr "Fil:" +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: git-gui.sh:3336 -msgid "Refresh" -msgstr "Uppdatera" +#: builtin/cat-file.c:247 +msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" +msgstr "git cat-file (-t|-s|-e|-p|<typ>|--textconv) <objekt>" -#: git-gui.sh:3357 -msgid "Decrease Font Size" -msgstr "Minska teckensnittsstorlek" +#: builtin/cat-file.c:248 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +msgstr "git cat-file (--batch|--batch-check) < <objektlista>" -#: git-gui.sh:3361 -msgid "Increase Font Size" -msgstr "Öka teckensnittsstorlek" +#: builtin/cat-file.c:266 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: git-gui.sh:3369 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Teckenkodning" +#: builtin/cat-file.c:267 +msgid "show object type" +msgstr "visa objekttyp" -#: git-gui.sh:3380 -msgid "Apply/Reverse Hunk" -msgstr "Använd/återställ del" +#: builtin/cat-file.c:268 +msgid "show object size" +msgstr "visa objektstorlek" + +#: builtin/cat-file.c:270 +msgid "exit with zero when there's no error" +msgstr "avsluta med noll när det inte uppstått något fel" + +#: builtin/cat-file.c:271 +msgid "pretty-print object's content" +msgstr "visa objektets innehåll snyggt" + +#: builtin/cat-file.c:273 +msgid "for blob objects, run textconv on object's content" +msgstr "för blob-objekt, kör textconv på objektets innehåll" + +#: builtin/cat-file.c:275 +msgid "show info and content of objects fed from the standard input" +msgstr "visa information och innehåll för objekt som listas på standard in" + +#: builtin/cat-file.c:278 +msgid "show info about objects fed from the standard input" +msgstr "visa information för objekt som listas på standard in" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgstr "git check-attr [-a | --all | attr...] [--] sökväg..." + +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <sökvägslista>" + +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" +msgstr "visa alla attribut som satts på filen" + +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" +msgstr "använd .gitattributes endast från indexet" + +#: builtin/check-attr.c:21 builtin/hash-object.c:75 +msgid "read file names from stdin" +msgstr "läs filnamn från standard in" + +#: builtin/check-attr.c:23 +msgid "input paths are terminated by a null character" +msgstr "sökvägar avdelas med null-tecken" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [options] [--] [<file>...]" +msgstr "git checkout-index [flaggor] [--] [<fil>...]" + +#: builtin/checkout-index.c:187 +msgid "check out all files in the index" +msgstr "checka ut alla filer i indexet" + +#: builtin/checkout-index.c:188 +msgid "force overwrite of existing files" +msgstr "tvinga överskrivning av befintliga filer" + +#: builtin/checkout-index.c:190 +msgid "no warning for existing files and files not in index" +msgstr "ingen varning för existerande filer och filer ej i indexet" + +#: builtin/checkout-index.c:192 +msgid "don't checkout new files" +msgstr "checka inte ut nya filer" + +#: builtin/checkout-index.c:194 +msgid "update stat information in the index file" +msgstr "uppdatera stat-information i indexfilen" + +#: builtin/checkout-index.c:200 +msgid "read list of paths from the standard input" +msgstr "läs listan över sökvägar från standard in" + +#: builtin/checkout-index.c:202 +msgid "write the content to temporary files" +msgstr "skriv innehåll till temporära filer" + +#: builtin/checkout-index.c:203 builtin/column.c:30 +msgid "string" +msgstr "sträng" + +#: builtin/checkout-index.c:204 +msgid "when creating files, prepend <string>" +msgstr "när filer skapas, lägg till <sträng> först" + +#: builtin/checkout-index.c:207 +msgid "copy out the files from named stage" +msgstr "kopiera ut filer från namngiven etapp" + +#: builtin/checkout.c:25 +msgid "git checkout [options] <branch>" +msgstr "git checkout [flaggor] <gren>" + +#: builtin/checkout.c:26 +msgid "git checkout [options] [<branch>] -- <file>..." +msgstr "git checkout [flaggor] [<gren>] -- <fil>..." + +#: builtin/checkout.c:116 builtin/checkout.c:149 +#, c-format +msgid "path '%s' does not have our version" +msgstr "sökvägen \"%s\" har inte vår version" + +#: builtin/checkout.c:118 builtin/checkout.c:151 +#, c-format +msgid "path '%s' does not have their version" +msgstr "sökvägen \"%s\" har inte deras version" + +#: builtin/checkout.c:134 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" + +#: builtin/checkout.c:178 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" + +#: builtin/checkout.c:195 +#, c-format +msgid "path '%s': cannot merge" +msgstr "sökväg \"%s\": kan inte slå ihop" + +#: builtin/checkout.c:212 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" + +#: 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 "\"%s\" kan inte användas vid uppdatering av sökvägar" + +#: builtin/checkout.c:248 builtin/checkout.c:251 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "\"%s\" kan inte användas med %s" + +#: builtin/checkout.c:254 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." + +#: builtin/checkout.c:265 builtin/checkout.c:426 +msgid "corrupt index file" +msgstr "indexfilen är trasig" + +#: builtin/checkout.c:295 builtin/checkout.c:302 +#, c-format +msgid "path '%s' is unmerged" +msgstr "sökvägen \"%s\" har inte slagits ihop" + +#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586 +#: builtin/merge.c:811 +msgid "unable to write new index file" +msgstr "kunde inte skriva ny indexfil" + +#: builtin/checkout.c:448 +msgid "you need to resolve your current index first" +msgstr "du måste lösa ditt befintliga index först" + +#: builtin/checkout.c:569 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "Kan inte skapa referenslog för \"%s\"\n" + +#: builtin/checkout.c:602 +msgid "HEAD is now at" +msgstr "HEAD är nu på" + +#: builtin/checkout.c:609 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Återställ gren \"%s\"\n" + +#: builtin/checkout.c:612 +#, c-format +msgid "Already on '%s'\n" +msgstr "Redan på \"%s\"\n" + +#: builtin/checkout.c:616 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Växlade till och nollställde grenen \"%s\"\n" + +#: builtin/checkout.c:618 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Växlade till en ny gren \"%s\"\n" + +#: builtin/checkout.c:620 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Växlade till grenen \"%s\"\n" + +#: builtin/checkout.c:676 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... och %d till.\n" + +#. 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] "" +"Varning: du lämnar %d incheckning bakom dig som inte är ansluten till\n" +"någon av dina grenar:\n" +"\n" +"%s\n" +msgstr[1] "" +"Varning: du lämnar %d incheckningar bakom dig som inte är ansluta till\n" +"någon av dina grenar:\n" +"\n" +"%s\n" -#: git-gui.sh:3385 -msgid "Apply/Reverse Line" -msgstr "Använd/återställ rad" +#: 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 "" +"Om du vill behålla dem genom att skapa en ny gren är nu en bra tidpunkt\n" +"att göra så, med:\n" +"\n" +" git branch nytt_grennamn %s\n" +"\n" -#: git-gui.sh:3404 -msgid "Run Merge Tool" -msgstr "Starta verktyg för sammanslagning" +#: builtin/checkout.c:730 +msgid "internal error in revision walk" +msgstr "internt fel vid genomgång av revisioner (revision walk)" + +#: builtin/checkout.c:734 +msgid "Previous HEAD position was" +msgstr "Tidigare position för HEAD var" + +#: builtin/checkout.c:761 builtin/checkout.c:950 +msgid "You are on a branch yet to be born" +msgstr "Du är på en gren som ännu inte är född" + +#. case (1) +#: builtin/checkout.c:886 +#, c-format +msgid "invalid reference: %s" +msgstr "felaktig referens: %s" + +#. case (1): want a tree +#: builtin/checkout.c:925 +#, c-format +msgid "reference is not a tree: %s" +msgstr "referensen är inte ett träd: %s" + +#: builtin/checkout.c:961 +msgid "paths cannot be used with switching branches" +msgstr "sökvägar kan inte användas vid byte av gren" + +#: builtin/checkout.c:964 builtin/checkout.c:968 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "\"%s\" kan inte användas vid byte av gren" + +#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980 +#: builtin/checkout.c:983 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "\"%s\" kan inte användas med \"%s\"" + +#: builtin/checkout.c:988 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" + +#: builtin/checkout.c:1009 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "undertryck förloppsrapportering" + +#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89 +#: builtin/remote.c:169 builtin/remote.c:171 +msgid "branch" +msgstr "gren" + +#: builtin/checkout.c:1011 +msgid "create and checkout a new branch" +msgstr "skapa och checka ut en ny gren" + +#: builtin/checkout.c:1013 +msgid "create/reset and checkout a branch" +msgstr "skapa/nollställ och checka ut en gren" + +#: builtin/checkout.c:1014 +msgid "create reflog for new branch" +msgstr "skapa reflogg för ny gren" + +#: builtin/checkout.c:1015 +msgid "detach the HEAD at named commit" +msgstr "koppla från HEAD vid namngiven incheckning" + +#: builtin/checkout.c:1016 +msgid "set upstream info for new branch" +msgstr "sätt uppströmsinformation för ny gren" + +#: builtin/checkout.c:1018 +msgid "new branch" +msgstr "ny gren" + +#: builtin/checkout.c:1018 +msgid "new unparented branch" +msgstr "ny gren utan förälder" + +#: builtin/checkout.c:1019 +msgid "checkout our version for unmerged files" +msgstr "checka ut vår version för ej sammanslagna filer" + +#: builtin/checkout.c:1021 +msgid "checkout their version for unmerged files" +msgstr "checka ut deras version för ej sammanslagna filer" + +#: builtin/checkout.c:1023 +msgid "force checkout (throw away local modifications)" +msgstr "tvinga utcheckning (kasta bort lokala ändringar)" + +#: builtin/checkout.c:1024 +msgid "perform a 3-way merge with the new branch" +msgstr "utför en 3-vägssammanslagning för den nya grenen" + +#: builtin/checkout.c:1025 builtin/merge.c:215 +msgid "update ignored files (default)" +msgstr "uppdatera ignorerade filer (standard)" + +#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241 +msgid "style" +msgstr "stil" + +#: builtin/checkout.c:1027 +msgid "conflict style (merge or diff3)" +msgstr "konfliktstil (merge eller diff3)" + +#: builtin/checkout.c:1030 +msgid "second guess 'git checkout no-such-branch'" +msgstr "förutspå \"git checkout gren-saknas\"" + +#: builtin/checkout.c:1054 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "-b, -B och --orphan är ömsesidigt uteslutande" + +#: builtin/checkout.c:1071 +msgid "--track needs a branch name" +msgstr "--track behöver ett namn på en gren" + +#: builtin/checkout.c:1078 +msgid "Missing branch name; try -b" +msgstr "Grennamn saknas; försök med -b" + +#: builtin/checkout.c:1113 +msgid "invalid path specification" +msgstr "felaktig sökvägsangivelse" + +#: builtin/checkout.c:1120 +#, 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 "" +"Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n" +"Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?" -#: git-gui.sh:3409 -msgid "Use Remote Version" -msgstr "Använd versionen från fjärrarkivet" +#: builtin/checkout.c:1125 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: git-gui.sh:3413 -msgid "Use Local Version" -msgstr "Använd lokala versionen" +#: builtin/checkout.c:1129 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" +"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" +"du checkar ut från indexet." -#: git-gui.sh:3417 -msgid "Revert To Base" -msgstr "Återställ till basversionen" +#: builtin/clean.c:19 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" +"git clean [-d] [-f] [-n] [-q] [-e <mönster>] [-x | -X] [--] <sökvägar>..." -#: git-gui.sh:3435 -msgid "Visualize These Changes In The Submodule" -msgstr "Visualisera ändringarna i undermodulen" +#: builtin/clean.c:51 +msgid "do not print names of files removed" +msgstr "skriv inte ut namn på borttagna filer" -#: git-gui.sh:3439 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Visualisera grenens historik i undermodulen" +#: builtin/clean.c:53 +msgid "force" +msgstr "tvinga" -#: git-gui.sh:3443 -msgid "Visualize All Branch History In The Submodule" -msgstr "Visualisera alla grenars historik i undermodulen" +#: builtin/clean.c:55 +msgid "remove whole directories" +msgstr "ta bort hela kataloger" -#: git-gui.sh:3448 -msgid "Start git gui In The Submodule" -msgstr "Starta git gui i undermodulen" +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199 +msgid "pattern" +msgstr "mönster" -#: git-gui.sh:3483 -msgid "Unstage Hunk From Commit" -msgstr "Ta bort del ur incheckningskö" +#: builtin/clean.c:57 +msgid "add <pattern> to ignore rules" +msgstr "lägg till <mönster> till ignoreringsregler" -#: git-gui.sh:3485 -msgid "Unstage Lines From Commit" -msgstr "Ta bort rader ur incheckningskö" +#: builtin/clean.c:58 +msgid "remove ignored files, too" +msgstr "ta även bort ignorerade filer" -#: git-gui.sh:3487 -msgid "Unstage Line From Commit" -msgstr "Ta bort rad ur incheckningskö" +#: builtin/clean.c:60 +msgid "remove only ignored files" +msgstr "ta endast bort ignorerade filer" -#: git-gui.sh:3490 -msgid "Stage Hunk For Commit" -msgstr "Ställ del i incheckningskö" +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "-x och -X kan inte användas samtidigt" -#: git-gui.sh:3492 -msgid "Stage Lines For Commit" -msgstr "Ställ rader i incheckningskö" +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" +"clean.requireForce satt till true, men varken -n eller -f angavs; vägrar " +"städa" -#: git-gui.sh:3494 -msgid "Stage Line For Commit" -msgstr "Ställ rad i incheckningskö" +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" +"clean.requireForce har standardvärdet true, men varken -n eller -f angavs; " +"vägrar städa" + +#: builtin/clean.c:155 builtin/clean.c:176 +#, c-format +msgid "Would remove %s\n" +msgstr "Skulle ta bort %s\n" + +#: builtin/clean.c:159 builtin/clean.c:179 +#, c-format +msgid "Removing %s\n" +msgstr "Tar bort %s\n" + +#: builtin/clean.c:162 builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" +msgstr "misslyckades ta bort %s" + +#: builtin/clean.c:166 +#, c-format +msgid "Would not remove %s\n" +msgstr "Skulle inte ta bort %s\n" + +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" +msgstr "Tar inte bort %s\n" + +#: builtin/clone.c:36 +msgid "git clone [options] [--] <repo> [<dir>]" +msgstr "git clone [flaggor] [--] <arkiv> [<kat>]" + +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 +#: builtin/push.c:399 +msgid "force progress reporting" +msgstr "tvinga förloppsrapportering" + +#: builtin/clone.c:66 +msgid "don't create a checkout" +msgstr "skapa inte någon utcheckning" + +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +msgid "create a bare repository" +msgstr "skapa ett naket (\"bare\") arkiv" + +#: builtin/clone.c:72 +msgid "create a mirror repository (implies bare)" +msgstr "skapa ett spegelarkiv (implicerar \"bare\")" + +#: builtin/clone.c:74 +msgid "to clone from a local repository" +msgstr "för att klona från ett lokalt arkiv" + +#: builtin/clone.c:76 +msgid "don't use local hardlinks, always copy" +msgstr "skapa inte lokala hårda länkar, kopiera alltid" + +#: builtin/clone.c:78 +msgid "setup as shared repository" +msgstr "skapa som ett delat arkiv" + +#: builtin/clone.c:80 builtin/clone.c:82 +msgid "initialize submodules in the clone" +msgstr "initiera undermoduler i klonen" + +#: builtin/clone.c:83 builtin/init-db.c:485 +msgid "template-directory" +msgstr "mallkatalog" + +#: builtin/clone.c:84 builtin/init-db.c:486 +msgid "directory from which templates will be used" +msgstr "katalog att använda mallar från" + +#: builtin/clone.c:86 +msgid "reference repository" +msgstr "referensarkiv" + +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "namn" + +#: builtin/clone.c:88 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" + +#: builtin/clone.c:90 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "checka ut <gren> istället för fjärrens HEAD" + +#: builtin/clone.c:92 +msgid "path to git-upload-pack on the remote" +msgstr "sökväg till git-upload-pack på fjärren" + +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:748 +msgid "depth" +msgstr "djup" + +#: builtin/clone.c:94 +msgid "create a shallow clone of that depth" +msgstr "skapa en grund klon på detta djup" + +#: builtin/clone.c:96 +msgid "clone only one branch, HEAD or --branch" +msgstr "klona endast en gren, HEAD eller --branch" + +#: builtin/clone.c:97 builtin/init-db.c:494 +msgid "gitdir" +msgstr "gitkat" + +#: builtin/clone.c:98 builtin/init-db.c:495 +msgid "separate git dir from working tree" +msgstr "separera gitkatalogen från arbetskatalogen" + +#: builtin/clone.c:99 +msgid "key=value" +msgstr "nyckel=värde" + +#: builtin/clone.c:100 +msgid "set config inside the new repository" +msgstr "ställ in konfiguration i det nya arkivet" + +#: builtin/clone.c:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "referensarkivet \"%s\" är inte en lokal katalog." + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "misslyckades skapa katalogen \"%s\"" + +#: builtin/clone.c:308 builtin/diff.c:77 +#, c-format +msgid "failed to stat '%s'" +msgstr "misslyckades ta status på \"%s\"" + +#: builtin/clone.c:310 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s finns och är ingen katalog" + +#: builtin/clone.c:324 +#, c-format +msgid "failed to stat %s\n" +msgstr "misslyckades ta status på %s\n" + +#: builtin/clone.c:346 +#, c-format +msgid "failed to create link '%s'" +msgstr "misslyckades skapa länken \"%s\"" + +#: builtin/clone.c:350 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "misslyckades kopiera filen till \"%s\"" + +#: builtin/clone.c:373 +#, c-format +msgid "done.\n" +msgstr "klart.\n" + +#: builtin/clone.c:443 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "Kunde inte hitta fjärrgrenen %s för att klona." + +#: builtin/clone.c:552 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" +"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" + +#: builtin/clone.c:690 +msgid "Too many arguments." +msgstr "För många argument." + +#: builtin/clone.c:694 +msgid "You must specify a repository to clone." +msgstr "Du måste ange ett arkiv att klona." + +#: builtin/clone.c:705 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "flaggorna --bare och --origin %s är inkompatibla." + +#: builtin/clone.c:719 +#, c-format +msgid "repository '%s' does not exist" +msgstr "arkivet \"%s\" finns inte" + +#: builtin/clone.c:724 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" + +#: builtin/clone.c:734 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." + +#: builtin/clone.c:744 +#, c-format +msgid "working tree '%s' already exists." +msgstr "arbetsträdet \"%s\" finns redan." + +#: builtin/clone.c:757 builtin/clone.c:771 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "kunde inte skapa inledande kataloger för \"%s\"" + +#: builtin/clone.c:760 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "kunde inte skapa arbetskatalogen \"%s\"" + +#: builtin/clone.c:779 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "Klonar till ett naket arkiv \"%s\"...\n" + +#: builtin/clone.c:781 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "Klonar till \"%s\"...\n" + +#: builtin/clone.c:823 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Vet inte hur man klonar %s" + +#: builtin/clone.c:872 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" + +#: builtin/clone.c:879 +msgid "You appear to have cloned an empty repository." +msgstr "Du verkar ha klonat ett tomt arkiv." + +#: builtin/column.c:9 +msgid "git column [options]" +msgstr "git column [flaggor]" + +#: builtin/column.c:26 +msgid "lookup config vars" +msgstr "slå upp konfigurationsvariabler" + +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" +msgstr "utseende att använda" + +#: builtin/column.c:29 +msgid "Maximum width" +msgstr "Maximal bredd" + +#: builtin/column.c:30 +msgid "Padding space on left border" +msgstr "Spaltfyllnad i vänsterkanten" + +#: builtin/column.c:31 +msgid "Padding space on right border" +msgstr "Spaltfyllnad i högerkanten" + +#: builtin/column.c:32 +msgid "Padding space between columns" +msgstr "Spaltfyllnad mellan spalter" + +#: builtin/column.c:51 +msgid "--command must be the first argument" +msgstr "--command måste vara första argument" + +#: builtin/commit.c:34 +msgid "git commit [options] [--] <filepattern>..." +msgstr "git commit [flaggor] [--] <filmöster>..." + +#: builtin/commit.c:39 +msgid "git status [options] [--] <filepattern>..." +msgstr "git status [flaggor] [--] <filmönster>..." + +#: 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 "" +"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n" +"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n" +"kan förhindra det här meddelandet genom att ställa dem explicit:\n" +"\n" +" git config --global user.name \"Ditt namn\"\n" +" git config --global user.email du@example.com\n" +"\n" +"När du gjort det kan du rätta identiteten som användes för den här\n" +"incheckningen med:\n" +"\n" +" git commit --amend --reset-author\n" -#: git-gui.sh:3519 -msgid "Initializing..." -msgstr "Initierar..." +#: 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 "" +"Du bad om att utöka den senaste incheckningen, men om du gör det\n" +"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n" +"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n" -#: git-gui.sh:3658 -#, tcl-format +#: builtin/commit.c:61 msgid "" -"Possible environment issues exist.\n" +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" +"If you wish to commit it anyway, use:\n" "\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" +" git commit --allow-empty\n" "\n" +"Otherwise, please use 'git reset'\n" msgstr "" -"Det finns möjliga problem med miljövariabler.\n" +"Den tidigare \"cherry-pick\":en är nu tom, kanske på grund av en löst\n" +"konflikt. Om du vill checka in den ändå använder du:\n" "\n" -"Följande miljövariabler kommer troligen att\n" -"ignoreras av alla Git-underprocesser som körs\n" -"av %s:\n" +" git commit --allow-empty\n" "\n" - -#: git-gui.sh:3687 +"Annars använder du \"git reset\"\n" + +#: builtin/commit.c:257 +msgid "failed to unpack HEAD tree object" +msgstr "misslyckades packa upp HEAD:s trädobjekt" + +#: builtin/commit.c:299 +msgid "unable to create temporary index" +msgstr "kunde inte skapa temporär indexfil" + +#: builtin/commit.c:305 +msgid "interactive add failed" +msgstr "interaktiv tilläggning misslyckades" + +#: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409 +msgid "unable to write new_index file" +msgstr "kunde inte skriva filen new_index" + +#: builtin/commit.c:390 +msgid "cannot do a partial commit during a merge." +msgstr "kan inte utföra en delvis incheckning under en sammanslagning." + +#: builtin/commit.c:392 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "kan inte utföra en delvis incheckning under en cherry-pick." + +#: builtin/commit.c:402 +msgid "cannot read the index" +msgstr "kan inte läsa indexet" + +#: builtin/commit.c:422 +msgid "unable to write temporary index file" +msgstr "kunde inte skriva temporär indexfil" + +#: builtin/commit.c:509 builtin/commit.c:515 +#, c-format +msgid "invalid commit: %s" +msgstr "felaktig incheckning: %s" + +#: builtin/commit.c:538 +msgid "malformed --author parameter" +msgstr "felformad \"--author\"-flagga" + +#: builtin/commit.c:558 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "Felaktig indragningssträng: \"%s\"" + +#: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952 +#, c-format +msgid "could not lookup commit %s" +msgstr "kunde inte slå upp incheckningen %s" + +#: builtin/commit.c:608 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(läser loggmeddelande från standard in)\n" + +#: builtin/commit.c:610 +msgid "could not read log from standard input" +msgstr "kunde inte läsa logg från standard in" + +#: builtin/commit.c:614 +#, c-format +msgid "could not read log file '%s'" +msgstr "kunde inte läsa loggfilen \"%s\"" + +#: builtin/commit.c:620 +msgid "commit has empty message" +msgstr "incheckningen har ett tomt meddelande" + +#: builtin/commit.c:636 +msgid "could not read MERGE_MSG" +msgstr "kunde inte läsa MERGE_MSG" + +#: builtin/commit.c:640 +msgid "could not read SQUASH_MSG" +msgstr "kunde inte läsa SQUASH_MSG" + +#: builtin/commit.c:644 +#, c-format +msgid "could not read '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: builtin/commit.c:705 +msgid "could not write commit template" +msgstr "kunde inte skriva incheckningsmall" + +#: builtin/commit.c:716 +#, c-format msgid "" "\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." +"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 "" "\n" -"Detta beror på ett känt problem med\n" -"Tcl-binären som följer med Cygwin." +"Det verkar som du checkar in en sammanslagning.\n" +"Om det inte stämmer tar du bort filen\n" +"\t%s\n" +"och försöker igen.\n" -#: git-gui.sh:3692 -#, tcl-format +#: builtin/commit.c:721 +#, c-format msgid "" "\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\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 "" "\n" -"\n" -"Du kan ersätta %s\n" -"med att lägga in värden för inställningarna\n" -"user.name och user.email i din personliga\n" -"~/.gitconfig-fil.\n" +"Det verkar som du checkar in en cherry-pick.\n" +"Om det inte stämmer tar du bort filen\n" +"\t%s\n" +"och försöker igen.\n" + +#: builtin/commit.c:733 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" +"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n" + +#: builtin/commit.c:738 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" +"med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" +"Ett tomt meddelande avbryter incheckningen.\n" + +#: builtin/commit.c:751 +#, c-format +msgid "%sAuthor: %s" +msgstr "%sFörfattare: %s" + +#: builtin/commit.c:758 +#, c-format +msgid "%sCommitter: %s" +msgstr "%sIncheckare: %s" + +#: builtin/commit.c:778 +msgid "Cannot read index" +msgstr "Kan inte läsa indexet" + +#: builtin/commit.c:815 +msgid "Error building trees" +msgstr "Fel vid byggande av träd" + +#: builtin/commit.c:830 builtin/tag.c:361 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" + +#: builtin/commit.c:927 +#, c-format +msgid "No existing author found with '%s'" +msgstr "Hittade ingen befintlig författare med \"%s\"" + +#: builtin/commit.c:942 builtin/commit.c:1142 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Ogiltigt läge för ospårade filer: \"%s\"" + +#: builtin/commit.c:982 +msgid "Using both --reset-author and --author does not make sense" +msgstr "Kan inte använda både --reset-author och --author" + +#: builtin/commit.c:993 +msgid "You have nothing to amend." +msgstr "Du har inget att utöka." + +#: builtin/commit.c:996 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." + +#: builtin/commit.c:998 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." + +#: builtin/commit.c:1001 +msgid "Options --squash and --fixup cannot be used together" +msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" + +#: builtin/commit.c:1011 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "Endast en av -c/-C/-F/--fixup kan användas." + +#: builtin/commit.c:1013 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." + +#: builtin/commit.c:1021 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author kan endast användas med -C, -c eller --amend." + +#: builtin/commit.c:1038 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" +"Endast en av --include/--only/--all/--interactive/--patch kan användas." + +#: builtin/commit.c:1040 +msgid "No paths with --include/--only does not make sense." +msgstr "Du måste ange sökvägar tillsammans med --include/--only." + +#: builtin/commit.c:1042 +msgid "Clever... amending the last one with dirty index." +msgstr "Smart... utöka den senaste med smutsigt index." + +#: builtin/commit.c:1044 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." + +#: builtin/commit.c:1054 builtin/tag.c:577 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Felaktigt städningsläge %s" + +#: builtin/commit.c:1059 +msgid "Paths with -a does not make sense." +msgstr "Kan inte ange sökvägar med -a." + +#: builtin/commit.c:1156 builtin/commit.c:1384 +msgid "show status concisely" +msgstr "vis koncis status" + +#: builtin/commit.c:1158 builtin/commit.c:1386 +msgid "show branch information" +msgstr "visa information om gren" + +#: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389 +msgid "machine-readable output" +msgstr "maskinläsbar utdata" + +#: builtin/commit.c:1163 builtin/commit.c:1390 +msgid "terminate entries with NUL" +msgstr "terminera poster med NUL" + +#: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636 +#: builtin/fast-export.c:639 builtin/tag.c:461 +msgid "mode" +msgstr "läge" + +#: builtin/commit.c:1166 builtin/commit.c:1393 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" + +#: builtin/commit.c:1169 +msgid "show ignored files" +msgstr "visa ignorerade filer" + +#: builtin/commit.c:1170 parse-options.h:151 +msgid "when" +msgstr "när" + +#: builtin/commit.c:1171 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " +"(Default: all)" + +#: builtin/commit.c:1173 +msgid "list untracked files in columns" +msgstr "visa ospårade filer i spalter" + +#: builtin/commit.c:1242 +msgid "couldn't look up newly created commit" +msgstr "kunde inte slå upp en precis skapad incheckning" + +#: builtin/commit.c:1244 +msgid "could not parse newly created commit" +msgstr "kunde inte tolka en precis skapad incheckning" + +#: builtin/commit.c:1285 +msgid "detached HEAD" +msgstr "frånkopplad HEAD" + +#: builtin/commit.c:1287 +msgid " (root-commit)" +msgstr " (rotincheckning)" + +#: builtin/commit.c:1354 +msgid "suppress summary after successful commit" +msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - ett grafiskt användargränssnitt för Git." +#: builtin/commit.c:1355 +msgid "show diff in commit message template" +msgstr "visa diff i mallen för incheckningsmeddelandet" -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Filvisare" +#: builtin/commit.c:1357 +msgid "Commit message options" +msgstr "Alternativ för incheckningsmeddelande" -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Incheckning:" +#: builtin/commit.c:1358 builtin/tag.c:459 +msgid "read message from file" +msgstr "läs meddelande från fil" -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Kopiera incheckning" +#: builtin/commit.c:1359 +msgid "author" +msgstr "författare" -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Sök text..." +#: builtin/commit.c:1359 +msgid "override author for commit" +msgstr "överstyr författare för incheckningen" -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Gör full kopieringsigenkänning" +#: builtin/commit.c:1360 builtin/gc.c:178 +msgid "date" +msgstr "datum" -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Visa historiksammanhang" +#: builtin/commit.c:1360 +msgid "override date for commit" +msgstr "överstyr datum för inchecknignen" -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Klandra föräldraincheckning" +#: builtin/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537 +#: builtin/notes.c:694 builtin/tag.c:457 +msgid "message" +msgstr "meddelande" -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Läser %s..." +#: builtin/commit.c:1361 +msgid "commit message" +msgstr "incheckningsmeddelande" -#: lib/blame.tcl:581 -msgid "Loading copy/move tracking annotations..." -msgstr "Läser annoteringar för kopiering/flyttning..." +#: builtin/commit.c:1362 +msgid "reuse and edit message from specified commit" +msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: lib/blame.tcl:601 -msgid "lines annotated" -msgstr "rader annoterade" +#: builtin/commit.c:1363 +msgid "reuse message from specified commit" +msgstr "återanvänd meddelande från angiven incheckning" -#: lib/blame.tcl:793 -msgid "Loading original location annotations..." -msgstr "Läser in annotering av originalplacering..." +#: builtin/commit.c:1364 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" +"använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: lib/blame.tcl:796 -msgid "Annotation complete." -msgstr "Annotering fullbordad." +#: builtin/commit.c:1365 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" +"använd autosquash-formaterat meddelande för att slå ihop med angiven " +"incheckning" -#: lib/blame.tcl:826 -msgid "Busy" -msgstr "Upptagen" +#: builtin/commit.c:1366 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: lib/blame.tcl:827 -msgid "Annotation process is already running." -msgstr "Annoteringsprocess körs redan." +#: builtin/commit.c:1367 builtin/log.c:1068 builtin/revert.c:109 +msgid "add Signed-off-by:" +msgstr "lägg till Signed-off-by:" -#: lib/blame.tcl:866 -msgid "Running thorough copy detection..." -msgstr "Kör grundlig kopieringsigenkänning..." +#: builtin/commit.c:1368 +msgid "use specified template file" +msgstr "använd angiven mallfil" + +#: builtin/commit.c:1369 +msgid "force edit of commit" +msgstr "tvinga redigering av incheckning" + +#: builtin/commit.c:1370 +msgid "default" +msgstr "standard" + +#: builtin/commit.c:1370 builtin/tag.c:462 +msgid "how to strip spaces and #comments from message" +msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" + +#: builtin/commit.c:1371 +msgid "include status in commit message template" +msgstr "inkludera status i mallen för incheckningsmeddelandet" + +#: builtin/commit.c:1372 builtin/merge.c:213 builtin/tag.c:463 +msgid "key id" +msgstr "nyckel-id" + +#: builtin/commit.c:1373 builtin/merge.c:214 +msgid "GPG sign commit" +msgstr "GPG-signera incheckning" + +#. end commit message options +#: builtin/commit.c:1376 +msgid "Commit contents options" +msgstr "Alternativ för incheckningens innehåll" + +#: builtin/commit.c:1377 +msgid "commit all changed files" +msgstr "checka in alla ändrade filer" + +#: builtin/commit.c:1378 +msgid "add specified files to index for commit" +msgstr "lägg till angivna filer till indexet för incheckning" + +#: builtin/commit.c:1379 +msgid "interactively add files" +msgstr "lägg till filer interaktivt" + +#: builtin/commit.c:1380 +msgid "interactively add changes" +msgstr "lägg till ändringar interaktivt" + +#: builtin/commit.c:1381 +msgid "commit only specified files" +msgstr "checka endast in angivna filer" + +#: builtin/commit.c:1382 +msgid "bypass pre-commit hook" +msgstr "förbigå pre-commit-krok" + +#: builtin/commit.c:1383 +msgid "show what would be committed" +msgstr "visa vad som skulle checkas in" + +#: builtin/commit.c:1391 +msgid "amend previous commit" +msgstr "lägg till föregående incheckning" + +#: builtin/commit.c:1392 +msgid "bypass post-rewrite hook" +msgstr "förbigå post-rewrite-krok" + +#: builtin/commit.c:1397 +msgid "ok to record an empty change" +msgstr "ok att registrera en tom ändring" + +#: builtin/commit.c:1400 +msgid "ok to record a change with an empty message" +msgstr "ok att registrera en ändring med tomt meddelande" + +#: builtin/commit.c:1432 +msgid "could not parse HEAD commit" +msgstr "kunde inte tolka HEAD:s incheckning" + +#: builtin/commit.c:1470 builtin/merge.c:508 +#, c-format +msgid "could not open '%s' for reading" +msgstr "kunde inte öppna \"%s\" för läsning" + +#: builtin/commit.c:1477 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Trasig MERGE_HEAD-fil (%s)" + +#: builtin/commit.c:1484 +msgid "could not read MERGE_MODE" +msgstr "kunde inte läsa MERGE_MODE" + +#: builtin/commit.c:1503 +#, c-format +msgid "could not read commit message: %s" +msgstr "kunde inte läsa incheckningsmeddelande: %s" + +#: builtin/commit.c:1517 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" + +#: builtin/commit.c:1522 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" + +#: builtin/commit.c:1537 builtin/merge.c:935 builtin/merge.c:960 +msgid "failed to write commit object" +msgstr "kunde inte skriva incheckningsobjekt" + +#: builtin/commit.c:1558 +msgid "cannot lock HEAD ref" +msgstr "kunde inte låsa HEAD-referens" + +#: builtin/commit.c:1562 +msgid "cannot update HEAD ref" +msgstr "kunde inte uppdatera HEAD-referens" + +#: builtin/commit.c:1573 +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 "" +"Arkivet har uppdaterats, men kunde inte skriva filen\n" +"new_index. Kontrollera att disken inte är full och\n" +"att kvoten inte har överskridits, och kör sedan\n" +"\"git reset HEAD\" för att återställa." -#: lib/blame.tcl:934 -msgid "Loading annotation..." -msgstr "Läser in annotering..." +#: builtin/config.c:7 +msgid "git config [options]" +msgstr "git config [flaggor]" -#: lib/blame.tcl:987 -msgid "Author:" -msgstr "Författare:" +#: builtin/config.c:52 +msgid "Config file location" +msgstr "Konfigurationsfilens plats" -#: lib/blame.tcl:991 -msgid "Committer:" -msgstr "Incheckare:" +#: builtin/config.c:53 +msgid "use global config file" +msgstr "använd global konfigurationsfil" -#: lib/blame.tcl:996 -msgid "Original File:" -msgstr "Ursprunglig fil:" +#: builtin/config.c:54 +msgid "use system config file" +msgstr "använd systemets konfigurationsfil" -#: lib/blame.tcl:1044 -msgid "Cannot find HEAD commit:" -msgstr "Hittar inte incheckning för HEAD:" +#: builtin/config.c:55 +msgid "use repository config file" +msgstr "använd arkivets konfigurationsfil" -#: lib/blame.tcl:1099 -msgid "Cannot find parent commit:" -msgstr "Hittar inte föräldraincheckning:" - -#: lib/blame.tcl:1114 -msgid "Unable to display parent" -msgstr "Kan inte visa förälder" +#: builtin/config.c:56 +msgid "use given config file" +msgstr "använd angiven konfigurationsil" -#: lib/blame.tcl:1115 lib/diff.tcl:323 -msgid "Error loading diff:" -msgstr "Fel vid inläsning av differens:" - -#: lib/blame.tcl:1255 -msgid "Originally By:" -msgstr "Ursprungligen av:" - -#: lib/blame.tcl:1261 -msgid "In File:" -msgstr "I filen:" - -#: lib/blame.tcl:1266 -msgid "Copied Or Moved Here By:" -msgstr "Kopierad eller flyttad hit av:" - -#: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21 -msgid "Checkout Branch" -msgstr "Checka ut gren" - -#: lib/branch_checkout.tcl:26 -msgid "Checkout" -msgstr "Checka ut" - -#: lib/branch_checkout.tcl:30 lib/branch_create.tcl:37 -#: lib/branch_delete.tcl:34 lib/branch_rename.tcl:32 lib/browser.tcl:286 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:45 lib/merge.tcl:172 -#: lib/option.tcl:127 lib/remote_add.tcl:34 lib/remote_branch_delete.tcl:43 -#: lib/tools_dlg.tcl:41 lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 -#: lib/transport.tcl:111 -msgid "Cancel" -msgstr "Avbryt" - -#: lib/branch_checkout.tcl:35 lib/browser.tcl:291 lib/tools_dlg.tcl:321 -msgid "Revision" -msgstr "Revision" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:69 lib/option.tcl:287 -msgid "Options" -msgstr "Alternativ" - -#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Hämta spårande gren" - -#: lib/branch_checkout.tcl:47 -msgid "Detach From Local Branch" -msgstr "Koppla bort från lokal gren" +#: builtin/config.c:57 +msgid "Action" +msgstr "Åtgärd" -#: lib/branch_create.tcl:23 -msgid "Create Branch" -msgstr "Skapa gren" +#: builtin/config.c:58 +msgid "get value: name [value-regex]" +msgstr "hämta värde: namn [värde-reguttr]" -#: lib/branch_create.tcl:28 -msgid "Create New Branch" -msgstr "Skapa ny gren" +#: builtin/config.c:59 +msgid "get all values: key [value-regex]" +msgstr "hämta alla värden: nyckel [värde-reguttr]" -#: lib/branch_create.tcl:33 lib/choose_repository.tcl:389 -msgid "Create" -msgstr "Skapa" +#: builtin/config.c:60 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" -#: lib/branch_create.tcl:42 -msgid "Branch Name" -msgstr "Namn på gren" +#: builtin/config.c:61 +msgid "replace all matching variables: name value [value_regex]" +msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" -#: lib/branch_create.tcl:44 lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 -msgid "Name:" -msgstr "Namn:" +#: builtin/config.c:62 +msgid "add a new variable: name value" +msgstr "lägg till en ny variabel: namn värde" -#: lib/branch_create.tcl:57 -msgid "Match Tracking Branch Name" -msgstr "Använd namn på spårad gren" +#: builtin/config.c:63 +msgid "remove a variable: name [value-regex]" +msgstr "ta bort en variabel: namn [värde-reguttr]" -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Inledande revision" +#: builtin/config.c:64 +msgid "remove all matches: name [value-regex]" +msgstr "ta bort alla träffar: namn [värde-reguttr]" -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Uppdatera befintlig gren:" +#: builtin/config.c:65 +msgid "rename section: old-name new-name" +msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Nej" +#: builtin/config.c:66 +msgid "remove a section: name" +msgstr "ta bort en sektion: namn" -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Endast snabbspolning" +#: builtin/config.c:67 +msgid "list all" +msgstr "visa alla" -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Återställ" +#: builtin/config.c:68 +msgid "open an editor" +msgstr "öppna textredigeringsprogram" -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Checka ut när skapad" +#: builtin/config.c:69 builtin/config.c:70 +msgid "slot" +msgstr "plats" -#: lib/branch_create.tcl:132 -msgid "Please select a tracking branch." -msgstr "Välj en gren att spåra." +#: builtin/config.c:69 +msgid "find the color configured: [default]" +msgstr "hitta den inställda färgen: [default]" -#: lib/branch_create.tcl:141 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Den spårade grenen %s är inte en gren i fjärrarkivet." +#: builtin/config.c:70 +msgid "find the color setting: [stdout-is-tty]" +msgstr "hitta färginställningen: [stdout-is-tty]" -#: lib/branch_create.tcl:154 lib/branch_rename.tcl:92 -msgid "Please supply a branch name." -msgstr "Ange ett namn för grenen." +#: builtin/config.c:71 +msgid "Type" +msgstr "Typ" -#: lib/branch_create.tcl:165 lib/branch_rename.tcl:112 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "\"%s\" kan inte användas som namn på grenen." +#: builtin/config.c:72 +msgid "value is \"true\" or \"false\"" +msgstr "värdet är \"true\" eller \"false\"" -#: lib/branch_delete.tcl:16 -msgid "Delete Branch" -msgstr "Ta bort gren" +#: builtin/config.c:73 +msgid "value is decimal number" +msgstr "värdet är ett decimalt tal" -#: lib/branch_delete.tcl:21 -msgid "Delete Local Branch" -msgstr "Ta bort lokal gren" +#: builtin/config.c:74 +msgid "value is --bool or --int" +msgstr "värdet är --bool eller --int" -#: lib/branch_delete.tcl:39 -msgid "Local Branches" -msgstr "Lokala grenar" +#: builtin/config.c:75 +msgid "value is a path (file or directory name)" +msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: lib/branch_delete.tcl:51 -msgid "Delete Only If Merged Into" -msgstr "Ta bara bort om sammanslagen med" +#: builtin/config.c:76 +msgid "Other" +msgstr "Andra" + +#: builtin/config.c:77 +msgid "terminate values with NUL byte" +msgstr "terminera värden med NUL-byte" + +#: builtin/config.c:78 +msgid "respect include directives on lookup" +msgstr "respektera inkluderingsdirektiv vid uppslag" + +#: builtin/count-objects.c:69 +msgid "git count-objects [-v]" +msgstr "git count-objects [-v]" + +#: builtin/describe.c:15 +msgid "git describe [options] <committish>*" +msgstr "git describe [flaggor] <incheckning-igt>*" + +#: builtin/describe.c:16 +msgid "git describe [options] --dirty" +msgstr "git describe [flaggor] --dirty" + +#: builtin/describe.c:234 +#, c-format +msgid "annotated tag %s not available" +msgstr "den annoterade taggen %s inte tillgänglig" + +#: builtin/describe.c:238 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "den annoterade taggen %s har inget inbäddat namn" + +#: builtin/describe.c:240 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "taggen \"%s\" är i verkligheten \"%s\" här" + +#: builtin/describe.c:267 +#, c-format +msgid "Not a valid object name %s" +msgstr "Objektnamnet är inte giltigt: %s" + +#: builtin/describe.c:270 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s är inte ett giltigt \"%s\"-objekt" + +#: builtin/describe.c:287 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "ingen tagg motsvarar \"%s\" exakt" + +#: builtin/describe.c:289 +#, c-format +msgid "searching to describe %s\n" +msgstr "söker för att beskriva %s\n" + +#: builtin/describe.c:329 +#, c-format +msgid "finished search at %s\n" +msgstr "avslutade sökning på %s\n" + +#: builtin/describe.c:353 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"Inga annoterade taggar kan beskriva \"%s\".\n" +"Det finns dock oannoterade taggar: testa --tags." -#: lib/branch_delete.tcl:53 lib/remote_branch_delete.tcl:120 -msgid "Always (Do not perform merge checks)" -msgstr "Alltid (utför inte sammanslagningstest)" +#: builtin/describe.c:357 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"Inga taggar kan beskriva \"%s\".\n" +"Testa --always, eller skapa några taggar." -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Följande grenar är inte till fullo sammanslagna med %s:" +#: builtin/describe.c:378 +#, c-format +msgid "traversed %lu commits\n" +msgstr "traverserade %lu incheckningar\n" -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:218 +#: builtin/describe.c:381 +#, c-format msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" msgstr "" -"Det kan vara svårt att återställa borttagna grenar.\n" -"\n" -"Ta bort de valda grenarna?" +"mer än %i taggar hittades; listar de %i senaste\n" +"gav upp sökningen vid %s\n" + +#: builtin/describe.c:403 +msgid "find the tag that comes after the commit" +msgstr "hitta taggen som kommer efter incheckningen" + +#: builtin/describe.c:404 +msgid "debug search strategy on stderr" +msgstr "felsök sökstrategin på standard fel" + +#: builtin/describe.c:405 +msgid "use any ref in .git/refs" +msgstr "använd alla referenser i .git/refs" + +#: builtin/describe.c:406 +msgid "use any tag in .git/refs/tags" +msgstr "använd alla taggar i .git/refs/tags" + +#: builtin/describe.c:407 +msgid "always use long format" +msgstr "använd alltid långt format" + +#: builtin/describe.c:410 +msgid "only output exact matches" +msgstr "skriv endast ut exakta träffar" + +#: builtin/describe.c:412 +msgid "consider <n> most recent tags (default: 10)" +msgstr "överväg de <n> nyaste taggarna (standard: 10)" + +#: builtin/describe.c:414 +msgid "only consider tags matching <pattern>" +msgstr "överväg endast taggar som motsvarar <mönster>" + +#: builtin/describe.c:416 builtin/name-rev.c:238 +msgid "show abbreviated commit object as fallback" +msgstr "visa förkortade incheckningsobjekt som standard" + +#: builtin/describe.c:417 +msgid "mark" +msgstr "märke" + +#: builtin/describe.c:418 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" + +#: builtin/describe.c:436 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long är inkompatibel med --abbrev=0" + +#: builtin/describe.c:462 +msgid "No names found, cannot describe anything." +msgstr "Inga namn hittades, kan inte beskriva något." + +#: builtin/describe.c:482 +msgid "--dirty is incompatible with committishes" +msgstr "--dirty är inkompatibelt med \"committish\"-värden" + +#: builtin/diff.c:79 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "\"%s\": inte en normal fil eller symbolisk länk" + +#: builtin/diff.c:224 +#, c-format +msgid "invalid option: %s" +msgstr "ogiltig flagga: %s" + +#: builtin/diff.c:301 +msgid "Not a git repository" +msgstr "Inte ett git-arkiv" + +#: builtin/diff.c:344 +#, c-format +msgid "invalid object '%s' given." +msgstr "objektet \"%s\" som angavs är felaktigt." + +#: builtin/diff.c:349 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "mer än %d träd angavs: \"%s\"" + +#: builtin/diff.c:359 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "mer än två blobbar angavs: \"%s\"" + +#: builtin/diff.c:367 +#, c-format +msgid "unhandled object '%s' given." +msgstr "ej hanterat objekt \"%s\" angavs." + +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" +msgstr "git fast-export [rev-list-flaggor]" + +#: builtin/fast-export.c:635 +msgid "show progress after <n> objects" +msgstr "visa förlopp efter <n> objekt" + +#: builtin/fast-export.c:637 +msgid "select handling of signed tags" +msgstr "välj hantering av signerade taggar" + +#: builtin/fast-export.c:640 +msgid "select handling of tags that tag filtered objects" +msgstr "välj hantering av taggar som har taggfiltrerade objekt" + +#: builtin/fast-export.c:643 +msgid "Dump marks to this file" +msgstr "Dump märken till filen" + +#: builtin/fast-export.c:645 +msgid "Import marks from this file" +msgstr "Importera märken från filen" + +#: builtin/fast-export.c:647 +msgid "Fake a tagger when tags lack one" +msgstr "Fejka taggare när taggen saknar en" + +#: builtin/fast-export.c:649 +msgid "Output full tree for each commit" +msgstr "Skriv ut hela trädet för varje incheckning" + +#: builtin/fast-export.c:651 +msgid "Use the done feature to terminate the stream" +msgstr "Använd done-funktionen för att avsluta strömmen" + +#: builtin/fast-export.c:652 +msgid "Skip output of blob data" +msgstr "Hoppa över skrivning av blob-data" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" + +#: builtin/fetch.c:21 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<flaggor>] <grupp>" + +#: builtin/fetch.c:22 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" + +#: builtin/fetch.c:23 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<flaggor>]" + +#: builtin/fetch.c:60 +msgid "fetch from all remotes" +msgstr "hämta från alla fjärrar" + +#: builtin/fetch.c:62 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" + +#: builtin/fetch.c:64 +msgid "path to upload pack on remote end" +msgstr "sökväg till upload pack på fjärren" + +#: builtin/fetch.c:65 +msgid "force overwrite of local branch" +msgstr "tvinga överskrivning av lokal gren" + +#: builtin/fetch.c:67 +msgid "fetch from multiple remotes" +msgstr "hämta från flera fjärrar" + +#: builtin/fetch.c:69 +msgid "fetch all tags and associated objects" +msgstr "hämta alla taggar och associerade objekt" + +#: builtin/fetch.c:71 +msgid "do not fetch all tags (--no-tags)" +msgstr "hämta inte alla taggar (--no-tags)" + +#: builtin/fetch.c:73 +msgid "prune remote-tracking branches no longer on remote" +msgstr "rensa fjärrspårande grenar ej längre på fjärren" + +#: builtin/fetch.c:74 +msgid "on-demand" +msgstr "on-demand" + +#: builtin/fetch.c:75 +msgid "control recursive fetching of submodules" +msgstr "styr rekursiv hämtning av undermoduler" + +#: builtin/fetch.c:79 +msgid "keep downloaded pack" +msgstr "behåll hämtade paket" + +#: builtin/fetch.c:81 +msgid "allow updating of HEAD ref" +msgstr "tillåt uppdatering av HEAD-referens" + +#: builtin/fetch.c:84 +msgid "deepen history of shallow clone" +msgstr "fördjupa historik för grund klon" + +#: builtin/fetch.c:85 builtin/log.c:1083 +msgid "dir" +msgstr "kat" + +#: builtin/fetch.c:86 +msgid "prepend this to submodule path output" +msgstr "lägg till i början av undermodulens sökvägsutdata" + +#: builtin/fetch.c:89 +msgid "default mode for recursion" +msgstr "standardläge för rekursion" + +#: builtin/fetch.c:201 +msgid "Couldn't find remote ref HEAD" +msgstr "Kunde inte hitta fjärr-referensen HEAD" + +#: builtin/fetch.c:254 +#, c-format +msgid "object %s not found" +msgstr "objektet %s hittades inte" + +#: builtin/fetch.c:259 +msgid "[up to date]" +msgstr "[àjour]" + +#: builtin/fetch.c:273 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" + +#: builtin/fetch.c:274 builtin/fetch.c:360 +msgid "[rejected]" +msgstr "[refuserad]" + +#: builtin/fetch.c:285 +msgid "[tag update]" +msgstr "[uppdaterad tagg]" + +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +msgid " (unable to update local ref)" +msgstr " (kunde inte uppdatera lokal ref)" + +#: builtin/fetch.c:305 +msgid "[new tag]" +msgstr "[ny tagg]" + +#: builtin/fetch.c:308 +msgid "[new branch]" +msgstr "[ny gren]" + +#: builtin/fetch.c:311 +msgid "[new ref]" +msgstr "[ny ref]" + +#: builtin/fetch.c:356 +msgid "unable to update local ref" +msgstr "kunde inte uppdatera lokal ref" + +#: builtin/fetch.c:356 +msgid "forced update" +msgstr "tvingad uppdatering" + +#: builtin/fetch.c:362 +msgid "(non-fast-forward)" +msgstr "(ej snabbspolad)" + +#: builtin/fetch.c:393 builtin/fetch.c:685 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "kan inte öppna %s: %s\n" + +#: builtin/fetch.c:402 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s sände inte alla nödvändiga objekt\n" + +#: builtin/fetch.c:488 +#, c-format +msgid "From %.*s\n" +msgstr "Från %.*s\n" + +#: builtin/fetch.c:499 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"vissa lokala referenser kunde inte uppdateras; testa att köra\n" +" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" + +#: builtin/fetch.c:549 +#, c-format +msgid " (%s will become dangling)" +msgstr " (%s kommer bli dinglande)" + +#: builtin/fetch.c:550 +#, c-format +msgid " (%s has become dangling)" +msgstr " (%s har blivit dinglande)" + +#: builtin/fetch.c:557 +msgid "[deleted]" +msgstr "[borttagen]" + +#: builtin/fetch.c:558 builtin/remote.c:1055 +msgid "(none)" +msgstr "(ingen)" + +#: builtin/fetch.c:675 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" + +#: builtin/fetch.c:709 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "Vet inte hur man hämtar från %s" + +#: builtin/fetch.c:786 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" + +#: builtin/fetch.c:789 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "Flaggan \"%s\" ignoreras för %s\n" + +#: builtin/fetch.c:891 +#, c-format +msgid "Fetching %s\n" +msgstr "Hämtar %s\n" + +#: builtin/fetch.c:893 builtin/remote.c:100 +#, c-format +msgid "Could not fetch %s" +msgstr "Kunde inte hämta %s" + +#: builtin/fetch.c:912 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" +"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" +"fjärrarkiv som nya incheckningar skall hämtas från." + +#: builtin/fetch.c:932 +msgid "You need to specify a tag name." +msgstr "Du måste ange namnet på en tagg." + +#: builtin/fetch.c:984 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all tar inte namnet på ett arkiv som argument" + +#: builtin/fetch.c:986 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all kan inte anges med referensspecifikationer" -#: lib/branch_delete.tcl:141 -#, tcl-format +#: builtin/fetch.c:997 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "Fjärren eller fjärrgruppen finns inte: %s" + +#: builtin/fetch.c:1005 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "Kan inte hämta från grupp och ange referensspecifikationer" + +#: builtin/fmt-merge-msg.c:13 +msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgstr "" +"git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]" + +#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:787 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "n" + +#: builtin/fmt-merge-msg.c:654 +msgid "populate log with at most <n> entries from shortlog" +msgstr "fyll i loggen med som mest <n> poster från shortlog" + +#: builtin/fmt-merge-msg.c:657 +msgid "alias for --log (deprecated)" +msgstr "alias för --log (avråds)" + +#: builtin/fmt-merge-msg.c:660 +msgid "text" +msgstr "text" + +#: builtin/fmt-merge-msg.c:661 +msgid "use <text> as start of message" +msgstr "inled meddelande med <text>" + +#: builtin/fmt-merge-msg.c:662 +msgid "file to read from" +msgstr "fil att läsa från" + +#: builtin/for-each-ref.c:979 +msgid "git for-each-ref [options] [<pattern>]" +msgstr "git for-each-ref [flaggor] [<mönster>]" + +#: builtin/for-each-ref.c:994 +msgid "quote placeholders suitably for shells" +msgstr "citera platshållare passande för skal" + +#: builtin/for-each-ref.c:996 +msgid "quote placeholders suitably for perl" +msgstr "citera platshållare passande för perl" + +#: builtin/for-each-ref.c:998 +msgid "quote placeholders suitably for python" +msgstr "citera platshållare passande för python" + +#: builtin/for-each-ref.c:1000 +msgid "quote placeholders suitably for tcl" +msgstr "citera platshållare passande för tcl" + +#: builtin/for-each-ref.c:1003 +msgid "show only <n> matched refs" +msgstr "visa endast <n> träffade refs" + +#: builtin/for-each-ref.c:1004 +msgid "format" +msgstr "format" + +#: builtin/for-each-ref.c:1004 +msgid "format to use for the output" +msgstr "format att använda för utdata" + +#: builtin/for-each-ref.c:1005 +msgid "key" +msgstr "nyckel" + +#: builtin/for-each-ref.c:1006 +msgid "field name to sort on" +msgstr "fältnamn att sortera på" + +#: builtin/fsck.c:608 +msgid "git fsck [options] [<object>...]" +msgstr "git fsck [flaggor] [<objekt>...]" + +#: builtin/fsck.c:614 +msgid "show unreachable objects" +msgstr "visa onåbara objekt" + +#: builtin/fsck.c:615 +msgid "show dangling objects" +msgstr "visa dinglande objekt" + +#: builtin/fsck.c:616 +msgid "report tags" +msgstr "rapportera taggar" + +#: builtin/fsck.c:617 +msgid "report root nodes" +msgstr "rapportera rotnoder" + +#: builtin/fsck.c:618 +msgid "make index objects head nodes" +msgstr "gör indexojekt till huvudnoder" + +#: builtin/fsck.c:619 +msgid "make reflogs head nodes (default)" +msgstr "gör refloggar till huvudnoder (standard)" + +#: builtin/fsck.c:620 +msgid "also consider packs and alternate objects" +msgstr "ta även hänsyn till paket och alternativa objekt" + +#: builtin/fsck.c:621 +msgid "enable more strict checking" +msgstr "aktivera striktare kontroll" + +#: builtin/fsck.c:623 +msgid "write dangling objects in .git/lost-found" +msgstr "skriv dinglande objekt i .git/lost-found" + +#: builtin/fsck.c:624 builtin/prune.c:134 +msgid "show progress" +msgstr "visa förlopp" + +#: builtin/gc.c:22 +msgid "git gc [options]" +msgstr "git gc [flaggor]" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "Felaktigt %s: \"%s\"" + +#: builtin/gc.c:90 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "tokigt lång objektkatalog %.*s" + +#: builtin/gc.c:179 +msgid "prune unreferenced objects" +msgstr "rensa ej refererade objekt" + +#: builtin/gc.c:181 +msgid "be more thorough (increased runtime)" +msgstr "var mer grundlig (ökar körtiden)" + +#: builtin/gc.c:182 +msgid "enable auto-gc mode" +msgstr "aktivera auto-gc-läge" + +#: builtin/gc.c:222 +#, c-format msgid "" -"Failed to delete branches:\n" -"%s" +"Auto packing the repository for optimum performance. You may also\n" +"run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" -"Kunde inte ta bort grenar:\n" -"%s" +"Packar arkivet automatiskt för optimal prestanda. Du kan även\n" +"köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n" + +#: builtin/gc.c:249 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" +"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " +"dem." + +#: builtin/grep.c:22 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" + +#: builtin/grep.c:217 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: misslyckades skapa tråd. %s" + +#: builtin/grep.c:455 +#, c-format +msgid "Failed to chdir: %s" +msgstr "Kunde inte byta katalog (chdir): %s" + +#: builtin/grep.c:531 builtin/grep.c:565 +#, c-format +msgid "unable to read tree (%s)" +msgstr "kunde inte läsa träd (%s)" + +#: builtin/grep.c:579 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "Kunde inte \"grep\" från objekt av typen %s" + +#: builtin/grep.c:637 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "flaggan \"%c\" antar ett numeriskt värde" + +#: builtin/grep.c:654 +#, c-format +msgid "cannot open '%s'" +msgstr "kan inte öppna \"%s\"" + +#: builtin/grep.c:729 +msgid "search in index instead of in the work tree" +msgstr "sök i indexet istället för i arbetskatalogen" + +#: builtin/grep.c:731 +msgid "find in contents not managed by git" +msgstr "sök i innehål som inte hanteras av git" + +#: builtin/grep.c:733 +msgid "search in both tracked and untracked files" +msgstr "sök i både spårade och ospårade filer" + +#: builtin/grep.c:735 +msgid "search also in ignored files" +msgstr "sök även i ignorerade filer" + +#: builtin/grep.c:738 +msgid "show non-matching lines" +msgstr "vis rader som inte träffas" + +#: builtin/grep.c:740 +msgid "case insensitive matching" +msgstr "skiftlägesokänslig sökning" + +#: builtin/grep.c:742 +msgid "match patterns only at word boundaries" +msgstr "matcha endast mönster vid ordgränser" + +#: builtin/grep.c:744 +msgid "process binary files as text" +msgstr "hantera binärfiler som text" + +#: builtin/grep.c:746 +msgid "don't match patterns in binary files" +msgstr "träffa inte mönster i binärfiler" + +#: builtin/grep.c:749 +msgid "descend at most <depth> levels" +msgstr "gå som mest ned <djup> nivåer" + +#: builtin/grep.c:753 +msgid "use extended POSIX regular expressions" +msgstr "använd utökade POSIX-reguljära uttryck" + +#: builtin/grep.c:756 +msgid "use basic POSIX regular expressions (default)" +msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" + +#: builtin/grep.c:759 +msgid "interpret patterns as fixed strings" +msgstr "tolka mönster som fixerade strängar" + +#: builtin/grep.c:762 +msgid "use Perl-compatible regular expressions" +msgstr "använd Perlkompatibla reguljära uttryck" + +#: builtin/grep.c:765 +msgid "show line numbers" +msgstr "visa radnummer" + +#: builtin/grep.c:766 +msgid "don't show filenames" +msgstr "visa inte filnamn" + +#: builtin/grep.c:767 +msgid "show filenames" +msgstr "visa filnamn" + +#: builtin/grep.c:769 +msgid "show filenames relative to top directory" +msgstr "visa filnamn relativa till toppkatalogen" + +#: builtin/grep.c:771 +msgid "show only filenames instead of matching lines" +msgstr "visa endast filnamn istället för träffade rader" + +#: builtin/grep.c:773 +msgid "synonym for --files-with-matches" +msgstr "synonym för --files-with-matches" + +#: builtin/grep.c:776 +msgid "show only the names of files without match" +msgstr "visa endast namn på filer utan träffar" + +#: builtin/grep.c:778 +msgid "print NUL after filenames" +msgstr "skriv NUL efter filnamn" + +#: builtin/grep.c:780 +msgid "show the number of matches instead of matching lines" +msgstr "visa antal träffar istället för träffade rader" + +#: builtin/grep.c:781 +msgid "highlight matches" +msgstr "ljusmarkera träffar" + +#: builtin/grep.c:783 +msgid "print empty line between matches from different files" +msgstr "skriv tomma rader mellan träffar från olika filer" + +#: builtin/grep.c:785 +msgid "show filename only once above matches from same file" +msgstr "visa filnamn endast en gång ovanför träffar från samma fil" + +#: builtin/grep.c:788 +msgid "show <n> context lines before and after matches" +msgstr "visa <n> rader sammanhang före och efter träffar" + +#: builtin/grep.c:791 +msgid "show <n> context lines before matches" +msgstr "visa <n> rader sammanhang före träffar" + +#: builtin/grep.c:793 +msgid "show <n> context lines after matches" +msgstr "visa <n> rader sammanhang efter träffar" + +#: builtin/grep.c:794 +msgid "shortcut for -C NUM" +msgstr "genväg för -C NUM" + +#: builtin/grep.c:797 +msgid "show a line with the function name before matches" +msgstr "visa en rad med funktionsnamnet före träffen" + +#: builtin/grep.c:799 +msgid "show the surrounding function" +msgstr "visa den omkringliggande funktionen" -#: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23 -msgid "Rename Branch" -msgstr "Byt namn på gren" - -#: lib/branch_rename.tcl:28 -msgid "Rename" -msgstr "Byt namn" - -#: lib/branch_rename.tcl:38 -msgid "Branch:" -msgstr "Gren:" +#: builtin/grep.c:802 +msgid "read patterns from file" +msgstr "läs mönster från fil" -#: lib/branch_rename.tcl:46 -msgid "New Name:" -msgstr "Nytt namn:" +#: builtin/grep.c:804 +msgid "match <pattern>" +msgstr "träffa <mönster>" -#: lib/branch_rename.tcl:81 -msgid "Please select a branch to rename." -msgstr "Välj en gren att byta namn på." +#: builtin/grep.c:806 +msgid "combine patterns specified with -e" +msgstr "kombinera mönster som anges med -e" -#: lib/branch_rename.tcl:102 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Grenen \"%s\" finns redan." +#: builtin/grep.c:818 +msgid "indicate hit with exit status without output" +msgstr "ange träff med slutstatuskod utan utdata" -#: lib/branch_rename.tcl:123 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Kunde inte byta namn på \"%s\"." +#: builtin/grep.c:820 +msgid "show only matches from files that match all patterns" +msgstr "visa endast träffar från filer som träffar alla mönster" -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Startar..." +#: builtin/grep.c:822 +msgid "show parse tree for grep expression" +msgstr "visa analysträd för grep-uttryck" -#: lib/browser.tcl:27 -msgid "File Browser" -msgstr "Filbläddrare" +#: builtin/grep.c:826 +msgid "pager" +msgstr "bläddrare" -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Läser %s..." +#: builtin/grep.c:826 +msgid "show matching files in the pager" +msgstr "visa träffade filer i filbläddraren" -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Upp till förälder]" +#: builtin/grep.c:829 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: lib/browser.tcl:269 lib/browser.tcl:276 -msgid "Browse Branch Files" -msgstr "Bläddra filer på grenen" +#: builtin/grep.c:830 builtin/show-ref.c:201 +msgid "show usage" +msgstr "visa användning" -#: lib/browser.tcl:282 lib/choose_repository.tcl:404 -#: lib/choose_repository.tcl:491 lib/choose_repository.tcl:500 -#: lib/choose_repository.tcl:1027 -msgid "Browse" -msgstr "Bläddra" +#: builtin/grep.c:921 +msgid "no pattern given." +msgstr "inget mönster angavs." -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Hämtar %s från %s" +#: builtin/grep.c:935 +#, c-format +msgid "bad object %s" +msgstr "felaktigt objekt %s" -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "ödesdigert: Kunde inte slå upp %s" +#: builtin/grep.c:976 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:30 -#: lib/sshkey.tcl:55 -msgid "Close" -msgstr "Stäng" +#: builtin/grep.c:999 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached och --untracked kan inte användas med --no-index." -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Grenen \"%s\" finns inte." +#: builtin/grep.c:1004 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "--no-index och --untracked kan inte användas med revisioner." -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Kunde inte konfigurera förenklad git-pull för '%s'." +#: builtin/grep.c:1007 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." -#: lib/checkout_op.tcl:229 -#, tcl-format +#: builtin/grep.c:1015 +msgid "both --cached and trees are given." +msgstr "både --cached och träd angavs." + +#: builtin/hash-object.c:60 msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " +"<file>..." msgstr "" -"Grenen \"%s\" finns redan.\n" -"\n" -"Den kan inte snabbspolas till %s.\n" -"En sammanslagning krävs." +"git hash-object [-t <typ>] [-w] [--path=<fil>|--no-filters] [--stdin] [--] " +"<fil>..." + +#: builtin/hash-object.c:61 +msgid "git hash-object --stdin-paths < <list-of-paths>" +msgstr "git hash-object --stdin-paths < <sökvägslista>" + +#: builtin/hash-object.c:72 +msgid "type" +msgstr "typ" + +#: builtin/hash-object.c:72 +msgid "object type" +msgstr "objekttyp" + +#: builtin/hash-object.c:73 +msgid "write the object into the object database" +msgstr "skriv objektet till objektdatabasen" + +#: builtin/hash-object.c:74 +msgid "read the object from stdin" +msgstr "läs objektet från standard in" + +#: builtin/hash-object.c:76 +msgid "store file as is without filters" +msgstr "spara filen som den är utan filer" + +#: builtin/hash-object.c:77 +msgid "process file as it were from this path" +msgstr "hantera filen som om den kom från sökvägen" + +#: builtin/help.c:43 +msgid "print all available commands" +msgstr "visa alla tillgängliga kommandon" + +#: builtin/help.c:44 +msgid "show man page" +msgstr "visa manualsida" + +#: builtin/help.c:45 +msgid "show manual in web browser" +msgstr "visa manual i webbläsare" + +#: builtin/help.c:47 +msgid "show info page" +msgstr "visa info-sida" + +#: builtin/help.c:53 +msgid "git help [--all] [--man|--web|--info] [command]" +msgstr "git help [--all] [--man|--web|--info] [kommando]" + +#: builtin/help.c:65 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "okänt hjälpformat: %s" + +#: builtin/help.c:93 +msgid "Failed to start emacsclient." +msgstr "Misslyckades starta emacsclient." + +#: builtin/help.c:106 +msgid "Failed to parse emacsclient version." +msgstr "Kunde inte tolka emacsclient-version." + +#: builtin/help.c:114 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "emacsclient version \"%d\" för gammal (< 22)." + +#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "exec misslyckades för \"%s\": %s" + +#: builtin/help.c:217 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "" +"\"%s\": sökväg för man-visare som ej stöds.\n" +"Använd \"man.<verktyg>.cmd\" istället." -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Sammanslagningsstrategin \"%s\" stöds inte." +#: builtin/help.c:229 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "" +"\"%s\": kommando för man-visare som stöds.\n" +"Använd \"man.<verktyg>.path\" istället." + +#: builtin/help.c:299 +msgid "The most commonly used git commands are:" +msgstr "De mest använda git-kommandona är:" + +#: builtin/help.c:367 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "\"%s\": okänd man-visare." + +#: builtin/help.c:384 +msgid "no man viewer handled the request" +msgstr "ingen man-visare hanterade förfrågan" + +#: builtin/help.c:392 +msgid "no info viewer handled the request" +msgstr "ingen info-visare hanterade förfrågan" + +#: builtin/help.c:447 builtin/help.c:454 +#, c-format +msgid "usage: %s%s" +msgstr "användning: %s%s" + +#: builtin/help.c:470 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "\"git %s\" är ett alias för \"%s\"" + +#: builtin/index-pack.c:170 +#, c-format +msgid "object type mismatch at %s" +msgstr "objekttyp stämmer inte överens vid %s" + +#: builtin/index-pack.c:190 +msgid "object of unexpected type" +msgstr "objekt av oväntad typ" + +#: builtin/index-pack.c:227 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "kan inte fylla %d byte" +msgstr[1] "kan inte fylla %d byte" + +#: builtin/index-pack.c:237 +msgid "early EOF" +msgstr "tidigt filslut" + +#: builtin/index-pack.c:238 +msgid "read error on input" +msgstr "indataläsfel" + +#: builtin/index-pack.c:250 +msgid "used more bytes than were available" +msgstr "använde fler byte än tillgängligt" + +#: builtin/index-pack.c:257 +msgid "pack too large for current definition of off_t" +msgstr "paket för stort för nuvarande definition av off_t" + +#: builtin/index-pack.c:273 +#, c-format +msgid "unable to create '%s'" +msgstr "kunde inte skapa \"%s\"" + +#: builtin/index-pack.c:278 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "kan inte öppna paketfilen \"%s\"" + +#: builtin/index-pack.c:292 +msgid "pack signature mismatch" +msgstr "paketsignatur stämmer inte överens" + +#: builtin/index-pack.c:294 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "paketversion %<PRIu32> stöds ej" + +#: builtin/index-pack.c:312 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "paketet har felaktigt objekt vid index %lu: %s" + +#: builtin/index-pack.c:434 +#, c-format +msgid "inflate returned %d" +msgstr "inflate returnerade %d" + +#: builtin/index-pack.c:483 +msgid "offset value overflow for delta base object" +msgstr "indexvärdespill för deltabasobjekt" + +#: builtin/index-pack.c:491 +msgid "delta base offset is out of bound" +msgstr "deltabasindex utanför gränsen" + +#: builtin/index-pack.c:499 +#, c-format +msgid "unknown object type %d" +msgstr "okänd objekttyp %d" + +#: builtin/index-pack.c:530 +msgid "cannot pread pack file" +msgstr "kan inte utföra \"pread\" på paketfil" + +#: 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] "för tidigt slut på paketfilen, %lu byte saknas" +msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas" + +#: builtin/index-pack.c:558 +msgid "serious inflate inconsistency" +msgstr "allvarlig inflate-inkonsekvens" + +#: 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 "SHA1-KOLLISION UPPTÄCKT VID %s !" + +#: builtin/index-pack.c:652 builtin/pack-objects.c:170 +#: builtin/pack-objects.c:262 +#, c-format +msgid "unable to read %s" +msgstr "kunde inte läsa %s" + +#: builtin/index-pack.c:718 +#, c-format +msgid "cannot read existing object %s" +msgstr "kan inte läsa befintligt objekt %s" + +#: builtin/index-pack.c:732 +#, c-format +msgid "invalid blob object %s" +msgstr "ogiltigt blob-objekt %s" + +#: builtin/index-pack.c:747 +#, c-format +msgid "invalid %s" +msgstr "ogiltigt %s" + +#: builtin/index-pack.c:749 +msgid "Error in object" +msgstr "Fel i objekt" + +#: builtin/index-pack.c:751 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "Inte alla barnobjekt för %s kan nås" + +#: builtin/index-pack.c:821 builtin/index-pack.c:847 +msgid "failed to apply delta" +msgstr "misslyckades tillämpa delta" + +#: builtin/index-pack.c:986 +msgid "Receiving objects" +msgstr "Tar emot objekt" + +#: builtin/index-pack.c:986 +msgid "Indexing objects" +msgstr "Skapar index för objekt" + +#: builtin/index-pack.c:1012 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "paketet är trasigt (SHA1 stämmer inte)" + +#: builtin/index-pack.c:1017 +msgid "cannot fstat packfile" +msgstr "kan inte utföra \"fstat\" på paketfil" + +#: builtin/index-pack.c:1020 +msgid "pack has junk at the end" +msgstr "paket har skräp i slutet" + +#: builtin/index-pack.c:1031 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "förvirrad bortom vanvett i parse_pack_objects()" + +#: builtin/index-pack.c:1054 +msgid "Resolving deltas" +msgstr "Analyserar delta" + +#: builtin/index-pack.c:1064 +#, c-format +msgid "unable to create thread: %s" +msgstr "kunde inte skapa tråd: %s" + +#: builtin/index-pack.c:1106 +msgid "confusion beyond insanity" +msgstr "förvirrad bortom vanvett" + +#: builtin/index-pack.c:1112 +#, c-format +msgid "completed with %d local objects" +msgstr "slutfördes med %d lokala objekt" + +#: builtin/index-pack.c:1121 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "Oväntad svanschecksumma för %s (trasig disk?)" + +#: builtin/index-pack.c:1125 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "paketet har %d oanalyserat delta" +msgstr[1] "paketet har %d oanalyserade delta" + +#: builtin/index-pack.c:1150 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" + +#: builtin/index-pack.c:1229 +#, c-format +msgid "local object %s is corrupt" +msgstr "lokalt objekt %s är trasigt" + +#: builtin/index-pack.c:1253 +msgid "error while closing pack file" +msgstr "fel vid stängning av paketfil" + +#: builtin/index-pack.c:1266 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" + +#: builtin/index-pack.c:1274 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" + +#: builtin/index-pack.c:1287 +msgid "cannot store pack file" +msgstr "kan inte spara paketfil" + +#: builtin/index-pack.c:1298 +msgid "cannot store index file" +msgstr "kan inte spara indexfil" + +#: builtin/index-pack.c:1331 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "felaktig pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1337 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "felaktigt antal trådar angivet (%d)" + +#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "trådstöd saknas, ignorerar %s" + +#: builtin/index-pack.c:1399 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Kan inte öppna befintlig paketfil \"%s\"" + +#: builtin/index-pack.c:1401 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\"" + +#: builtin/index-pack.c:1448 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "icke-delta: %d objekt" +msgstr[1] "icke-delta: %d objekt" + +#: builtin/index-pack.c:1455 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "kedjelängd = %d: %lu objekt" +msgstr[1] "kedjelängd = %d: %lu objekt" + +#: builtin/index-pack.c:1482 +msgid "Cannot come back to cwd" +msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" + +#: 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 "felaktig %s" + +#: builtin/index-pack.c:1559 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin kan inte användas med --stdin" + +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" + +#: builtin/index-pack.c:1582 +msgid "--verify with no packfile name given" +msgstr "--verify angavs utan paketfilnamn" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Kunde inte göra %s skrivbar för gruppen" + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "tokigt långt namn på mallen %s" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "kan inte ta status på \"%s\"" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "kan inte ta status på mallen \"%s\"" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "kan inte öppna katalogen (opendir) \"%s\"" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "kan inte läsa länk (readlink) \"%s\"" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "tokigt lång symbolisk länk %s" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "kan inte kopiera \"%s\" till \"%s\"" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "ignorerar mallen %s" + +#: builtin/init-db.c:133 +#, c-format +msgid "insanely long template path %s" +msgstr "tokigt lång mallsökväg %s" + +#: builtin/init-db.c:141 +#, c-format +msgid "templates not found %s" +msgstr "mallarna hittades inte %s" + +#: builtin/init-db.c:154 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\"" + +#: builtin/init-db.c:192 +#, c-format +msgid "insane git directory %s" +msgstr "tokig git-katalog %s" + +#: builtin/init-db.c:323 builtin/init-db.c:326 +#, c-format +msgid "%s already exists" +msgstr "%s finns redan" + +#: builtin/init-db.c:355 +#, c-format +msgid "unable to handle file type %d" +msgstr "kan inte hantera filtyp %d" + +#: builtin/init-db.c:358 +#, c-format +msgid "unable to move %s to %s" +msgstr "kan inte flytta %s till %s" + +#: builtin/init-db.c:363 +#, c-format +msgid "Could not create git link %s" +msgstr "Kunde inte skapa gitlänk %s" + +#. +#. * 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 "%s%s Git-arkiv i %s%s\n" + +#: builtin/init-db.c:421 +msgid "Reinitialized existing" +msgstr "Ominitierade befintligt" + +#: builtin/init-db.c:421 +msgid "Initialized empty" +msgstr "Initierade tomt" + +#: builtin/init-db.c:422 +msgid " shared" +msgstr " delat" + +#: builtin/init-db.c:441 +msgid "cannot tell cwd" +msgstr "kan inte läsa aktuell katalog (cwd)" + +#: builtin/init-db.c:467 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" +"[=<permissions>]] [directory]" +msgstr "" +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared" +"[=<behörigheter>]] [katalog]" -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Misslyckades med att uppdatera \"%s\"." +#: builtin/init-db.c:490 +msgid "permissions" +msgstr "behörigheter" -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "Köområdet (index) är redan låst." +#: builtin/init-db.c:491 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "ange att git-arkivet skall delas bland flera användare" -#: lib/checkout_op.tcl:289 +#: builtin/init-db.c:493 builtin/prune-packed.c:77 +msgid "be quiet" +msgstr "var tyst" + +#: builtin/init-db.c:522 builtin/init-db.c:529 +#, c-format +msgid "cannot mkdir %s" +msgstr "kan inte skapa katalogen (mkdir) %s" + +#: builtin/init-db.c:533 +#, c-format +msgid "cannot chdir to %s" +msgstr "kan inte byta katalog (chdir) till %s" + +#: builtin/init-db.c:555 +#, c-format msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" msgstr "" -"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n" -"\n" -"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste " -"utföra en ny sökning innan den aktuella grenen kan ändras.\n" -"\n" -"Sökningen kommer att startas automatiskt nu.\n" +"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" +"dir=<katalog>)" + +#: builtin/init-db.c:579 +msgid "Cannot access current working directory" +msgstr "Kan inte komma åt aktuell arbetskatalog" + +#: builtin/init-db.c:586 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "Kan inte komma åt arbetskatalogen \"%s\"" + +#: builtin/log.c:37 +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +msgstr "git log [<flaggor>] [<sedan>..<till>] [[--] <sökväg>...]\n" + +#: builtin/log.c:38 +msgid " or: git show [options] <object>..." +msgstr " eller: git show [flaggor] <objekt>..." + +#: builtin/log.c:100 +msgid "suppress diff output" +msgstr "undertryck diff-utdata" + +#: builtin/log.c:101 +msgid "show source" +msgstr "visa källkod" + +#: builtin/log.c:102 +msgid "decorate options" +msgstr "dekoreringsflaggor" + +#: builtin/log.c:189 +#, c-format +msgid "Final output: %d %s\n" +msgstr "Slututdata: %d %s\n" + +#: builtin/log.c:403 builtin/log.c:494 +#, c-format +msgid "Could not read object %s" +msgstr "Kunde inte läsa objektet %s" + +#: builtin/log.c:518 +#, c-format +msgid "Unknown type: %d" +msgstr "Okänd typ: %d" + +#: builtin/log.c:608 +msgid "format.headers without value" +msgstr "format.headers utan värde" + +#: builtin/log.c:682 +msgid "name of output directory is too long" +msgstr "namnet på utdatakatalogen är för långt" + +#: builtin/log.c:693 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Kan inte öppna patchfilen %s" + +#: builtin/log.c:707 +msgid "Need exactly one range." +msgstr "Behöver precis ett intervall." + +#: builtin/log.c:715 +msgid "Not a range." +msgstr "Inte ett intervall." + +#: builtin/log.c:789 +msgid "Cover letter needs email format" +msgstr "Omslagsbrevet behöver e-postformat" + +#: builtin/log.c:862 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "tokigt in-reply-to: %s" + +#: builtin/log.c:890 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]" + +#: builtin/log.c:935 +msgid "Two output directories?" +msgstr "Två utdatakataloger?" + +#: builtin/log.c:1063 +msgid "use [PATCH n/m] even with a single patch" +msgstr "använd [PATCH n/m] även för en ensam patch" + +#: builtin/log.c:1066 +msgid "use [PATCH] even with multiple patches" +msgstr "använd [PATCH] även för flera patchar" + +#: builtin/log.c:1070 +msgid "print patches to standard out" +msgstr "skriv patcharna på stnadard ut" + +#: builtin/log.c:1072 +msgid "generate a cover letter" +msgstr "generera ett följebrev" + +#: builtin/log.c:1074 +msgid "use simple number sequence for output file names" +msgstr "använd enkel nummersekvens för utdatafilnamn" + +#: builtin/log.c:1075 +msgid "sfx" +msgstr "sfx" + +#: builtin/log.c:1076 +msgid "use <sfx> instead of '.patch'" +msgstr "använd <sfx> istället för \".patch\"" + +#: builtin/log.c:1078 +msgid "start numbering patches at <n> instead of 1" +msgstr "börja numrera patchar på <n> istället för 1" + +#: builtin/log.c:1080 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "Använd [<prefix>] istället för [PATCH]" + +#: builtin/log.c:1083 +msgid "store resulting files in <dir>" +msgstr "spara filerna i <katalog>" + +#: builtin/log.c:1086 +msgid "don't strip/add [PATCH]" +msgstr "ta inte bort eller lägg till [PATCH]" + +#: builtin/log.c:1089 +msgid "don't output binary diffs" +msgstr "skriv inte binära diffar" + +#: builtin/log.c:1091 +msgid "don't include a patch matching a commit upstream" +msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" + +#: builtin/log.c:1093 +msgid "show patch format instead of default (patch + stat)" +msgstr "visa patchformat istället för standard (patch + stat)" + +#: builtin/log.c:1095 +msgid "Messaging" +msgstr "E-post" + +#: builtin/log.c:1096 +msgid "header" +msgstr "huvud" + +#: builtin/log.c:1097 +msgid "add email header" +msgstr "lägg till e-posthuvud" + +#: builtin/log.c:1098 builtin/log.c:1100 +msgid "email" +msgstr "epost" + +#: builtin/log.c:1098 +msgid "add To: header" +msgstr "Lägg till mottagarhuvud (\"To:\")" + +#: builtin/log.c:1100 +msgid "add Cc: header" +msgstr "Lägg till kopiehuvud (\"Cc:\")" + +#: builtin/log.c:1102 +msgid "message-id" +msgstr "meddelande-id" + +#: builtin/log.c:1103 +msgid "make first mail a reply to <message-id>" +msgstr "Gör det första brevet ett svar till <meddelande-id>" + +#: builtin/log.c:1104 builtin/log.c:1107 +msgid "boundary" +msgstr "gräns" + +#: builtin/log.c:1105 +msgid "attach the patch" +msgstr "bifoga patchen" + +#: builtin/log.c:1108 +msgid "inline the patch" +msgstr "gör patchen ett inline-objekt" -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Uppdaterar arbetskatalogen till \"%s\"..." +#: builtin/log.c:1112 +msgid "enable message threading, styles: shallow, deep" +msgstr "aktivera brevtrådning, typer: shallow, deep" -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "filer utcheckade" +#: builtin/log.c:1114 +msgid "signature" +msgstr "signatur" -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "Avbryter utcheckning av \"%s\" (sammanslagning på filnivå krävs)." +#: builtin/log.c:1115 +msgid "add a signature" +msgstr "lägg till signatur" -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Sammanslagning på filnivå krävs." +#: builtin/log.c:1117 +msgid "don't print the patch filenames" +msgstr "visa inte filnamn för patchar" -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Stannar på grenen \"%s\"." +#: builtin/log.c:1157 +#, c-format +msgid "bogus committer info %s" +msgstr "felaktig incheckarinformation %s" + +#: builtin/log.c:1202 +msgid "-n and -k are mutually exclusive." +msgstr "-n och -k kan inte användas samtidigt." + +#: builtin/log.c:1204 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix och -k kan inte användas samtidigt." + +#: builtin/log.c:1212 +msgid "--name-only does not make sense" +msgstr "kan inte använda --name-only" + +#: builtin/log.c:1214 +msgid "--name-status does not make sense" +msgstr "kan inte använda --name-status" + +#: builtin/log.c:1216 +msgid "--check does not make sense" +msgstr "kan inte använda --check" + +#: builtin/log.c:1239 +msgid "standard output, or directory, which one?" +msgstr "standard ut, eller katalog, vilken skall det vara?" + +#: builtin/log.c:1241 +#, c-format +msgid "Could not create directory '%s'" +msgstr "Kunde inte skapa katalogen \"%s\"" -#: lib/checkout_op.tcl:452 +#: builtin/log.c:1394 +msgid "Failed to create output files" +msgstr "Misslyckades skapa utdatafiler" + +#: builtin/log.c:1443 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" + +#: builtin/log.c:1498 +#, c-format msgid "" -"You are no longer on a local branch.\n" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" + +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#, c-format +msgid "Unknown commit %s" +msgstr "Okänd incheckning %s" + +#: builtin/ls-files.c:408 +msgid "git ls-files [options] [<file>...]" +msgstr "git ls-files [flaggor] [<fil>...]" + +#: builtin/ls-files.c:463 +msgid "identify the file status with tags" +msgstr "identifiera filstatus med taggar" + +#: builtin/ls-files.c:465 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "använd små bokstäver för \"anta oförändrade\"-filer" + +#: builtin/ls-files.c:467 +msgid "show cached files in the output (default)" +msgstr "visa cachade filer i utdata (standard)" + +#: builtin/ls-files.c:469 +msgid "show deleted files in the output" +msgstr "visa borttagna filer i utdata" + +#: builtin/ls-files.c:471 +msgid "show modified files in the output" +msgstr "visa modifierade filer i utdata" + +#: builtin/ls-files.c:473 +msgid "show other files in the output" +msgstr "visa andra filer i utdata" + +#: builtin/ls-files.c:475 +msgid "show ignored files in the output" +msgstr "visa ignorerade filer i utdata" + +#: builtin/ls-files.c:478 +msgid "show staged contents' object name in the output" +msgstr "visa köat innehålls objektnamn i utdata" + +#: builtin/ls-files.c:480 +msgid "show files on the filesystem that need to be removed" +msgstr "visa filer i filsystemet som behöver tas bort" + +#: builtin/ls-files.c:482 +msgid "show 'other' directories' name only" +msgstr "visa endast namn för \"andra\" kataloger" + +#: builtin/ls-files.c:485 +msgid "don't show empty directories" +msgstr "visa inte tomma kataloger" + +#: builtin/ls-files.c:488 +msgid "show unmerged files in the output" +msgstr "visa ej sammanslagna filer i utdata" + +#: builtin/ls-files.c:490 +msgid "show resolve-undo information" +msgstr "visa \"resolve-undo\"-information" + +#: builtin/ls-files.c:492 +msgid "skip files matching pattern" +msgstr "hoppa över filer som motsvarar mönster" + +#: builtin/ls-files.c:495 +msgid "exclude patterns are read from <file>" +msgstr "exkludera mönster som läses från <fil>" + +#: builtin/ls-files.c:498 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" + +#: builtin/ls-files.c:500 +msgid "add the standard git exclusions" +msgstr "lägg till git:s standardexkluderingar" + +#: builtin/ls-files.c:503 +msgid "make the output relative to the project top directory" +msgstr "gör utdata relativ till projektets toppkatalog" + +#: builtin/ls-files.c:506 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "om en <fil> inte är indexet, betrakta det som ett fel" + +#: builtin/ls-files.c:507 +msgid "tree-ish" +msgstr "träd-igt" + +#: builtin/ls-files.c:508 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" + +#: builtin/ls-files.c:510 +msgid "show debugging data" +msgstr "visa felsökningsutdata" + +#: builtin/ls-tree.c:27 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]" + +#: builtin/ls-tree.c:125 +msgid "only show trees" +msgstr "visa endast träd" + +#: builtin/ls-tree.c:127 +msgid "recurse into subtrees" +msgstr "rekursera ner i underträd" + +#: builtin/ls-tree.c:129 +msgid "show trees when recursing" +msgstr "visa träd medan rekursering" + +#: builtin/ls-tree.c:132 +msgid "terminate entries with NUL byte" +msgstr "terminera poster med NUL-byte" + +#: builtin/ls-tree.c:133 +msgid "include object size" +msgstr "inkludera objektstorlek" + +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +msgid "list only filenames" +msgstr "visa endast filnamn" + +#: builtin/ls-tree.c:140 +msgid "use full path names" +msgstr "använd fullständiga sökvägsnamn" + +#: builtin/ls-tree.c:142 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" + +#: builtin/merge.c:43 +msgid "git merge [options] [<commit>...]" +msgstr "git merge [flaggor] [<incheckning>...]" + +#: builtin/merge.c:44 +msgid "git merge [options] <msg> HEAD <commit>" +msgstr "git merge [flaggor] <meddelande> HEAD <incheckning>" + +#: builtin/merge.c:45 +msgid "git merge --abort" +msgstr "git merge --abort" + +#: builtin/merge.c:90 +msgid "switch `m' requires a value" +msgstr "flaggan \"m\" behöver ett värde" + +#: builtin/merge.c:127 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" + +#: builtin/merge.c:128 +#, c-format +msgid "Available strategies are:" +msgstr "Tillgängliga strategier är:" + +#: builtin/merge.c:133 +#, c-format +msgid "Available custom strategies are:" +msgstr "Tillgängliga skräddarsydda strategier är:" + +#: builtin/merge.c:183 +msgid "do not show a diffstat at the end of the merge" +msgstr "visa inte en diffstat när sammanslagningen är färdig" + +#: builtin/merge.c:186 +msgid "show a diffstat at the end of the merge" +msgstr "visa en diffstat när sammanslagningen är färdig" + +#: builtin/merge.c:187 +msgid "(synonym to --stat)" +msgstr "(synonym till --stat)" + +#: builtin/merge.c:189 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "" +"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" + +#: builtin/merge.c:192 +msgid "create a single commit instead of doing a merge" +msgstr "skapa en ensam incheckning istället för en sammanslagning" + +#: builtin/merge.c:194 +msgid "perform a commit if the merge succeeds (default)" +msgstr "utför en incheckning om sammanslagningen lyckades (standard)" + +#: builtin/merge.c:196 +msgid "edit message before committing" +msgstr "redigera meddelande innan incheckning" + +#: builtin/merge.c:198 +msgid "allow fast-forward (default)" +msgstr "tillåt snabbspolning (standard)" + +#: builtin/merge.c:200 +msgid "abort if fast-forward is not possible" +msgstr "avbryt om snabbspolning inte är möjlig" + +#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112 +msgid "strategy" +msgstr "strategi" + +#: builtin/merge.c:203 +msgid "merge strategy to use" +msgstr "sammanslagninsstrategi att använda" + +#: builtin/merge.c:204 +msgid "option=value" +msgstr "alternativ=värde" + +#: builtin/merge.c:205 +msgid "option for selected merge strategy" +msgstr "alternativ för vald sammanslagningsstrategi" + +#: builtin/merge.c:207 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" + +#: builtin/merge.c:211 +msgid "abort the current in-progress merge" +msgstr "avbryt den pågående sammanslagningen" + +#: builtin/merge.c:240 +msgid "could not run stash." +msgstr "kunde köra stash." + +#: builtin/merge.c:245 +msgid "stash failed" +msgstr "stash misslyckades" + +#: builtin/merge.c:250 +#, c-format +msgid "not a valid object: %s" +msgstr "inte ett giltigt objekt: %s" + +#: builtin/merge.c:269 builtin/merge.c:286 +msgid "read-tree failed" +msgstr "read-tree misslyckades" + +#: builtin/merge.c:316 +msgid " (nothing to squash)" +msgstr " (inget att platta till)" + +#: builtin/merge.c:329 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" + +#: builtin/merge.c:361 +msgid "Writing SQUASH_MSG" +msgstr "Skriver SQUASH_MSG" + +#: builtin/merge.c:363 +msgid "Finishing SQUASH_MSG" +msgstr "Avslutar SQUASH_MSG" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" + +#: builtin/merge.c:436 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "\"%s\" verkar inte peka på en incheckning" + +#: builtin/merge.c:535 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" + +#: builtin/merge.c:628 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree misslyckades skriva ett träd" + +#: builtin/merge.c:678 +msgid "failed to read the cache" +msgstr "misslyckads läsa cachen" + +#: builtin/merge.c:709 +msgid "Not handling anything other than two heads merge." +msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." + +#: builtin/merge.c:723 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "Felaktig flagga för merge-recursive: -X%s" + +#: builtin/merge.c:737 +#, c-format +msgid "unable to write %s" +msgstr "kunde inte skriva %s" + +#: builtin/merge.c:876 +#, c-format +msgid "Could not read from '%s'" +msgstr "Kunde inte läsa från \"%s\"" + +#: builtin/merge.c:885 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" +"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " +"den.\n" + +#: builtin/merge.c:891 +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" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." +"Lines starting with '#' will be ignored, and an empty message aborts\n" +"the commit.\n" msgstr "" -"Du är inte längre på en lokal gren.\n" +"Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n" +"är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n" +"temagren.\n" "\n" -"Om du ville vara på en gren skapar du en nu, baserad på \"Denna frånkopplade " -"utcheckning\"." +"Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n" +"avbryter incheckningen.\n" -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Checkade ut \"%s\"." +#: builtin/merge.c:915 +msgid "Empty commit message." +msgstr "Tomt incheckningsmeddelande." -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" +#: builtin/merge.c:927 +#, c-format +msgid "Wonderful.\n" +msgstr "Underbart.\n" + +#: builtin/merge.c:992 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -"Om du återställer \"%s\" till \"%s\" går följande incheckningar förlorade:" +"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" + +#: builtin/merge.c:1008 +#, c-format +msgid "'%s' is not a commit" +msgstr "\"%s\" är inte en incheckning" + +#: builtin/merge.c:1049 +msgid "No current branch." +msgstr "Inte på någon gren." + +#: builtin/merge.c:1051 +msgid "No remote for the current branch." +msgstr "Ingen fjärr för aktuell gren." -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Det kanske inte är så enkelt att återskapa förlorade incheckningar." +#: builtin/merge.c:1053 +msgid "No default upstream defined for the current branch." +msgstr "Ingen standarduppström angiven för aktuell gren." -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Återställa \"%s\"?" +#: builtin/merge.c:1058 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "Ingen fjärrspårande gren för %s från %s" -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:336 -msgid "Visualize" -msgstr "Visualisera" +#: builtin/merge.c:1145 builtin/merge.c:1302 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - inte något vi kan slå ihop" -#: lib/checkout_op.tcl:635 -#, tcl-format +#: builtin/merge.c:1213 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." + +#: builtin/merge.c:1229 git-pull.sh:31 msgid "" -"Failed to set current branch.\n" -"\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" -"\n" -"This should not have occurred. %s will now close and give up." +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." msgstr "" -"Kunde inte ställa in aktuell gren.\n" -"\n" -"Arbetskatalogen har bara växlats delvis. Vi uppdaterade filerna utan " -"problem, men kunde inte uppdatera en intern fil i Git.\n" -"\n" -"Detta skulle inte ha hänt. %s kommer nu stängas och ge upp." +"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" +"Checka in dina ändringar innan du kan slå ihop." + +#: builtin/merge.c:1232 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." + +#: builtin/merge.c:1236 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" +"Checka in dina ändringar innan du kan slå ihop." + +#: builtin/merge.c:1239 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." + +#: builtin/merge.c:1248 +msgid "You cannot combine --squash with --no-ff." +msgstr "Du kan inte kombinera --squash med --no-ff." + +#: builtin/merge.c:1253 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "Du kan inte kombinera --no-ff med --ff-only." + +#: builtin/merge.c:1260 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." + +#: builtin/merge.c:1292 +msgid "Can merge only exactly one commit into empty head" +msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud." + +#: builtin/merge.c:1295 +msgid "Squash commit into empty head not supported yet" +msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" + +#: builtin/merge.c:1297 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" + +#: builtin/merge.c:1412 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Uppdaterar %s..%s\n" + +#: builtin/merge.c:1450 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" + +#: builtin/merge.c:1457 +#, c-format +msgid "Nope.\n" +msgstr "Nej.\n" + +#: builtin/merge.c:1489 +msgid "Not possible to fast-forward, aborting." +msgstr "Kan inte snabbspola, avbryter." + +#: builtin/merge.c:1512 builtin/merge.c:1591 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "Återspolar trädet till orört...\n" + +#: builtin/merge.c:1516 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Försöker sammanslagninsstrategin %s...\n" + +#: builtin/merge.c:1582 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" + +#: builtin/merge.c:1584 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Sammanslagning med strategin %s misslyckades.\n" + +#: builtin/merge.c:1593 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "Använder %s för att förbereda lösning för hand.\n" + +#: builtin/merge.c:1605 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" +"Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" + +#: builtin/merge-base.c:26 +msgid "git merge-base [-a|--all] <commit> <commit>..." +msgstr "git merge-base [-a|--all] <incheckning> <incheckning>..." + +#: builtin/merge-base.c:27 +msgid "git merge-base [-a|--all] --octopus <commit>..." +msgstr "git merge-base [-a|--all] --octopus <incheckning>..." + +#: builtin/merge-base.c:28 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <incheckning>..." + +#: builtin/merge-base.c:29 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" + +#: builtin/merge-base.c:98 +msgid "output all common ancestors" +msgstr "skriv ut alla gemensamma anfäder" + +#: builtin/merge-base.c:99 +msgid "find ancestors for a single n-way merge" +msgstr "hitta anfader för enkel n-vägssammanslagning" + +#: builtin/merge-base.c:100 +msgid "list revs not reachable from others" +msgstr "visa revisioner som inte kan nås från andra" + +#: builtin/merge-base.c:102 +msgid "is the first one ancestor of the other?" +msgstr "är den första anfader till den andra?" + +#: builtin/merge-file.c:8 +msgid "" +"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " +"file2" +msgstr "" +"git merge-file [alternativ] [-L namn1 [-L orig [-L namn2]]] fil1 origfil fil2" -#: lib/choose_font.tcl:41 -msgid "Select" -msgstr "Välj" +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "sänd resultat till standard ut" -#: lib/choose_font.tcl:55 -msgid "Font Family" -msgstr "Teckensnittsfamilj" +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "använd diff3-baserad sammanslagning" -#: lib/choose_font.tcl:76 -msgid "Font Size" -msgstr "Storlek" +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "för konflikter, använd vår version" -#: lib/choose_font.tcl:93 -msgid "Font Example" -msgstr "Exempel" +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "för konflikter, använd deras version" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "för konflikter, använd en förenad version" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "för konflikter, använd denna markörstorlek" + +#: builtin/merge-file.c:43 +msgid "do not warn about conflicts" +msgstr "varna inte om konflikter" + +#: builtin/merge-file.c:45 +msgid "set labels for file1/orig_file/file2" +msgstr "sätt etiketter för fil1/origfil/fil2" + +#: builtin/mktree.c:67 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" + +#: builtin/mktree.c:153 +msgid "input is NUL terminated" +msgstr "indata är NUL-terminerad" + +#: builtin/mktree.c:154 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "tillåt saknade objekt" + +#: builtin/mktree.c:155 +msgid "allow creation of more than one tree" +msgstr "tillåt skapa mer än ett träd" + +#: builtin/mv.c:14 +msgid "git mv [options] <source>... <destination>" +msgstr "git mv [flaggor] <källa>... <mål>" + +#: builtin/mv.c:64 +msgid "force move/rename even if target exists" +msgstr "tvinga flytta/ändra namn även om målet finns" + +#: builtin/mv.c:65 +msgid "skip move/rename errors" +msgstr "hoppa över fel vid flytt/namnändring" + +#: builtin/mv.c:108 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" + +#: builtin/mv.c:112 +msgid "bad source" +msgstr "felaktig källa" + +#: builtin/mv.c:115 +msgid "can not move directory into itself" +msgstr "kan inte flytta katalog till sig själv" + +#: builtin/mv.c:118 +msgid "cannot move directory over file" +msgstr "kan inte flytta katalog över fil" + +#: builtin/mv.c:128 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "Vad? %.*s är i indexet?" + +#: builtin/mv.c:140 +msgid "source directory is empty" +msgstr "källkatalogen är tom" + +#: builtin/mv.c:171 +msgid "not under version control" +msgstr "inte versionshanterad" + +#: builtin/mv.c:173 +msgid "destination exists" +msgstr "destinationen finns" + +#: builtin/mv.c:181 +#, c-format +msgid "overwriting '%s'" +msgstr "skriver över \"%s\"" + +#: builtin/mv.c:184 +msgid "Cannot overwrite" +msgstr "Kan inte skriva över" + +#: builtin/mv.c:187 +msgid "multiple sources for the same target" +msgstr "flera källor för samma mål" + +#: builtin/mv.c:202 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, källa=%s, mål=%s" + +#: builtin/mv.c:212 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Byter namn på %s till %s\n" + +#: builtin/mv.c:215 builtin/remote.c:731 +#, c-format +msgid "renaming '%s' failed" +msgstr "misslyckades byta namn på \"%s\"" + +#: builtin/name-rev.c:175 +msgid "git name-rev [options] <commit>..." +msgstr "git name-rev [flaggor] <incheckning>..." + +#: builtin/name-rev.c:176 +msgid "git name-rev [options] --all" +msgstr "git name-rev [flaggor] --all" + +#: builtin/name-rev.c:177 +msgid "git name-rev [options] --stdin" +msgstr "git name-rev [flaggor] --stdin" + +#: builtin/name-rev.c:229 +msgid "print only names (no SHA-1)" +msgstr "skriv endast namn (ingen SHA-1)" + +#: builtin/name-rev.c:230 +msgid "only use tags to name the commits" +msgstr "använd endast taggar för att namnge incheckningar" + +#: builtin/name-rev.c:232 +msgid "only use refs matching <pattern>" +msgstr "använd endast referenser som motsvarar <mönster>" + +#: builtin/name-rev.c:234 +msgid "list all commits reachable from all refs" +msgstr "lista alla incheckningar som kan nås alla referenser" + +#: builtin/name-rev.c:235 +msgid "read from stdin" +msgstr "läs från standard in" + +#: builtin/name-rev.c:236 +msgid "allow to print `undefined` names" +msgstr "tillåt att skriva \"odefinierade\" namn" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <anteckningsref>] add [-f] [-m <medd> | -F <fil> | (-c | -" +"C) <objekt>] [<objekt>]" -#: lib/choose_font.tcl:105 +#: builtin/notes.c:28 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgstr "" +"git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>" + +#: builtin/notes.c:29 msgid "" -"This is example text.\n" -"If you like this text, it can be your font." +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" msgstr "" -"Detta är en exempeltext.\n" -"Om du tycker om den här texten kan den vara ditt teckensnitt." +"git notes [--ref <anteckningsref>] append [-m <medd> | -F <fil> | (-c | -C) " +"<objekt>] [<objekt>]" -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" +#: builtin/notes.c:30 +msgid "git notes [--ref <notes_ref>] edit [<object>]" +msgstr "git notes [--ref <anteckningsref>] edit [<objekt>]" -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:394 -msgid "Create New Repository" -msgstr "Skapa nytt arkiv" +#: builtin/notes.c:31 +msgid "git notes [--ref <notes_ref>] show [<object>]" +msgstr "git notes [--ref <anteckningsref>] show [<objekt>]" -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Nytt..." +#: builtin/notes.c:32 +msgid "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +msgstr "" +"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi> ] " +"<anteckningsref>" -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:478 -msgid "Clone Existing Repository" -msgstr "Klona befintligt arkiv" +#: builtin/notes.c:33 +msgid "git notes merge --commit [-v | -q]" +msgstr "git notes merge --commit [-v | -q]" + +#: builtin/notes.c:34 +msgid "git notes merge --abort [-v | -q]" +msgstr "git notes merge --abort [-v | -q]" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]" + +#: builtin/notes.c:36 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]" + +#: builtin/notes.c:37 +msgid "git notes [--ref <notes_ref>] get-ref" +msgstr "git notes [--ref <anteckningsref>] get-ref" + +#: builtin/notes.c:42 +msgid "git notes [list [<object>]]" +msgstr "git notes [list [<objekt>]]" + +#: builtin/notes.c:47 +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<flaggor>] [<objekt>]" + +#: builtin/notes.c:52 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>" + +#: builtin/notes.c:53 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..." + +#: builtin/notes.c:58 +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<flaggor>] [<objekt>]" + +#: builtin/notes.c:63 +msgid "git notes edit [<object>]" +msgstr "git notes edit [<objekt>]" + +#: builtin/notes.c:68 +msgid "git notes show [<object>]" +msgstr "git notes show [<objekt>]" + +#: builtin/notes.c:73 +msgid "git notes merge [<options>] <notes_ref>" +msgstr "git notes merge [<flaggor>] <anteckningsref>" + +#: builtin/notes.c:74 +msgid "git notes merge --commit [<options>]" +msgstr "git notes merge --commit [<flaggor>]" + +#: builtin/notes.c:75 +msgid "git notes merge --abort [<options>]" +msgstr "git notes merge --abort [<flaggor>]" + +#: builtin/notes.c:80 +msgid "git notes remove [<object>]" +msgstr "git notes remove [<objekt>]" + +#: builtin/notes.c:85 +msgid "git notes prune [<options>]" +msgstr "git notes prune [<flaggor>]" + +#: builtin/notes.c:90 +msgid "git notes get-ref" +msgstr "git notes get-ref" + +#: builtin/notes.c:142 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "kunde inte starta \"show\" för objektet \"%s\"" + +#: builtin/notes.c:148 +msgid "can't fdopen 'show' output fd" +msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" + +#: builtin/notes.c:161 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" + +#: builtin/notes.c:178 builtin/tag.c:347 +#, c-format +msgid "could not create file '%s'" +msgstr "kunde inte skapa filen \"%s\"" + +#: builtin/notes.c:192 +msgid "Please supply the note contents using either -m or -F option" +msgstr "Ange innehåll för anteckningen med antingen -m eller -F" + +#: builtin/notes.c:213 builtin/notes.c:976 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Tar bort anteckning för objektet %s\n" + +#: builtin/notes.c:218 +msgid "unable to write note object" +msgstr "kunde inte skriva anteckningsobjekt" + +#: builtin/notes.c:220 +#, c-format +msgid "The note contents has been left in %s" +msgstr "Anteckningens innehåll har lämnats kvar i %s" + +#: builtin/notes.c:254 builtin/tag.c:542 +#, c-format +msgid "cannot read '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: builtin/notes.c:256 builtin/tag.c:545 +#, c-format +msgid "could not open or read '%s'" +msgstr "kunde inte öppna eller läsa \"%s\"" + +#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 +#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 +#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 +#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Kunde inte slå upp \"%s\" som en giltig referens." + +#: builtin/notes.c:278 +#, c-format +msgid "Failed to read object '%s'." +msgstr "Kunde inte läsa objektet \"%s\"." + +#: builtin/notes.c:302 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" + +#: builtin/notes.c:343 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Felaktigt värde för notes.rewriteMode: '%s'" + +#: builtin/notes.c:353 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:380 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Felaktigt värde på %s: \"%s\"" + +#: builtin/notes.c:444 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Felaktig indatarad: \"%s\"." + +#: builtin/notes.c:459 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" + +#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630 +#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 +#: builtin/notes.c:1036 +msgid "too many parameters" +msgstr "för många parametrar" + +#: builtin/notes.c:516 builtin/notes.c:775 +#, c-format +msgid "No note found for object %s." +msgstr "Inga anteckningar hittades för objektet %s." + +#: builtin/notes.c:538 builtin/notes.c:695 +msgid "note contents as a string" +msgstr "anteckningsinnehåll som sträng" + +#: builtin/notes.c:541 builtin/notes.c:698 +msgid "note contents in a file" +msgstr "anteckningsinnehåll i en fil" + +#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 +#: builtin/notes.c:703 builtin/tag.c:476 +msgid "object" +msgstr "objekt" -#: lib/choose_repository.tcl:111 -msgid "Clone..." -msgstr "Klona..." +#: builtin/notes.c:544 builtin/notes.c:701 +msgid "reuse and edit specified note object" +msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: lib/choose_repository.tcl:118 lib/choose_repository.tcl:1017 -msgid "Open Existing Repository" -msgstr "Öppna befintligt arkiv" +#: builtin/notes.c:547 builtin/notes.c:704 +msgid "reuse specified note object" +msgstr "återanvänd angivet anteckningsobjekt" -#: lib/choose_repository.tcl:124 -msgid "Open..." -msgstr "Öppna..." +#: builtin/notes.c:549 builtin/notes.c:617 +msgid "replace existing notes" +msgstr "ersätt befintliga anteckningar" -#: lib/choose_repository.tcl:137 -msgid "Recent Repositories" -msgstr "Senaste arkiven" +#: builtin/notes.c:583 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " +"objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: lib/choose_repository.tcl:143 -msgid "Open Recent Repository:" -msgstr "Öppna tidigare arkiv:" +#: builtin/notes.c:588 builtin/notes.c:665 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: lib/choose_repository.tcl:313 lib/choose_repository.tcl:320 -#: lib/choose_repository.tcl:327 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Kunde inte skapa arkivet %s:" +#: builtin/notes.c:618 +msgid "read objects from stdin" +msgstr "läs objekt från standard in" -#: lib/choose_repository.tcl:399 -msgid "Directory:" -msgstr "Katalog:" +#: builtin/notes.c:620 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: lib/choose_repository.tcl:429 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1051 -msgid "Git Repository" -msgstr "Gitarkiv" +#: builtin/notes.c:638 +msgid "too few parameters" +msgstr "för få parametrar" -#: lib/choose_repository.tcl:454 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Katalogen %s finns redan." +#: builtin/notes.c:659 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " +"%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: lib/choose_repository.tcl:458 -#, tcl-format -msgid "File %s already exists." -msgstr "Filen %s finns redan." +#: builtin/notes.c:671 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: lib/choose_repository.tcl:473 -msgid "Clone" -msgstr "Klona" - -#: lib/choose_repository.tcl:486 -msgid "Source Location:" -msgstr "Plats för källkod:" - -#: lib/choose_repository.tcl:495 -msgid "Target Directory:" -msgstr "Målkatalog:" - -#: lib/choose_repository.tcl:505 -msgid "Clone Type:" -msgstr "Typ av klon:" - -#: lib/choose_repository.tcl:510 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Standard (snabb, semiredundant, hårda länkar)" - -#: lib/choose_repository.tcl:515 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Full kopia (långsammare, redundant säkerhetskopia)" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)" - -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1057 lib/choose_repository.tcl:1065 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Inte ett Gitarkiv: %s" - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "Standard är endast tillgängligt för lokala arkiv." - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "Delat är endast tillgängligt för lokala arkiv." - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "Platsen %s finns redan." - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "Kunde inte konfigurera ursprung" - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "Räknar objekt" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "hinkar" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Kunde inte kopiera objekt/info/alternativ: %s" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Ingenting att klona från %s." - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "Grenen \"master\" har inte initierats." - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Hårda länkar är inte tillgängliga. Faller tillbaka på kopiering." - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "Klonar från %s" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "Kopierar objekt" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Kunde inte kopiera objekt: %s" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "Länkar objekt" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "objekt" +#: builtin/notes.c:720 +#, 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 "" +"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" +"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Kunde inte hårdlänka objekt: %s" +#: builtin/notes.c:867 +msgid "General options" +msgstr "Allmänna flaggor" -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "Kunde inte hämta grenar och objekt. Se konsolutdata för detaljer." +#: builtin/notes.c:869 +msgid "Merge options" +msgstr "Flaggor för sammanslagning" -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "Kunde inte hämta taggar. Se konsolutdata för detaljer." +#: builtin/notes.c:871 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" +"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" +"cat_sort_uniq)" -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "Kunde inte avgöra HEAD. Se konsolutdata för detaljer." +#: builtin/notes.c:873 +msgid "Committing unmerged notes" +msgstr "Checkar in ej sammanslagna anteckningar" -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Kunde inte städa upp %s" +#: builtin/notes.c:875 +msgid "finalize notes merge by committing unmerged notes" +msgstr "" +"färdigställ sammanslagning av anteckningar genom att checka in ej " +"sammanslagna anteckningar" + +#: builtin/notes.c:877 +msgid "Aborting notes merge resolution" +msgstr "Avbryt lösning av sammanslagning av anteckningar" + +#: builtin/notes.c:879 +msgid "abort notes merge" +msgstr "avbryt sammanslagning av anteckningar" + +#: builtin/notes.c:974 +#, c-format +msgid "Object %s has no note\n" +msgstr "Objektet %s har ingen anteckning\n" + +#: builtin/notes.c:986 +msgid "attempt to remove non-existent note is not an error" +msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" + +#: builtin/notes.c:989 +msgid "read object names from the standard input" +msgstr "läs objektnamn från standard in" + +#: builtin/notes.c:1070 +msgid "notes_ref" +msgstr "anteckningar-ref" + +#: builtin/notes.c:1071 +msgid "use notes from <notes_ref>" +msgstr "använd anteckningar från <anteckningsref>" + +#: builtin/notes.c:1106 builtin/remote.c:1598 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Okänt underkommando: %s" + +#: builtin/pack-objects.c:23 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]" + +#: builtin/pack-objects.c:24 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]" + +#: builtin/pack-objects.c:183 builtin/pack-objects.c:186 +#, c-format +msgid "deflate error (%d)" +msgstr "fel i deflate (%d)" + +#: builtin/pack-objects.c:2398 +#, c-format +msgid "unsupported index version %s" +msgstr "indexversionen %s stöds ej" + +#: builtin/pack-objects.c:2402 +#, c-format +msgid "bad index version '%s'" +msgstr "felaktig indexversion \"%s\"" + +#: builtin/pack-objects.c:2425 +#, c-format +msgid "option %s does not accept negative form" +msgstr "flaggan %s godtar inte negativ form" + +#: builtin/pack-objects.c:2429 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" + +#: builtin/pack-objects.c:2448 +msgid "do not show progress meter" +msgstr "visa inte förloppsindikator" + +#: builtin/pack-objects.c:2450 +msgid "show progress meter" +msgstr "visa förloppsindikator" + +#: builtin/pack-objects.c:2452 +msgid "show progress meter during object writing phase" +msgstr "visa förloppsindikator under objektskrivningsfasen" + +#: builtin/pack-objects.c:2455 +msgid "similar to --all-progress when progress meter is shown" +msgstr "som --all-progress när förloppsmätaren visas" + +#: builtin/pack-objects.c:2456 +msgid "version[,offset]" +msgstr "version[,offset]" + +#: builtin/pack-objects.c:2457 +msgid "write the pack index file in the specified idx format version" +msgstr "skriv paketindexfilen i angiven indexformatversion" + +#: builtin/pack-objects.c:2460 +msgid "maximum size of each output pack file" +msgstr "maximal storlek på varje utdatapaketfil" + +#: builtin/pack-objects.c:2462 +msgid "ignore borrowed objects from alternate object store" +msgstr "ignorera lånade objekt från alternativa objektlager" + +#: builtin/pack-objects.c:2464 +msgid "ignore packed objects" +msgstr "ignorera packade objekt" + +#: builtin/pack-objects.c:2466 +msgid "limit pack window by objects" +msgstr "begränsa paketfönster efter objekt" + +#: builtin/pack-objects.c:2468 +msgid "limit pack window by memory in addition to object limit" +msgstr "begränsa paketfönster efter minne förutom objektgräns" + +#: builtin/pack-objects.c:2470 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "maximal längd på deltakedja tillåten i slutligt paket" + +#: builtin/pack-objects.c:2472 +msgid "reuse existing deltas" +msgstr "återanvänd befintliga delta" + +#: builtin/pack-objects.c:2474 +msgid "reuse existing objects" +msgstr "återanvänd befintliga objekt" + +#: builtin/pack-objects.c:2476 +msgid "use OFS_DELTA objects" +msgstr "använd OFS_DELTA-objekt" + +#: builtin/pack-objects.c:2478 +msgid "use threads when searching for best delta matches" +msgstr "använd trådar vid sökning efter bästa deltaträffar" + +#: builtin/pack-objects.c:2480 +msgid "do not create an empty pack output" +msgstr "försök inte skapa tom paketutdata" + +#: builtin/pack-objects.c:2482 +msgid "read revision arguments from standard input" +msgstr "läs revisionsargument från standard in" + +#: builtin/pack-objects.c:2484 +msgid "limit the objects to those that are not yet packed" +msgstr "begränsa objekt till de som ännu inte packats" + +#: builtin/pack-objects.c:2487 +msgid "include objects reachable from any reference" +msgstr "inkludera objekt som kan nås från någon referens" -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "Kloning misslyckades." +#: builtin/pack-objects.c:2490 +msgid "include objects referred by reflog entries" +msgstr "inkludera objekt som refereras från referensloggposter" -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "Hämtade ingen standardgren." +#: builtin/pack-objects.c:2493 +msgid "output pack to stdout" +msgstr "skriv paket på standard ut" -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Kunde inte slå upp %s till någon incheckning." +#: builtin/pack-objects.c:2495 +msgid "include tag objects that refer to objects to be packed" +msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "Skapar arbetskatalog" +#: builtin/pack-objects.c:2497 +msgid "keep unreachable objects" +msgstr "behåll onåbara objekt" -#: lib/choose_repository.tcl:939 lib/index.tcl:70 lib/index.tcl:133 -#: lib/index.tcl:201 -msgid "files" -msgstr "filer" +#: builtin/pack-objects.c:2498 parse-options.h:141 +msgid "time" +msgstr "tid" -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "Inledande filutcheckning misslyckades." +#: builtin/pack-objects.c:2499 +msgid "unpack unreachable objects newer than <time>" +msgstr "packa upp onåbara objekt nyare än <tid>" -#: lib/choose_repository.tcl:1012 -msgid "Open" -msgstr "Öppna" +#: builtin/pack-objects.c:2502 +msgid "create thin packs" +msgstr "skapa tunna paket" -#: lib/choose_repository.tcl:1022 -msgid "Repository:" -msgstr "Arkiv:" +#: builtin/pack-objects.c:2504 +msgid "ignore packs that have companion .keep file" +msgstr "ignorera paket som har tillhörande .keep-fil" -#: lib/choose_repository.tcl:1071 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Kunde inte öppna arkivet %s:" +#: builtin/pack-objects.c:2506 +msgid "pack compression level" +msgstr "komprimeringsgrad för paket" -#: lib/choose_rev.tcl:52 -msgid "This Detached Checkout" -msgstr "Denna frånkopplade utcheckning" +#: builtin/pack-objects.c:2508 +msgid "do not hide commits by grafts" +msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Revisionsuttryck:" +#: builtin/pack-refs.c:6 +msgid "git pack-refs [options]" +msgstr "git pack-refs [flaggor]" -#: lib/choose_rev.tcl:72 -msgid "Local Branch" -msgstr "Lokal gren" +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "packa allt" -#: lib/choose_rev.tcl:77 -msgid "Tracking Branch" -msgstr "Spårande gren" +#: builtin/pack-refs.c:15 +msgid "prune loose refs (default)" +msgstr "ta bort lösa referenser (standard)" -#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:543 -msgid "Tag" -msgstr "Tagg" +#: builtin/prune-packed.c:7 +msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" -#: lib/choose_rev.tcl:321 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Ogiltig revision: %s" +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" -#: lib/choose_rev.tcl:342 -msgid "No revision selected." -msgstr "Ingen revision vald." +#: builtin/prune.c:132 +msgid "do not remove, show only" +msgstr "ta inte bort, bara visa" -#: lib/choose_rev.tcl:350 -msgid "Revision expression is empty." -msgstr "Revisionsuttrycket är tomt." +#: builtin/prune.c:133 +msgid "report pruned objects" +msgstr "rapportera borttagna objekt" -#: lib/choose_rev.tcl:536 -msgid "Updated" -msgstr "Uppdaterad" +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "låt tid gå ut för objekt äldre än <tid>" -#: lib/choose_rev.tcl:564 -msgid "URL" -msgstr "Webbadress" +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" -#: lib/commit.tcl:9 +#: builtin/push.c:45 +msgid "tag shorthand without <tag>" +msgstr "taggförkortning utan <tagg>" + +#: builtin/push.c:64 +msgid "--delete only accepts plain target ref names" +msgstr "--delete godtar endast enkla målreferensnamn" + +#: builtin/push.c:99 msgid "" -"There is nothing to amend.\n" "\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" +"To choose either option permanently, see push.default in 'git help config'." msgstr "" -"Det finns ingenting att utöka.\n" "\n" -"Du håller på att skapa den inledande incheckningen. Det finns ingen tidigare " -"incheckning att utöka.\n" +"För att välja ett av alternativen permanent, se push.default i \"git help " +"config\"." -#: lib/commit.tcl:18 +#: builtin/push.c:102 +#, c-format msgid "" -"Cannot amend while merging.\n" +"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" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" +"To push to the branch of the same name on the remote, use\n" +"\n" +" git push %s %s\n" +"%s" msgstr "" -"Kan inte utöka vid sammanslagning.\n" +"Uppströmsgrenen för din nuvarande gren stämmer inte överens\n" +"med namnet på din aktuella gren. För att sända till uppströmsgrenen\n" +"i fjärrarkivet använder du\n" "\n" -"Du är i mitten av en sammanslagning som inte är fullbordad. Du kan inte " -"utöka tidigare incheckningar om du inte först avbryter den pågående " -"sammanslagningen.\n" +" git push %s HEAD:%s\n" +"\n" +"För att sända till grenen med samma namn i fjärrarkivet använder du\n" +"\n" +" git push %s %s\n" +"%s" -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Fel vid inläsning av incheckningsdata för utökning:" +#: 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 "" +"Du är inte på någon gren för närvarande.\n" +"För att sända in historiken som leder till den aktuella (frånkopplat\n" +"HEAD) situationen använder du\n" +"\n" +" git push %s HEAD:<namn-på-fjärrgren>\n" -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Kunde inte hämta din identitet:" +#: 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 "" +"Den aktuella grenen %s har ingen uppströmsgren.\n" +"För att sända aktuell gren och ange fjärrarkiv som uppström använder du\n" +"\n" +" git push --set-upstream %s %s\n" -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Felaktig GIT_COMMITTER_IDENT:" +#: builtin/push.c:136 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända." -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"." +#: 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 "" +"Du sänder till fjärren \"%s\", som inte är uppströms för den\n" +"aktuella grenen \"%s\", utan att tala om för mig vad som\n" +"skall sändas för att uppdatera fjärrgrenen." -#: lib/commit.tcl:149 +#: builtin/push.c:151 msgid "" -"Last scanned state does not match repository state.\n" +"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" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" +" git config --global push.default matching\n" "\n" -"The rescan will be automatically started now.\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 "" -"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n" +"push.default har inte ställts in; dess underförstådda värde\n" +"ändras i Git 2.0 från \"matching\" till \"simple\". För att\n" +"undertrycka det här meddelandet och behålla nuvarande beteende\n" +"efter att förvalet ändras,\n" +"skriver du:\n" "\n" -"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste " -"utföra en ny sökning innan du kan göra en ny incheckning.\n" +" git config --global push.default matching\n" "\n" -"Sökningen kommer att startas automatiskt nu.\n" - -#: lib/commit.tcl:172 -#, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" +"För att undertrycka meddelandet och välja det nya beteendet nu skriver du:\n" "\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" -msgstr "" -"Osammanslagna filer kan inte checkas in.\n" +" git config --global push.default simple\n" "\n" -"Filen %s har sammanslagningskonflikter. Du måste lösa dem och köa filen " -"innan du checkar in den.\n" +"Se \"git help config\" och sök efter \"push.default\" för ytterligare \n" +"information. (Läget \"simple\" introducerades i Git 1.7.11. Använd det\n" +"liknande läget \"current\" istället för \"simple\" om du ibland använder\n" +"äldre versioner av Git.)" -#: lib/commit.tcl:180 -#, tcl-format +#: builtin/push.c:199 msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -"Okänd filstatus %s upptäckt.\n" -"\n" -"Filen %s kan inte checkas in av programmet.\n" +"Du angav inga referensspecifikationer att sända, och push.default är " +"\"nothing\"." -#: lib/commit.tcl:188 +#: builtin/push.c:206 msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" +"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 "" -"Inga ändringar att checka in.\n" -"\n" -"Du måste köa åtminstone en fil innan du kan checka in.\n" +"Uppdateringar avvisades då änden på din befintliga gren är bakom\n" +"dess fjärrmotsvarighet. Slå ihop fjärrändringarna (t.ex. \"git pull\")\n" +"innan du sänder igen.\n" +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: lib/commit.tcl:203 +#: builtin/push.c:212 msgid "" -"Please supply a commit message.\n" +"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 "" +"Uppdateringar avvisades då änden på en insänd gren är bakom dess\n" +"fjärrmotsvarighet. Om det inte var meningen att sända in grenen, bör\n" +"du specificera grenar att sända, eller ändra inställningsvariabeln\n" +"\"push-default\" till \"simple\", \"current\" eller \"upstream\" för att " +"endast\n" +"sända aktuell gren." + +#: 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 "" +"Uppdateringar avvisades då änden på en gren som sänds in är bakom dess\n" +"fjärrmotsvarighet. Checka ut grenen och slå ihop fjärrändringarna (t.ex.\n" +"\"git pull\") innan du sänder igen.\n" +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." + +#: builtin/push.c:258 +#, c-format +msgid "Pushing to %s\n" +msgstr "Sänder till %s\n" + +#: builtin/push.c:262 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "misslyckades sända vissa referenser till \"%s\"" + +#: builtin/push.c:294 +#, c-format +msgid "bad repository '%s'" +msgstr "felaktigt arkiv \"%s\"" + +#: builtin/push.c:295 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" "\n" -"A good commit message has the following format:\n" +" git remote add <name> <url>\n" "\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" msgstr "" -"Ange ett incheckningsmeddelande.\n" +"Ingen destination har angivits.\n" +"Ange antingen URL:en på kommandoraden eller ställ in ett uppströmsarkiv med\n" +"\n" +" git remote add <namn> <url>\n" "\n" -"Ett bra incheckningsmeddelande har följande format:\n" +"och sänd sedan med hjälp av fjärrnamnet\n" "\n" -"- Första raden: Beskriv i en mening vad du gjorde.\n" -"- Andra raden: Tom\n" -"- Följande rader: Beskriv varför det här är en bra ändring.\n" +" git push <namn>\n" + +#: builtin/push.c:310 +msgid "--all and --tags are incompatible" +msgstr "--all och --tags är inkompatibla" + +#: builtin/push.c:311 +msgid "--all can't be combined with refspecs" +msgstr "--all kan inte kombineras med referensspecifikationer" -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." -msgstr "Anropar kroken före incheckning (pre-commit)..." +#: builtin/push.c:316 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror och --tags är inkompatibla" -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "Incheckningen avvisades av kroken före incheckning (pre-commit)." +#: builtin/push.c:317 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "Anropar kroken för incheckningsmeddelande (commit-msg)..." +#: builtin/push.c:322 +msgid "--all and --mirror are incompatible" +msgstr "--all och --mirror är inkompatibla" -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "Incheckning avvisad av kroken för incheckningsmeddelande (commit-msg)." +#: builtin/push.c:382 +msgid "repository" +msgstr "arkiv" -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "Checkar in ändringar..." +#: builtin/push.c:383 +msgid "push all refs" +msgstr "sänd alla referenser" -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "write-tree misslyckades:" +#: builtin/push.c:384 +msgid "mirror all refs" +msgstr "spegla alla referenser" -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "Incheckningen misslyckades." +#: builtin/push.c:386 +msgid "delete refs" +msgstr "ta bort referenser" -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Incheckningen %s verkar vara trasig" +#: builtin/push.c:387 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: lib/commit.tcl:339 +#: builtin/push.c:390 +msgid "force updates" +msgstr "tvinga uppdateringar" + +#: builtin/push.c:391 +msgid "check" +msgstr "kontrollera" + +#: builtin/push.c:392 +msgid "control recursive pushing of submodules" +msgstr "styr rekursiv insändning av undermoduler" + +#: builtin/push.c:394 +msgid "use thin pack" +msgstr "använd tunna paket" + +#: builtin/push.c:395 builtin/push.c:396 +msgid "receive pack program" +msgstr "program för att ta emot paket" + +#: builtin/push.c:397 +msgid "set upstream for git pull/status" +msgstr "ställ in uppström för git pull/status" + +#: builtin/push.c:400 +msgid "prune locally removed refs" +msgstr "ta bort lokalt borttagna referenser" + +#: builtin/push.c:410 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete är imkompatibel med --all, --mirror och --tags" + +#: builtin/push.c:412 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete kan inte användas utan referenser" + +#: builtin/read-tree.c:36 msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" +"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 "" -"Inga ändringar att checka in.\n" -"\n" -"Inga filer ändrades av incheckningen och det var inte en sammanslagning.\n" -"\n" -"En sökning kommer att startas automatiskt nu.\n" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])" + +#: builtin/read-tree.c:108 +msgid "write resulting index to <file>" +msgstr "skriv resulterande index till <fil>" -#: lib/commit.tcl:346 -msgid "No changes to commit." -msgstr "Inga ändringar att checka in." +#: builtin/read-tree.c:111 +msgid "only empty the index" +msgstr "töm bara indexet" -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "commit-tree misslyckades:" +#: builtin/read-tree.c:113 +msgid "Merging" +msgstr "Sammanslagning" -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "update-ref misslyckades:" +#: builtin/read-tree.c:115 +msgid "perform a merge in addition to a read" +msgstr "utför en sammanslagning i tillägg till en läsning" -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Skapade incheckningen %s: %s" +#: builtin/read-tree.c:117 +msgid "3-way merge if no file level merging required" +msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs" -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Arbetar... vänta..." +#: builtin/read-tree.c:119 +msgid "3-way merge in presence of adds and removes" +msgstr "3-vägssammanslagning när det finns tillägg och borttagningar" -#: lib/console.tcl:186 -msgid "Success" -msgstr "Lyckades" +#: builtin/read-tree.c:121 +msgid "same as -m, but discard unmerged entries" +msgstr "som -m, men kasta bort ej sammanslagna poster" -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Fel: Kommando misslyckades" +#: builtin/read-tree.c:122 +msgid "<subdirectory>/" +msgstr "<underkatalog>/" -#: lib/database.tcl:42 -msgid "Number of loose objects" -msgstr "Antal lösa objekt" +#: builtin/read-tree.c:123 +msgid "read the tree into the index under <subdirectory>/" +msgstr "läs in trädet i indexet under <underkatalog>/" -#: lib/database.tcl:43 -msgid "Disk space used by loose objects" -msgstr "Diskutrymme använt av lösa objekt" +#: builtin/read-tree.c:126 +msgid "update working tree with merge result" +msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen" -#: lib/database.tcl:44 -msgid "Number of packed objects" -msgstr "Antal packade objekt" +#: builtin/read-tree.c:128 +msgid "gitignore" +msgstr "gitignore" -#: lib/database.tcl:45 -msgid "Number of packs" -msgstr "Antal paket" +#: builtin/read-tree.c:129 +msgid "allow explicitly ignored files to be overwritten" +msgstr "tillåt explicit ignorerade filer att skrivas över" -#: lib/database.tcl:46 -msgid "Disk space used by packed objects" -msgstr "Diskutrymme använt av packade objekt" +#: builtin/read-tree.c:132 +msgid "don't check the working tree after merging" +msgstr "kontrollera inte arbetskatalogen efter sammanslagning" -#: lib/database.tcl:47 -msgid "Packed objects waiting for pruning" -msgstr "Packade objekt som väntar på städning" +#: builtin/read-tree.c:133 +msgid "don't update the index or the work tree" +msgstr "uppdatera inte indexet eller arbetskatalogen" -#: lib/database.tcl:48 -msgid "Garbage files" -msgstr "Skräpfiler" +#: builtin/read-tree.c:135 +msgid "skip applying sparse checkout filter" +msgstr "hoppa över att applicera filter för gles utcheckning" -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Komprimerar objektdatabasen" +#: builtin/read-tree.c:137 +msgid "debug unpack-trees" +msgstr "felsök unpack-trees" -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Verifierar objektdatabasen med fsck-objects" +#: builtin/remote.c:11 +msgid "git remote [-v | --verbose]" +msgstr "git remote [-v | --verbose]" -#: lib/database.tcl:107 -#, tcl-format +#: builtin/remote.c:12 msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <name> <url>" msgstr "" -"Arkivet har för närvarande omkring %i lösa objekt.\n" -"\n" -"För att bibehålla optimal prestanda rekommenderas det å det bestämdaste att " -"du komprimerar databasen.\n" -"\n" -"Komprimera databasen nu?" +"git remote add [-t <gren>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <namn> <url>" -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Ogiltigt datum från Git: %s" +#: builtin/remote.c:13 builtin/remote.c:32 +msgid "git remote rename <old> <new>" +msgstr "git remote rename <gammal> <ny>" -#: lib/diff.tcl:64 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." -msgstr "" -"Hittade inga skillnader.\n" -"\n" -"%s innehåller inga ändringar.\n" -"\n" -"Modifieringsdatum för filen uppdaterades av ett annat program, men " -"innehållet i filen har inte ändrats.\n" -"\n" -"En sökning kommer automatiskt att startas för att hitta andra filer som kan " -"vara i samma tillstånd." +#: builtin/remote.c:14 builtin/remote.c:37 +msgid "git remote remove <name>" +msgstr "git remote remove <namn>" -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Läser differens för %s..." +#: builtin/remote.c:15 +msgid "git remote set-head <name> (-a | -d | <branch>)" +msgstr "git remote set-head <namn> (-a | -d | <gren>)" -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"LOKAL: borttagen\n" -"FJÄRR:\n" +#: builtin/remote.c:16 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "git remote [-v | --verbose] show [-n] <namn>" + +#: builtin/remote.c:17 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "git remote prune [-n | --dry-run] <namn>" -#: lib/diff.tcl:130 +#: builtin/remote.c:18 msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" -"FJÄRR: borttagen\n" -"LOKAL:\n" +"git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]" + +#: builtin/remote.c:19 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "git remote set-branches [--add] <namn> <gren>..." + +#: builtin/remote.c:20 builtin/remote.c:68 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]" + +#: builtin/remote.c:21 builtin/remote.c:69 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <namn> <nyurl>" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <namn> <url>" + +#: builtin/remote.c:27 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<flaggor>] <namn> <url>" + +#: builtin/remote.c:42 +msgid "git remote set-head <name> (-a | -d | <branch>])" +msgstr "git remote set-head <namn> (-a | -d | <gren>])" -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "LOKAL:\n" +#: builtin/remote.c:47 +msgid "git remote set-branches <name> <branch>..." +msgstr "git remote set-branches <namn> <gren>..." -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "FJÄRR:\n" +#: builtin/remote.c:48 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "git remote set-branches --add <namn> <gren>..." -#: lib/diff.tcl:202 lib/diff.tcl:322 -#, tcl-format -msgid "Unable to display %s" -msgstr "Kan inte visa %s" +#: builtin/remote.c:53 +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<flaggor>] <namn>" -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "Fel vid läsning av fil:" +#: builtin/remote.c:58 +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<flaggor>] <namn>" -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Gitarkiv (underprojekt)" +#: builtin/remote.c:63 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..." -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* Binärfil (visar inte innehållet)." +#: builtin/remote.c:98 +#, c-format +msgid "Updating %s" +msgstr "Uppdaterar %s" -#: lib/diff.tcl:227 -#, tcl-format +#: builtin/remote.c:130 msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" msgstr "" -"* Den ospårade filen är %d byte.\n" -"* Visar endast inledande %d byte.\n" +"--mirror är farlig och föråldrad; använd\n" +"\t --mirror=fetch eller --mirror=push istället" + +#: builtin/remote.c:147 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "okänt argument till mirror: %s" + +#: builtin/remote.c:163 +msgid "fetch the remote branches" +msgstr "hämta fjärrgrenarna" + +#: builtin/remote.c:165 +msgid "import all tags and associated objects when fetching" +msgstr "importera alla taggar och associerade objekt vid hämtning" + +#: builtin/remote.c:168 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "eller hämta inte några taggar alls (--no-tags)" + +#: builtin/remote.c:170 +msgid "branch(es) to track" +msgstr "gren(ar) att spåra" + +#: builtin/remote.c:171 +msgid "master branch" +msgstr "huvudgren" + +#: builtin/remote.c:172 +msgid "push|fetch" +msgstr "push|fetch" + +#: builtin/remote.c:173 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "ställ in arkiv som spegel att sända eller ta emot från" + +#: builtin/remote.c:185 +msgid "specifying a master branch makes no sense with --mirror" +msgstr "att ange en master-gren ger ingen mening med --mirror" + +#: builtin/remote.c:187 +msgid "specifying branches to track makes sense only with fetch mirrors" +msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" + +#: builtin/remote.c:195 builtin/remote.c:646 +#, c-format +msgid "remote %s already exists." +msgstr "fjärrarkivet %s finns redan." + +#: builtin/remote.c:199 builtin/remote.c:650 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" + +#: builtin/remote.c:243 +#, c-format +msgid "Could not setup master '%s'" +msgstr "Kunde inte skapa master \"%s\"" + +#: builtin/remote.c:299 +#, c-format +msgid "more than one %s" +msgstr "mer än en %s" + +#: builtin/remote.c:339 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "Kunde inte hämta mappning för referensspecifikation %s" + +#: builtin/remote.c:440 builtin/remote.c:448 +msgid "(matching)" +msgstr "(matchande)" + +#: builtin/remote.c:452 +msgid "(delete)" +msgstr "(ta bort)" + +#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "Kunde inte tillämpa \"%s\" på \"%s\"" + +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#, c-format +msgid "No such remote: %s" +msgstr "Inget sådant fjärrarkiv: %s" + +#: builtin/remote.c:656 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" + +#: builtin/remote.c:662 builtin/remote.c:799 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" + +#: 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 "" +"Uppdaterar inte icke-standard hämtningsreferensspecifikation\n" +"\t%s\n" +"\tUppdatera konfigurationen manuellt om nödvändigt." + +#: builtin/remote.c:683 +#, c-format +msgid "Could not append '%s'" +msgstr "Kunde inte lägga till på \"%s\"" + +#: builtin/remote.c:694 +#, c-format +msgid "Could not set '%s'" +msgstr "Kunde inte sätta \"%s\"" + +#: builtin/remote.c:716 +#, c-format +msgid "deleting '%s' failed" +msgstr "misslyckades ta bort \"%s\"" + +#: builtin/remote.c:750 +#, c-format +msgid "creating '%s' failed" +msgstr "misslyckades skapa \"%s\"" + +#: builtin/remote.c:764 +#, c-format +msgid "Could not remove branch %s" +msgstr "Kunde inte ta bort grenen %s" + +#: 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] "" +"Observera: En gren utanför hierarkin refs/remotes/ togs inte bort;\n" +"för att ta bort den, använd:" +msgstr[1] "" +"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n" +"för att ta bort dem, använd:" + +#: builtin/remote.c:943 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " ny (nästa hämtning sparar i remotes/%s)" + +#: builtin/remote.c:946 +msgid " tracked" +msgstr " spårad" + +#: builtin/remote.c:948 +msgid " stale (use 'git remote prune' to remove)" +msgstr " förlegad (använd \"git remote prune\" för att ta bort)" + +#: builtin/remote.c:950 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:991 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren" + +#: builtin/remote.c:998 +#, c-format +msgid "rebases onto remote %s" +msgstr "ombaseras på fjärren %s" + +#: builtin/remote.c:1001 +#, c-format +msgid " merges with remote %s" +msgstr " sammanslås med fjärren %s" + +#: builtin/remote.c:1002 +msgid " and with remote" +msgstr " och med fjärren" + +#: builtin/remote.c:1004 +#, c-format +msgid "merges with remote %s" +msgstr "sammanslås med fjärren %s" + +#: builtin/remote.c:1005 +msgid " and with remote" +msgstr " och med fjärren" + +#: builtin/remote.c:1051 +msgid "create" +msgstr "skapa" + +#: builtin/remote.c:1054 +msgid "delete" +msgstr "ta bort" + +#: builtin/remote.c:1058 +msgid "up to date" +msgstr "àjour" + +#: builtin/remote.c:1061 +msgid "fast-forwardable" +msgstr "kan snabbspolas" + +#: builtin/remote.c:1064 +msgid "local out of date" +msgstr "lokal föråldrad" + +#: builtin/remote.c:1071 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s tvingar till %-*s (%s)" + +#: builtin/remote.c:1074 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s sänder till %-*s (%s)" + +#: builtin/remote.c:1078 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s tvingar till %s" + +#: builtin/remote.c:1081 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s sänder till %s" + +#: builtin/remote.c:1091 +msgid "do not query remotes" +msgstr "fråga inte fjärrar" + +#: builtin/remote.c:1118 +#, c-format +msgid "* remote %s" +msgstr "* fjärr %s" + +#: builtin/remote.c:1119 +#, c-format +msgid " Fetch URL: %s" +msgstr " Hämt-URL: %s" + +#: builtin/remote.c:1120 builtin/remote.c:1285 +msgid "(no URL)" +msgstr "(ingen URL)" + +#: builtin/remote.c:1129 builtin/remote.c:1131 +#, c-format +msgid " Push URL: %s" +msgstr " Sänd-URL: %s" + +#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#, c-format +msgid " HEAD branch: %s" +msgstr " HEAD-gren: %s" + +#: builtin/remote.c:1139 +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n" + +#: builtin/remote.c:1151 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " Fjärrgren:%s" +msgstr[1] " Fjärrgrenar:%s" + +#: builtin/remote.c:1154 builtin/remote.c:1181 +msgid " (status not queried)" +msgstr " (status inte förfrågad)" + +#: builtin/remote.c:1163 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] " Lokal gren konfigurerad för \"git pull\":" +msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" + +#: builtin/remote.c:1171 +msgid " Local refs will be mirrored by 'git push'" +msgstr " Lokala referenser speglas av \"git push\"" + +#: 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] " Lokal referens konfigurerad för \"git push\"%s:" +msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" + +#: builtin/remote.c:1199 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" + +#: builtin/remote.c:1201 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "ta bort refs/remotes/<namn>/HEAD" + +#: builtin/remote.c:1216 +msgid "Cannot determine remote HEAD" +msgstr "Kan inte bestämma HEAD på fjärren" + +#: builtin/remote.c:1218 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" + +#: builtin/remote.c:1228 +#, c-format +msgid "Could not delete %s" +msgstr "Kunde inte ta bort %s" + +#: builtin/remote.c:1236 +#, c-format +msgid "Not a valid ref: %s" +msgstr "Inte en giltig referens: %s" + +#: builtin/remote.c:1238 +#, c-format +msgid "Could not setup %s" +msgstr "Kunde inte ställa in %s" + +#: builtin/remote.c:1274 +#, c-format +msgid " %s will become dangling!" +msgstr " %s kommer bli dinglande!" + +#: builtin/remote.c:1275 +#, c-format +msgid " %s has become dangling!" +msgstr " %s har blivit dinglande!" + +#: builtin/remote.c:1281 +#, c-format +msgid "Pruning %s" +msgstr "Rensar %s" + +#: builtin/remote.c:1282 +#, c-format +msgid "URL: %s" +msgstr "URL: %s" + +#: builtin/remote.c:1295 +#, c-format +msgid " * [would prune] %s" +msgstr " * [skulle rensa] %s" + +#: builtin/remote.c:1298 +#, c-format +msgid " * [pruned] %s" +msgstr " * [rensad] %s" + +#: builtin/remote.c:1321 +msgid "prune remotes after fetching" +msgstr "rensa fjärrar efter hämtning" + +#: builtin/remote.c:1387 builtin/remote.c:1461 +#, c-format +msgid "No such remote '%s'" +msgstr "Ingen sådan fjärr \"%s\"" + +#: builtin/remote.c:1407 +msgid "add branch" +msgstr "lägg till gren" + +#: builtin/remote.c:1414 +msgid "no remote specified" +msgstr "ingen fjärr angavs" + +#: builtin/remote.c:1436 +msgid "manipulate push URLs" +msgstr "manipulera URL:ar för sändning" + +#: builtin/remote.c:1438 +msgid "add URL" +msgstr "lägg till URL" + +#: builtin/remote.c:1440 +msgid "delete URLs" +msgstr "ta bort URL:ar" + +#: builtin/remote.c:1447 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete ger ingen mening" + +#: builtin/remote.c:1487 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "Felaktig gammalt URL-mönster: %s" + +#: builtin/remote.c:1495 +#, c-format +msgid "No such URL found: %s" +msgstr "Ingen sådan URL hittades: %s" + +#: builtin/remote.c:1497 +msgid "Will not delete all non-push URLs" +msgstr "Kommer inte ta bort alla icke-sänd-URL:er" + +#: builtin/remote.c:1569 +msgid "be verbose; must be placed before a subcommand" +msgstr "var pratsam; måste skrivas före ett underkommando" + +#: builtin/replace.c:17 +msgid "git replace [-f] <object> <replacement>" +msgstr "git replace [-f] <objekt> <ersättning>" + +#: builtin/replace.c:18 +msgid "git replace -d <object>..." +msgstr "git replace -d <objekt>..." + +#: builtin/replace.c:19 +msgid "git replace -l [<pattern>]" +msgstr "git replace -l [<mönster>]" + +#: builtin/replace.c:118 +msgid "list replace refs" +msgstr "visa ersättningsreferenser" + +#: builtin/replace.c:119 +msgid "delete replace refs" +msgstr "ta bort ersättningsreferenser" + +#: builtin/replace.c:120 +msgid "replace the ref if it exists" +msgstr "ersätt referensen om den finns" + +#: builtin/rerere.c:11 +msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" + +#: builtin/rerere.c:56 +msgid "register clean resolutions in index" +msgstr "registrera rena lösningar i indexet" + +#: builtin/reset.c:25 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" + +#: builtin/reset.c:26 +msgid "git reset [-q] <commit> [--] <paths>..." +msgstr "git reset [-q] <incheckning> [--] <sökvägar>..." + +#: builtin/reset.c:27 +msgid "git reset --patch [<commit>] [--] [<paths>...]" +msgstr "git reset --patch [<incheckning>] [--] [<sökvägar>...]" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "blandad" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "mjuk" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "hård" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "sammanslagning" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "behåll" + +#: builtin/reset.c:77 +msgid "You do not have a valid HEAD." +msgstr "Du har inte en giltig HEAD." + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "Kunde inte hitta träder för HEAD." + +#: builtin/reset.c:85 +#, c-format +msgid "Failed to find tree of %s." +msgstr "Kunde inte hitta träder för %s." + +#: builtin/reset.c:96 +msgid "Could not write new index file." +msgstr "Kunde inte skriva ny indexfil." + +#: builtin/reset.c:106 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD är nu på %s" + +#: builtin/reset.c:130 +msgid "Could not read index" +msgstr "Kunde inte läsa indexet" + +#: builtin/reset.c:133 +msgid "Unstaged changes after reset:" +msgstr "Oköade ändringar efter återställning:" + +#: builtin/reset.c:223 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." + +#: builtin/reset.c:238 +msgid "be quiet, only report errors" +msgstr "var tyst, rapportera endast fel" + +#: builtin/reset.c:240 +msgid "reset HEAD and index" +msgstr "återställ HEAD och index" + +#: builtin/reset.c:241 +msgid "reset only HEAD" +msgstr "återställ endast HEAD" + +#: builtin/reset.c:243 builtin/reset.c:245 +msgid "reset HEAD, index and working tree" +msgstr "återställ HEAD, index och arbetskatalog" + +#: builtin/reset.c:247 +msgid "reset HEAD but keep local changes" +msgstr "återställ HEAD men behåll lokala ändringar" + +#: builtin/reset.c:303 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Kan inte tolka objektet \"%s\"" + +#: builtin/reset.c:308 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch är inkompatibel med --{hard,mixed,soft}" + +#: builtin/reset.c:317 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "" +"--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." + +#: builtin/reset.c:319 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "Kan inte göra %s återställning med sökvägar." + +#: builtin/reset.c:331 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "%s återställning tillåts inte i ett naket arkiv" -#: lib/diff.tcl:233 -#, tcl-format +#: builtin/reset.c:347 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." + +#: builtin/rev-parse.c:339 +msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgstr "git rev-parse --parseopt [options] -- [<argument>...]" + +#: builtin/rev-parse.c:344 +msgid "keep the `--` passed as an arg" +msgstr "behåll \"--\" sänt som argument" + +#: builtin/rev-parse.c:346 +msgid "stop parsing after the first non-option argument" +msgstr "sluta tolka efter första argument som inte är flagga" + +#: 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" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" +"Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" +"git rev-parse --parseopt [flaggor] -- [<argument>...]\n" +" eller: git rev-parse --sq-quote [<argument>...]\n" +" eller: git rev-parse [flaggor] [<argument>...]\n" "\n" -"* Den ospårade filen klipptes här av %s.\n" -"* För att se hela filen, använd ett externt redigeringsprogram.\n" +"Kör \"git rev-parse --parseopt -h\" för mer information om den första " +"varianten." -#: lib/diff.tcl:485 -msgid "Failed to unstage selected hunk." -msgstr "Kunde inte ta bort den valda delen från kön." +#: builtin/revert.c:22 +msgid "git revert [options] <commit-ish>" +msgstr "git revert [flaggor] <incheckning-igt>" -#: lib/diff.tcl:492 -msgid "Failed to stage selected hunk." -msgstr "Kunde inte lägga till den valda delen till kön." +#: builtin/revert.c:23 +msgid "git revert <subcommand>" +msgstr "git revert <underkommando>" -#: lib/diff.tcl:571 -msgid "Failed to unstage selected line." -msgstr "Kunde inte ta bort den valda raden från kön." +#: builtin/revert.c:28 +msgid "git cherry-pick [options] <commit-ish>" +msgstr "git cherry-pick [flaggor] <incheckning-igt>" -#: lib/diff.tcl:579 -msgid "Failed to stage selected line." -msgstr "Kunde inte lägga till den valda raden till kön." +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "git cherry-pick <underkommando>" -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Standard" +#: builtin/revert.c:70 builtin/revert.c:92 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s kan inte användas med %s" -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Systemets (%s)" +#: builtin/revert.c:103 +msgid "end revert or cherry-pick sequence" +msgstr "avsluta revert- eller cherry-pick-sekvens" -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Annan" +#: builtin/revert.c:104 +msgid "resume revert or cherry-pick sequence" +msgstr "återuppta revert- eller cherry-pick-sekvens" -#: lib/error.tcl:20 lib/error.tcl:116 -msgid "error" -msgstr "fel" +#: builtin/revert.c:105 +msgid "cancel revert or cherry-pick sequence" +msgstr "avbryt revert- eller cherry-pick-sekvens" -#: lib/error.tcl:36 -msgid "warning" -msgstr "varning" +#: builtin/revert.c:106 +msgid "don't automatically commit" +msgstr "checka inte in automatiskt" -#: lib/error.tcl:96 -msgid "You must correct the above errors before committing." -msgstr "Du måste rätta till felen ovan innan du checkar in." +#: builtin/revert.c:107 +msgid "edit the commit message" +msgstr "redigera incheckningsmeddelandet" -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Kunde inte låsa upp indexet." +#: builtin/revert.c:110 +msgid "parent number" +msgstr "nummer på förälder" -#: lib/index.tcl:17 -msgid "Index Error" -msgstr "Indexfel" +#: builtin/revert.c:112 +msgid "merge strategy" +msgstr "sammanslagninsstrategi" -#: lib/index.tcl:19 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Misslyckades med att uppdatera Gitindexet. En omsökning kommer att startas " -"automatiskt för att synkronisera om git-gui." +#: builtin/revert.c:113 +msgid "option" +msgstr "alternativ" -#: lib/index.tcl:30 -msgid "Continue" -msgstr "Fortsätt" +#: builtin/revert.c:114 +msgid "option for merge strategy" +msgstr "alternativ för sammanslagningsstrategi" -#: lib/index.tcl:33 -msgid "Unlock Index" -msgstr "Lås upp index" +#: builtin/revert.c:125 +msgid "append commit name" +msgstr "lägg till incheckningsnamn" -#: lib/index.tcl:292 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Tar bort %s för incheckningskön" +#: builtin/revert.c:126 +msgid "allow fast-forward" +msgstr "tillåt snabbspolning" -#: lib/index.tcl:331 -msgid "Ready to commit." -msgstr "Redo att checka in." +#: builtin/revert.c:127 +msgid "preserve initially empty commits" +msgstr "behåll incheckningar som börjar som tomma" -#: lib/index.tcl:344 -#, tcl-format -msgid "Adding %s" -msgstr "Lägger till %s" +#: builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "tillåt incheckningar med tomt meddelande" -#: lib/index.tcl:401 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Återställ ändringarna i filen %s?" +#: builtin/revert.c:129 +msgid "keep redundant, empty commits" +msgstr "behåll redundanta, tomma incheckningar" -#: lib/index.tcl:403 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Återställ ändringarna i dessa %i filer?" +#: builtin/revert.c:133 +msgid "program error" +msgstr "programfel" -#: lib/index.tcl:411 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Alla oköade ändringar kommer permanent gå förlorade vid återställningen." +#: builtin/revert.c:223 +msgid "revert failed" +msgstr "\"revert\" misslyckades" -#: lib/index.tcl:414 -msgid "Do Nothing" -msgstr "Gör ingenting" +#: builtin/revert.c:238 +msgid "cherry-pick failed" +msgstr "\"cherry-pick\" misslyckades" -#: lib/index.tcl:432 -msgid "Reverting selected files" -msgstr "Återställer valda filer" +#: builtin/rm.c:14 +msgid "git rm [options] [--] <file>..." +msgstr "git rm [flaggor] [--] <fil>..." -#: lib/index.tcl:436 -#, tcl-format -msgid "Reverting %s" -msgstr "Återställer %s" +#: builtin/rm.c:109 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" +"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n" +"(använd -f för att tvinga borttagning)" -#: lib/merge.tcl:13 +#: builtin/rm.c:115 +#, c-format msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" msgstr "" -"Kan inte slå ihop vid utökning.\n" -"\n" -"Du måste göra färdig utökningen av incheckningen innan du påbörjar någon " -"slags sammanslagning.\n" +"\"%s\" har köade ändringar i indexet\n" +"(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: lib/merge.tcl:27 +#: builtin/rm.c:119 +#, c-format msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" msgstr "" -"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n" -"\n" -"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste " -"utföra en ny sökning innan du kan utföra en sammanslagning.\n" -"\n" -"Sökningen kommer att startas automatiskt nu.\n" +"\"%s\" har lokala ändringar\n" +"(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: lib/merge.tcl:45 -#, tcl-format +#: builtin/rm.c:134 +msgid "do not list removed files" +msgstr "lista inte borttagna filer" + +#: builtin/rm.c:135 +msgid "only remove from the index" +msgstr "ta bara bort från indexet" + +#: builtin/rm.c:136 +msgid "override the up-to-date check" +msgstr "överstyr àjour-testet" + +#: builtin/rm.c:137 +msgid "allow recursive removal" +msgstr "tillåt rekursiv borttagning" + +#: builtin/rm.c:139 +msgid "exit with a zero status even if nothing matched" +msgstr "avsluta med nollstatus även om inget träffades" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "tar inte bort \"%s\" rekursivt utan -r" + +#: builtin/rm.c:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: kan inte ta bort %s" + +#: builtin/shortlog.c:13 +msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +msgstr "" +"git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "Författare saknas: %s" + +#: builtin/shortlog.c:253 +msgid "sort output according to the number of commits per author" +msgstr "sortera utdata enligt antal incheckningar per författare" + +#: builtin/shortlog.c:255 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "Undertryck beskrivningar, visa bara antal incheckningar" + +#: builtin/shortlog.c:257 +msgid "Show the email address of each author" +msgstr "Visa e-postadress för varje författare" + +#: builtin/shortlog.c:258 +msgid "w[,i1[,i2]]" +msgstr "w[,i1[,i2]]" + +#: builtin/shortlog.c:259 +msgid "Linewrap output" +msgstr "Radbryt utdata" + +#: builtin/show-branch.c:9 msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" +"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 "" -"Du är mitt i en sammanslagning med konflikter.\n" -"\n" -"Filen %s har sammanslagningskonflikter.\n" -"\n" -"Du måste lösa dem, köa filen och checka in för att fullborda den aktuella " -"sammanslagningen. När du gjort det kan du påbörja en ny sammanslagning.\n" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<när>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<mönster>)...]" + +#: builtin/show-branch.c:10 +msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]" + +#: builtin/show-branch.c:651 +msgid "show remote-tracking and local branches" +msgstr "visa fjärrspårande och lokala grenar" + +#: builtin/show-branch.c:653 +msgid "show remote-tracking branches" +msgstr "visa fjärrspårande grenar" + +#: builtin/show-branch.c:655 +msgid "color '*!+-' corresponding to the branch" +msgstr "färga \"*!+-\" enligt grenen" + +#: builtin/show-branch.c:657 +msgid "show <n> more commits after the common ancestor" +msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" + +#: builtin/show-branch.c:659 +msgid "synonym to more=-1" +msgstr "synonym till more=-1" -#: lib/merge.tcl:55 -#, tcl-format +#: builtin/show-branch.c:660 +msgid "suppress naming strings" +msgstr "undertyck namnsträngar" + +#: builtin/show-branch.c:662 +msgid "include the current branch" +msgstr "inkludera aktuell gren" + +#: builtin/show-branch.c:664 +msgid "name commits with their object names" +msgstr "namnge incheckningar med deras objektnamn" + +#: builtin/show-branch.c:666 +msgid "show possible merge bases" +msgstr "visa möjliga sammanslaningsbaser" + +#: builtin/show-branch.c:668 +msgid "show refs unreachable from any other ref" +msgstr "visa referenser som inte kan nås från någon annan referens" + +#: builtin/show-branch.c:670 +msgid "show commits in topological order" +msgstr "visa incheckningar i topologisk ordning" + +#: builtin/show-branch.c:672 +msgid "show only commits not on the first branch" +msgstr "visa endast incheckningar inte på den första grenen" + +#: builtin/show-branch.c:674 +msgid "show merges reachable from only one tip" +msgstr "visa sammanslagningar som endast kan nås från en spets" + +#: builtin/show-branch.c:676 +msgid "show commits where no parent comes before its children" +msgstr "visa incheckningar där ingen förälder kommer före dess barn" + +#: builtin/show-branch.c:678 +msgid "<n>[,<base>]" +msgstr "<n>[,<bas>]" + +#: builtin/show-branch.c:679 +msgid "show <n> most recent ref-log entries starting at base" +msgstr "visa <n> nyaste refloggposter med början på bas" + +#: builtin/show-ref.c:10 msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " msgstr "" -"Du är mitt i en ändring.\n" -"\n" -"Filen %s har ändringar.\n" -"\n" -"Du bör fullborda den aktuella incheckningen innan du påbörjar en " -"sammanslagning. Om du gör det blir det enklare att avbryta en misslyckad " -"sammanslagning, om det skulle vara nödvändigt.\n" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] " + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgstr "git show-ref --exclude-existing[=mönster] < reflista" + +#: builtin/show-ref.c:182 +msgid "only show tags (can be combined with heads)" +msgstr "visa endast taggar (kan kombineras med huvuden)" -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s av %s" +#: builtin/show-ref.c:183 +msgid "only show heads (can be combined with tags)" +msgstr "visa endast huvuden (kan kombineras med taggar)" -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Slår ihop %s och %s..." +#: builtin/show-ref.c:184 +msgid "stricter reference checking, requires exact ref path" +msgstr "striktare referenskontroll, kräver exakt referenssökväg" -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "Sammanslagningen avslutades framgångsrikt." +#: builtin/show-ref.c:187 builtin/show-ref.c:189 +msgid "show the HEAD reference" +msgstr "visa HEAD-referensen" -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "Sammanslagningen misslyckades. Du måste lösa konflikterna." +#: builtin/show-ref.c:191 +msgid "dereference tags into object IDs" +msgstr "avreferera taggar till objekt-id" -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "Slå ihop i %s" +#: builtin/show-ref.c:193 +msgid "only show SHA1 hash using <n> digits" +msgstr "visa SHA1-hash endast med <n> siffror" -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Revisioner att slå ihop" +#: builtin/show-ref.c:197 +msgid "do not print results to stdout (useful with --verify)" +msgstr "visa inte resultat på standard ut (användbart med --verify)" -#: lib/merge.tcl:212 +#: builtin/show-ref.c:199 +msgid "show refs from stdin that aren't in local repository" +msgstr "visa referenser från standard in som inte finns i lokalt arkiv" + +#: builtin/symbolic-ref.c:7 +msgid "git symbolic-ref [options] name [ref]" +msgstr "git symbolic-ref [flaggor] namn [ref]" + +#: builtin/symbolic-ref.c:38 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "" +"undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser" + +#: builtin/symbolic-ref.c:39 +msgid "shorten ref output" +msgstr "förkorta ref-utdata" + +#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +msgid "reason" +msgstr "skäl" + +#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +msgid "reason of the update" +msgstr "skäl till uppdateringen" + +#: builtin/tag.c:22 msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" +"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" msgstr "" -"Kan inte avbryta vid utökning.\n" -"\n" -"Du måste göra dig färdig med att utöka incheckningen.\n" +"git tag [-a|-s|-u <nyckel-id>] [-f] [-m <medd>|-F <fil>] <taggnamn> [<huvud>]" -#: lib/merge.tcl:222 +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "git tag -d <taggnamn>..." + +#: builtin/tag.c:24 msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"\t\t[<pattern>...]" msgstr "" -"Avbryt sammanslagning?\n" +"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>] \n" +"\t\t[<mönster>...]" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "git tag -v <taggnamn>..." + +#: builtin/tag.c:60 +#, c-format +msgid "malformed object at '%s'" +msgstr "felformat objekt vid \"%s\"" + +#: builtin/tag.c:207 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "taggnamnet för långt: %.*s..." + +#: builtin/tag.c:212 +#, c-format +msgid "tag '%s' not found." +msgstr "taggen \"%s\" hittades inte." + +#: builtin/tag.c:227 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Tog bort tagg \"%s\" (var %s)\n" + +#: builtin/tag.c:239 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "kunde inte bekräfta taggen \"%s\"" + +#: builtin/tag.c:249 +msgid "" "\n" -"Om du avbryter sammanslagningen kommer *ALLA* ej incheckade ändringar att gå " -"förlorade.\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" "\n" -"Gå vidare med att avbryta den aktuella sammanslagningen?" +"#\n" +"# Skriv ett taggmeddelande\n" +"# Rader som inleds med \"#\" ignoreras.\n" +"#\n" -#: lib/merge.tcl:228 +#: builtin/tag.c:256 msgid "" -"Reset changes?\n" "\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" +"#\n" msgstr "" -"Återställ ändringar?\n" -"\n" -"Om du återställer ändringarna kommer *ALLA* ej incheckade ändringar att gå " -"förlorade.\n" "\n" -"Gå vidare med att återställa de aktuella ändringarna?" +"#\n" +"# Skriv ett taggmeddelande\n" +"# Rader som inleds med \"#\" kommer behållas; du kan själv ta bort dem om\n" +"# du vill.\n" +"#\n" + +#: builtin/tag.c:298 +msgid "unable to sign the tag" +msgstr "kunde inte signera taggen" + +#: builtin/tag.c:300 +msgid "unable to write tag file" +msgstr "kunde inte skriva tagg-filen" + +#: builtin/tag.c:325 +msgid "bad object type." +msgstr "felaktig objekttyp" + +#: builtin/tag.c:338 +msgid "tag header too big." +msgstr "tagghuvud för stort." + +#: builtin/tag.c:370 +msgid "no tag message?" +msgstr "inget taggmeddelande?" + +#: builtin/tag.c:376 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "Taggmeddelandet har lämnats i %s\n" + +#: builtin/tag.c:425 +msgid "switch 'points-at' requires an object" +msgstr "flaggan \"points-at\" behöver ett object" + +#: builtin/tag.c:427 +#, c-format +msgid "malformed object name '%s'" +msgstr "felformat objektnamn \"%s\"" + +#: builtin/tag.c:447 +msgid "list tag names" +msgstr "lista taggnamn" + +#: builtin/tag.c:449 +msgid "print <n> lines of each tag message" +msgstr "visa <n> rader från varje taggmeddelande" + +#: builtin/tag.c:451 +msgid "delete tags" +msgstr "ta bort taggar" + +#: builtin/tag.c:452 +msgid "verify tags" +msgstr "verifiera taggar" + +#: builtin/tag.c:454 +msgid "Tag creation options" +msgstr "Alternativ för att skapa taggar" + +#: builtin/tag.c:456 +msgid "annotated tag, needs a message" +msgstr "annoterad tagg, behöver meddelande" + +#: builtin/tag.c:458 +msgid "tag message" +msgstr "taggmeddelande" + +#: builtin/tag.c:460 +msgid "annotated and GPG-signed tag" +msgstr "annoterad och GPG-signerad tagg" + +#: builtin/tag.c:464 +msgid "use another key to sign the tag" +msgstr "använd annan nyckel för att signera taggen" + +#: builtin/tag.c:465 +msgid "replace the tag if exists" +msgstr "ersätt taggen om den finns" + +#: builtin/tag.c:466 +msgid "show tag list in columns" +msgstr "lista taggar i spalter" + +#: builtin/tag.c:468 +msgid "Tag listing options" +msgstr "Alternativ för listning av taggar" + +#: builtin/tag.c:471 +msgid "print only tags that contain the commit" +msgstr "visa endast taggar som innehåller incheckningen" + +#: builtin/tag.c:477 +msgid "print only tags of the object" +msgstr "visa endast taggar för objektet" + +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "--column och -n är inkompatibla" + +#: builtin/tag.c:523 +msgid "-n option is only allowed with -l." +msgstr "Flaggan -n är endast tillåten tillsammans med -l." + +#: builtin/tag.c:525 +msgid "--contains option is only allowed with -l." +msgstr "Flaggan --contains är endast tillåten tillsammans med -l" + +#: builtin/tag.c:527 +msgid "--points-at option is only allowed with -l." +msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." + +#: builtin/tag.c:535 +msgid "only one -F or -m option is allowed." +msgstr "endast en av flaggorna -F eller -m tillåts." + +#: builtin/tag.c:555 +msgid "too many params" +msgstr "för många parametrar" + +#: builtin/tag.c:561 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "\"%s\" är inte ett giltigt taggnamn." + +#: builtin/tag.c:566 +#, c-format +msgid "tag '%s' already exists" +msgstr "taggen \"%s\" finns redan" + +#: builtin/tag.c:584 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s: kan inte låsa referensen" + +#: builtin/tag.c:586 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s: kan inte uppdatera referensen" + +#: builtin/tag.c:588 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Uppdaterad tagg \"%s\" (var %s)\n" + +#: builtin/update-index.c:401 +msgid "git update-index [options] [--] [<file>...]" +msgstr "git update-index [flaggor] [--] [<fil>...]" + +#: builtin/update-index.c:717 +msgid "continue refresh even when index needs update" +msgstr "fortsätt uppdatera även när index inte är àjour" + +#: builtin/update-index.c:720 +msgid "refresh: ignore submodules" +msgstr "refresh: ignorera undermoduler" + +#: builtin/update-index.c:723 +msgid "do not ignore new files" +msgstr "ignorera inte nya filer" + +#: builtin/update-index.c:725 +msgid "let files replace directories and vice-versa" +msgstr "låt filer ersätta kataloger och omvänt" + +#: builtin/update-index.c:727 +msgid "notice files missing from worktree" +msgstr "lägg märke till filer som saknas i arbetskatalogen" + +#: builtin/update-index.c:729 +msgid "refresh even if index contains unmerged entries" +msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" + +#: builtin/update-index.c:732 +msgid "refresh stat information" +msgstr "uppdatera statusinformation" + +#: builtin/update-index.c:736 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "som --refresh, men ignorera assume-unchanged-inställning" + +#: builtin/update-index.c:740 +msgid "<mode> <object> <path>" +msgstr "<läge> <objekt> <sökväg>" + +#: builtin/update-index.c:741 +msgid "add the specified entry to the index" +msgstr "lägg till angiven post i indexet" + +#: builtin/update-index.c:745 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/update-index.c:746 +msgid "override the executable bit of the listed files" +msgstr "överstyr exekveringsbiten för angivna filer" + +#: builtin/update-index.c:750 +msgid "mark files as \"not changing\"" +msgstr "markera filer som \"ändras inte\"" + +#: builtin/update-index.c:753 +msgid "clear assumed-unchanged bit" +msgstr "rensa \"assume-unchanged\"-biten" + +#: builtin/update-index.c:756 +msgid "mark files as \"index-only\"" +msgstr "markera filer som \"endast index\"" + +#: builtin/update-index.c:759 +msgid "clear skip-worktree bit" +msgstr "töm \"skip-worktree\"-biten" + +#: builtin/update-index.c:762 +msgid "add to index only; do not add content to object database" +msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" + +#: builtin/update-index.c:764 +msgid "remove named paths even if present in worktree" +msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" + +#: builtin/update-index.c:766 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "med --stdin: indatarader termineras med null-byte" -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Avbryter" +#: builtin/update-index.c:768 +msgid "read list of paths to be updated from standard input" +msgstr "läs lista över sökvägar att uppdatera från standard in" -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "filer återställda" +#: builtin/update-index.c:772 +msgid "add entries from standard input to the index" +msgstr "lägg poster från från standard in till indexet" -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "Misslyckades avbryta." +#: builtin/update-index.c:776 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Avbrytning fullbordad. Redo." +#: builtin/update-index.c:780 +msgid "only update entries that differ from HEAD" +msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Tvinga lösning att använda basversionen?" +#: builtin/update-index.c:784 +msgid "ignore files missing from worktree" +msgstr "ignorera filer som saknas i arbetskatalogen" -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Tvinga lösning att använda den aktuella grenen?" +#: builtin/update-index.c:787 +msgid "report actions to standard output" +msgstr "raportera åtgärder på standard ut" -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Tvinga lösning att använda den andra grenen?" +#: builtin/update-index.c:789 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "(för porslin) glöm sparade olösta konflikter" -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." +#: builtin/update-index.c:793 +msgid "write index in this format" +msgstr "skriv index i detta format" + +#: builtin/update-ref.c:7 +msgid "git update-ref [options] -d <refname> [<oldval>]" +msgstr "git update-ref [flaggor] -d <refnamn> [<gammaltvärde>]" + +#: builtin/update-ref.c:8 +msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgstr "git update-ref [flaggor] <refnamn> <gammaltvärde> [<nyttvärde>]" + +#: builtin/update-ref.c:19 +msgid "delete the reference" +msgstr "ta bort referensen" + +#: builtin/update-ref.c:21 +msgid "update <refname> not the one it points to" +msgstr "uppdatera <refnamn> inte det den pekar på" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "git update-server-info [--force]" + +#: builtin/update-server-info.c:14 +msgid "update the info files from scratch" +msgstr "uppdatera informationsfilerna från grunden" + +#: builtin/verify-pack.c:56 +msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <paket>..." + +#: builtin/verify-pack.c:66 +msgid "verbose" +msgstr "pratsam" + +#: builtin/verify-pack.c:68 +msgid "show statistics only" +msgstr "visa endast statistik" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v|--verbose] <tag>..." +msgstr "git verify-tag [-v|--verbose] <tagg>..." + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "visa innehåll för tag" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]" + +#: builtin/write-tree.c:26 +msgid "<prefix>/" +msgstr "<prefix>/" + +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" +msgstr "visa trädobjekt för underkatalogen <prefix>" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" +msgstr "endast användbart vid felsökning" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." msgstr "" -"Observera att diffen endast visar de ändringar som står i konflikt.\n" -"\n" -"%s kommer att skrivas över.\n" -"\n" -"Du måste starta om sammanslagningen för att göra den här operationen ogjord." +"Se \"git help <kommando>\" för mer information om ett specifikt kommando." + +#: parse-options.h:156 +msgid "no-op (backward compatibility)" +msgstr "ingen funktion (bakåtkompatibilitet)" + +#: parse-options.h:228 +msgid "be more verbose" +msgstr "var mer pratsam" + +#: parse-options.h:230 +msgid "be more quiet" +msgstr "var mer tyst" + +#: parse-options.h:236 +msgid "use <n> digits to display SHA-1s" +msgstr "använd <n> siffror för att visa SHA-1:or" + +#: common-cmds.h:8 +msgid "Add file contents to the index" +msgstr "Lägg filinnehåll till indexet" + +#: common-cmds.h:9 +msgid "Find by binary search the change that introduced a bug" +msgstr "Binärsök för att hitta ändringen som introducerade ett fel" + +#: common-cmds.h:10 +msgid "List, create, or delete branches" +msgstr "Visa, skapa eller ta bort grenar" + +#: common-cmds.h:11 +msgid "Checkout a branch or paths to the working tree" +msgstr "Checka ut en gren eller filer i arbetskatalogen" + +#: common-cmds.h:12 +msgid "Clone a repository into a new directory" +msgstr "Klona ett arkiv till en ny katalog" + +#: common-cmds.h:13 +msgid "Record changes to the repository" +msgstr "Protokollför ändringar i arkivet" + +#: common-cmds.h:14 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv" + +#: common-cmds.h:15 +msgid "Download objects and refs from another repository" +msgstr "Hämta objekt och referenser från annat arkiv" + +#: common-cmds.h:16 +msgid "Print lines matching a pattern" +msgstr "Visa rader som motsvarar mönster" + +#: common-cmds.h:17 +msgid "Create an empty git repository or reinitialize an existing one" +msgstr "Skapa tomt git-arkiv eller ominitiera ett befintligt" + +#: common-cmds.h:18 +msgid "Show commit logs" +msgstr "Visa incheckningsloggar" -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "Filen %s verkar innehålla olösta konflikter. Vill du köa ändå?" +#: common-cmds.h:19 +msgid "Join two or more development histories together" +msgstr "Slå ihop två eller flera utvecklingshistorier" -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Lägger till lösning för %s" +#: common-cmds.h:20 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk" -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "Kan inte lösa borttagnings- eller länkkonflikter med ett verktyg" +#: common-cmds.h:21 +msgid "Fetch from and merge with another repository or a local branch" +msgstr "Hämta från och slå ihop med annat arkiv eller en lokal gren" -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Konfliktfil existerar inte" +#: common-cmds.h:22 +msgid "Update remote refs along with associated objects" +msgstr "Uppdatera fjärr-referenser och tillhörande objekt" -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Inte ett grafiskt verktyg för sammanslagning: %s" +#: common-cmds.h:23 +msgid "Forward-port local commits to the updated upstream head" +msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud" -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Verktyget \"%s\" för sammanslagning stöds inte" +#: common-cmds.h:24 +msgid "Reset current HEAD to the specified state" +msgstr "Återställ aktuell HEAD till angivet tillstånd" -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "Verktyget för sammanslagning körs redan. Vill du avsluta det?" +#: common-cmds.h:25 +msgid "Remove files from the working tree and from the index" +msgstr "Ta bort filer från arbetskatalogen och från indexet" -#: lib/mergetool.tcl:323 -#, tcl-format +#: common-cmds.h:26 +msgid "Show various types of objects" +msgstr "Visa olika sorters objekt" + +#: common-cmds.h:27 +msgid "Show the working tree status" +msgstr "Visa status för arbetskatalogen" + +#: common-cmds.h:28 +msgid "Create, list, delete or verify a tag object signed with GPG" +msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" + +#: git-am.sh:50 +msgid "You need to set your committer info first" +msgstr "Du måste ställa in din incheckarinformation först" + +#: git-am.sh:95 msgid "" -"Error retrieving versions:\n" -"%s" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" msgstr "" -"Fel vid hämtning av versioner:\n" -"%s" +"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" +"Återställer inte till ORIG_HEAD" -#: lib/mergetool.tcl:343 -#, tcl-format +#: git-am.sh:105 +#, sh-format msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" +"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 "" -"Kunde inte starta verktyg för sammanslagning:\n" -"\n" -"%s" +"När du har löst problemet kör du \"$cmdline --resolved\".\n" +"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" +"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." + +#: git-am.sh:121 +msgid "Cannot fall back to three-way merge." +msgstr "Kan inte falla tillbaka på trevägssammanslagning." + +#: git-am.sh:137 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" +"Arkivet saknar objekt som behövs för att falla tillbaka på 3-" +"vägssammanslagning." + +#: git-am.sh:139 +msgid "Using index info to reconstruct a base tree..." +msgstr "Använder indexinfo för att åteskapa ett basträd..." + +#: git-am.sh:154 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"Har du handredigerat din patch?\n" +"Den kan inte tillämpas på blobbar som antecknats i dess index." -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "Kör verktyg för sammanslagning..." +#: git-am.sh:163 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" +"Faller tillbaka på att pacha grundversionen och trevägssammanslagning..." -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "Verktyget för sammanslagning misslyckades." +#: git-am.sh:179 +msgid "Failed to merge in the changes." +msgstr "Misslyckads slå ihop ändringarna." -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Den globala teckenkodningen \"%s\" är ogiltig" +#: git-am.sh:274 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Arkivets teckenkodning \"%s\" är ogiltig" +#: git-am.sh:361 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "Patchformatet $patch_format stöds inte." -#: lib/option.tcl:119 -msgid "Restore Defaults" -msgstr "Återställ standardvärden" +#: git-am.sh:363 +msgid "Patch format detection failed." +msgstr "Misslyckades detektera patchformat." -#: lib/option.tcl:123 -msgid "Save" -msgstr "Spara" +#: 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 "" +"Flaggan -b/--binary har varit utan funktion länge, och\n" +"kommer tas bort. Vi ber dig att inte använda den längre." -#: lib/option.tcl:133 -#, tcl-format -msgid "%s Repository" -msgstr "Arkivet %s" - -#: lib/option.tcl:134 -msgid "Global (All Repositories)" -msgstr "Globalt (alla arkiv)" - -#: lib/option.tcl:140 -msgid "User Name" -msgstr "Användarnamn" - -#: lib/option.tcl:141 -msgid "Email Address" -msgstr "E-postadress" - -#: lib/option.tcl:143 -msgid "Summarize Merge Commits" -msgstr "Summera sammanslagningsincheckningar" - -#: lib/option.tcl:144 -msgid "Merge Verbosity" -msgstr "Pratsamhet för sammanslagningar" - -#: lib/option.tcl:145 -msgid "Show Diffstat After Merge" -msgstr "Visa diffstatistik efter sammanslagning" - -#: lib/option.tcl:146 -msgid "Use Merge Tool" -msgstr "Använd verktyg för sammanslagning" - -#: lib/option.tcl:148 -msgid "Trust File Modification Timestamps" -msgstr "Lita på filändringstidsstämplar" - -#: lib/option.tcl:149 -msgid "Prune Tracking Branches During Fetch" -msgstr "Städa spårade grenar vid hämtning" - -#: lib/option.tcl:150 -msgid "Match Tracking Branches" -msgstr "Matcha spårade grenar" - -#: lib/option.tcl:151 -msgid "Use Textconv For Diffs and Blames" -msgstr "Använd Textconv för diff och klandring" - -#: lib/option.tcl:152 -msgid "Blame Copy Only On Changed Files" -msgstr "Klandra kopiering bara i ändrade filer" - -#: lib/option.tcl:153 -msgid "Minimum Letters To Blame Copy On" -msgstr "Minsta antal tecken att klandra kopiering för" - -#: lib/option.tcl:154 -msgid "Blame History Context Radius (days)" -msgstr "Historikradie för klandring (dagar)" - -#: lib/option.tcl:155 -msgid "Number of Diff Context Lines" -msgstr "Antal rader sammanhang i differenser" - -#: lib/option.tcl:156 -msgid "Commit Message Text Width" -msgstr "Textbredd för incheckningsmeddelande" - -#: lib/option.tcl:157 -msgid "New Branch Name Template" -msgstr "Mall för namn på nya grenar" - -#: lib/option.tcl:158 -msgid "Default File Contents Encoding" -msgstr "Standardteckenkodning för filinnehåll" - -#: lib/option.tcl:204 -msgid "Change" -msgstr "Ändra" - -#: lib/option.tcl:231 -msgid "Spelling Dictionary:" -msgstr "Stavningsordlista:" - -#: lib/option.tcl:261 -msgid "Change Font" -msgstr "Byt teckensnitt" - -#: lib/option.tcl:265 -#, tcl-format -msgid "Choose %s" -msgstr "Välj %s" - -#: lib/option.tcl:271 -msgid "pt." -msgstr "p." - -#: lib/option.tcl:285 -msgid "Preferences" -msgstr "Inställningar" - -#: lib/option.tcl:322 -msgid "Failed to completely save options:" -msgstr "Misslyckades med att helt spara alternativ:" - -#: lib/remote_add.tcl:20 -msgid "Add Remote" -msgstr "Lägg till fjärrarkiv" - -#: lib/remote_add.tcl:25 -msgid "Add New Remote" -msgstr "Lägg till nytt fjärrarkiv" - -#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 -msgid "Add" -msgstr "Lägg till" - -#: lib/remote_add.tcl:39 -msgid "Remote Details" -msgstr "Detaljer för fjärrarkiv" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Plats:" +#: git-am.sh:477 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs." -#: lib/remote_add.tcl:60 -msgid "Further Action" -msgstr "Ytterligare åtgärd" +#: git-am.sh:482 +msgid "Please make up your mind. --skip or --abort?" +msgstr "Bestäm dig. --skip eller --abort?" -#: lib/remote_add.tcl:63 -msgid "Fetch Immediately" -msgstr "Hämta omedelbart" +#: git-am.sh:509 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: lib/remote_add.tcl:69 -msgid "Initialize Remote Repository and Push" -msgstr "Initiera fjärrarkiv och sänd till" +#: git-am.sh:575 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: $files)" -#: lib/remote_add.tcl:75 -msgid "Do Nothing Else Now" -msgstr "Gör ingent mer nu" +#: 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 "" +"Patchen är tom. Delades den upp felaktigt?\n" +"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" +"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." -#: lib/remote_add.tcl:100 -msgid "Please supply a remote name." -msgstr "Ange ett namn för fjärrarkivet." +#: git-am.sh:706 +msgid "Patch does not have a valid e-mail address." +msgstr "Patchen har inte någon giltig e-postadress." -#: lib/remote_add.tcl:113 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "\"%s\" kan inte användas som namn på fjärrarkivet." +#: git-am.sh:753 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" +"kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: lib/remote_add.tcl:124 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Kunde inte lägga till fjärrarkivet \"%s\" på platsen \"%s\"." +#: git-am.sh:757 +msgid "Commit Body is:" +msgstr "Incheckningskroppen är:" -#: lib/remote_add.tcl:132 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "hämta %s" +#. 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 "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla " -#: lib/remote_add.tcl:133 -#, tcl-format -msgid "Fetching the %s" -msgstr "Hämtar %s" +#: git-am.sh:800 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "Tillämpar: $FIRSTLINE" -#: lib/remote_add.tcl:156 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Vet inte hur arkivet på platsen \"%s\" skall initieras." +#: 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 "" +"Inga ändringar - glömde du använda \"git add\"?\n" +"Om det inte är något kvar att köa kan det hända att något annat redan\n" +"introducerat samma ändringar; kanske du bör hoppa över patchen." -#: lib/remote_add.tcl:162 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "sänd %s" +#: git-am.sh:829 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" +"Du har fortfarande sökvägar som inte slagits samman i ditt index\n" +"glömde du använda \"git add\"?" -#: lib/remote_add.tcl:163 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Konfigurerar %s (på %s)" +#: git-am.sh:845 +msgid "No changes -- Patch already applied." +msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Ta bort gren från fjärrarkiv" +#: git-am.sh:855 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" -#: lib/remote_branch_delete.tcl:48 -msgid "From Repository" -msgstr "Från arkiv" +#: git-am.sh:858 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "" +"En kopia av patchen som misslyckades finns i:\n" +" $dotest/patch" + +#: git-am.sh:876 +msgid "applying to an empty history" +msgstr "tillämpar på en tom historik" + +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "Du måste starta med \"git bisect start\"" + +#. 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 "Vill du att jag ska göra det åt dig [Y=ja/N=nej]?" + +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "flaggan känns inte igen: \"$arg\"" + +#: git-bisect.sh:99 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "\"$arg\" verkar inte vara en giltig revision" + +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" +msgstr "Felaktigt HEAD - Jag behöver ett HEAD" + +#: git-bisect.sh:130 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +msgstr "" +"Misslyckades checka ut \"$start_head\". Försök \"git bisect reset " +"<giltiggren>\"" + +# cogito-relaterat +#: git-bisect.sh:140 +msgid "won't bisect on seeked tree" +msgstr "kör inte \"bisect\" på ett \"seeked\"-träd" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "Felaktigt HEAD - konstig symbolisk referens" + +#: git-bisect.sh:189 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "Felaktigt argument till bisect_write: $state" + +#: git-bisect.sh:218 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "Felaktig rev-indata: $arg" + +#: git-bisect.sh:232 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "Anropa \"bisect_state\" med minst ett argument." + +#: git-bisect.sh:244 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "Felaktig rev-indata: $rev" + +#: git-bisect.sh:250 +msgid "'git bisect bad' can take only one argument." +msgstr "\"git bisect bad\" kan bara ta ett argument." + +#. 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 "Varning: utför \"bisect\" med endast en dålig incheckning" + +#. 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 "Är du säker [Y=ja/N=nej]? " + +#: 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 "" +"Du måste ange åtminstone en bra och en dålig version.\n" +"(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)" -#: lib/remote_branch_delete.tcl:51 lib/transport.tcl:134 -msgid "Remote:" -msgstr "Fjärrarkiv:" +#: 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 "" +"Du måste starta med \"git bisect start\".\n" +"Du måste sedan ange åtminstone en bra och en dålig version.\n" +"(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)" -#: lib/remote_branch_delete.tcl:72 lib/transport.tcl:154 -msgid "Arbitrary Location:" -msgstr "Godtycklig plats:" +#: git-bisect.sh:347 git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "Vi utför ingen bisect för tillfället." -#: lib/remote_branch_delete.tcl:88 -msgid "Branches" -msgstr "Grenar" +#: git-bisect.sh:354 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "\"$invalid\" är inte en giltig incheckning" -#: lib/remote_branch_delete.tcl:110 -msgid "Delete Only If" -msgstr "Ta endast bort om" +#: git-bisect.sh:363 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." +msgstr "" +"Kunde inte checka ut original-HEAD \"$branch\".\n" +"Försök \"git bisect reset <incheckning>\"." + +#: git-bisect.sh:390 +msgid "No logfile given" +msgstr "Ingen loggfil angiven" -#: lib/remote_branch_delete.tcl:112 -msgid "Merged Into:" -msgstr "Sammanslagen i:" +#: git-bisect.sh:391 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "kan inte läsa $file för uppspelning" -#: lib/remote_branch_delete.tcl:153 -msgid "A branch is required for 'Merged Into'." -msgstr "En gren krävs för \"Sammanslagen i\"." +#: git-bisect.sh:408 +msgid "?? what are you talking about?" +msgstr "?? vad menar du?" -#: lib/remote_branch_delete.tcl:185 -#, tcl-format +#: git-bisect.sh:420 +#, sh-format +msgid "running $command" +msgstr "kör $command" + +#: git-bisect.sh:427 +#, sh-format msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" msgstr "" -"Följande grenar har inte helt slagits samman i %s:\n" -"\n" -" - %s" +"\"bisect\"-körningen misslyckades:\n" +"felkod $res från \"$command\" är < 0 eller >= 128" + +#: git-bisect.sh:453 +msgid "bisect run cannot continue any more" +msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#: lib/remote_branch_delete.tcl:190 -#, tcl-format +#: git-bisect.sh:459 +#, sh-format msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" msgstr "" -"En eller flera av sammanslagningstesterna misslyckades eftersom du inte har " -"hämtat de nödvändiga incheckningarna. Försök hämta från %s först." +"\"bisect\"-körningen misslyckades:\n" +"\"bisect_state $state\" avslutades med felkoden $res" -#: lib/remote_branch_delete.tcl:208 -msgid "Please select one or more branches to delete." -msgstr "Välj en eller flera grenar att ta bort." +#: git-bisect.sh:466 +msgid "bisect run success" +msgstr "\"bisect\"-körningen lyckades" -#: lib/remote_branch_delete.tcl:227 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Tar bort grenar från %s" +#: 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 "" +"Du kan inte göra en \"pull\" då du har ändringar som inte checkats in.\n" +"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" +"där det är lämpligt för att ange lösning, eller använd \"git commit -a\"." + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in." + +#: git-pull.sh:197 +msgid "updating an unborn branch with changes added to the index" +msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet" + +#. 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:228 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" +"Varning: fetch uppdaterade huvudet för aktuell gren.\n" +"Varning: snabbspolar din arbetskatalog från\n" +"Varning: incheckningen $orig_head." -#: lib/remote_branch_delete.tcl:293 -msgid "No repository selected." -msgstr "Inget arkiv markerat." +#: git-pull.sh:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: lib/remote_branch_delete.tcl:298 -#, tcl-format -msgid "Scanning %s..." -msgstr "Söker %s..." +#: git-pull.sh:257 +msgid "Cannot rebase onto multiple branches" +msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar" -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Ta bort fjärrarkiv" +#: 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 "" +"När du har löst problemet kör du \"git rebase --continue\".\n" +"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n" +"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"." -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Ta bort från" +#: git-rebase.sh:160 +msgid "The pre-rebase hook refused to rebase." +msgstr "Kroken pre-rebase vägrade ombaseringen." -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Hämta från" +#: git-rebase.sh:165 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "Det verkar som en git-am körs. Kan inte ombasera." -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Sänd till" +#: git-rebase.sh:296 +msgid "The --exec option must be used with the --interactive option" +msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive" -#: lib/search.tcl:22 -msgid "Find:" -msgstr "Sök:" +#: git-rebase.sh:301 +msgid "No rebase in progress?" +msgstr "Ingen ombasering pågår?" -#: lib/search.tcl:24 -msgid "Next" -msgstr "Nästa" +#: git-rebase.sh:312 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: lib/search.tcl:25 -msgid "Prev" -msgstr "Föreg" +#: git-rebase.sh:319 +msgid "Cannot read HEAD" +msgstr "Kan inte läsa HEAD" -#: lib/search.tcl:26 -msgid "Case-Sensitive" -msgstr "Skilj på VERSALER/gemener" +#: git-rebase.sh:322 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"Du måste redigera alla sammanslagningskonflikter och\n" +"därefter markera dem som lösta med git add" -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Kan inte skriva genväg:" +#: git-rebase.sh:340 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Kunde inte flytta tillbaka till $head_name" -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Kan inte skriva ikon:" +#: 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 "" +"Det verkar som katalogen $state_dir_base redan existerar, och\n" +"jag undrar om du redan är mitt i en annan ombasering. Om så är\n" +"fallet, försök\n" +"\t$cmd_live_rebase\n" +"Om så inte är fallet, kör\n" +"\t$cmd_clear_stale_rebase\n" +"och kör programmet igen. Jag avslutar ifall du fortfarande har\n" +"något av värde där." + +#: git-rebase.sh:404 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "ogiltig uppström $upstream_name" + +#: git-rebase.sh:428 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "$onto_name: mer än en sammanslagningsbas finns" + +#: git-rebase.sh:431 git-rebase.sh:435 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: ingen sammanslagningsbas finns" + +#: git-rebase.sh:440 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "Peka på en giltig incheckning: $onto_name" + +#: git-rebase.sh:463 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "ödesdigert: ingen sådan gren: $branch_name" + +#: git-rebase.sh:483 +msgid "Please commit or stash them." +msgstr "Checka in eller använd \"stash\" på dem." + +#: git-rebase.sh:501 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "Aktuell gren $branch_name är à jour." + +#: git-rebase.sh:504 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." + +#: git-rebase.sh:515 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "Ändringar från $mb till $onto:" + +#. Detach HEAD and reset the tree +#: git-rebase.sh:524 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "" +"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." + +#: git-rebase.sh:532 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "Snabbspolade $branch_name till $onto_name." + +#: git-stash.sh:51 +msgid "git stash clear with parameters is unimplemented" +msgstr "\"git stash clear\" med parametrar har inte implementerats" + +#: git-stash.sh:74 +msgid "You do not have the initial commit yet" +msgstr "Du har inte den första incheckningen ännu" + +#: git-stash.sh:89 +msgid "Cannot save the current index state" +msgstr "Kan inte spara aktuellt tillstånd för indexet" + +#: git-stash.sh:123 git-stash.sh:136 +msgid "Cannot save the current worktree state" +msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" + +#: git-stash.sh:140 +msgid "No changes selected" +msgstr "Inga ändringar valda" + +#: git-stash.sh:143 +msgid "Cannot remove temporary index (can't happen)" +msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" + +#: git-stash.sh:156 +msgid "Cannot record working tree state" +msgstr "Kan inte registrera tillstånd för arbetskatalog" + +#. 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 "" +"fel: felaktig flagga för \"stash save\": $option\n" +" För att ange ett meddelande, använd git stash save -- \"$option\"" + +#: git-stash.sh:223 +msgid "No local changes to save" +msgstr "Inga lokala ändringar att spara" + +#: git-stash.sh:227 +msgid "Cannot initialize stash" +msgstr "Kan inte initiera \"stash\"" + +#: git-stash.sh:235 +msgid "Cannot save the current status" +msgstr "Kan inte spara aktuell status" + +#: git-stash.sh:253 +msgid "Cannot remove worktree changes" +msgstr "Kan inte ta bort ändringar i arbetskatalogen" + +#: git-stash.sh:352 +msgid "No stash found." +msgstr "Ingen \"stash\" hittades." + +#: git-stash.sh:359 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "För många revisioner angivna: $REV" + +#: git-stash.sh:365 +#, sh-format +msgid "$reference is not valid reference" +msgstr "$reference är inte en giltig referens." + +#: git-stash.sh:393 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" + +#: git-stash.sh:404 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "\"$args\" är inte en \"stash\"-referens" + +#: git-stash.sh:412 +msgid "unable to refresh index" +msgstr "kan inte uppdatera indexet" + +#: git-stash.sh:416 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning" + +#: git-stash.sh:424 +msgid "Conflicts in index. Try without --index." +msgstr "Konflikter i indexet. Testa utan --index." + +#: git-stash.sh:426 +msgid "Could not save index tree" +msgstr "Kunde inte spara indexträd" + +#: git-stash.sh:460 +msgid "Cannot unstage modified files" +msgstr "Kan inte ta bort ändrade filer ur kön" + +#: git-stash.sh:475 +msgid "Index was not unstashed." +msgstr "Indexet har inte tagits ur kön." + +#: git-stash.sh:492 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "Kastade ${REV} ($s)" + +#: git-stash.sh:493 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}: Kunde inte kasta \"stash\"-post" + +#: git-stash.sh:500 +msgid "No branch name specified" +msgstr "Inget grennamn angavs" + +#: git-stash.sh:571 +msgid "(To restore them type \"git stash apply\")" +msgstr "(För att återställa dem, skriv \"git stash apply\")" + +#: git-submodule.sh:88 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\"" + +#: git-submodule.sh:167 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "" +"Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\"" + +#: git-submodule.sh:211 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\"" + +#: git-submodule.sh:223 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt" + +#: git-submodule.sh:312 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../" + +#: git-submodule.sh:329 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "\"$sm_path\" finns redan i indexet" + +#: git-submodule.sh:333 +#, 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 "" +"Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" +"$sm_path\n" +"Använd -f om du verkligen vill lägga till den" + +#: git-submodule.sh:344 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet" + +#: git-submodule.sh:346 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv" + +#: git-submodule.sh:360 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "Kan inte checka ut undermodulen \"$sm_path\"" + +#: git-submodule.sh:365 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" + +#: git-submodule.sh:370 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "Misslyckades registrera undermodulen \"$sm_path\"" + +#: git-submodule.sh:413 +#, sh-format +msgid "Entering '$prefix$sm_path'" +msgstr "Går in i \"$prefix$sm_path\"" + +#: git-submodule.sh:427 +#, sh-format +msgid "Stopping at '$sm_path'; script returned non-zero status." +msgstr "" +"Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll." + +#: git-submodule.sh:471 +#, sh-format +msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules" + +#: git-submodule.sh:480 +#, sh-format +msgid "Failed to register url for submodule path '$sm_path'" +msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\"" + +#: git-submodule.sh:482 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\"" + +#: git-submodule.sh:490 +#, sh-format +msgid "Failed to register update mode for submodule path '$sm_path'" +msgstr "" +"Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\"" -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Stavningskontrollprogrammet stöds inte" +#: git-submodule.sh:590 +#, sh-format +msgid "" +"Submodule path '$sm_path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" +"Undermodulen \"$sm_path\" har inte initierats\n" +"Kanske du vill köra \"update --init\"?" + +#: git-submodule.sh:603 +#, sh-format +msgid "Unable to find current revision in submodule path '$sm_path'" +msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\"" + +#: git-submodule.sh:622 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" + +#: git-submodule.sh:636 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\"" + +#: git-submodule.sh:637 +#, sh-format +msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\"" + +#: git-submodule.sh:642 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\"" + +#: git-submodule.sh:643 +#, sh-format +msgid "Submodule path '$sm_path': merged in '$sha1'" +msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\"" + +#: git-submodule.sh:648 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\"" + +#: git-submodule.sh:649 +#, sh-format +msgid "Submodule path '$sm_path': checked out '$sha1'" +msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\"" + +#: git-submodule.sh:671 git-submodule.sh:995 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" + +#: git-submodule.sh:779 +msgid "The --cached option cannot be used with the --files option" +msgstr "Flaggan --cached kan inte användas med flaggan --files" + +#. unexpected type +#: git-submodule.sh:819 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "oväntat läge $mod_dst" + +#: git-submodule.sh:837 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr " Varning: $name innehåller inte incheckning $sha1_src" + +#: git-submodule.sh:840 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr " Varning: $name innehåller inte incheckning $sha1_dst" + +#: git-submodule.sh:843 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst" + +#: git-submodule.sh:868 +msgid "blob" +msgstr "blob" + +#: git-submodule.sh:906 +msgid "# Submodules changed but not updated:" +msgstr "# Undermoduler ändrade men inte uppdaterade:" + +#: git-submodule.sh:908 +msgid "# Submodule changes to be committed:" +msgstr "# Undermodulers ändringar att checka in:" + +#: git-submodule.sh:1054 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "Synkroniserar undermodul-url för \"$name\"" + +#~ msgid " 0 files changed" +#~ msgstr " 0 filer ändrade" + +#~ msgid " %d file changed" +#~ msgid_plural " %d files changed" +#~ msgstr[0] " %d fil ändrad" +#~ msgstr[1] " %d filer ändrade" + +#~ msgid ", %d insertion(+)" +#~ msgid_plural ", %d insertions(+)" +#~ msgstr[0] ", %d tillägg(+)" +#~ msgstr[1] ", %d tillägg(+)" + +#~ msgid ", %d deletion(-)" +#~ msgid_plural ", %d deletions(-)" +#~ msgstr[0] ", %d borttagning(-)" +#~ msgstr[1] ", %d borttagningar(-)" + +#~ msgid "Auto packing the repository for optimum performance.\n" +#~ msgstr "Packar arkivet automatiskt för optimal prestanda.\n" + +#~ msgid " (use \"git add\" to track)" +#~ msgstr " (spåra med \"git add\")" + +#~ msgid "-B cannot be used with -b" +#~ msgstr "-B kan inte användas med -b" -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Stavningskontroll är ej tillgänglig" +#~ msgid "--patch is incompatible with all other options" +#~ msgstr "--patch är inkompatibel med alla andra flaggor" + +#~ msgid "--detach cannot be used with -b/-B/--orphan" +#~ msgstr "--detcah kan inte användas med -b/-B/--orphan" -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Ogiltig inställning för stavningskontroll" +#~ msgid "--detach cannot be used with -t" +#~ msgstr "--detach kan inte användas med -t" -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Återställer ordlistan till %s." +#~ msgid "--orphan and -b|-B are mutually exclusive" +#~ msgstr "--orphan och -b|-B kan inte användas samtidigt" -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Stavningskontroll misslyckades tyst vid start" +#~ msgid "--orphan cannot be used with -t" +#~ msgstr "--orphan kan inte användas med -t" -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Stavningskontrollprogrammet känns inte igen" +#~ msgid "git checkout: -f and -m are incompatible" +#~ msgstr "git checkout: -f och -m är inkompatibla" -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Inga förslag" +#~ msgid "" +#~ "git checkout: updating paths is incompatible with switching branches." +#~ msgstr "" +#~ "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Oväntat filslut från stavningskontroll" +#~ msgid "diff setup failed" +#~ msgstr "misslyckades sätta upp för diff" -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Stavningskontroll misslyckades" +#~ msgid "merge-recursive: disk full?" +#~ msgstr "merge-recursive: disk full?" -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Inga nycklar hittades." +#~ msgid "diff_setup_done failed" +#~ msgstr "diff_setup_done misslyckades" -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Hittade öppen nyckel i: %s" +#~ msgid "%s: has been deleted/renamed" +#~ msgstr "%s: har tagits bort/ändrat namn" -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Skapa nyckel" +#~ msgid "'%s': not a documentation directory." +#~ msgstr "\"%s\": inte en dokumentationskatalog." -#: lib/sshkey.tcl:58 -msgid "Copy To Clipboard" -msgstr "Kopiera till Urklipp" +#~ msgid "-d option is no longer supported. Do not use." +#~ msgstr "Flaggan -d stöds inte lägre. Använd inte." -#: lib/sshkey.tcl:72 -msgid "Your OpenSSH Public Key" -msgstr "Din öppna OpenSSH-nyckel" +#~ msgid "cherry-pick" +#~ msgstr "cherry-pick" -#: lib/sshkey.tcl:80 -msgid "Generating..." -msgstr "Skapar..." +#~ msgid "Please enter the commit message for your changes." +#~ msgstr "Ange ett incheckningsmeddelande för dina ändringar." -#: lib/sshkey.tcl:86 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Kunde inte starta ssh-keygen:\n" -"\n" -"%s" +#~ msgid "Could not extract email from committer identity." +#~ msgstr "Kunde inte extrahera e-postadress från incheckarens identitet." -#: lib/sshkey.tcl:113 -msgid "Generation failed." -msgstr "Misslyckades med att skapa." +#~ msgid "--" +#~ msgstr "--" -#: lib/sshkey.tcl:120 -msgid "Generation succeeded, but no keys found." -msgstr "Lyckades skapa nyckeln, men hittar inte någon nyckel." +#~ msgid "# Changed but not updated:" +#~ msgstr "# Ändrade men inte uppdaterade:" -#: lib/sshkey.tcl:123 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Din nyckel finns i: %s" +#~ msgid "A branch named '%s' already exists." +#~ msgstr "Det finns redan en gren som heter \"%s\"" -#: lib/status_bar.tcl:86 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s... %*i av %*i %s (%3i%%)" +#~ msgid "path '%s' does not have all 3 versions" +#~ msgstr "sökvägen \"%s\" har inte alla 3 versionerna" -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Lägg till verktyg" +#~ msgid "git checkout: we do not like '%s' as a branch name." +#~ msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren." -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Lägg till nytt verktygskommando" +#~ msgid "git checkout: branch %s already exists" +#~ msgstr "git checkout: grenen %s finns redan" -#: lib/tools_dlg.tcl:34 -msgid "Add globally" -msgstr "Lägg till globalt" +#~ msgid "Paths with --interactive does not make sense." +#~ msgstr "Kan inte ange sökvägar med --interactive." -#: lib/tools_dlg.tcl:46 -msgid "Tool Details" -msgstr "Detaljer för verktyg" +#~ msgid "No HEAD commit to compare with (yet)" +#~ msgstr "Ingen HEAD-incheckning att jämföra med (ännu)" -#: lib/tools_dlg.tcl:49 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Använd \"/\"-avdelare för att skapa ett undermenyträd:" +#~ msgid "cannot mix --fixed-strings and regexp" +#~ msgstr "kan inte blanda --fixed-strings och reguljära uttryck" -#: lib/tools_dlg.tcl:60 -msgid "Command:" -msgstr "Kommando:" +#~ msgid "%s; will overwrite!" +#~ msgstr "%s; kommer skriva över!" -#: lib/tools_dlg.tcl:71 -msgid "Show a dialog before running" -msgstr "Visa dialog innan programmet startas" +#~ msgid "Failed to write current notes tree to database" +#~ msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen" -#: lib/tools_dlg.tcl:77 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Be användaren välja en version (sätter $REVISION)" +# FIXME: Untranslatable! +# +#~ msgid "Refusing to %s notes in %s (outside of refs/notes/)" +#~ msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)" -#: lib/tools_dlg.tcl:82 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Be användaren om ytterligare parametrar (sätter $ARGS)" +#~ msgid "add" +#~ msgstr "add" -#: lib/tools_dlg.tcl:89 -msgid "Don't show the command output window" -msgstr "Visa inte kommandots utdatafönster" +#~ msgid "copy" +#~ msgstr "copy" -#: lib/tools_dlg.tcl:94 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Kör endast om en diff har markerats ($FILENAME är inte tomt)" +#~ msgid "show" +#~ msgstr "show" -#: lib/tools_dlg.tcl:118 -msgid "Please supply a name for the tool." -msgstr "Ange ett namn för verktyget." +#~ msgid "remove" +#~ msgstr "remove" -#: lib/tools_dlg.tcl:126 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "Verktyget \"%s\" finns redan." +#~ msgid "prune" +#~ msgstr "prune" -#: lib/tools_dlg.tcl:148 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Kunde inte lägga till verktyget:\n" -"%s" +#~ msgid "The current branch %s is not tracking anything." +#~ msgstr "Den aktuella grenen %s spårar ingenting." + +#~ msgid "No destination configured to push to." +#~ msgstr "Har inte ställt in någon destination att sända till." + +#~ msgid "Reflog action message too long: %.*s..." +#~ msgstr "Reflog-händelsemeddelande för långt: %.*s..." + +#~ msgid "Could not read commit message of %s" +#~ msgstr "Kunde inte läsa incheckningsmeddelandet för %s" -#: lib/tools_dlg.tcl:187 -msgid "Remove Tool" -msgstr "Ta bort verktyg" - -#: lib/tools_dlg.tcl:193 -msgid "Remove Tool Commands" -msgstr "Ta bort verktygskommandon" - -#: lib/tools_dlg.tcl:198 -msgid "Remove" -msgstr "Ta bort" - -#: lib/tools_dlg.tcl:231 -msgid "(Blue denotes repository-local tools)" -msgstr "(Blått anger verktyg lokala för arkivet)" - -#: lib/tools_dlg.tcl:292 -#, tcl-format -msgid "Run Command: %s" -msgstr "Kör kommandot: %s" - -#: lib/tools_dlg.tcl:306 -msgid "Arguments" -msgstr "Argument" - -#: lib/tools_dlg.tcl:341 -msgid "OK" -msgstr "OK" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "För att starta %s måste du välja en fil." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Är du säker på att du vill starta %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Verktyg: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Exekverar: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Verktyget avslutades framgångsrikt: %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Verktyget misslyckades: %s" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Hämtar nya ändringar från %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "fjärrborttagning %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Tar bort spårande grenar som tagits bort från %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Sänder ändringar till %s" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Speglar till %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Sänder %s %s till %s" - -#: lib/transport.tcl:102 -msgid "Push Branches" -msgstr "Sänd grenar" - -#: lib/transport.tcl:117 -msgid "Source Branches" -msgstr "Källgrenar" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Destinationsarkiv" - -#: lib/transport.tcl:172 -msgid "Transfer Options" -msgstr "Överföringsalternativ" - -#: lib/transport.tcl:174 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Tvinga överskrivning av befintlig gren (kan kasta bort ändringar)" - -#: lib/transport.tcl:178 -msgid "Use thin pack (for slow network connections)" -msgstr "Använd tunt paket (för långsamma nätverksanslutningar)" - -#: lib/transport.tcl:182 -msgid "Include tags" -msgstr "Ta med taggar" - -#~ msgid "Cannot use funny .git directory:" -#~ msgstr "Kan inte använda underlig .git-katalog:" - -#~ msgid "Preferences..." -#~ msgstr "Inställningar..." - -#~ msgid "Always (Do not perform merge test.)" -#~ msgstr "Alltid (utför inte sammanslagningstest)." - -#~ msgid "URL:" -#~ msgstr "Webbadress:" - -#~ msgid "Delete Remote Branch" -#~ msgstr "Ta bort fjärrgren" +#~ msgid "Could not extract author email from %s" +#~ msgstr "Kunde inte hämta författarens e-postadress från %s" + +#~ msgid "Could not extract author time from %s" +#~ msgstr "Kunde inte hämta författartid från %s" + +#~ msgid "No author information found in %s" +#~ msgstr "Hittade ingen författarinformation i %s" + +#~ msgid "cherry-pick --ff cannot be used with --signoff" +#~ msgstr "cherry-pick --ff kan inte användas med --signoff" + +#~ msgid "cherry-pick --ff cannot be used with --no-commit" +#~ msgstr "cherry-pick --ff kan inte användas med --no-commit" + +#~ msgid "cherry-pick --ff cannot be used with -x" +#~ msgstr "cherry-pick --ff kan inte användas med -x" + +#~ msgid "cherry-pick --ff cannot be used with --edit" +#~ msgstr "cherry-pick --ff kan inte användas med --edit" + +#~ msgid "committer info too long." +#~ msgstr "incheckarinformation för lång." #~ msgid "" -#~ "Unable to start gitk:\n" #~ "\n" -#~ "%s does not exist" +#~ "#\n" +#~ "# Write a tag message\n" +#~ "#\n" #~ msgstr "" -#~ "Kan inte starta gitk:\n" #~ "\n" -#~ "%s finns inte" - -#~ msgid "Apple" -#~ msgstr "Äpple" +#~ "#\n" +#~ "# Skriv ett taggmeddelande\n" +#~ "#\n" -#~ msgid "Not connected to aspell" -#~ msgstr "Inte ansluten till aspell" +#~ msgid "signing key value too long (%.10s...)" +#~ msgstr "signeringsnyckelvärdet för långt (%.10s...)" diff --git a/po/vi.po b/po/vi.po new file mode 100644 index 0000000..ca617a3 --- /dev/null +++ b/po/vi.po @@ -0,0 +1,9613 @@ +# Vietnamese translation for GIT-CORE. +# Copyright (C) 2012, Trần Ngọc Quân. +# This file is distributed under the same license as the git-core package. +# First translated by Trần Ngọc Quân <vnwildman@gmail.com>, 2012. +# Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: git-v1.8.0-rc2-4-g42e55\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2012-10-16 08:38+0800\n" +"PO-Revision-Date: 2012-10-17 08:09+0700\n" +"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" +"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=1;\n" +"X-Poedit-SourceCharset: UTF-8\n" +"X-Poedit-Basepath: ../\n" + +#: advice.c:40 +#, c-format +msgid "hint: %.*s\n" +msgstr "gợi ý: %.*s\n" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:70 +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 "" +"Sửa chúng trong cây làm việc,\n" +"và sau đó dùng lệnh `git add/rm <tập-tin>'\n" +"dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao,\n" +"hoặc là dùng lệnh `git commit -a'." + +#: archive.c:10 +msgid "git archive [options] <tree-ish> [<path>...]" +msgstr "git archive [các-tùy-chọn] <tree-ish> [<đường-dẫn>...]" + +#: archive.c:11 +msgid "git archive --list" +msgstr "git archive --list" + +#: archive.c:12 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +msgstr "" +"git archive --remote <kho> [--exec <lệnh>] [các-tùy-chọn] <tree-ish> [<đường-" +"dẫn>...]" + +#: archive.c:13 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <kho> [--exec <lệnh>] --list" + +#: archive.c:322 +msgid "fmt" +msgstr "fmt" + +#: archive.c:322 +msgid "archive format" +msgstr "định dạng lưu trữ" + +#: archive.c:323 builtin/log.c:1079 +msgid "prefix" +msgstr "tiền tố" + +#: archive.c:324 +msgid "prepend prefix to each pathname in the archive" +msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu" + +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389 +#: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642 +#: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 +#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "tập-tin" + +#: archive.c:326 builtin/archive.c:92 +msgid "write the archive to this file" +msgstr "ghi kho lưu vào tập tin này" + +#: archive.c:328 +msgid "read .gitattributes in working directory" +msgstr "đọc .gitattributes trong thư mục làm việc" + +#: archive.c:329 +msgid "report archived files on stderr" +msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi chuẩn)" + +#: archive.c:330 +msgid "store only" +msgstr "chỉ lưu" + +#: archive.c:331 +msgid "compress faster" +msgstr "nén nhanh hơn" + +#: archive.c:339 +msgid "compress better" +msgstr "nén nhỏ hơn" + +#: archive.c:342 +msgid "list supported archive formats" +msgstr "liệt kê các kiểu né được hỗ trợ" + +#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +msgid "repo" +msgstr "kho" + +#: archive.c:345 builtin/archive.c:94 +msgid "retrieve the archive from remote repository <repo>" +msgstr "nhận kho lưu từ kho chứa <kho> trên máy chủ" + +#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619 +msgid "command" +msgstr "lệnh" + +#: archive.c:347 builtin/archive.c:96 +msgid "path to the remote git-upload-archive command" +msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ" + +#: bundle.c:36 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "`%s' không giống như tập tin v2 bundle (cụm)" + +#: bundle.c:63 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "phần đầu (header) không được thừa nhận: %s%s (%d)" + +#: bundle.c:89 builtin/commit.c:672 +#, c-format +msgid "could not open '%s'" +msgstr "không thể mở `%s'" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "Khó chứa thiếu những lần chuyển giao (commit) cần trước hết này:" + +#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "Cài đặt việc di chuyển qua các điểm xét lại gặp lỗi" + +#: bundle.c:186 +#, c-format +msgid "The bundle contains %d ref" +msgid_plural "The bundle contains %d refs" +msgstr[0] "Bundle chứa %d tham chiếu (refs)" +msgstr[1] "Bundle chứa %d tham chiếu (refs)" + +#: bundle.c:192 +msgid "The bundle records a complete history." +msgstr "Lệnh bundle ghi lại toàn bộ lịch sử." + +#: bundle.c:195 +#, c-format +msgid "The bundle requires this ref" +msgid_plural "The bundle requires these %d refs" +msgstr[0] "Lệnh bundle yêu cầu tham chiếu (refs) này" +msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu (refs) này" + +#: bundle.c:294 +msgid "rev-list died" +msgstr "rev-list bị chết" + +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "đối số không được thừa nhận: %s" + +#: bundle.c:335 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "tham chiếu `%s' bị loại trừ bởi các tùy chọn rev-list" + +#: bundle.c:380 +msgid "Refusing to create empty bundle." +msgstr "Từ chối tạo một bundle trống rỗng." + +#: bundle.c:398 +msgid "Could not spawn pack-objects" +msgstr "Không thể sản sinh pack-objects" + +#: bundle.c:416 +msgid "pack-objects died" +msgstr "pack-objects đã chết" + +#: bundle.c:419 +#, c-format +msgid "cannot create '%s'" +msgstr "không thể tạo `%s'" + +#: bundle.c:441 +msgid "index-pack died" +msgstr "index-pack đã chết" + +#: commit.c:50 +#, c-format +msgid "could not parse %s" +msgstr "không thể phân tích %s" + +#: commit.c:52 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s không phải là một lần commit!" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "cạn bộ nhớ" + +#: connected.c:39 +msgid "Could not run 'git rev-list'" +msgstr "Không thể chạy `git rev-list'" + +#: connected.c:48 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "gặp lỗi khi ghi vào rev-list: %s" + +#: connected.c:56 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list: %s" + +#: date.c:95 +msgid "in the future" +msgstr "trong tương lai" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "%lu giây trước" +msgstr[1] "%lu giây trước" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "%lu phút trước" +msgstr[1] "%lu phút trước" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "%lu giờ trước" +msgstr[1] "%lu giờ trước" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "%lu ngày trước" +msgstr[1] "%lu ngày trước" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "%lu tuần trước" +msgstr[1] "%lu tuần trước" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "%lu tháng trước" +msgstr[1] "%lu tháng trước" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "%lu năm" +msgstr[1] "%lu năm" + +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "%s, %lu tháng trước" +msgstr[1] "%s, %lu tháng trước" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "%lu năm trước" +msgstr[1] "%lu năm trước" + +#: diff.c:105 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr " Gặp lỗi khi phân tích dirstat cắt bỏ phần trăm `%.*s'\n" + +#: diff.c:110 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr " Không hiểu đối số dirstat `%.*s'\n" + +#: diff.c:210 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"Tìm thấy các lỗi trong biến cấu hình 'diff.dirstat':\n" +"%s" + +#: diff.c:3458 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" +"%s" + +#: gpg-interface.c:59 +msgid "could not run gpg." +msgstr "không thể chạy gpg." + +#: gpg-interface.c:71 +msgid "gpg did not accept the data" +msgstr "gpg đã không đồng ý dữ liệu" + +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "gpg gặp lỗi khi ký dữ liệu" + +#: grep.c:1441 +#, c-format +msgid "'%s': unable to read %s" +msgstr "`%s': không thể đọc %s" + +#: grep.c:1458 +#, c-format +msgid "'%s': %s" +msgstr "`%s': %s" + +#: grep.c:1469 +#, c-format +msgid "'%s': short read %s" +msgstr "`%s': đọc ngắn %s" + +#: help.c:212 +#, c-format +msgid "available git commands in '%s'" +msgstr "các lệnh git sẵn sàng để dùng trong `%s'" + +#: help.c:219 +msgid "git commands available from elsewhere on your $PATH" +msgstr "các lệnh git sẵn sàng để dùng từ một nơi khác trong $PATH của bạn" + +#: help.c:275 +#, 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 "" +"`%s' trông như là một lệnh git, nhưng chúng tôi không\n" +"thể thực thi nó. Có lẽ là lệnh git-%s đã bị hỏng?" + +#: help.c:332 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Ối chà. Hệ thống của bạn báo rằng chẳng có lệnh Git nào cả." + +#: help.c:354 +#, 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 "" +"CẢNH BÁO: Bạn đã gọi lệnh Git có tên `%s', mà nó lại không có sẵn.\n" +"Giả định rằng ý bạn là `%s'" + +#: help.c:359 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "trong %0.1f giây một cách tự động..." + +#: help.c:366 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: `%s' không phải là một lệnh của git. Xem `git --help'." + +#: help.c:370 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"Có phải ý bạn là cái này không?" +msgstr[1] "" +"\n" +"Có phải ý bạn là một trong số những cái này không?" + +#: merge-recursive.c:190 +#, c-format +msgid "(bad commit)\n" +msgstr "(commit sai)\n" + +#: merge-recursive.c:206 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "addinfo_cache gặp lỗi đối với đường dẫn `%s'" + +#: merge-recursive.c:268 +msgid "error building trees" +msgstr "gặp lỗi khi xây dựng cây" + +#: merge-recursive.c:672 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "gặp lỗi khi tạo đường dẫn `%s'%s" + +#: merge-recursive.c:683 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n" + +#. 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 ": có lẽ là một xung đột D/F?" + +#: merge-recursive.c:708 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "từ chối đóng tập tin không được theo vết tại `%s'" + +#: merge-recursive.c:748 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "không thể đọc đối tượng %s `%s'" + +#: merge-recursive.c:750 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "đối tượng blob được mong đợi cho %s `%s'" + +#: merge-recursive.c:773 builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "gặp lỗi khi mở `%s'" + +#: merge-recursive.c:781 +#, c-format +msgid "failed to symlink '%s'" +msgstr "gặp lỗi khi tạo liên kết tượng trưng (symlink) `%s'" + +#: merge-recursive.c:784 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "không hiểu phải làm gì với %06o %s `%s'" + +#: merge-recursive.c:922 +msgid "Failed to execute internal merge" +msgstr "Gặp lỗi khi thực hiện trộn nội bộ" + +#: merge-recursive.c:926 +#, c-format +msgid "Unable to add %s to database" +msgstr "Không thể thêm %s vào cơ sở dữ liệu" + +#: merge-recursive.c:942 +msgid "unsupported object type in the tree" +msgstr "kiểu đối tượng không được hỗ trợ trong cây (tree)" + +#: 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 "" +"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " +"còn lại trong cây (tree)." + +#: 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 "" +"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " +"còn lại trong cây (tree) tại %s." + +#: merge-recursive.c:1081 +msgid "rename" +msgstr "đổi tên" + +#: merge-recursive.c:1081 +msgid "renamed" +msgstr "đã đổi tên" + +#: merge-recursive.c:1137 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s" + +#: merge-recursive.c:1159 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" +"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi " +"tên \"%s\"->\"%s\" trong \"%s\"%s" + +#: merge-recursive.c:1164 +msgid " (left unresolved)" +msgstr " (cần giải quyết)" + +#: merge-recursive.c:1218 +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgstr "" +"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s" + +#: merge-recursive.c:1248 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "Đang đổi tên %s thành %s thay vì %s thành %s" + +#: merge-recursive.c:1447 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "" +"XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm vào trong %s" + +#: merge-recursive.c:1457 +#, c-format +msgid "Adding merged %s" +msgstr "Thêm hòa trộn %s" + +#: merge-recursive.c:1462 merge-recursive.c:1660 +#, c-format +msgid "Adding as %s instead" +msgstr "Thay vào đó thêm vào %s" + +#: merge-recursive.c:1513 +#, c-format +msgid "cannot read object %s" +msgstr "không thể đọc đối tượng %s" + +#: merge-recursive.c:1516 +#, c-format +msgid "object %s is not a blob" +msgstr "đối tượng %s không phải là một blob" + +#: merge-recursive.c:1564 +msgid "modify" +msgstr "sửa đổi" + +#: merge-recursive.c:1564 +msgid "modified" +msgstr "đã sửa" + +#: merge-recursive.c:1574 +msgid "content" +msgstr "nội dung" + +#: merge-recursive.c:1581 +msgid "add/add" +msgstr "thêm/thêm" + +#: merge-recursive.c:1615 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" + +#: merge-recursive.c:1629 +#, c-format +msgid "Auto-merging %s" +msgstr "Tự-động-hòa-trộn %s" + +#: merge-recursive.c:1633 git-submodule.sh:869 +msgid "submodule" +msgstr "mô-đun-con" + +#: merge-recursive.c:1634 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" + +#: merge-recursive.c:1724 +#, c-format +msgid "Removing %s" +msgstr "Đang xóa %s" + +#: merge-recursive.c:1749 +msgid "file/directory" +msgstr "tập-tin/thư-mục" + +#: merge-recursive.c:1755 +msgid "directory/file" +msgstr "thư-mục/tập tin" + +#: merge-recursive.c:1760 +#, c-format +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +msgstr "" +"XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là " +"%s" + +#: merge-recursive.c:1770 +#, c-format +msgid "Adding %s" +msgstr "Thêm \"%s\"" + +#: merge-recursive.c:1787 +msgid "Fatal merge failure, shouldn't happen." +msgstr "Việc hòa trộn hỏng nghiêm trọng, không nên để xảy ra." + +#: merge-recursive.c:1806 +msgid "Already up-to-date!" +msgstr "Đã cập nhật rồi!" + +#: merge-recursive.c:1815 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "hòa trộn cây (tree) %s và %s gặp lỗi" + +#: merge-recursive.c:1845 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "Đường dẫn chưa được xử lý??? %s" + +#: merge-recursive.c:1890 +msgid "Merging:" +msgstr "Đang trộn:" + +#: merge-recursive.c:1903 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "tìm thấy %u tổ tiên chung:" +msgstr[1] "tìm thấy %u tổ tiên chung:" + +#: merge-recursive.c:1940 +msgid "merge returned no commit" +msgstr "hòa trộn không trả về lần chuyển giao (commit) nào" + +#: merge-recursive.c:1997 +#, c-format +msgid "Could not parse object '%s'" +msgstr "Không thể phân tích đối tượng `%s'" + +#: merge-recursive.c:2009 builtin/merge.c:696 +msgid "Unable to write index." +msgstr "Không thể ghi bảng mục lục" + +#: parse-options.c:494 +msgid "..." +msgstr "..." + +#: parse-options.c:512 +#, c-format +msgid "usage: %s" +msgstr "cách dùng: %s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:516 +#, c-format +msgid " or: %s" +msgstr " hoặc: %s" + +#: parse-options.c:519 +#, c-format +msgid " %s" +msgstr " %s" + +#: remote.c:1632 +#, 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] "Nhánh của bạn là đầu của `%s' bởi %d lần chuyển giao (commit).\n" +msgstr[1] "Nhánh của bạn là đầu của `%s' bởi %d lần chuyển giao (commit).\n" + +#: remote.c:1638 +#, 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] "" +"Nhánh của bạn thì ở đằng sau `%s' bởi %d lần chuyển giao (commit), và có thể " +"được fast-forward.\n" +msgstr[1] "" +"Nhánh của bạn thì ở đằng sau `%s' bởi %d lần chuyển giao (commit), và có thể " +"được fast-forward.\n" + +#: remote.c:1646 +#, 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] "" +"Nhánh của bạn và `%s' bị phân kỳ,\n" +"và có %d và %d lần chuyển giao (commit) khác nhau cho từng cái,\n" +"tương ứng với mỗi lần.\n" +msgstr[1] "" +"Your branch and `%s' have diverged,\n" +"and have %d and %d different commit each, respectively.\n" + +#: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Không thể mở %s' để ghi" + +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:867 +#: builtin/merge.c:1089 builtin/merge.c:1102 +#, c-format +msgid "Could not write to '%s'" +msgstr "Không thể ghi vào `%s'" + +#: sequencer.c:146 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" +"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n" +"với lệnh `git add <đường_dẫn>' hoặc `git rm <đường_dẫn>'" + +#: 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 "" +"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n" +"với lệnh `git add <đường_dẫn>' hoặc `git rm <đường_dẫn>'\n" +"và chuyển giao (commit) kết quả bằng lệnh `git commit'" + +#: sequencer.c:162 sequencer.c:770 sequencer.c:853 +#, c-format +msgid "Could not write to %s" +msgstr "Không thể ghi vào %s" + +#: sequencer.c:165 +#, c-format +msgid "Error wrapping up %s" +msgstr "Lỗi bao bọc %s" + +#: sequencer.c:180 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh cherry-pick." + +#: sequencer.c:182 +msgid "Your local changes would be overwritten by revert." +msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh revert." + +#: sequencer.c:185 +msgid "Commit your changes or stash them to proceed." +msgstr "Chuyển giao (commit) các thay đổi của bạn hay stash chúng để xử lý." + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:235 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới" + +#: sequencer.c:266 +msgid "Could not resolve HEAD commit\n" +msgstr "Không thể phân giải commit (lần chuyển giao) HEAD\n" + +#: sequencer.c:287 +msgid "Unable to update cache tree\n" +msgstr "Không thể cập nhật cây bộ nhớ đệm\n" + +#: sequencer.c:332 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "Không thể phân tích commit (lần chuyển giao) %s\n" + +#: sequencer.c:337 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "Không thể phân tích commit (lần chuyển giao) cha mẹ %s\n" + +#: sequencer.c:403 +msgid "Your index file is unmerged." +msgstr "Tập tin lưu mục lục của bạn không được hòa trộn." + +#: sequencer.c:406 +msgid "You do not have a valid HEAD" +msgstr "Bạn không có HEAD nào hợp lệ" + +#: sequencer.c:421 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" +"Lần chuyển giao (commit) %s là một lần hòa trộn nhưng không đưa ra tùy chọn -" +"m." + +#: sequencer.c:429 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "Lần chuyển giao (commit) %s không có cha mẹ %d" + +#: sequencer.c:433 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "" +"Luồng chính được chỉ ra nhưng lần chuyển giao (commit) %s không phải là một " +"lần hòa trộn." + +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: sequencer.c:444 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s" + +#: sequencer.c:448 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Không thể lấy thông điệp lần chuyển giao (commit) cho %s" + +#: sequencer.c:532 +#, c-format +msgid "could not revert %s... %s" +msgstr "không thể revert %s... %s" + +#: sequencer.c:533 +#, c-format +msgid "could not apply %s... %s" +msgstr "không thể apply (áp dụng miếng vá) %s... %s" + +#: sequencer.c:565 +msgid "empty commit set passed" +msgstr "lần chuyển giao (commit) trống rỗng đặt là hợp quy cách" + +#: sequencer.c:573 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: gặp lỗi đọc bảng mục lục" + +#: sequencer.c:578 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục" + +#: sequencer.c:636 +#, c-format +msgid "Cannot %s during a %s" +msgstr "Không thể %s trong khi %s" + +#: sequencer.c:658 +#, c-format +msgid "Could not parse line %d." +msgstr "Không phân tích được dòng %d." + +#: sequencer.c:663 +msgid "No commits parsed." +msgstr "Không có lần chuyển giao (commit) nào được phân tích." + +#: sequencer.c:676 +#, c-format +msgid "Could not open %s" +msgstr "Không thể mở %s" + +#: sequencer.c:680 +#, c-format +msgid "Could not read %s." +msgstr "Không thể đọc %s." + +#: sequencer.c:687 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "Bảng chỉ thị không thể dùng được: %s" + +#: sequencer.c:715 +#, c-format +msgid "Invalid key: %s" +msgstr "Khóa không đúng: %s" + +#: sequencer.c:718 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Giá trị không hợp lệ %s: %s" + +#: sequencer.c:730 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "Bảng tùy chọn dị hình: %s" + +#: sequencer.c:751 +msgid "a cherry-pick or revert is already in progress" +msgstr "một thao tác cherry-pick hoặc revert đang được thực hiện" + +#: sequencer.c:752 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\"" + +#: sequencer.c:756 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "Không thể tạo thư mục xếp dãy %s" + +#: sequencer.c:772 sequencer.c:857 +#, c-format +msgid "Error wrapping up %s." +msgstr "Lỗi bao bọc %s." + +#: sequencer.c:791 sequencer.c:925 +msgid "no cherry-pick or revert in progress" +msgstr "không cherry-pick hay revert trong tiến trình" + +#: sequencer.c:793 +msgid "cannot resolve HEAD" +msgstr "không thể phân giải HEAD" + +#: sequencer.c:795 +msgid "cannot abort from a branch yet to be born" +msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra" + +#: sequencer.c:817 builtin/apply.c:4005 +#, c-format +msgid "cannot open %s: %s" +msgstr "không thể mở %s: %s" + +#: sequencer.c:820 +#, c-format +msgid "cannot read %s: %s" +msgstr "không thể đọc %s: %s" + +#: sequencer.c:821 +msgid "unexpected end of file" +msgstr "kết thúc tập tin đột xuất" + +#: sequencer.c:827 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "tập tin HEAD 'pre-cherry-pick' đã lưu `%s' bị hỏng" + +#: sequencer.c:850 +#, c-format +msgid "Could not format %s." +msgstr "Không thể định dạng %s." + +#: sequencer.c:1012 +msgid "Can't revert as initial commit" +msgstr "Không thể revert một lần chuyển giao (commit) khởi tạo" + +#: sequencer.c:1013 +msgid "Can't cherry-pick into empty head" +msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng" + +#: sha1_name.c:1044 +msgid "HEAD does not point to a branch" +msgstr "HEAD không chỉ đến một nhánh nào cả" + +#: sha1_name.c:1047 +#, c-format +msgid "No such branch: '%s'" +msgstr "Không có nhánh nào như thế: `%s'" + +#: sha1_name.c:1049 +#, c-format +msgid "No upstream configured for branch '%s'" +msgstr "Không có thượng nguồn (upstream) được cấu hình cho nhánh `%s'" + +#: sha1_name.c:1052 +#, c-format +msgid "Upstream branch '%s' not stored as a remote-tracking branch" +msgstr "" +"Nhánh thượng nguồn (upstream) `%s' không được lưu lại như là một nhánh " +"'remote-tracking'" + +#: wrapper.c:408 +#, c-format +msgid "unable to access '%s': %s" +msgstr "không thể truy cập `%s': %s" + +#: wrapper.c:426 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "không tìm thấy người dùng hiện tại trong tập tin passwd: %s" + +#: wrapper.c:427 +msgid "no such user" +msgstr "không có người dùng như vậy" + +#: wt-status.c:140 +msgid "Unmerged paths:" +msgstr "Những đường dẫn chưa được hòa trộn:" + +#: wt-status.c:167 wt-status.c:194 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr " (dùng \"git reset %s <tập-tin>...\" để bỏ một stage (trạng thái))" + +#: wt-status.c:169 wt-status.c:196 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr " (dùng \"git rm --cached <tập-tin>...\" để bỏ trạng thái (stage))" + +#: wt-status.c:173 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " (dùng \"git add <tập-tin>...\" để đánh dấu là cần giải quyết)" + +#: wt-status.c:175 wt-status.c:179 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr "" +" (dùng \"git add/rm <tập-tin>...\" như là một cách thích hợp để đánh dấu " +"là cần được giải quyết)" + +#: wt-status.c:177 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " (dùng \"git rm <tập-tin>...\" để đánh dấu là cần giải quyết)" + +#: wt-status.c:188 +msgid "Changes to be committed:" +msgstr "Những thay đổi sẽ được chuyển giao:" + +#: wt-status.c:206 +msgid "Changes not staged for commit:" +msgstr "" +"Các thay đổi không được đặt trạng thái (stage) cho lần chuyển giao (commit):" + +#: wt-status.c:210 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr "" +" (dùng \"git add <tập-tin>...\" để cập nhật những gì cần chuyển giao " +"(commit))" + +#: wt-status.c:212 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr "" +" (dùng \"git add/rm <tập-tin>...\" để cập nhật những gì sẽ được chuyển giao)" + +#: wt-status.c:213 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr "" +" (dùng \"git checkout -- <tập-tin>...\" để bỏ thay đổi trong thư mục làm " +"việc)" + +#: wt-status.c:215 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr "" +" (chuyển giao (commit) hoặc là loại bỏ các nội dung không-bị-theo-vết hay " +"đã bị chỉnh sửa trong mô-đun-con)" + +#: wt-status.c:227 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr "" +" (dùng \"git %s <tập-tin>...\" để thêm vào những gì cần chuyển giao " +"(commit))" + +#: wt-status.c:244 +msgid "bug" +msgstr "lỗi" + +#: wt-status.c:249 +msgid "both deleted:" +msgstr "bị xóa bởi cả hai:" + +#: wt-status.c:250 +msgid "added by us:" +msgstr "được thêm vào bởi chúng tôi:" + +#: wt-status.c:251 +msgid "deleted by them:" +msgstr "bị xóa đi bởi họ:" + +#: wt-status.c:252 +msgid "added by them:" +msgstr "được thêm vào bởi họ:" + +#: wt-status.c:253 +msgid "deleted by us:" +msgstr "bị xóa bởi chúng tôi:" + +#: wt-status.c:254 +msgid "both added:" +msgstr "được thêm vào bởi cả hai:" + +#: wt-status.c:255 +msgid "both modified:" +msgstr "bị sửa bởi cả hai:" + +#: wt-status.c:285 +msgid "new commits, " +msgstr "lần chuyển giao (commit) mới, " + +#: wt-status.c:287 +msgid "modified content, " +msgstr "nội dung được sửa đổi, " + +#: wt-status.c:289 +msgid "untracked content, " +msgstr "nội dung chưa được theo dõi, " + +#: wt-status.c:303 +#, c-format +msgid "new file: %s" +msgstr "tập tin mới: %s" + +#: wt-status.c:306 +#, c-format +msgid "copied: %s -> %s" +msgstr "đã sao chép: %s -> %s" + +#: wt-status.c:309 +#, c-format +msgid "deleted: %s" +msgstr "đã xóa: %s" + +#: wt-status.c:312 +#, c-format +msgid "modified: %s" +msgstr "đã sửa đổi: %s" + +#: wt-status.c:315 +#, c-format +msgid "renamed: %s -> %s" +msgstr "đã đổi tên: %s -> %s" + +#: wt-status.c:318 +#, c-format +msgid "typechange: %s" +msgstr "đổi-kiểu: %s" + +#: wt-status.c:321 +#, c-format +msgid "unknown: %s" +msgstr "không hiểu: %s" + +#: wt-status.c:324 +#, c-format +msgid "unmerged: %s" +msgstr "chưa hòa trộn: %s" + +#: wt-status.c:327 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "lỗi: không lấy được trạng thái lệnh diff %c" + +#: wt-status.c:785 +msgid "You have unmerged paths." +msgstr "Bạn có những đường dẫn chưa được hòa trộn." + +#: wt-status.c:788 wt-status.c:912 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (sửa các xung đột sau đó chạy \"git commit\")" + +#: wt-status.c:791 +msgid "All conflicts fixed but you are still merging." +msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn." + +#: wt-status.c:794 +msgid " (use \"git commit\" to conclude merge)" +msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)" + +#: wt-status.c:804 +msgid "You are in the middle of an am session." +msgstr "Bạn đang ở giữa của một phiên 'am'." + +#: wt-status.c:807 +msgid "The current patch is empty." +msgstr "Miếng vá hiện tại bị trống rỗng." + +#: wt-status.c:811 +msgid " (fix conflicts and then run \"git am --resolved\")" +msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --resolved\")" + +#: wt-status.c:813 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (dùng \"git am --skip\" để bỏ qua lần vá này)" + +#: wt-status.c:815 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)" + +#: wt-status.c:873 wt-status.c:883 +msgid "You are currently rebasing." +msgstr "Bạn hiện nay đang thực hiện việc rebase (tái cấu trúc)." + +#: wt-status.c:876 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " (sửa các xung đột và sau đó chạy lệnh \"git rebase --continue\")" + +#: wt-status.c:878 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (dùng \"git rebase --skip\" để bỏ qua lần vá này)" + +#: wt-status.c:880 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr " (dùng \"git rebase --abort\" để check-out nhánh nguyên thủy)" + +#: wt-status.c:886 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr "" +" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git rebase --continue\")" + +#: wt-status.c:888 +msgid "You are currently splitting a commit during a rebase." +msgstr "" +"Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc " +"rebase." + +#: wt-status.c:891 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr "" +" (Một khi thư mục làm việc của bạn đã gọn gàng, chạy \"git rebase --continue" +"\")" + +#: wt-status.c:893 +msgid "You are currently editing a commit during a rebase." +msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase." + +#: wt-status.c:896 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr "" +" (dùng \"git commit --amend\" để tu bổ lần chuyển giao (commit) hiện tại)" + +#: wt-status.c:898 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr "" +" (dùng \"git rebase --continue\" một khi bạn cảm thấy hài lòng về những " +"thay đổi của mình)" + +#: wt-status.c:908 +msgid "You are currently cherry-picking." +msgstr "Bạn hiện nay đang thực hiện việc cherry-pick." + +#: wt-status.c:915 +msgid " (all conflicts fixed: run \"git commit\")" +msgstr " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git commit\")" + +#: wt-status.c:924 +msgid "You are currently bisecting." +msgstr "Bạn hiện tại đang thực hiện việc bisect (chia đôi)." + +#: wt-status.c:927 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" + +#: wt-status.c:978 +msgid "On branch " +msgstr "Trên nhánh " + +#: wt-status.c:985 +msgid "Not currently on any branch." +msgstr "Hiện tại chẳng ở nhánh nào cả." + +#: wt-status.c:997 +msgid "Initial commit" +msgstr "Lần chuyển giao (commit) khởi đầu" + +#: wt-status.c:1011 +msgid "Untracked files" +msgstr "Những tập tin chưa được theo dõi" + +#: wt-status.c:1013 +msgid "Ignored files" +msgstr "Những tập tin bị lờ đi" + +#: wt-status.c:1015 +#, c-format +msgid "Untracked files not listed%s" +msgstr "Những tập tin không bị theo vết không được liệt kê ra %s" + +#: wt-status.c:1017 +msgid " (use -u option to show untracked files)" +msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" + +#: wt-status.c:1023 +msgid "No changes" +msgstr "Không có thay đổi nào" + +#: wt-status.c:1028 +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "" +"không có thay đổi nào được thêm vào commit (dùng \"git add\" và/hoặc \"git " +"commit -a\")\n" + +#: wt-status.c:1031 +#, c-format +msgid "no changes added to commit\n" +msgstr "không có thay đổi nào được thêm vào lần chuyển giao (commit)\n" + +#: wt-status.c:1034 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" +"không có gì được thêm vào lần chuyển giao (commit) nhưng có những tập tin " +"không được theo dấu vết hiện diện (dùng \"git add\" để đưa vào theo dõi)\n" + +#: wt-status.c:1037 +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "" +"không có gì được thêm vào lần chuyển giao (commit) nhưng có những tập tin " +"không được theo dấu vết hiện diện\n" + +#: wt-status.c:1040 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "" +" không có gì để commit (tạo/sao-chép các tập tin và dùng \"git add\" để theo " +"dõi dấu vết)\n" + +#: wt-status.c:1043 wt-status.c:1048 +#, c-format +msgid "nothing to commit\n" +msgstr "không có gì để chuyển giao (commit)\n" + +#: wt-status.c:1046 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "" +"không có gì để chuyển giao (commit) (dùng -u để bỏ các tập tin cần theo dấu " +"vết)\n" + +#: wt-status.c:1050 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "không có gì để chuyển giao (commit), thư mục làm việc sạch sẽ\n" + +#: wt-status.c:1158 +msgid "HEAD (no branch)" +msgstr "HEAD (không nhánh)" + +#: wt-status.c:1164 +msgid "Initial commit on " +msgstr "Lần chuyển giao (commit) khởi tạo trên " + +#: wt-status.c:1179 +msgid "behind " +msgstr "đằng sau " + +#: wt-status.c:1182 wt-status.c:1185 +msgid "ahead " +msgstr "phía trước " + +#: wt-status.c:1187 +msgid ", behind " +msgstr ", đằng sau " + +#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "bỏ liên kết (unlink) %s không thành công" + +#: builtin/add.c:19 +msgid "git add [options] [--] <filepattern>..." +msgstr "git add [các-tùy-chọn] [--] <mẫu-tập-tin>..." + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "trạng thái lệnh diff không như mong đợi %c" + +#: builtin/add.c:67 builtin/commit.c:230 +msgid "updating files failed" +msgstr "Cập nhật tập tin gặp lỗi" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "gỡ bỏ `%s'\n" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Đường dẫn `%s' thì ở trong mô-đun-con `%.*s'" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "" +"Các thay đổi không được lưu trạng thái sau khi làm tươi mới lại bảng mục lục:" + +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "pathspec `%s' không khớp với bất kỳ tập tin nào" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "`%s' nằm ngoài một liên kết tượng trưng" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "Không thể đọc bảng mục lục" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Không thể mở `%s' để ghi" + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "Không thể ghi ra miếng vá" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "không thể lấy trạng thái về `%s'" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "Miếng vá trống rỗng. Đã bỏ qua." + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "Không thể apply (áp dụng miếng vá) `%s'" + +#: builtin/add.c:313 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" +"Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " +"của bạn:\n" + +#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 +#: builtin/rm.c:133 +msgid "dry run" +msgstr "chạy thử" + +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1154 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477 +#: builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "chi tiết" + +#: builtin/add.c:322 +msgid "interactive picking" +msgstr "sửa bằng cách tương tác" + +#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248 +msgid "select hunks interactively" +msgstr "chọn `hunks' một cách tương tác" + +#: builtin/add.c:324 +msgid "edit current diff and apply" +msgstr "sửa diff hiện nay và áp dụng nó" + +#: builtin/add.c:325 +msgid "allow adding otherwise ignored files" +msgstr "cho phép thêm các tập tin bị bỏ qua khác" + +#: builtin/add.c:326 +msgid "update tracked files" +msgstr "cập nhật các tập tin được theo vết" + +#: builtin/add.c:327 +msgid "record only the fact that the path will be added later" +msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau" + +#: builtin/add.c:328 +msgid "add changes from all tracked and untracked files" +msgstr "" +"thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu " +"vết" + +#: builtin/add.c:329 +msgid "don't add, only refresh the index" +msgstr "không thêm, chỉ làm tươi mới bảng mục lục" + +#: builtin/add.c:330 +msgid "just skip files which cannot be added because of errors" +msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi" + +#: builtin/add.c:331 +msgid "check if - even missing - files are ignored in dry run" +msgstr "" +"kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử" + +#: builtin/add.c:353 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n" + +#: builtin/add.c:354 +msgid "no files added" +msgstr "chưa có tập tin nào được thêm vào" + +#: builtin/add.c:360 +msgid "adding files failed" +msgstr "thêm tập tin gặp lỗi" + +#: builtin/add.c:392 +msgid "-A and -u are mutually incompatible" +msgstr "-A và -u xung khắc nhau" + +#: builtin/add.c:394 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run" + +#: builtin/add.c:414 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n" + +#: builtin/add.c:415 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Có lẽ bạn muốn là `git add .' phải không?\n" + +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:290 builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "tập tin ghi bảng mục lục bị hỏng" + +#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "Không thể ghi tập tin lưu bảng mục lục mới" + +#: builtin/apply.c:57 +msgid "git apply [options] [<patch>...]" +msgstr "git apply [các-tùy-chọn] [<miếng-vá>...]" + +#: builtin/apply.c:110 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "không nhận ra tùy chọn về khoảng trắng `%s'" + +#: builtin/apply.c:125 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng `%s'" + +#: builtin/apply.c:823 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "" +"Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) " +"%s" + +#: builtin/apply.c:832 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "thi hành biểu thức chính quy trả về %d cho kết xuất: %s" + +#: builtin/apply.c:913 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d" + +#: builtin/apply.c:945 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "git apply: git-diff sai - mong đợi /dev/null, đã nhận %s trên dòng %d" + +#: builtin/apply.c:949 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "git apply: git-diff sai - tên tập tin mới mâu thuấn trên dòng %d" + +#: builtin/apply.c:950 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "git apply: git-diff sai - tên tập tin cũ mâu thuấn trên dòng %d" + +#: builtin/apply.c:957 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: git-diff sai - mong đợi /dev/null trên dòng %d" + +#: builtin/apply.c:1420 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "chi tiết: dòng không được mong đợi: %.*s" + +#: builtin/apply.c:1477 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s" + +#: builtin/apply.c:1494 +#, 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] "" +"phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong " +"thành phần dẫn đầu tên của đường dẫn (dòng %d)" +msgstr[1] "" +"phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong " +"thành phần dẫn đầu tên của đường dẫn (dòng %d)" + +#: builtin/apply.c:1654 +msgid "new file depends on old contents" +msgstr "tập tin mới phụ thuộc vào nội dung cũ" + +#: builtin/apply.c:1656 +msgid "deleted file still has contents" +msgstr "tập tin đã xóa vẫn còn nội dung" + +#: builtin/apply.c:1682 +#, c-format +msgid "corrupt patch at line %d" +msgstr "miếng vá hỏng tại dòng %d" + +#: builtin/apply.c:1718 +#, c-format +msgid "new file %s depends on old contents" +msgstr "tập tin mới %s phụ thuộc vào nội dung cũ" + +#: builtin/apply.c:1720 +#, c-format +msgid "deleted file %s still has contents" +msgstr "tập tin đã xóa %s vẫn còn nội dung" + +#: builtin/apply.c:1723 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa" + +#: builtin/apply.c:1869 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1898 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d" + +#: builtin/apply.c:1984 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "vá chỉ với 'garbage' tại dòng %d" + +#: builtin/apply.c:2074 +#, c-format +msgid "unable to read symlink %s" +msgstr "không thể đọc liên kết tượng trưng %s" + +#: builtin/apply.c:2078 +#, c-format +msgid "unable to open or read %s" +msgstr "không thể mở để đọc hay ghi %s" + +#: builtin/apply.c:2149 +msgid "oops" +msgstr "ôi?" + +#: builtin/apply.c:2671 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "sai khởi đầu dòng: `%c'" + +#: builtin/apply.c:2789 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." +msgstr[1] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." + +#: builtin/apply.c:2801 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "Nội dung bị giảm xuống (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" + +#: builtin/apply.c:2807 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"Trong khi đang tìm kiếm cho:\n" +"%.*s" + +#: builtin/apply.c:2826 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho `%s'" + +#: builtin/apply.c:2929 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "miếng vá định dạng nhị phân không được áp dụng cho `%s'" + +#: builtin/apply.c:2935 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" +"vá nhị phân cho `%s' tạo ra kết quả không chính xác (mong chờ %s, lại nhận " +"%s)" + +#: builtin/apply.c:2956 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "vá gặp lỗi: %s:%ld" + +#: builtin/apply.c:3078 +#, c-format +msgid "cannot checkout %s" +msgstr "không thể \"checkout\" %s" + +#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#, c-format +msgid "read of %s failed" +msgstr "đọc %s gặp lỗi" + +#: builtin/apply.c:3156 builtin/apply.c:3378 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "đường dẫn %s đã bị xóa/đổi tên" + +#: builtin/apply.c:3237 builtin/apply.c:3392 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: không tồn tại trong bảng mục lục" + +#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: builtin/apply.c:3246 builtin/apply.c:3400 +#, c-format +msgid "%s: does not match index" +msgstr "%s: không khớp trong mục lục" + +#: builtin/apply.c:3348 +msgid "removal patch leaves file contents" +msgstr "loại bỏ miếng vá để lại nội dung tập tin" + +#: builtin/apply.c:3417 +#, c-format +msgid "%s: wrong type" +msgstr "%s: sai kiểu" + +#: builtin/apply.c:3419 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s có kiểu %o, mong chờ %o" + +#: builtin/apply.c:3520 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: đã có từ trước trong bảng mục lục" + +#: builtin/apply.c:3523 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: đã sẵn có trong thư mục đang làm việc" + +#: builtin/apply.c:3543 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)" + +#: builtin/apply.c:3548 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s" + +#: builtin/apply.c:3556 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: miếng vá không được áp dụng" + +#: builtin/apply.c:3569 +#, c-format +msgid "Checking patch %s..." +msgstr "Đang kiểm tra miếng vá %s..." + +#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry gặp lỗi đối với đường dẫn `%s'" + +#: builtin/apply.c:3767 +#, c-format +msgid "unable to remove %s from index" +msgstr "không thể gỡ bỏ %s từ mục lục" + +#: builtin/apply.c:3795 +#, c-format +msgid "corrupt patch for subproject %s" +msgstr "miếng vá sai hỏng cho dự án con (subproject) %s" + +#: builtin/apply.c:3799 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "không thể lấy trạng thái về tập tin %s mới hơn đã được tạo" + +#: builtin/apply.c:3804 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "không thể tạo 'backing store' cho tập tin được tạo mới hơn %s" + +#: builtin/apply.c:3807 builtin/apply.c:3915 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "không thể thêm mục nhớ tạm cho %s" + +#: builtin/apply.c:3840 +#, c-format +msgid "closing file '%s'" +msgstr "đang đóng tập tin `%s'" + +#: builtin/apply.c:3889 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "không thể ghi vào tập tin `%s' chế độ (mode) %o" + +#: builtin/apply.c:3976 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Đã áp dụng miếng và %s một cách sạch sẽ." + +#: builtin/apply.c:3984 +msgid "internal error" +msgstr "lỗi nội bộ" + +#. Say this even without --verbose +#: builtin/apply.c:3987 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối..." +msgstr[1] "Đang áp dụng miếng vá %%s với %d lần từ chối..." + +#: builtin/apply.c:3997 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "đang cắt cụt tên tập tin .rej thành %.*s.rej" + +#: builtin/apply.c:4018 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Khối nhớ #%d được áp dụng gọn gàng." + +#: builtin/apply.c:4021 +#, c-format +msgid "Rejected hunk #%d." +msgstr "hunk #%d bị từ chối." + +#: builtin/apply.c:4171 +msgid "unrecognized input" +msgstr "không thừa nhận đầu vào" + +#: builtin/apply.c:4182 +msgid "unable to read index file" +msgstr "không thể đọc tập tin lưu bảng mục lục" + +#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/fetch.c:63 +msgid "path" +msgstr "đường-dẫn" + +#: builtin/apply.c:4302 +msgid "don't apply changes matching the given path" +msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho" + +#: builtin/apply.c:4305 +msgid "apply changes matching the given path" +msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" + +#: builtin/apply.c:4307 +msgid "num" +msgstr "số" + +#: builtin/apply.c:4308 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "gỡ bỏ <số> phần dẫn đầu (slashe) từ đường dẫn diff cổ điển" + +#: builtin/apply.c:4311 +msgid "ignore additions made by the patch" +msgstr "lờ đi phần phụ thêm tạo ra bởi miếng vá" + +#: builtin/apply.c:4313 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "" +"thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" + +#: builtin/apply.c:4317 +msgid "show number of added and deleted lines in decimal notation" +msgstr "" +"hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" + +#: builtin/apply.c:4319 +msgid "instead of applying the patch, output a summary for the input" +msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào" + +#: builtin/apply.c:4321 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không" + +#: builtin/apply.c:4323 +msgid "make sure the patch is applicable to the current index" +msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành" + +#: builtin/apply.c:4325 +msgid "apply a patch without touching the working tree" +msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc" + +#: builtin/apply.c:4327 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "" +"đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)" + +#: builtin/apply.c:4329 +msgid "attempt three-way merge if a patch does not apply" +msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được" + +#: builtin/apply.c:4331 +msgid "build a temporary index based on embedded index information" +msgstr "" +"xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng" + +#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +msgid "paths are separated with NUL character" +msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" + +#: builtin/apply.c:4336 +msgid "ensure at least <n> lines of context match" +msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp" + +#: builtin/apply.c:4337 +msgid "action" +msgstr "hành động" + +#: builtin/apply.c:4338 +msgid "detect new or modified lines that have whitespace errors" +msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng" + +#: builtin/apply.c:4341 builtin/apply.c:4344 +msgid "ignore changes in whitespace when finding context" +msgstr "lờ đi sự thay đổi do khoảng trắng khi quét nội dung" + +#: builtin/apply.c:4347 +msgid "apply the patch in reverse" +msgstr "áp dụng miếng vá theo chiều ngược" + +#: builtin/apply.c:4349 +msgid "don't expect at least one line of context" +msgstr "đừng hy vọng có ít nhất một dòng nội dung" + +#: builtin/apply.c:4351 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng" + +#: builtin/apply.c:4353 +msgid "allow overlapping hunks" +msgstr "cho phép chồng khối nhớ" + +#: builtin/apply.c:4356 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "" +"đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin" + +#: builtin/apply.c:4359 +msgid "do not trust the line counts in the hunk headers" +msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" + +#: builtin/apply.c:4361 +msgid "root" +msgstr "root" + +#: builtin/apply.c:4362 +msgid "prepend <root> to all filenames" +msgstr "treo thêm <root> vào tất cả các tên tập tin" + +#: builtin/apply.c:4384 +msgid "--3way outside a repository" +msgstr "--3way ở ngoài một kho chứa" + +#: builtin/apply.c:4392 +msgid "--index outside a repository" +msgstr "--index ở ngoài một kho chứa" + +#: builtin/apply.c:4395 +msgid "--cached outside a repository" +msgstr "--cached ở ngoài một kho chứa" + +#: builtin/apply.c:4411 +#, c-format +msgid "can't open patch '%s'" +msgstr "không thể mở miếng vá `%s'" + +#: builtin/apply.c:4425 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "đã chấm dứt %d lỗi khoảng trắng" +msgstr[1] "đã chấm dứt %d lỗi khoảng trắng" + +#: builtin/apply.c:4431 builtin/apply.c:4441 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d dòng thêm khoảng trắng lỗi." +msgstr[1] "%d dòng thêm khoảng trắng lỗi." + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "không thể tạo tập tin kho (lưu trữ, nén) `%s'" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "không thể chuyển hướng kết xuất" + +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" +msgstr "git archive: Máy chủ không có địa chỉ URL" + +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive: mong đợi ACK/NAK, nhận EOF" + +#: builtin/archive.c:63 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:65 +#, c-format +msgid "remote error: %s" +msgstr "lỗi máy chủ: %s" + +#: builtin/archive.c:66 +msgid "git archive: protocol error" +msgstr "git archive: lỗi giao thức" + +#: builtin/archive.c:71 +msgid "git archive: expected a flush" +msgstr "git archive: đã mong chờ một flush" + +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "thực hiện `git bisect next'" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "" +"cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao (commit) " +"hiện hành" + +#: builtin/blame.c:25 +msgid "git blame [options] [rev-opts] [rev] [--] file" +msgstr "git blame [các-tùy-chọn] [rev-opts] [rev] [--] tập-tin" + +#: builtin/blame.c:30 builtin/shortlog.c:15 +msgid "[rev-opts] are documented in git-rev-list(1)" +msgstr "[rev-opts] được mô tả trong git-rev-list(1)" + +#: builtin/blame.c:2373 +msgid "Show blame entries as we find them, incrementally" +msgstr "Hiển thị các mục `blame' như là chúng ta thấy chúng, tăng dần" + +#: builtin/blame.c:2374 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "" +"Hiển thị SHA-1 trống cho những lần chuyển giao biên giới (Mặc định: off)" + +#: builtin/blame.c:2375 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)" + +#: builtin/blame.c:2376 +msgid "Show work cost statistics" +msgstr "Hiển thị thống kê công sức làm việc" + +#: builtin/blame.c:2377 +msgid "Show output score for blame entries" +msgstr "Hiển thị kết xuất điểm số có các mục tin `blame'" + +#: builtin/blame.c:2378 +msgid "Show original filename (Default: auto)" +msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)" + +#: builtin/blame.c:2379 +msgid "Show original linenumber (Default: off)" +msgstr "Hiển thị số dòng gốc (Mặc định: off)" + +#: builtin/blame.c:2380 +msgid "Show in a format designed for machine consumption" +msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy" + +#: builtin/blame.c:2381 +msgid "Show porcelain format with per-line commit information" +msgstr "Hiển thị định dạng 'porcelain' với thông tin chuyển giao mỗi dòng" + +#: builtin/blame.c:2382 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "Dùng cùng chế độ xuất ra vóigit-annotate (Mặc định: off)" + +#: builtin/blame.c:2383 +msgid "Show raw timestamp (Default: off)" +msgstr "Hiển thị dấu vết thời gian dạng thô (Mặc định: off)" + +#: builtin/blame.c:2384 +msgid "Show long commit SHA1 (Default: off)" +msgstr "Hiển thị SHA1 của lần chuyển giao (commit) dạng dài (Mặc định: off)" + +#: builtin/blame.c:2385 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "Không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)" + +#: builtin/blame.c:2386 +msgid "Show author email instead of name (Default: off)" +msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)" + +#: builtin/blame.c:2387 +msgid "Ignore whitespace differences" +msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra" + +#: builtin/blame.c:2388 +msgid "Spend extra cycles to find better match" +msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa" + +#: builtin/blame.c:2389 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "" +"Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi `git-rev-list'" + +#: builtin/blame.c:2390 +msgid "Use <file>'s contents as the final image" +msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng" + +#: builtin/blame.c:2391 builtin/blame.c:2392 +msgid "score" +msgstr "điểm số" + +#: builtin/blame.c:2391 +msgid "Find line copies within and across files" +msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin" + +#: builtin/blame.c:2392 +msgid "Find line movements within and across files" +msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin" + +#: builtin/blame.c:2393 +msgid "n,m" +msgstr "n,m" + +#: builtin/blame.c:2393 +msgid "Process only line range n,m, counting from 1" +msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" + +#: builtin/branch.c:23 +msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [các-tùy-chọn] [-r | -a] [--merged | --no-merged]" + +#: builtin/branch.c:24 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgstr "git branch [các-tùy-chọn] [-l] [-f] <tên-nhánh> [<điểm-đầu>]" + +#: builtin/branch.c:25 +msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgstr "git branch [các-tùy-chọn] [-r] (-d | -D) <tên-nhánh> ..." + +#: builtin/branch.c:26 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgstr "git branch [các-tùy-chọn] (-m | -M) [<nhánh-cũ>] <nhánh-mới>" + +#: builtin/branch.c:145 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" +"đang xóa nhánh `%s' mà nó lại đã được hòa trộn vào\n" +" `%s', nhưng vẫn chưa được hòa trộn vào HEAD." + +#: 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 "" +"không xóa nhánh `%s' cái mà chưa được hòa trộng vào\n" +" `%s', cho dù là nó đã được hòa trộn vào HEAD." + +#: builtin/branch.c:181 +msgid "cannot use -a with -d" +msgstr "không thể dùng tùy chọn -a với -d" + +#: builtin/branch.c:187 +msgid "Couldn't look up commit object for HEAD" +msgstr "Không thể tìm kiếm đối tượng chuyển giao (commit) cho HEAD" + +#: builtin/branch.c:192 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "Không thể xóa nhánh `%s' cái mà bạn hiện nay đang ở." + +#: builtin/branch.c:203 +#, c-format +msgid "remote branch '%s' not found." +msgstr "không tìm thấy nhánh máy chủ `%s'." + +#: builtin/branch.c:204 +#, c-format +msgid "branch '%s' not found." +msgstr "không tìm thấy nhánh `%s'." + +#: builtin/branch.c:211 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Không thể tìm kiếm đối tượng chuyển giao (commit) cho `%s'" + +#: builtin/branch.c:217 +#, 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 "" +"Nhánh `%s' không được trộn một cách đầy đủ.\n" +"Nếu bạn thực sự muốn xóa nó, thì chạy lệnh `git branch -D %s'." + +#: builtin/branch.c:226 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "Gặp lỗi khi đang xóa nhánh máy chủ `%s'" + +#: builtin/branch.c:227 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "Lỗi khi xoá bỏ nhánh `%s'" + +#: builtin/branch.c:234 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "Nhánh máy chủ \"%s\" đã bị xóa (từng là %s).\n" + +#: builtin/branch.c:235 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Nhánh `%s' đã bị xóa (từng là %s)\n" + +#: builtin/branch.c:240 +msgid "Update of config-file failed" +msgstr "Cập nhật tập tin cấu hình gặp lỗi" + +#: builtin/branch.c:338 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "nhánh `%s' không chỉ đến một lần chuyển giao (commit) nào cả" + +#: builtin/branch.c:410 +#, c-format +msgid "[%s: behind %d]" +msgstr "[%s: đằng sau %d]" + +#: builtin/branch.c:412 +#, c-format +msgid "[behind %d]" +msgstr "[đằng sau %d]" + +#: builtin/branch.c:416 +#, c-format +msgid "[%s: ahead %d]" +msgstr "[%s: phía trước %d]" + +#: builtin/branch.c:418 +#, c-format +msgid "[ahead %d]" +msgstr "[phía trước %d]" + +#: builtin/branch.c:421 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "[%s: trước %d, sau %d]" + +#: builtin/branch.c:424 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "[trước %d, sau %d]" + +#: builtin/branch.c:537 +msgid "(no branch)" +msgstr "(không nhánh)" + +#: builtin/branch.c:602 +msgid "some refs could not be read" +msgstr "một số tham chiếu đã không thể đọc được" + +#: builtin/branch.c:615 +msgid "cannot rename the current branch while not on any." +msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả." + +#: builtin/branch.c:625 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Sai tên nhánh: `%s'" + +#: builtin/branch.c:640 +msgid "Branch rename failed" +msgstr "Đổi tên nhánh gặp lỗi" + +#: builtin/branch.c:644 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Đã đổi tên nhánh khuyết danh `%s' đi" + +#: builtin/branch.c:648 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!" + +#: builtin/branch.c:655 +msgid "Branch is renamed, but update of config-file failed" +msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi" + +#: builtin/branch.c:670 +#, c-format +msgid "malformed object name %s" +msgstr "tên đối tượng dị hình %s" + +#: builtin/branch.c:694 +#, c-format +msgid "could not write branch description template: %s" +msgstr "không thể ghi vào mẫu mô tả nhánh: %s" + +#: builtin/branch.c:724 +msgid "Generic options" +msgstr "Tùy chọn chung" + +#: builtin/branch.c:726 +msgid "show hash and subject, give twice for upstream branch" +msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn" + +#: builtin/branch.c:727 +msgid "suppress informational messages" +msgstr "Thu hồi các thông điệp thông tin" + +#: builtin/branch.c:728 +msgid "set up tracking mode (see git-pull(1))" +msgstr "cài đặt chế độ theo vết (xem git-pull(1))" + +#: builtin/branch.c:730 +msgid "change upstream info" +msgstr "thay đổi thông tin thượng nguồn (upstream)" + +#: builtin/branch.c:734 +msgid "use colored output" +msgstr "sử dụng kết xuất có tô màu" + +#: builtin/branch.c:735 +msgid "act on remote-tracking branches" +msgstr "thao tác trên nhánh `remote-tracking'" + +#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765 +#: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363 +#: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470 +msgid "commit" +msgstr "commit" + +#: builtin/branch.c:739 builtin/branch.c:745 +msgid "print only branches that contain the commit" +msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" + +#: builtin/branch.c:751 +msgid "Specific git-branch actions:" +msgstr "Hành động git-branch:" + +#: builtin/branch.c:752 +msgid "list both remote-tracking and local branches" +msgstr "liệt kê cả nhánh `remote-tracking' và nội bộ" + +#: builtin/branch.c:754 +msgid "delete fully merged branch" +msgstr "xóa một cách đầy đủ nhánh đã hòa trộn" + +#: builtin/branch.c:755 +msgid "delete branch (even if not merged)" +msgstr "xoá nhánh (cho dù là chưa được hòa trộn)" + +#: builtin/branch.c:756 +msgid "move/rename a branch and its reflog" +msgstr "di chuyển hay đổi tên một nhánh và reflog của nó" + +#: builtin/branch.c:757 +msgid "move/rename a branch, even if target exists" +msgstr "di chuyể hoặc đổi tên một nhánh, thậm chí cả khi đích đã có sẵn" + +#: builtin/branch.c:758 +msgid "list branch names" +msgstr "liệt kê các tên nhánh" + +#: builtin/branch.c:759 +msgid "create the branch's reflog" +msgstr "tạo reflog của nhánh" + +#: builtin/branch.c:761 +msgid "edit the description for the branch" +msgstr "sửa mô tả cho nhánh" + +#: builtin/branch.c:762 +msgid "force creation (when already exists)" +msgstr "ép buộc tạo (khi đã sẵn tồn tại rồi)" + +#: builtin/branch.c:765 +msgid "print only not merged branches" +msgstr "chỉ hiển thị các nhánh chưa được hòa trộn" + +#: builtin/branch.c:771 +msgid "print only merged branches" +msgstr "chỉ hiển thị các nhánh được hòa trộn" + +#: builtin/branch.c:775 +msgid "list branches in columns" +msgstr "liệt kê các nhánh trong các cột" + +#: builtin/branch.c:788 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Gặp lỗi khi giải quyết HEAD như là một tham chiếu (ref) hợp lệ." + +#: builtin/branch.c:793 builtin/clone.c:561 +msgid "HEAD not found below refs/heads!" +msgstr "không tìm thấy HEAD ở dưới refs/heads!" + +#: builtin/branch.c:813 +msgid "--column and --verbose are incompatible" +msgstr "--column và --verbose xung khắc nhau" + +#: builtin/branch.c:864 +#, c-format +msgid "branch '%s' does not exist" +msgstr "nhánh `%s' chưa sẵn có" + +#: builtin/branch.c:876 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "Nhánh `%s' không có thông tin thượng nguồn (upstream)" + +#: builtin/branch.c:891 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" +"hai tùy chọn -a và -r áp dụng cho lệnh `git branch' không hợp lý đối với tên " +"nhánh" + +#: builtin/branch.c:894 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" +msgstr "" +"Cờ --set-upstream bị phản đối và sẽ bị xóa bỏ. Nên dùng --track hoặc --set-" +"upstream-to\n" + +#: builtin/branch.c:911 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" +"\n" +"Nếu bạn muốn `%s' theo dõi `%s', thực hiện lệnh sau:\n" +"\n" + +#: builtin/branch.c:912 +#, c-format +msgid " git branch -d %s\n" +msgstr " git branch -d %s\n" + +#: builtin/branch.c:913 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "`%s' tốt\n" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "Cần một kho chứa để mà tạo một bundle." + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "Cần một kho chứa để mà bung một bundle." + +#: builtin/cat-file.c:247 +msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" +msgstr "git cat-file (-t|-s|-e|-p|<kiểu>|--textconv) <đối tượng>" + +#: builtin/cat-file.c:248 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +msgstr "git cat-file (--batch|--batch-check) < <danh-sách-đối-tượng>" + +#: builtin/cat-file.c:266 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<kiểu> là một trong số: blob, tree, commit, tag" + +#: builtin/cat-file.c:267 +msgid "show object type" +msgstr "hiển thị kiểu đối tượng" + +#: builtin/cat-file.c:268 +msgid "show object size" +msgstr "hiển thị kích thước đối tượng" + +#: builtin/cat-file.c:270 +msgid "exit with zero when there's no error" +msgstr "thoát với 0 khi không có lỗi" + +#: builtin/cat-file.c:271 +msgid "pretty-print object's content" +msgstr "in nội dung đối tượng dạng dễ đọc" + +#: builtin/cat-file.c:273 +msgid "for blob objects, run textconv on object's content" +msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng" + +#: builtin/cat-file.c:275 +msgid "show info and content of objects fed from the standard input" +msgstr "" +"hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn" + +#: builtin/cat-file.c:278 +msgid "show info about objects fed from the standard input" +msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgstr "git check-attr [-a | --all | attr...] [--] tên-đường-dẫn..." + +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgstr "" +"git check-attr --stdin [-z] [-a | --all | attr...] < <danh-sách-đường-dẫn>" + +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" +msgstr "báo cáo tất cả các thuộc tính đặt trên tập tin" + +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" +msgstr "chỉ sử dụng .gitattributes từ bảng mục lục" + +#: builtin/check-attr.c:21 builtin/hash-object.c:75 +msgid "read file names from stdin" +msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" + +#: builtin/check-attr.c:23 +msgid "input paths are terminated by a null character" +msgstr "các đường dẫn được ngăn cách bởi ký tự null" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [options] [--] [<file>...]" +msgstr "git checkout-index [các-tùy-chọn] [--] [<tập-tin>...]" + +#: builtin/checkout-index.c:187 +msgid "check out all files in the index" +msgstr "lấy ra toàn bộ các tập tin trong bảng mục lục" + +#: builtin/checkout-index.c:188 +msgid "force overwrite of existing files" +msgstr "ép buộc ghi đè lên tập tin đã sẵn có từ trước" + +#: builtin/checkout-index.c:190 +msgid "no warning for existing files and files not in index" +msgstr "" +"không cảnh báo cho những tập tin tồn tại và không có trong bảng mục lục" + +#: builtin/checkout-index.c:192 +msgid "don't checkout new files" +msgstr "không checkout các tập tin mới" + +#: builtin/checkout-index.c:194 +msgid "update stat information in the index file" +msgstr "cập nhật thông tin thống kê trong tập tin lưu bảng mục lục mới" + +#: builtin/checkout-index.c:200 +msgid "read list of paths from the standard input" +msgstr " đọc danh sách đường dẫn từ thiết bị nhập chuẩn" + +#: builtin/checkout-index.c:202 +msgid "write the content to temporary files" +msgstr "ghi nội dung vào tập tin tạm" + +#: builtin/checkout-index.c:203 builtin/column.c:30 +msgid "string" +msgstr "chuỗi" + +#: builtin/checkout-index.c:204 +msgid "when creating files, prepend <string>" +msgstr "khi tạo các tập tin, nối thêm <chuỗi>" + +#: builtin/checkout-index.c:207 +msgid "copy out the files from named stage" +msgstr "sao chép ra các tập tin từ trạng thái được đặt tên" + +#: builtin/checkout.c:25 +msgid "git checkout [options] <branch>" +msgstr "git checkout [các-tùy-chọn] <nhánh>" + +#: builtin/checkout.c:26 +msgid "git checkout [options] [<branch>] -- <file>..." +msgstr "git checkout [các-tùy-chọn] [<nhánh>] -- <tập-tin>..." + +#: builtin/checkout.c:116 builtin/checkout.c:149 +#, c-format +msgid "path '%s' does not have our version" +msgstr "đường dẫn `%s' không có các phiên bản của chúng ta" + +#: builtin/checkout.c:118 builtin/checkout.c:151 +#, c-format +msgid "path '%s' does not have their version" +msgstr "đường dẫn `%s' không có các phiên bản của chúng" + +#: builtin/checkout.c:134 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "đường dẫn `%s' không có tất cả các phiên bản cần thiết" + +#: builtin/checkout.c:178 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "đường dẫn `%s' không có các phiên bản cần thiết" + +#: builtin/checkout.c:195 +#, c-format +msgid "path '%s': cannot merge" +msgstr "đường dẫn `%s': không thể hòa trộn" + +#: builtin/checkout.c:212 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "Không thể thêm kết quả hòa trộn cho `%s'" + +#: 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 "`%s' không thể được sử dụng với các đường dẫn cập nhật" + +#: builtin/checkout.c:248 builtin/checkout.c:251 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "`%s' không thể được sử dụng với %s" + +#: builtin/checkout.c:254 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "" +"Không thể cập nhật các đường dẫn và chuyển đến nhánh `%s' cùng một lúc." + +#: builtin/checkout.c:265 builtin/checkout.c:426 +msgid "corrupt index file" +msgstr "tập tin ghi bảng mục lục bị hỏng" + +#: builtin/checkout.c:295 builtin/checkout.c:302 +#, c-format +msgid "path '%s' is unmerged" +msgstr "đường dẫn `%s' không được hòa trộn" + +#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586 +#: builtin/merge.c:811 +msgid "unable to write new index file" +msgstr "không thể ghi tập tin lưu bảng mục lục mới" + +#: builtin/checkout.c:448 +msgid "you need to resolve your current index first" +msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã!" + +#: builtin/checkout.c:569 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "Không thể thực hiện reflog cho `%s'\n" + +#: builtin/checkout.c:602 +msgid "HEAD is now at" +msgstr "HEAD hiện giờ tại" + +#: builtin/checkout.c:609 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Đặt lại nhánh `%s'\n" + +#: builtin/checkout.c:612 +#, c-format +msgid "Already on '%s'\n" +msgstr "Đã sẵn sàng trên `%s'\n" + +#: builtin/checkout.c:616 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Đã chuyển tới và reset nhánh `%s'\n" + +#: builtin/checkout.c:618 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Đã chuyển đến nhánh mới `%s'\n" + +#: builtin/checkout.c:620 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Đã chuyển đến nhánh `%s'\n" + +#: builtin/checkout.c:676 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... và nhiều hơn %d.\n" + +#. 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] "" +"Cảnh báo: bạn đã rời bỏ %d lần chuyển giao (commit) lại đằng sau, không được " +"kết nối đến\n" +"bất kỳ nhánh nào của bạn:\n" +"\n" +"%s\n" +msgstr[1] "" +"Cảnh báo: bạn đã rời bỏ %d lần chuyển giao (commit) lại đằng sau, không được " +"kết nối đến\n" +"bất kỳ nhánh nào của bạn:\n" +"\n" +"%s\n" + +#: 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 "" +"Nếu bạn muốn giữ chúng bằng cách tạo ra một nhánh mới, đây có lẽ là một thời " +"điểm thích hợp\n" +"để làm thế bằng lệnh:\n" +"\n" +" git branch tên_nhánh_mới %s\n" +"\n" + +#: builtin/checkout.c:730 +msgid "internal error in revision walk" +msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét lại" + +#: builtin/checkout.c:734 +msgid "Previous HEAD position was" +msgstr "Vị trí kế trước của HEAD là" + +#: builtin/checkout.c:761 builtin/checkout.c:950 +msgid "You are on a branch yet to be born" +msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra" + +#. case (1) +#: builtin/checkout.c:886 +#, c-format +msgid "invalid reference: %s" +msgstr "tham chiếu sai: %s" + +#. case (1): want a tree +#: builtin/checkout.c:925 +#, c-format +msgid "reference is not a tree: %s" +msgstr "tham chiếu không phải là một cây (tree):%s" + +#: builtin/checkout.c:961 +msgid "paths cannot be used with switching branches" +msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển" + +#: builtin/checkout.c:964 builtin/checkout.c:968 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "`%s' không thể được sử dụng với các nhánh chuyển" + +#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980 +#: builtin/checkout.c:983 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "`%s' không thể được sử dụng với `%s'" + +#: builtin/checkout.c:988 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "Không thể chuyển nhánh đến một non-commit `%s'" + +#: builtin/checkout.c:1009 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "chặn các báo cáo tiến trình hoạt động" + +#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89 +#: builtin/remote.c:169 builtin/remote.c:171 +msgid "branch" +msgstr "nhánh" + +#: builtin/checkout.c:1011 +msgid "create and checkout a new branch" +msgstr "tạo và checkout một nhánh mới" + +#: builtin/checkout.c:1013 +msgid "create/reset and checkout a branch" +msgstr "create/reset và checkout một nhánh" + +#: builtin/checkout.c:1014 +msgid "create reflog for new branch" +msgstr "tạo reflog cho nhánh mới" + +#: builtin/checkout.c:1015 +msgid "detach the HEAD at named commit" +msgstr "rời bỏ HEAD tại lần chuyển giao danh nghĩa" + +#: builtin/checkout.c:1016 +msgid "set upstream info for new branch" +msgstr "đặt thông tin thượng nguồn (upstream) cho nhánh mới" + +#: builtin/checkout.c:1018 +msgid "new branch" +msgstr "nhánh mới" + +#: builtin/checkout.c:1018 +msgid "new unparented branch" +msgstr "nhánh mồ côi mới" + +#: builtin/checkout.c:1019 +msgid "checkout our version for unmerged files" +msgstr "" +"lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn" + +#: builtin/checkout.c:1021 +msgid "checkout their version for unmerged files" +msgstr "" +"lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn" + +#: builtin/checkout.c:1023 +msgid "force checkout (throw away local modifications)" +msgstr "ép buộc lấy ra (checkout) (bỏ đi những thay đổi nội bộ)" + +#: builtin/checkout.c:1024 +msgid "perform a 3-way merge with the new branch" +msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới" + +#: builtin/checkout.c:1025 builtin/merge.c:215 +msgid "update ignored files (default)" +msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" + +#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241 +msgid "style" +msgstr "kiểu" + +#: builtin/checkout.c:1027 +msgid "conflict style (merge or diff3)" +msgstr "xung đột kiểu (hòa trộn hay diff3)" + +#: builtin/checkout.c:1030 +msgid "second guess 'git checkout no-such-branch'" +msgstr "gợi ý thứ hai `git checkout không-nhánh-nào-như-vậy'" + +#: builtin/checkout.c:1054 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "Tùy chọn -b|-B và --orphan loại từ lẫn nhau" + +#: builtin/checkout.c:1071 +msgid "--track needs a branch name" +msgstr "--track cần tên một nhánh" + +#: builtin/checkout.c:1078 +msgid "Missing branch name; try -b" +msgstr "Thiếu tên nhánh; hãy thử -b" + +#: builtin/checkout.c:1113 +msgid "invalid path specification" +msgstr "đường dẫn đã cho không hợp lệ" + +#: builtin/checkout.c:1120 +#, 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 "" +"Không thể cập nhật và chuyển thành nhánh `%s' cùng lúc\n" +"Bạn đã có ý định checkout `%s' cái mà không thể được phân giải như là lần " +"chuyển giao (commit)?" + +#: builtin/checkout.c:1125 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout: --detach không nhận một đối số đường dẫn `%s'" + +#: builtin/checkout.c:1129 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" +"git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n" +"checkout bảng mục lục (index)." + +#: builtin/clean.c:19 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "git clean [-d] [-f] [-n] [-q] [-e <mẫu>] [-x | -X] [--] <đường-dẫn>..." + +#: builtin/clean.c:51 +msgid "do not print names of files removed" +msgstr "không hiển thị tên của các tập tin đã gỡ bỏ" + +#: builtin/clean.c:53 +msgid "force" +msgstr "ép buộc" + +#: builtin/clean.c:55 +msgid "remove whole directories" +msgstr "gỡ bỏ toàn bộ thư mục" + +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199 +msgid "pattern" +msgstr "mẫu" + +#: builtin/clean.c:57 +msgid "add <pattern> to ignore rules" +msgstr "thêm <mẫu> vào trong qui tắc bỏ qua" + +#: builtin/clean.c:58 +msgid "remove ignored files, too" +msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua" + +#: builtin/clean.c:60 +msgid "remove only ignored files" +msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua" + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "-x và -X không thể dùng cùng một lúc với nhau" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" +"clean.requireForce được đặt thành true và không đưa ra tùy chọn -n mà cũng " +"không -f; từ chối lệnh dọn dẹp (clean)" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" +"clean.requireForce mặc định được đặt thành true và không đưa ra tùy chọn -n " +"mà cũng không -f; từ chối lệnh dọn dẹp (clean)" + +#: builtin/clean.c:155 builtin/clean.c:176 +#, c-format +msgid "Would remove %s\n" +msgstr "Có thể gỡ bỏ %s\n" + +#: builtin/clean.c:159 builtin/clean.c:179 +#, c-format +msgid "Removing %s\n" +msgstr "Đang gỡ bỏ %s\n" + +#: builtin/clean.c:162 builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" +msgstr "gặp lỗi khi gỡ bỏ %s" + +#: builtin/clean.c:166 +#, c-format +msgid "Would not remove %s\n" +msgstr "Không thể gỡ bỏ %s\n" + +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" +msgstr "Không xóa %s\n" + +#: builtin/clone.c:36 +msgid "git clone [options] [--] <repo> [<dir>]" +msgstr "git clone [các-tùy-chọn] [--] <kho> [<t.mục>]" + +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 +#: builtin/push.c:399 +msgid "force progress reporting" +msgstr "ép buộc báo cáo tiến trình" + +#: builtin/clone.c:66 +msgid "don't create a checkout" +msgstr "không tạo một checkout" + +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +msgid "create a bare repository" +msgstr "tạo kho chứa bare" + +#: builtin/clone.c:72 +msgid "create a mirror repository (implies bare)" +msgstr "tạo kho bản sao (mirror) (ngụ ý là bare)" + +#: builtin/clone.c:74 +msgid "to clone from a local repository" +msgstr "để nhân bản từ kho nội bộ" + +#: builtin/clone.c:76 +msgid "don't use local hardlinks, always copy" +msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép" + +#: builtin/clone.c:78 +msgid "setup as shared repository" +msgstr "cài đặt đây là kho chia sẻ" + +#: builtin/clone.c:80 builtin/clone.c:82 +msgid "initialize submodules in the clone" +msgstr "khởi tạo mô-đun-con trong bản sao" + +#: builtin/clone.c:83 builtin/init-db.c:485 +msgid "template-directory" +msgstr "thư-mục-tạm" + +#: builtin/clone.c:84 builtin/init-db.c:486 +msgid "directory from which templates will be used" +msgstr "thư mục mà tại đó các mẫu sẽ được dùng" + +#: builtin/clone.c:86 +msgid "reference repository" +msgstr "kho tham chiếu" + +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "tên" + +#: builtin/clone.c:88 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "dùng <tên> thay vì `origin' để theo dõi thượng nguồn (uptream)" + +#: builtin/clone.c:90 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "lấy ra nhánh (checkout <nhánh>) thay vì HEAD của máy chủ" + +#: builtin/clone.c:92 +msgid "path to git-upload-pack on the remote" +msgstr "đường dẫn đến git-upload-pack trên máy chủ" + +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:748 +msgid "depth" +msgstr "độ sâu" + +#: builtin/clone.c:94 +msgid "create a shallow clone of that depth" +msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho" + +#: builtin/clone.c:96 +msgid "clone only one branch, HEAD or --branch" +msgstr "nhân bản (clone) chỉ một nhánh, HEAD hoặc --branch" + +#: builtin/clone.c:97 builtin/init-db.c:494 +msgid "gitdir" +msgstr "gitdir" + +#: builtin/clone.c:98 builtin/init-db.c:495 +msgid "separate git dir from working tree" +msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc" + +#: builtin/clone.c:99 +msgid "key=value" +msgstr "khóa=giá trị" + +#: builtin/clone.c:100 +msgid "set config inside the new repository" +msgstr "đặt cấu hình bên trong một kho chứa mới" + +#: builtin/clone.c:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "kho tham chiếu `%s' không phải là một thư mục nội bộ." + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "tạo thư mục \"%s\" gặp lỗi" + +#: builtin/clone.c:308 builtin/diff.c:77 +#, c-format +msgid "failed to stat '%s'" +msgstr "gặp lỗi stat (lấy trạng thái về) `%s'" + +#: builtin/clone.c:310 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s tồn tại nhưng không phải là một thư mục" + +#: builtin/clone.c:324 +#, c-format +msgid "failed to stat %s\n" +msgstr "lỗi stat (lấy trạng thái về) %s\n" + +#: builtin/clone.c:346 +#, c-format +msgid "failed to create link '%s'" +msgstr "gặp lỗi khi tạo được liên kết mềm %s" + +#: builtin/clone.c:350 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "gặp lỗi khi chép tập tin tới `%s'" + +#: builtin/clone.c:373 +#, c-format +msgid "done.\n" +msgstr "hoàn tất.\n" + +#: builtin/clone.c:443 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." + +#: builtin/clone.c:552 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể checkout.\n" + +#: builtin/clone.c:690 +msgid "Too many arguments." +msgstr "Có quá nhiều đối số." + +#: builtin/clone.c:694 +msgid "You must specify a repository to clone." +msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)." + +#: builtin/clone.c:705 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "tùy chọn --bare và --origin %s xung khắc nhau." + +#: builtin/clone.c:719 +#, c-format +msgid "repository '%s' does not exist" +msgstr "kho chứa `%s' chưa tồn tại" + +#: builtin/clone.c:724 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế." + +#: builtin/clone.c:734 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "đường dẫn đích `%s' đã có từ trước và không phải là một thư mục rỗng." + +#: builtin/clone.c:744 +#, c-format +msgid "working tree '%s' already exists." +msgstr "cây làm việc `%s' đã sẵn tồn tại rồi." + +#: builtin/clone.c:757 builtin/clone.c:771 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "không thể tạo các thư mục dẫn đầu của `%s'" + +#: builtin/clone.c:760 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "không thể tạo cây thư mục làm việc dir `%s'." + +#: builtin/clone.c:779 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "Đang nhân bản thành kho chứa bare `%s'...\n" + +#: builtin/clone.c:781 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "Đang nhân bản thành `%s'...\n" + +#: builtin/clone.c:823 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Không biết làm cách nào để nhân bản (clone) %s" + +#: builtin/clone.c:872 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn (upstream) %s" + +#: builtin/clone.c:879 +msgid "You appear to have cloned an empty repository." +msgstr "Bạn hình như là đã nhân bản một kho trống rỗng." + +#: builtin/column.c:9 +msgid "git column [options]" +msgstr "git column [các-tùy-chọn]" + +#: builtin/column.c:26 +msgid "lookup config vars" +msgstr "tìm kiếm biến cấu hình" + +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" +msgstr "bố cục để dùng" + +#: builtin/column.c:29 +msgid "Maximum width" +msgstr "Độ rộng tối đa" + +#: builtin/column.c:30 +msgid "Padding space on left border" +msgstr "Chèn thêm khoảng trống vào bờ bên trái" + +#: builtin/column.c:31 +msgid "Padding space on right border" +msgstr "Chèn thêm khoảng trắng vào tiếp giáp bên phải" + +#: builtin/column.c:32 +msgid "Padding space between columns" +msgstr "Chèn thêm khoảng trắng giữa các cột" + +#: builtin/column.c:51 +msgid "--command must be the first argument" +msgstr "--command phải là đối số đầu tiên" + +#: builtin/commit.c:34 +msgid "git commit [options] [--] <filepattern>..." +msgstr "git commit [các-tùy-chọn] [--] <mẫu-tập-tin>..." + +#: builtin/commit.c:39 +msgid "git status [options] [--] <filepattern>..." +msgstr "git status [các-tùy-chọn] [--] <mẫu-tập-tin>..." + +#: 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 "" +"Tên và địa chỉ thư điện tử của bạn được cấu hình một cách tự động trên cơ " +"sở\n" +"tài khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chính " +"xác không.\n" +"Bạn có thể chặn những thông báo kiểu này bằng cách cài đặt các thông tin " +"trên một cách rõ ràng:\n" +"\n" +" git config --global user.name \"Tên của bạn\"\n" +" git config --global user.email you@example.com\n" +"\n" +"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho lần " +"chuyển giao (commit) này với lệnh:\n" +"\n" +" git commit --amend --reset-author\n" + +#: 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 "" +"Bạn đã yêu cầu amend (tu bổ) phần lớn các lần chuyển giao (commit) gần đây, " +"nhưng làm như thế\n" +"có thể làm cho nó trở nên trống rỗng. Bạn có thể lặp lại lệnh của mình bằng " +"--allow-empty,\n" +"hoặc là bạn gỡ bỏ các lần chuyển giao một cách hoàn toàn bằng lệnh:\n" +"\"git reset HEAD^\".\n" + +#: 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 "" +"Lần cherry-pick trước hiện nay trống rỗng, có lẽ là bởi vì sự phân giải xung " +"đột.\n" +"Nếu bạn muốn chuyển giao nó cho dù thế nào đi nữa, sử dụng:\n" +"\n" +" git commit --allow-empty\n" +"\n" +"Nếu không, hãy thử dùng `git reset'\n" + +#: builtin/commit.c:257 +msgid "failed to unpack HEAD tree object" +msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây" + +#: builtin/commit.c:299 +msgid "unable to create temporary index" +msgstr "không thể tạo bảng mục lục tạm thời" + +#: builtin/commit.c:305 +msgid "interactive add failed" +msgstr "việc thêm tương tác gặp lỗi" + +#: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409 +msgid "unable to write new_index file" +msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)" + +#: builtin/commit.c:390 +msgid "cannot do a partial commit during a merge." +msgstr "" +"không thể thực hiện việc chuyển giao (commit) cục bộ trong khi đang được hòa " +"trộn." + +#: builtin/commit.c:392 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "" +"không thể thực hiện việc chuyển giao (commit) bộ phận trong khi đang cherry-" +"pick." + +#: builtin/commit.c:402 +msgid "cannot read the index" +msgstr "không đọc được bảng mục lục" + +#: builtin/commit.c:422 +msgid "unable to write temporary index file" +msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời" + +#: builtin/commit.c:509 builtin/commit.c:515 +#, c-format +msgid "invalid commit: %s" +msgstr "lần chuyển giao (commit) không hợp lệ: %s" + +#: builtin/commit.c:538 +msgid "malformed --author parameter" +msgstr "đối số --author bị dị hình" + +#: builtin/commit.c:558 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "Chuỗi thụt lề đầu dòng dị hình: `%s'" + +#: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952 +#, c-format +msgid "could not lookup commit %s" +msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" + +#: builtin/commit.c:608 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n" + +#: builtin/commit.c:610 +msgid "could not read log from standard input" +msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn" + +#: builtin/commit.c:614 +#, c-format +msgid "could not read log file '%s'" +msgstr "không đọc được tệp nhật ký `%s'" + +#: builtin/commit.c:620 +msgid "commit has empty message" +msgstr "lần chuyển giao (commit) có ghi chú trống rỗng" + +#: builtin/commit.c:636 +msgid "could not read MERGE_MSG" +msgstr "không thể đọc MERGE_MSG" + +#: builtin/commit.c:640 +msgid "could not read SQUASH_MSG" +msgstr "không thể đọc SQUASH_MSG" + +#: builtin/commit.c:644 +#, c-format +msgid "could not read '%s'" +msgstr "Không thể đọc `%s'." + +#: builtin/commit.c:705 +msgid "could not write commit template" +msgstr "không thể ghi mẫu commit" + +#: builtin/commit.c:716 +#, 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 "" +"\n" +"Nó trông giống với việc bạn đang chuyển giao một lần hòa trộn.\n" +"Nếu không phải vậy, xin hãy gỡ bỏ tập tin\n" +"\t%s\n" +"và thử lại.\n" + +#: builtin/commit.c:721 +#, 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 "" +"\n" +"Nó trông giống với việc bạn đang chuyển giao một lần cherry-pick.\n" +"Nếu không phải vậy, xin hãy gỡ bỏ tập tin\n" +"\t%s\n" +"và thử lại.\n" + +#: builtin/commit.c:733 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng " +"được\n" +"bắt đầu bằng `#' sẽ được bỏ qua, phần chú thích này nếu rỗng sẽ làm hủy bỏ " +"lần chuyển giao (commit).\n" + +#: builtin/commit.c:738 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn.Những dòng " +"được\n" +"bắt đầu bằng `#' sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn.\n" +"Phần chú thích này nếu rỗng sẽ làm hủy bỏ lần chuyển giao (commit).\n" + +#: builtin/commit.c:751 +#, c-format +msgid "%sAuthor: %s" +msgstr "%sTác giả: %s" + +#: builtin/commit.c:758 +#, c-format +msgid "%sCommitter: %s" +msgstr "%sNgười chuyển giao (commit): %s" + +#: builtin/commit.c:778 +msgid "Cannot read index" +msgstr "không đọc được bảng mục lục" + +#: builtin/commit.c:815 +msgid "Error building trees" +msgstr "Gặp lỗi khi xây dựng cây" + +#: builtin/commit.c:830 builtin/tag.c:361 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "Xin hãy áp dụng thông điệp sử dụng hoặc là tùy chọn -m hoặc là -F.\n" + +#: builtin/commit.c:927 +#, c-format +msgid "No existing author found with '%s'" +msgstr "Không tìm thấy tác giả có sẵn với `%s'" + +#: builtin/commit.c:942 builtin/commit.c:1142 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Chế độ cho các tập tin không bị theo vết không hợp lệ `%s'" + +#: builtin/commit.c:982 +msgid "Using both --reset-author and --author does not make sense" +msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý" + +#: builtin/commit.c:993 +msgid "You have nothing to amend." +msgstr "Không có gì để amend (tu bổ) cả." + +#: builtin/commit.c:996 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "" +"Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện amend (tu bổ)." + +#: builtin/commit.c:998 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "" +"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện amend (tu " +"bổ)." + +#: builtin/commit.c:1001 +msgid "Options --squash and --fixup cannot be used together" +msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau" + +#: builtin/commit.c:1011 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "Chỉ một tùy chọn trong số -c/-C/-F/--fixup được sử dụng" + +#: builtin/commit.c:1013 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F/--fixup." + +#: builtin/commit.c:1021 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "" +"--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend." + +#: builtin/commit.c:1038 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" +"Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được " +"sử dụng." + +#: builtin/commit.c:1040 +msgid "No paths with --include/--only does not make sense." +msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý." + +#: builtin/commit.c:1042 +msgid "Clever... amending the last one with dirty index." +msgstr "Giỏi... tu bổ cái cuối với bảng mục lục phi nghĩa." + +#: builtin/commit.c:1044 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" +"Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; đang " +"giả định --only những-đường-dẫn..." + +#: builtin/commit.c:1054 builtin/tag.c:577 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Chế độ dọn dẹp không hợp lệ %s" + +#: builtin/commit.c:1059 +msgid "Paths with -a does not make sense." +msgstr "Các đường dẫn với tùy chọn -a không hợp lý." + +#: builtin/commit.c:1156 builtin/commit.c:1384 +msgid "show status concisely" +msgstr "hiển thị trạng thái ở dạng súc tích" + +#: builtin/commit.c:1158 builtin/commit.c:1386 +msgid "show branch information" +msgstr "hiển thị thông tin nhánh" + +#: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389 +msgid "machine-readable output" +msgstr "kết xuất dạng máy-có-thể-đọc" + +#: builtin/commit.c:1163 builtin/commit.c:1390 +msgid "terminate entries with NUL" +msgstr "chấm dứt các mục bằng NUL" + +#: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636 +#: builtin/fast-export.c:639 builtin/tag.c:461 +msgid "mode" +msgstr "chế độ" + +#: builtin/commit.c:1166 builtin/commit.c:1393 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "" +"hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, " +"normal, no. (Mặc định: all)" + +#: builtin/commit.c:1169 +msgid "show ignored files" +msgstr "hiển thị các tập tin ẩn" + +#: builtin/commit.c:1170 parse-options.h:151 +msgid "when" +msgstr "khi" + +#: builtin/commit.c:1171 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"bỏ qua các thay đổi trong mô-đun con, tùy chọn khi: all, dirty, untracked. " +"(Mặc định: all)" + +#: builtin/commit.c:1173 +msgid "list untracked files in columns" +msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột" + +#: builtin/commit.c:1242 +msgid "couldn't look up newly created commit" +msgstr "không thể tìm thấy lần chuyển giao (commit) mới hơn đã được tạo" + +#: builtin/commit.c:1244 +msgid "could not parse newly created commit" +msgstr "" +"không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo" + +#: builtin/commit.c:1285 +msgid "detached HEAD" +msgstr "đã rời khỏi HEAD" + +#: builtin/commit.c:1287 +msgid " (root-commit)" +msgstr " (root-commit)" + +#: builtin/commit.c:1354 +msgid "suppress summary after successful commit" +msgstr "không hiển thị tổng kết sau khi chuyển giao thành công" + +#: builtin/commit.c:1355 +msgid "show diff in commit message template" +msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao" + +#: builtin/commit.c:1357 +msgid "Commit message options" +msgstr "Các tùy chọn ghi chú commit" + +#: builtin/commit.c:1358 builtin/tag.c:459 +msgid "read message from file" +msgstr "đọc chú thích từ tập tin" + +#: builtin/commit.c:1359 +msgid "author" +msgstr "tác giả" + +#: builtin/commit.c:1359 +msgid "override author for commit" +msgstr "ghi đè tác giả cho commit" + +#: builtin/commit.c:1360 builtin/gc.c:178 +msgid "date" +msgstr "ngày tháng" + +#: builtin/commit.c:1360 +msgid "override date for commit" +msgstr "ghi đè ngày tháng cho commit" + +#: builtin/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537 +#: builtin/notes.c:694 builtin/tag.c:457 +msgid "message" +msgstr "thông điệp" + +#: builtin/commit.c:1361 +msgid "commit message" +msgstr "chú thích của lần commit" + +#: builtin/commit.c:1362 +msgid "reuse and edit message from specified commit" +msgstr "" +"dùng lại các ghi chú từ lần chuyển giao (commit) đã cho nhưng có cho sửa chữa" + +#: builtin/commit.c:1363 +msgid "reuse message from specified commit" +msgstr "dùng lại các ghi chú từ lần chuyển giao (commit) đã cho" + +#: builtin/commit.c:1364 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" +"dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra" + +#: builtin/commit.c:1365 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" +"dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ " +"ra" + +#: builtin/commit.c:1366 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "" +"lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)" + +#: builtin/commit.c:1367 builtin/log.c:1068 builtin/revert.c:109 +msgid "add Signed-off-by:" +msgstr "thêm dòng Signed-off-by:" + +#: builtin/commit.c:1368 +msgid "use specified template file" +msgstr "sử dụng tập tin mẫu đã cho" + +#: builtin/commit.c:1369 +msgid "force edit of commit" +msgstr "ép buộc sửa lần commit" + +#: builtin/commit.c:1370 +msgid "default" +msgstr "mặc định" + +#: builtin/commit.c:1370 builtin/tag.c:462 +msgid "how to strip spaces and #comments from message" +msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn" + +#: builtin/commit.c:1371 +msgid "include status in commit message template" +msgstr "bao gồm các trạng thái ghi mẫu ghi chú chuyển giao (commit)" + +#: builtin/commit.c:1372 builtin/merge.c:213 builtin/tag.c:463 +msgid "key id" +msgstr "id khóa" + +#: builtin/commit.c:1373 builtin/merge.c:214 +msgid "GPG sign commit" +msgstr "ký lần commit dùng GPG" + +#. end commit message options +#: builtin/commit.c:1376 +msgid "Commit contents options" +msgstr "Các tùy nội dung ghi chú commit" + +#: builtin/commit.c:1377 +msgid "commit all changed files" +msgstr "chuyển giao tất cả các tập tin có thay đổi" + +#: builtin/commit.c:1378 +msgid "add specified files to index for commit" +msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao (commit)" + +#: builtin/commit.c:1379 +msgid "interactively add files" +msgstr "thêm các tập-tin bằng tương tác" + +#: builtin/commit.c:1380 +msgid "interactively add changes" +msgstr "thêm các thay đổi bằng tương tác" + +#: builtin/commit.c:1381 +msgid "commit only specified files" +msgstr "chỉ chuyển giao các tập tin đã chỉ ra" + +#: builtin/commit.c:1382 +msgid "bypass pre-commit hook" +msgstr "vòng qua móc (hook) pre-commit" + +#: builtin/commit.c:1383 +msgid "show what would be committed" +msgstr "hiển thị xem cái gì có thể được chuyển giao" + +#: builtin/commit.c:1391 +msgid "amend previous commit" +msgstr "tu bổ (amend) lần commit trước" + +#: builtin/commit.c:1392 +msgid "bypass post-rewrite hook" +msgstr "vòng qua móc (hook) post-rewrite" + +#: builtin/commit.c:1397 +msgid "ok to record an empty change" +msgstr "ok để ghi lại một thay đổi trống rỗng" + +#: builtin/commit.c:1400 +msgid "ok to record a change with an empty message" +msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng" + +#: builtin/commit.c:1432 +msgid "could not parse HEAD commit" +msgstr "không thể phân tích commit (lần chuyển giao) HEAD" + +#: builtin/commit.c:1470 builtin/merge.c:508 +#, c-format +msgid "could not open '%s' for reading" +msgstr "không thể mở `%s' để đọc" + +#: builtin/commit.c:1477 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" + +#: builtin/commit.c:1484 +msgid "could not read MERGE_MODE" +msgstr "không thể đọc MERGE_MODE" + +#: builtin/commit.c:1503 +#, c-format +msgid "could not read commit message: %s" +msgstr "không thể đọc thông điệp (message) commit (lần chuyển giao): %s" + +#: builtin/commit.c:1517 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "" +"Đang bỏ qua việc chuyển giao (commit); bạn đã không biên soạn thông điệp " +"(message).\n" + +#: builtin/commit.c:1522 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "" +"Đang bỏ qua lần chuyển giao (commit) bởi vì thông điệp của nó trống rỗng.\n" + +#: builtin/commit.c:1537 builtin/merge.c:935 builtin/merge.c:960 +msgid "failed to write commit object" +msgstr "gặp lỗi khi ghi đối tượng chuyển giao (commit)" + +#: builtin/commit.c:1558 +msgid "cannot lock HEAD ref" +msgstr "không thể khóa HEAD ref (tham chiếu)" + +#: builtin/commit.c:1562 +msgid "cannot update HEAD ref" +msgstr "không thể cập nhật ref (tham chiếu) HEAD" + +#: builtin/commit.c:1573 +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 "" +"Kho chứa đã hoàn tất việc cập nhật, nhưng không thể ghi vào\n" +"tập tin new_index (bảng mục lục mới). Hãy kiểm tra xem đĩa có bị đầy quá\n" +"hay quota (hạn nghạch đĩa cứng) bị vượt quá, và sau đó \"git reset HEAD\" để " +"khắc phục." + +#: builtin/config.c:7 +msgid "git config [options]" +msgstr "git config [các-tùy-chọn]" + +#: builtin/config.c:52 +msgid "Config file location" +msgstr "Vị trí tập tin cấu hình" + +#: builtin/config.c:53 +msgid "use global config file" +msgstr "đặt tập tin cấu hình cần toàn cục" + +#: builtin/config.c:54 +msgid "use system config file" +msgstr "sử dụng tập tin cấu hình hệ thống" + +#: builtin/config.c:55 +msgid "use repository config file" +msgstr "dùng tập tin cấu hình của kho" + +#: builtin/config.c:56 +msgid "use given config file" +msgstr "sử dụng tập tin cấu hình đã cho" + +#: builtin/config.c:57 +msgid "Action" +msgstr "Hành động" + +#: builtin/config.c:58 +msgid "get value: name [value-regex]" +msgstr "lấy giá-trị: tên [value-regex]" + +#: builtin/config.c:59 +msgid "get all values: key [value-regex]" +msgstr "lấy tất cả giá-trị: khóa [value-regex]" + +#: builtin/config.c:60 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "lấy giá trị cho regexp: name-regex [value-regex]" + +#: builtin/config.c:61 +msgid "replace all matching variables: name value [value_regex]" +msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value_regex]" + +#: builtin/config.c:62 +msgid "add a new variable: name value" +msgstr "thêm biến mới: tên giá-trị" + +#: builtin/config.c:63 +msgid "remove a variable: name [value-regex]" +msgstr "gỡ bỏ biến: tên [value-regex]" + +#: builtin/config.c:64 +msgid "remove all matches: name [value-regex]" +msgstr "gỡ bỏ mọi cái khớp: tên [value-regex]" + +#: builtin/config.c:65 +msgid "rename section: old-name new-name" +msgstr "đổi tên chương: tên-cũ tên-mới" + +#: builtin/config.c:66 +msgid "remove a section: name" +msgstr "gỡ bỏ chương: tên" + +#: builtin/config.c:67 +msgid "list all" +msgstr "liệt kê tất" + +#: builtin/config.c:68 +msgid "open an editor" +msgstr "mở một trình biên soạn" + +#: builtin/config.c:69 builtin/config.c:70 +msgid "slot" +msgstr "khe" + +#: builtin/config.c:69 +msgid "find the color configured: [default]" +msgstr "tìm cấu hình màu sắc: [mặc định]" + +#: builtin/config.c:70 +msgid "find the color setting: [stdout-is-tty]" +msgstr "tìm các cài đặt về màu sắc: [stdout-là-tty]" + +#: builtin/config.c:71 +msgid "Type" +msgstr "Kiểu" + +#: builtin/config.c:72 +msgid "value is \"true\" or \"false\"" +msgstr "giá trị là \"true\" hoặc \"false\"" + +#: builtin/config.c:73 +msgid "value is decimal number" +msgstr "giá trị ở dạng số thập phân" + +#: builtin/config.c:74 +msgid "value is --bool or --int" +msgstr "giá trị là --bool hoặc --int" + +#: builtin/config.c:75 +msgid "value is a path (file or directory name)" +msgstr "giá trị là đường dẫn (tên tập tin hay thư mục)" + +#: builtin/config.c:76 +msgid "Other" +msgstr "Khác" + +#: builtin/config.c:77 +msgid "terminate values with NUL byte" +msgstr "chấm dứt giá trị với byte NUL" + +#: builtin/config.c:78 +msgid "respect include directives on lookup" +msgstr "tôn trọng kể cà các hướng trong tìm kiếm" + +#: builtin/count-objects.c:69 +msgid "git count-objects [-v]" +msgstr "git count-objects [-v]" + +#: builtin/describe.c:15 +msgid "git describe [options] <committish>*" +msgstr "git describe [các-tùy-chọn] <committish>*" + +#: builtin/describe.c:16 +msgid "git describe [options] --dirty" +msgstr "git describe [các-tùy-chọn] --dirty" + +#: builtin/describe.c:234 +#, c-format +msgid "annotated tag %s not available" +msgstr "thẻ đã được ghi chú %s không sẵn để dùng" + +#: builtin/describe.c:238 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "thẻ được chú giải %s không có tên nhúng" + +#: builtin/describe.c:240 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "thẻ `%s' đã thực sự ở đây `%s' rồi" + +#: builtin/describe.c:267 +#, c-format +msgid "Not a valid object name %s" +msgstr "Không phải tên đối tượng %s hợp lệ" + +#: builtin/describe.c:270 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s không phải là một đối tượng `%s' hợp lệ" + +#: builtin/describe.c:287 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "không có thẻ nào khớp chính xác với `%s'" + +#: builtin/describe.c:289 +#, c-format +msgid "searching to describe %s\n" +msgstr "Đang tìm kiếm để mô tả %s\n" + +#: builtin/describe.c:329 +#, c-format +msgid "finished search at %s\n" +msgstr "việc tìm kiếm đã kết thúc tại %s\n" + +#: builtin/describe.c:353 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"Không có thẻ được chú giải nào được mô tả là `%s'.\n" +"Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags." + +#: builtin/describe.c:357 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"Không có thẻ (tag) có thể mô tả `%s'.\n" +"Hãy thử --always, hoặt tạo một số thẻ." + +#: builtin/describe.c:378 +#, c-format +msgid "traversed %lu commits\n" +msgstr "đã xuyên %lu qua lần chuyển giao (commit)\n" + +#: builtin/describe.c:381 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" +"tìm thấy nhiều hơn %i thẻ (tag); đã liệt kê %i gần đây nhất\n" +"bỏ đi tìm kiếm tại %s\n" + +#: builtin/describe.c:403 +msgid "find the tag that comes after the commit" +msgstr "tìm các thẻ mà nó đến trước lần chuyển giao" + +#: builtin/describe.c:404 +msgid "debug search strategy on stderr" +msgstr "chiến lược tìm kiếm trên đầu ra lỗi chuẩn stderr" + +#: builtin/describe.c:405 +msgid "use any ref in .git/refs" +msgstr "sử dụng bất kỳ ref nào trong .git/refs" + +#: builtin/describe.c:406 +msgid "use any tag in .git/refs/tags" +msgstr "sử dụng bất kỳ thẻ nào trong .git/refs/tags" + +#: builtin/describe.c:407 +msgid "always use long format" +msgstr "luôn dùng định dạng dài" + +#: builtin/describe.c:410 +msgid "only output exact matches" +msgstr "chỉ xuất những gì khớp chính xác" + +#: builtin/describe.c:412 +msgid "consider <n> most recent tags (default: 10)" +msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)" + +#: builtin/describe.c:414 +msgid "only consider tags matching <pattern>" +msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>" + +#: builtin/describe.c:416 builtin/name-rev.c:238 +msgid "show abbreviated commit object as fallback" +msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback" + +#: builtin/describe.c:417 +msgid "mark" +msgstr "dấu" + +#: builtin/describe.c:418 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")" + +#: builtin/describe.c:436 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long là xung khắc với tùy chọn --abbrev=0" + +#: builtin/describe.c:462 +msgid "No names found, cannot describe anything." +msgstr "Không tìm thấy các tên, không thể mô tả gì cả." + +#: builtin/describe.c:482 +msgid "--dirty is incompatible with committishes" +msgstr "--dirty là xung khắc với các tùy chọn dành cho chuyển giao (commit)" + +#: builtin/diff.c:79 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "`%s': không phải tập tin bình thường hay liên kết tượng trưng" + +#: builtin/diff.c:224 +#, c-format +msgid "invalid option: %s" +msgstr "tùy chọn sai: %s" + +#: builtin/diff.c:301 +msgid "Not a git repository" +msgstr "Không phải là kho git" + +#: builtin/diff.c:344 +#, c-format +msgid "invalid object '%s' given." +msgstr "đối tượng đã cho `%s' không hợp lệ." + +#: builtin/diff.c:349 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "đã chỉ ra nhiều hơn %d cây (tree): `%s'" + +#: builtin/diff.c:359 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "đã cho nhiều hơn hai đối tượng blob: `%s'" + +#: builtin/diff.c:367 +#, c-format +msgid "unhandled object '%s' given." +msgstr "đã cho đối tượng không thể nắm giữ `%s'." + +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" +msgstr "git fast-export [rev-list-opts]" + +#: builtin/fast-export.c:635 +msgid "show progress after <n> objects" +msgstr "hiển thị tiến triển sau <n> đối tượng" + +#: builtin/fast-export.c:637 +msgid "select handling of signed tags" +msgstr "chọn điều khiển của thẻ đã ký" + +#: builtin/fast-export.c:640 +msgid "select handling of tags that tag filtered objects" +msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra" + +#: builtin/fast-export.c:643 +msgid "Dump marks to this file" +msgstr "Đổ các đánh dấu này vào tập-tin" + +#: builtin/fast-export.c:645 +msgid "Import marks from this file" +msgstr "nhập vào đánh dấu từ tập tin này" + +#: builtin/fast-export.c:647 +msgid "Fake a tagger when tags lack one" +msgstr "Làm giả một cái thẻ khi thẻ bị thiếu một cái" + +#: builtin/fast-export.c:649 +msgid "Output full tree for each commit" +msgstr "Xuất ra toàn bộ cây cho mỗi lần chuyển giao" + +#: builtin/fast-export.c:651 +msgid "Use the done feature to terminate the stream" +msgstr "Sử dụng tính năng done để chấm dứt luồng dữ liệu" + +#: builtin/fast-export.c:652 +msgid "Skip output of blob data" +msgstr "Bỏ qua kết xuất của dữ liệu blob" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<các-tùy-chọn>] [<kho-chứa> [<refspec>...]]" + +#: builtin/fetch.c:21 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<các-tùy-chọn>] [<nhóm>" + +#: builtin/fetch.c:22 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<các-tùy-chọn>] [(<kho> | <nhóm>)...]" + +#: builtin/fetch.c:23 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<các-tùy-chọn>]" + +#: builtin/fetch.c:60 +msgid "fetch from all remotes" +msgstr "fetch từ tất cả các máy chủ" + +#: builtin/fetch.c:62 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó" + +#: builtin/fetch.c:64 +msgid "path to upload pack on remote end" +msgstr "đường dẫn đến gói (pack) tải lên trên máy chủ cuối" + +#: builtin/fetch.c:65 +msgid "force overwrite of local branch" +msgstr "ép buộc ghi đè lên nhánh nội bộ" + +#: builtin/fetch.c:67 +msgid "fetch from multiple remotes" +msgstr "fetch từ nhiều máy chủ cùng lúc" + +#: builtin/fetch.c:69 +msgid "fetch all tags and associated objects" +msgstr "lấy (fetch) tất cả các thẻ cùng với các đối tượng liên quan đến nó" + +#: builtin/fetch.c:71 +msgid "do not fetch all tags (--no-tags)" +msgstr "không lấy (fetch) tất cả các thẻ (--no-tags)" + +#: builtin/fetch.c:73 +msgid "prune remote-tracking branches no longer on remote" +msgstr "" +"cắt cụt (prune) các nhánh `remote-tracking' không còn tồn tại trên máy chủ " +"nữa" + +#: builtin/fetch.c:74 +msgid "on-demand" +msgstr "khi-cần" + +#: builtin/fetch.c:75 +msgid "control recursive fetching of submodules" +msgstr "điều khiển việc lấy về (fetch) đệ quy trong các mô-đun-con" + +#: builtin/fetch.c:79 +msgid "keep downloaded pack" +msgstr "giữ các gói đã tải về" + +#: builtin/fetch.c:81 +msgid "allow updating of HEAD ref" +msgstr "cho phép cập nhật ref (tham chiếu) HEAD" + +#: builtin/fetch.c:84 +msgid "deepen history of shallow clone" +msgstr "làm sâu hơn lịch sử của bản sao" + +#: builtin/fetch.c:85 builtin/log.c:1083 +msgid "dir" +msgstr "tmục" + +#: builtin/fetch.c:86 +msgid "prepend this to submodule path output" +msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con" + +#: builtin/fetch.c:89 +msgid "default mode for recursion" +msgstr "chế độ mặc định cho đệ qui" + +#: builtin/fetch.c:201 +msgid "Couldn't find remote ref HEAD" +msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD" + +#: builtin/fetch.c:254 +#, c-format +msgid "object %s not found" +msgstr "Không tìm thấy đối tượng %s" + +#: builtin/fetch.c:259 +msgid "[up to date]" +msgstr "[đã cập nhật]" + +#: builtin/fetch.c:273 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "! %-*s %-*s -> %s (không thể fetch (lấy) về nhánh hiện hành)" + +#: builtin/fetch.c:274 builtin/fetch.c:360 +msgid "[rejected]" +msgstr "[Bị từ chối]" + +#: builtin/fetch.c:285 +msgid "[tag update]" +msgstr "[cập nhật thẻ]" + +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +msgid " (unable to update local ref)" +msgstr " (không thể cập nhật tham chiếu (ref) nội bộ)" + +#: builtin/fetch.c:305 +msgid "[new tag]" +msgstr "[thẻ mới]" + +#: builtin/fetch.c:308 +msgid "[new branch]" +msgstr "[nhánh mới]" + +#: builtin/fetch.c:311 +msgid "[new ref]" +msgstr "[ref (tham chiếu) mới]" + +#: builtin/fetch.c:356 +msgid "unable to update local ref" +msgstr "không thể cập nhật tham chiếu (ref) nội bộ" + +#: builtin/fetch.c:356 +msgid "forced update" +msgstr "cưỡng bức cập nhật" + +#: builtin/fetch.c:362 +msgid "(non-fast-forward)" +msgstr "(non-fast-forward)" + +#: builtin/fetch.c:393 builtin/fetch.c:685 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "không thể mở %s: %s\n" + +#: builtin/fetch.c:402 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n" + +#: builtin/fetch.c:488 +#, c-format +msgid "From %.*s\n" +msgstr "Từ %.*s\n" + +#: builtin/fetch.c:499 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"một số tham chiếu (refs) nội bộ không thể được cập nhật; hãy thử chạy\n" +" `git remote prune %s' để bỏ đi những nhánh cũ, hay bị xung đột" + +#: builtin/fetch.c:549 +#, c-format +msgid " (%s will become dangling)" +msgstr " (%s sẽ trở thành không đầu (không được quản lý))" + +#: builtin/fetch.c:550 +#, c-format +msgid " (%s has become dangling)" +msgstr " (%s đã trở thành không đầu (không được quản lý))" + +#: builtin/fetch.c:557 +msgid "[deleted]" +msgstr "[đã xóa]" + +#: builtin/fetch.c:558 builtin/remote.c:1055 +msgid "(none)" +msgstr "(không)" + +#: builtin/fetch.c:675 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" +"Từ chối việc lấy (fetch) vào trong nhánh hiện tại %s của một kho chứa không " +"phải kho trần (bare)" + +#: builtin/fetch.c:709 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "Không biết làm cách nào để lấy về (fetch) từ %s" + +#: builtin/fetch.c:786 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s" + +#: builtin/fetch.c:789 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n" + +#: builtin/fetch.c:891 +#, c-format +msgid "Fetching %s\n" +msgstr "Đang lấy (fetch) %s\n" + +#: builtin/fetch.c:893 builtin/remote.c:100 +#, c-format +msgid "Could not fetch %s" +msgstr "không thể fetch (lấy) %s" + +#: builtin/fetch.c:912 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" +"Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n" +"tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)." + +#: builtin/fetch.c:932 +msgid "You need to specify a tag name." +msgstr "Bạn phải định rõ tên thẻ." + +#: builtin/fetch.c:984 +msgid "fetch --all does not take a repository argument" +msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa" + +#: builtin/fetch.c:986 +msgid "fetch --all does not make sense with refspecs" +msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs" + +#: builtin/fetch.c:997 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "không có nhóm máy chủ hay máy chủ như thế: %s" + +#: builtin/fetch.c:1005 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý" + +#: builtin/fmt-merge-msg.c:13 +msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgstr "" +"git fmt-merge-msg [-m <thông điệp>] [--log[=<n>]|--no-log] [--file <tập-tin>]" + +#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:787 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "n" + +#: builtin/fmt-merge-msg.c:654 +msgid "populate log with at most <n> entries from shortlog" +msgstr "gắn nhật ký với ít nhất <n> mục từ lệnh `shortlog'" + +#: builtin/fmt-merge-msg.c:657 +msgid "alias for --log (deprecated)" +msgstr "bí danh cho --log (không được dùng)" + +#: builtin/fmt-merge-msg.c:660 +msgid "text" +msgstr "văn bản" + +#: builtin/fmt-merge-msg.c:661 +msgid "use <text> as start of message" +msgstr "dùng <văn bản thường> để bắt đầu ghi chú" + +#: builtin/fmt-merge-msg.c:662 +msgid "file to read from" +msgstr "tập tin để đọc dữ liệu từ đó" + +#: builtin/for-each-ref.c:979 +msgid "git for-each-ref [options] [<pattern>]" +msgstr "git for-each-ref [các-tùy-chọn] [<mẫu>]" + +#: builtin/for-each-ref.c:994 +msgid "quote placeholders suitably for shells" +msgstr "trích dẫn để phù hợp cho hệ vỏ (shell)" + +#: builtin/for-each-ref.c:996 +msgid "quote placeholders suitably for perl" +msgstr "trích dẫn để phù hợp cho perl" + +#: builtin/for-each-ref.c:998 +msgid "quote placeholders suitably for python" +msgstr "trích dẫn để phù hợp cho python" + +#: builtin/for-each-ref.c:1000 +msgid "quote placeholders suitably for tcl" +msgstr "trích dẫn để phù hợp cho tcl" + +#: builtin/for-each-ref.c:1003 +msgid "show only <n> matched refs" +msgstr "hiển thị chỉ <n> tham chiếu khớp" + +#: builtin/for-each-ref.c:1004 +msgid "format" +msgstr "định dạng" + +#: builtin/for-each-ref.c:1004 +msgid "format to use for the output" +msgstr "định dạng sẽ dùng cho đầu ra" + +#: builtin/for-each-ref.c:1005 +msgid "key" +msgstr "khóa" + +#: builtin/for-each-ref.c:1006 +msgid "field name to sort on" +msgstr "tên trường cần sắp xếp" + +#: builtin/fsck.c:608 +msgid "git fsck [options] [<object>...]" +msgstr "git fsck [các-tùy-chọn] [<đối-tượng>...]" + +#: builtin/fsck.c:614 +msgid "show unreachable objects" +msgstr "hiển thị các đối tượng không thể đọc được" + +#: builtin/fsck.c:615 +msgid "show dangling objects" +msgstr "hiển thị các đối tượng không được quản lý" + +#: builtin/fsck.c:616 +msgid "report tags" +msgstr "báo cáo các thẻ" + +#: builtin/fsck.c:617 +msgid "report root nodes" +msgstr "báo cáo node gốc" + +#: builtin/fsck.c:618 +msgid "make index objects head nodes" +msgstr "tạo ` index objects head nodes'" + +#: builtin/fsck.c:619 +msgid "make reflogs head nodes (default)" +msgstr "tạo reflogs head nodes (mặc định)" + +#: builtin/fsck.c:620 +msgid "also consider packs and alternate objects" +msgstr "cũng cân nhắc đến các đối tượng gói và thay thế" + +#: builtin/fsck.c:621 +msgid "enable more strict checking" +msgstr "cho phép kiểm tra hạn chế hơn" + +#: builtin/fsck.c:623 +msgid "write dangling objects in .git/lost-found" +msgstr "ghi các đối tượng không được quản lý trong .git/lost-found" + +#: builtin/fsck.c:624 builtin/prune.c:134 +msgid "show progress" +msgstr "hiển thị quá trình" + +#: builtin/gc.c:22 +msgid "git gc [options]" +msgstr "git gc [các-tùy-chọn]" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "%s không hợp lệ: `%s'" + +#: builtin/gc.c:90 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "thư mục đối tượng dài một cách điên rồ %.*s" + +#: builtin/gc.c:179 +msgid "prune unreferenced objects" +msgstr "xóa bỏ các đối tượng không được tham chiếu" + +#: builtin/gc.c:181 +msgid "be more thorough (increased runtime)" +msgstr "cẩn thận hơn nữa (tăng thời gian chạy)" + +#: builtin/gc.c:182 +msgid "enable auto-gc mode" +msgstr "bật chế độ auto-gc" + +#: 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 "" +"Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n" +"chạy lệnh \"git gc\" một cách thủ công. Hãy xem \"git help gc\" để biết thêm " +"chi tiết.\n" + +#: builtin/gc.c:249 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" +"Có quá nhiều đối tượng tự do không được dùng đến; hãy chạy lệnh `git prune' " +"để xóa bỏ chúng đi." + +#: builtin/grep.c:22 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [các-tùy-chọn] [-e] <mẫu> [<rev>...] [[--] <đường-dẫn>...]" + +#: builtin/grep.c:217 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: gặp lỗi tạo tuyến (thread): %s" + +#: builtin/grep.c:455 +#, c-format +msgid "Failed to chdir: %s" +msgstr "Gặp lỗi với lệnh chdir: %s" + +#: builtin/grep.c:531 builtin/grep.c:565 +#, c-format +msgid "unable to read tree (%s)" +msgstr "không thể đọc cây (%s)" + +#: builtin/grep.c:579 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s" + +#: builtin/grep.c:637 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "chuyển đến `%c' mong chờ một giá trị bằng số" + +#: builtin/grep.c:654 +#, c-format +msgid "cannot open '%s'" +msgstr "không mở được `%s'" + +#: builtin/grep.c:729 +msgid "search in index instead of in the work tree" +msgstr "tìm trong bảng mục lục thay vì trong cây làm việc" + +#: builtin/grep.c:731 +msgid "find in contents not managed by git" +msgstr "tìm trong nội dung không được quản lý bởi git" + +#: builtin/grep.c:733 +msgid "search in both tracked and untracked files" +msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết" + +#: builtin/grep.c:735 +msgid "search also in ignored files" +msgstr "tìm cả trong các tập tin đã bị lờ đi" + +#: builtin/grep.c:738 +msgid "show non-matching lines" +msgstr "hiển thị những dòng không khớp với mẫu" + +#: builtin/grep.c:740 +msgid "case insensitive matching" +msgstr "phân biệt chữ hoa/thường" + +#: builtin/grep.c:742 +msgid "match patterns only at word boundaries" +msgstr "chỉ khớp mẫu tại đường ranh giới từ" + +#: builtin/grep.c:744 +msgid "process binary files as text" +msgstr "xử lý tập tin nhị phân như là dạng văn bản thường" + +#: builtin/grep.c:746 +msgid "don't match patterns in binary files" +msgstr "không khớp mẫu trong các tập tin nhị phân" + +#: builtin/grep.c:749 +msgid "descend at most <depth> levels" +msgstr "giảm xuống ít nhất mức <sâu>" + +#: builtin/grep.c:753 +msgid "use extended POSIX regular expressions" +msgstr "dùng biểu thức chính qui POSIX có mở rộng" + +#: builtin/grep.c:756 +msgid "use basic POSIX regular expressions (default)" +msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)" + +#: builtin/grep.c:759 +msgid "interpret patterns as fixed strings" +msgstr "diễn dịch các mẫu như là chuỗi cố định" + +#: builtin/grep.c:762 +msgid "use Perl-compatible regular expressions" +msgstr "sử dụng biểu thức chính quy tương thích Perl" + +#: builtin/grep.c:765 +msgid "show line numbers" +msgstr "hiển thị số của dòng" + +#: builtin/grep.c:766 +msgid "don't show filenames" +msgstr "không hiển thị tên tập tin" + +#: builtin/grep.c:767 +msgid "show filenames" +msgstr "hiển thị các tên tập tin" + +#: builtin/grep.c:769 +msgid "show filenames relative to top directory" +msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)" + +#: builtin/grep.c:771 +msgid "show only filenames instead of matching lines" +msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu" + +#: builtin/grep.c:773 +msgid "synonym for --files-with-matches" +msgstr "đồng nghĩa với --files-with-matches" + +#: builtin/grep.c:776 +msgid "show only the names of files without match" +msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu" + +#: builtin/grep.c:778 +msgid "print NUL after filenames" +msgstr "thêm NUL vào sau tên tập tin" + +#: builtin/grep.c:780 +msgid "show the number of matches instead of matching lines" +msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu" + +#: builtin/grep.c:781 +msgid "highlight matches" +msgstr "tô sáng cái khớp" + +#: builtin/grep.c:783 +msgid "print empty line between matches from different files" +msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt" + +#: builtin/grep.c:785 +msgid "show filename only once above matches from same file" +msgstr "" +"hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin" + +#: builtin/grep.c:788 +msgid "show <n> context lines before and after matches" +msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp" + +#: builtin/grep.c:791 +msgid "show <n> context lines before matches" +msgstr "hiển thị <n> dòng nội dung trước khớp" + +#: builtin/grep.c:793 +msgid "show <n> context lines after matches" +msgstr "hiển thị <n> dòng nội dung sau khớp" + +#: builtin/grep.c:794 +msgid "shortcut for -C NUM" +msgstr "Dạng tắt cho -C SỐ" + +#: builtin/grep.c:797 +msgid "show a line with the function name before matches" +msgstr "hiển thị dòng vói tên hàm trước các lần khớp" + +#: builtin/grep.c:799 +msgid "show the surrounding function" +msgstr "hiển thị hàm bao quanh" + +#: builtin/grep.c:802 +msgid "read patterns from file" +msgstr "đọc mẫu từ tập-tin" + +#: builtin/grep.c:804 +msgid "match <pattern>" +msgstr "match <mẫu>" + +#: builtin/grep.c:806 +msgid "combine patterns specified with -e" +msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e" + +#: builtin/grep.c:818 +msgid "indicate hit with exit status without output" +msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất" + +#: builtin/grep.c:820 +msgid "show only matches from files that match all patterns" +msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu" + +#: builtin/grep.c:822 +msgid "show parse tree for grep expression" +msgstr "hiển thị cây phân tích cú pháp cho biểu thức `grep' (tìm kiếm)" + +#: builtin/grep.c:826 +msgid "pager" +msgstr "trang giấy" + +#: builtin/grep.c:826 +msgid "show matching files in the pager" +msgstr "hiển thị các tập tin khớp trong trang giấy" + +#: builtin/grep.c:829 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)" + +#: builtin/grep.c:830 builtin/show-ref.c:201 +msgid "show usage" +msgstr "hiển thị cách dùng" + +#: builtin/grep.c:921 +msgid "no pattern given." +msgstr "chưa chỉ ra mẫu." + +#: builtin/grep.c:935 +#, c-format +msgid "bad object %s" +msgstr "đối tượng sai %s" + +#: builtin/grep.c:976 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc" + +#: builtin/grep.c:999 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached hay --untracked không được sử dụng với --no-index." + +#: builtin/grep.c:1004 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "" +"--no-index hay --untracked không được sử dụng cùng với các tùy chọn liên " +"quan đến revs." + +#: builtin/grep.c:1007 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết." + +#: builtin/grep.c:1015 +msgid "both --cached and trees are given." +msgstr "cả hai --cached và các cây phải được chỉ ra." + +#: builtin/hash-object.c:60 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " +"<file>..." +msgstr "" +"git hash-object [-t <kiểu>] [-w] [--path=<tập-tin>|--no-filters] [--stdin] " +"[--] <tập-tin>..." + +#: builtin/hash-object.c:61 +msgid "git hash-object --stdin-paths < <list-of-paths>" +msgstr "git hash-object --stdin-paths < <danh-sách-đường-dẫn>" + +#: builtin/hash-object.c:72 +msgid "type" +msgstr "kiểu" + +#: builtin/hash-object.c:72 +msgid "object type" +msgstr "kiểu đối tượng" + +#: builtin/hash-object.c:73 +msgid "write the object into the object database" +msgstr "ghi đối tượng vào dữ liệu đối tượng" + +#: builtin/hash-object.c:74 +msgid "read the object from stdin" +msgstr "đọc đối tượng từ đầu vào tiêu chuẩn stdin" + +#: builtin/hash-object.c:76 +msgid "store file as is without filters" +msgstr "lưu các tập tin mà nó không có các bộ lọc" + +#: builtin/hash-object.c:77 +msgid "process file as it were from this path" +msgstr "xử lý tập tin như là nó đang ở thư mục này" + +#: builtin/help.c:43 +msgid "print all available commands" +msgstr "hiển thị danh sách các câu lệnh người dùng có thể sử dụng" + +#: builtin/help.c:44 +msgid "show man page" +msgstr "hiển thị trang man" + +#: builtin/help.c:45 +msgid "show manual in web browser" +msgstr "hiển thị hướng dẫn sử dụng trong trình duyệt web" + +#: builtin/help.c:47 +msgid "show info page" +msgstr "hiện trang info" + +#: builtin/help.c:53 +msgid "git help [--all] [--man|--web|--info] [command]" +msgstr "git help [--all] [--man|--web|--info] [lệnh]" + +#: builtin/help.c:65 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "không nhận ra định dạng trợ giúp `%s'" + +#: builtin/help.c:93 +msgid "Failed to start emacsclient." +msgstr "Lỗi khởi chạy emacsclient." + +#: builtin/help.c:106 +msgid "Failed to parse emacsclient version." +msgstr "Gặp lỗi khi phân tích phiên bản emacsclient." + +#: builtin/help.c:114 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "phiên bản của emacsclient `%d' quá cũ (< 22)." + +#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "gặp lỗi khi thực thi `%s': %s" + +#: builtin/help.c:217 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "" +"`%s': đường dẫn không hỗ trợ bộ trình chiếu man.\n" +"Hãy cân nhắc đến việc sử dụng 'man.<tool>.cmd' để thay thế." + +#: builtin/help.c:229 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "" +"`%s': cmd (lệnh) hỗ trợ bộ trình chiếu man.\n" +"Hãy cân nhắc đến việc sử dụng 'man.<tool>.path' để thay thế." + +#: builtin/help.c:299 +msgid "The most commonly used git commands are:" +msgstr "Những lệnh git hay được sử dụng nhất là:" + +#: builtin/help.c:367 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "`%s': không rõ chương trình xem man." + +#: builtin/help.c:384 +msgid "no man viewer handled the request" +msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu" + +#: builtin/help.c:392 +msgid "no info viewer handled the request" +msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu" + +#: builtin/help.c:447 builtin/help.c:454 +#, c-format +msgid "usage: %s%s" +msgstr "cách sử dụng: %s%s" + +#: builtin/help.c:470 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "`git %s' được đặt bí danh thành `%s'" + +#: builtin/index-pack.c:170 +#, c-format +msgid "object type mismatch at %s" +msgstr "kiểu đối tượng không khớp tại %s" + +#: builtin/index-pack.c:190 +msgid "object of unexpected type" +msgstr "đối tượng của kiểu không mong đợi" + +#: builtin/index-pack.c:227 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "không thể điền vào %d byte" +msgstr[1] "không thể điền vào %d byte" + +#: builtin/index-pack.c:237 +msgid "early EOF" +msgstr "vừa đúng lúc EOF" + +#: builtin/index-pack.c:238 +msgid "read error on input" +msgstr "lỗi đọc ở đầu vào" + +#: builtin/index-pack.c:250 +msgid "used more bytes than were available" +msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có" + +#: builtin/index-pack.c:257 +msgid "pack too large for current definition of off_t" +msgstr "pack quá lớn so với định nghĩa hiện tại của kiểu off_t" + +#: builtin/index-pack.c:273 +#, c-format +msgid "unable to create '%s'" +msgstr "không thể tạo `%s'" + +#: builtin/index-pack.c:278 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "không thể mở packfile `%s'" + +#: builtin/index-pack.c:292 +msgid "pack signature mismatch" +msgstr "chữ ký cho pack không khớp" + +#: builtin/index-pack.c:294 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "không hỗ trợ phiên bản pack %<PRIu32>" + +#: builtin/index-pack.c:312 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "pack có đối tượng sai khoảng bù (offset) %lu: %s" + +#: builtin/index-pack.c:434 +#, c-format +msgid "inflate returned %d" +msgstr "xả nén trả về %d" + +#: builtin/index-pack.c:483 +msgid "offset value overflow for delta base object" +msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở" + +#: builtin/index-pack.c:491 +msgid "delta base offset is out of bound" +msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi" + +#: builtin/index-pack.c:499 +#, c-format +msgid "unknown object type %d" +msgstr "không hiểu kiểu đối tượng %d" + +#: builtin/index-pack.c:530 +msgid "cannot pread pack file" +msgstr "không thể chạy hàm pread cho tập tin pack" + +#: 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] "tập tin pack bị kết thúc sớm, %lu byte bị thiếu" +msgstr[1] "tập tin pack bị kết thúc sớm, %lu byte bị thiếu" + +#: builtin/index-pack.c:558 +msgid "serious inflate inconsistency" +msgstr "sự mâu thuẫn xả nén nghiêm trọng" + +#: 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 "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!" + +#: builtin/index-pack.c:652 builtin/pack-objects.c:170 +#: builtin/pack-objects.c:262 +#, c-format +msgid "unable to read %s" +msgstr "không thể đọc %s" + +#: builtin/index-pack.c:718 +#, c-format +msgid "cannot read existing object %s" +msgstr "không thể đọc đối tượng đã tồn tại %s" + +#: builtin/index-pack.c:732 +#, c-format +msgid "invalid blob object %s" +msgstr "đối tượng blob không hợp lệ %s" + +#: builtin/index-pack.c:747 +#, c-format +msgid "invalid %s" +msgstr "%s không hợp lệ" + +#: builtin/index-pack.c:749 +msgid "Error in object" +msgstr "Lỗi trong đối tượng" + +#: builtin/index-pack.c:751 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được" + +#: builtin/index-pack.c:821 builtin/index-pack.c:847 +msgid "failed to apply delta" +msgstr "gặp lỗi khi áp dụng delta" + +#: builtin/index-pack.c:986 +msgid "Receiving objects" +msgstr "Đang nhận về các đối tượng" + +#: builtin/index-pack.c:986 +msgid "Indexing objects" +msgstr "Các đối tượng bảng mục lục" + +#: builtin/index-pack.c:1012 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "pack bị sai hỏng (SHA1 không khớp)" + +#: builtin/index-pack.c:1017 +msgid "cannot fstat packfile" +msgstr "không thể fstat packfile" + +#: builtin/index-pack.c:1020 +msgid "pack has junk at the end" +msgstr "pack có phần thừa ở cuối" + +#: builtin/index-pack.c:1031 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()" + +#: builtin/index-pack.c:1054 +msgid "Resolving deltas" +msgstr "Đang phân giải các delta" + +#: builtin/index-pack.c:1064 +#, c-format +msgid "unable to create thread: %s" +msgstr "không thể tạo tuyến: %s" + +#: builtin/index-pack.c:1106 +msgid "confusion beyond insanity" +msgstr "lộn xộn hơn cả điên rồ" + +#: builtin/index-pack.c:1112 +#, c-format +msgid "completed with %d local objects" +msgstr "đầy đủ với %d đối tượng nội bộ" + +#: builtin/index-pack.c:1121 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "Tổng kiểm tra tail không như mong đợi cho %s (đĩa hỏng?)" + +#: builtin/index-pack.c:1125 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "pack có %d delta chưa được giải quyết" +msgstr[1] "pack có %d delta chưa được giải quyết" + +#: builtin/index-pack.c:1150 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "không thể xả đối tượng nối thêm (%d)" + +#: builtin/index-pack.c:1229 +#, c-format +msgid "local object %s is corrupt" +msgstr "đối tượng nội bộ %s bị hỏng" + +#: builtin/index-pack.c:1253 +msgid "error while closing pack file" +msgstr "gặp lỗi trong khi đóng tập tin pack" + +#: builtin/index-pack.c:1266 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "không thể ghi tập tin giữ lại `%s'" + +#: builtin/index-pack.c:1274 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "không thể đóng tập tin giữ lại đã được ghi `%s'" + +#: builtin/index-pack.c:1287 +msgid "cannot store pack file" +msgstr "không thể lưu tập tin pack" + +#: builtin/index-pack.c:1298 +msgid "cannot store index file" +msgstr "không thể lưu trữ tập tin ghi mục lục" + +#: builtin/index-pack.c:1331 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "sai pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1337 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "số tuyến chỉ ra không hợp lệ (%d)" + +#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "không hỗ trợ đa tuyến, bỏ qua %s" + +#: builtin/index-pack.c:1399 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Không thể mở tập tin pack đã sẵn có `%s'" + +#: builtin/index-pack.c:1401 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "Không thể mở tập tin 'pack idx' cho `%s'" + +#: builtin/index-pack.c:1448 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "không delta: %d đối tượng" +msgstr[1] "không delta: %d đối tượng" + +#: builtin/index-pack.c:1455 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "chiều dài xích = %d: %lu đối tượng" +msgstr[1] "chiều dài xích = %d: %lu đối tượng" + +#: builtin/index-pack.c:1482 +msgid "Cannot come back to cwd" +msgstr "Không thể quay lại cwd" + +#: 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 "%s sai" + +#: builtin/index-pack.c:1559 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin không thể được dùng mà không có --stdin" + +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "tên tập tin packfile `%s' không được kết thúc bằng đuôi '.pack'" + +#: builtin/index-pack.c:1582 +msgid "--verify with no packfile name given" +msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Không thể làm %s được ghi bởi nhóm" + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "tên mẫu dài một cách điên rồ %s" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "không thể lấy trạng thái (stat) về `%s'" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "không thể stat (lấy trạng thái về) mẫu `%s'" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "không thể opendir `%s'" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "không thể readlink `%s'" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "liên kết tượng trưng dài một cách điên rồ %s" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "không thể tạo liên kết tượng trưng (symlink) `%s' `%s'" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "không thể sao chép %s sang %s" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "đang lờ đi mẫu %s" + +#: builtin/init-db.c:133 +#, c-format +msgid "insanely long template path %s" +msgstr "đường dẫn mẫu dài một cách điên rồ %s" + +#: builtin/init-db.c:141 +#, c-format +msgid "templates not found %s" +msgstr "các mẫu không được tìm thấy %s" + +#: builtin/init-db.c:154 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "không sao chép các mẫu của phiên bản sai định dạng %d từ `%s'" + +#: builtin/init-db.c:192 +#, c-format +msgid "insane git directory %s" +msgstr "thư mục git điên rồ %s" + +#: builtin/init-db.c:323 builtin/init-db.c:326 +#, c-format +msgid "%s already exists" +msgstr "%s đã có từ trước rồi" + +#: builtin/init-db.c:355 +#, c-format +msgid "unable to handle file type %d" +msgstr "không thể nắm (handle) tập tin kiểu %d" + +#: builtin/init-db.c:358 +#, c-format +msgid "unable to move %s to %s" +msgstr "không di chuyển được %s vào %s" + +#: builtin/init-db.c:363 +#, c-format +msgid "Could not create git link %s" +msgstr "Không thể tạo liên kết git `%s'" + +#. +#. * 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 "%s%s kho Git trong %s%s\n" + +#: builtin/init-db.c:421 +msgid "Reinitialized existing" +msgstr "Khởi tạo lại đã sẵn có rồi" + +#: builtin/init-db.c:421 +msgid "Initialized empty" +msgstr "Khởi tạo trống rỗng" + +#: builtin/init-db.c:422 +msgid " shared" +msgstr " đã chia sẻ" + +#: builtin/init-db.c:441 +msgid "cannot tell cwd" +msgstr "không nói chuyện được với lệnh cwd" + +#: builtin/init-db.c:467 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" +"[=<permissions>]] [directory]" +msgstr "" +"git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-" +"quyền>]] [thư-mục]" + +#: builtin/init-db.c:490 +msgid "permissions" +msgstr "các quyền" + +#: builtin/init-db.c:491 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiều người dùng" + +#: builtin/init-db.c:493 builtin/prune-packed.c:77 +msgid "be quiet" +msgstr "im lặng" + +#: builtin/init-db.c:522 builtin/init-db.c:529 +#, c-format +msgid "cannot mkdir %s" +msgstr "không thể mkdir (tạo thư mục): %s" + +#: builtin/init-db.c:533 +#, c-format +msgid "cannot chdir to %s" +msgstr "không thể chdir (chuyển đổi thư mục) sang %s" + +#: builtin/init-db.c:555 +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" +"%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-" +"dir=<thư-mục>)" + +#: builtin/init-db.c:579 +msgid "Cannot access current working directory" +msgstr "Không thể truy cập thư mục làm việc hiện hành" + +#: builtin/init-db.c:586 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "không thể truy cập cây (tree) làm việc `%s'" + +#: builtin/log.c:37 +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +msgstr "git log [<các-tùy-chọn>] [<kể-từ>..<cho-đến>] [[--] <đường-dẫn>...]\n" + +#: builtin/log.c:38 +msgid " or: git show [options] <object>..." +msgstr " or: git show [các-tùy-chọn] <đối-tượng>..." + +#: builtin/log.c:100 +msgid "suppress diff output" +msgstr "chặn mọi kết xuất từ diff" + +#: builtin/log.c:101 +msgid "show source" +msgstr "hiển thị mã nguồn" + +#: builtin/log.c:102 +msgid "decorate options" +msgstr "các tùy chọn trang trí" + +#: builtin/log.c:189 +#, c-format +msgid "Final output: %d %s\n" +msgstr "Kết xuất cuối cùng: %d %s\n" + +#: builtin/log.c:403 builtin/log.c:494 +#, c-format +msgid "Could not read object %s" +msgstr "Không thể đọc đối tượng %s" + +#: builtin/log.c:518 +#, c-format +msgid "Unknown type: %d" +msgstr "Không nhận ra kiểu: %d" + +#: builtin/log.c:608 +msgid "format.headers without value" +msgstr "format.headers không có giá trị cụ thể" + +#: builtin/log.c:682 +msgid "name of output directory is too long" +msgstr "tên của thư mục kết xuất quá dài" + +#: builtin/log.c:693 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Không thể mở tập tin miếng vá: %s" + +#: builtin/log.c:707 +msgid "Need exactly one range." +msgstr "Cần chính xác một vùng." + +#: builtin/log.c:715 +msgid "Not a range." +msgstr "Không phải là một vùng." + +#: builtin/log.c:789 +msgid "Cover letter needs email format" +msgstr "'Cover letter' cần cho định dạng thư" + +#: builtin/log.c:862 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "in-reply-to điên rồ: %s" + +#: builtin/log.c:890 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "git format-patch [các-tùy-chọn] [<kể-từ> | <vùng-xem-xét>]" + +#: builtin/log.c:935 +msgid "Two output directories?" +msgstr "Hai thư mục kết xuất?" + +#: builtin/log.c:1063 +msgid "use [PATCH n/m] even with a single patch" +msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn" + +#: builtin/log.c:1066 +msgid "use [PATCH] even with multiple patches" +msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp" + +#: builtin/log.c:1070 +msgid "print patches to standard out" +msgstr "hiển thị miếng vá ra đầu ra chuẩn" + +#: builtin/log.c:1072 +msgid "generate a cover letter" +msgstr "tạo bì thư" + +#: builtin/log.c:1074 +msgid "use simple number sequence for output file names" +msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra" + +#: builtin/log.c:1075 +msgid "sfx" +msgstr "sfx" + +#: builtin/log.c:1076 +msgid "use <sfx> instead of '.patch'" +msgstr "sử dụng <sfx> thay cho '.patch'" + +#: builtin/log.c:1078 +msgid "start numbering patches at <n> instead of 1" +msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1" + +#: builtin/log.c:1080 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "Dùng [<tiền-tố>] thay cho [VÁ]" + +#: builtin/log.c:1083 +msgid "store resulting files in <dir>" +msgstr "lưu các tập tin kết quả trong <t.mục>" + +#: builtin/log.c:1086 +msgid "don't strip/add [PATCH]" +msgstr "không strip/add [VÁ]" + +#: builtin/log.c:1089 +msgid "don't output binary diffs" +msgstr "không kết xuất diff (những khác biệt) nhị phân" + +#: builtin/log.c:1091 +msgid "don't include a patch matching a commit upstream" +msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn" + +#: builtin/log.c:1093 +msgid "show patch format instead of default (patch + stat)" +msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)" + +#: builtin/log.c:1095 +msgid "Messaging" +msgstr "Lời nhắn" + +#: builtin/log.c:1096 +msgid "header" +msgstr "đầu đề thư" + +#: builtin/log.c:1097 +msgid "add email header" +msgstr "thêm đầu đề thư" + +#: builtin/log.c:1098 builtin/log.c:1100 +msgid "email" +msgstr "thư điện tử" + +#: builtin/log.c:1098 +msgid "add To: header" +msgstr "thêm To: đầu đề thư" + +#: builtin/log.c:1100 +msgid "add Cc: header" +msgstr "thêm Cc: đầu đề thư" + +#: builtin/log.c:1102 +msgid "message-id" +msgstr "message-id" + +#: builtin/log.c:1103 +msgid "make first mail a reply to <message-id>" +msgstr "dùng thư đầu tiên để trả lời <message-id>" + +#: builtin/log.c:1104 builtin/log.c:1107 +msgid "boundary" +msgstr "ranh giới" + +#: builtin/log.c:1105 +msgid "attach the patch" +msgstr "đính kèm miếng vá" + +#: builtin/log.c:1108 +msgid "inline the patch" +msgstr "dùng miếng vá làm nội dung" + +#: builtin/log.c:1112 +msgid "enable message threading, styles: shallow, deep" +msgstr "cho phép luồng lời nhắn, kiểu: `shallow', `deep'" + +#: builtin/log.c:1114 +msgid "signature" +msgstr "chữ ký" + +#: builtin/log.c:1115 +msgid "add a signature" +msgstr "thêm chữ ký" + +#: builtin/log.c:1117 +msgid "don't print the patch filenames" +msgstr "không hiển thị các tên tập tin của miếng vá" + +#: builtin/log.c:1157 +#, c-format +msgid "bogus committer info %s" +msgstr "thông tin người chuyển giao không có thực %s" + +#: builtin/log.c:1202 +msgid "-n and -k are mutually exclusive." +msgstr "-n và -k loại từ lẫn nhau." + +#: builtin/log.c:1204 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix và -k xung khắc nhau." + +#: builtin/log.c:1212 +msgid "--name-only does not make sense" +msgstr "--name-only không hợp lý" + +#: builtin/log.c:1214 +msgid "--name-status does not make sense" +msgstr "--name-status không hợp lý" + +#: builtin/log.c:1216 +msgid "--check does not make sense" +msgstr "--check không hợp lý" + +#: builtin/log.c:1239 +msgid "standard output, or directory, which one?" +msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?" + +#: builtin/log.c:1241 +#, c-format +msgid "Could not create directory '%s'" +msgstr "Không thể tạo thư mục `%s'" + +#: builtin/log.c:1394 +msgid "Failed to create output files" +msgstr "Gặp lỗi khi tạo các tập tin kết xuất" + +#: builtin/log.c:1443 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<thượng-nguồn> [<head> [<giới-hạn>]]]" + +#: builtin/log.c:1498 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" +"Không tìm thấy nhánh mạng bị theo vết, hãy chỉ định <thượng-nguồn> một cách " +"thủ công.\n" + +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#, c-format +msgid "Unknown commit %s" +msgstr "Không hiểu lần chuyển giao (commit) %s" + +#: builtin/ls-files.c:408 +msgid "git ls-files [options] [<file>...]" +msgstr "git ls-files [các-tùy-chọn] [<tập-tin>...]" + +#: builtin/ls-files.c:463 +msgid "identify the file status with tags" +msgstr "nhận dạng các trạng thái tập tin với thẻ" + +#: builtin/ls-files.c:465 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "" +"dùng chữ cái viết thường cho các tập tin 'assume unchanged' (giả định không " +"thay đổi)" + +#: builtin/ls-files.c:467 +msgid "show cached files in the output (default)" +msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)" + +#: builtin/ls-files.c:469 +msgid "show deleted files in the output" +msgstr "hiển thị các tập tin đã xóa trong kết xuất" + +#: builtin/ls-files.c:471 +msgid "show modified files in the output" +msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất" + +#: builtin/ls-files.c:473 +msgid "show other files in the output" +msgstr "hiển thị các tập tin khác trong kết xuất" + +#: builtin/ls-files.c:475 +msgid "show ignored files in the output" +msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất" + +#: builtin/ls-files.c:478 +msgid "show staged contents' object name in the output" +msgstr "hiển thị tên đối tượng của nội dung được lưu trạng thái ở kết xuất" + +#: builtin/ls-files.c:480 +msgid "show files on the filesystem that need to be removed" +msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ" + +#: builtin/ls-files.c:482 +msgid "show 'other' directories' name only" +msgstr "chỉ hiển thị tên của các thư mục 'khác'" + +#: builtin/ls-files.c:485 +msgid "don't show empty directories" +msgstr "không hiển thị thư mục rỗng" + +#: builtin/ls-files.c:488 +msgid "show unmerged files in the output" +msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất" + +#: builtin/ls-files.c:490 +msgid "show resolve-undo information" +msgstr "hiển thị thông tin resolve-undo" + +#: builtin/ls-files.c:492 +msgid "skip files matching pattern" +msgstr "bỏ qua những tập tin khớp với một mẫu" + +#: builtin/ls-files.c:495 +msgid "exclude patterns are read from <file>" +msgstr "mẫu loại trừ được đọc từ <tập tin>" + +#: builtin/ls-files.c:498 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>" + +#: builtin/ls-files.c:500 +msgid "add the standard git exclusions" +msgstr "thêm loại trừ tiêu chuẩn kiểu git" + +#: builtin/ls-files.c:503 +msgid "make the output relative to the project top directory" +msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án" + +#: builtin/ls-files.c:506 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi" + +#: builtin/ls-files.c:507 +msgid "tree-ish" +msgstr "tree-ish" + +#: builtin/ls-files.c:508 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "" +"giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện" + +#: builtin/ls-files.c:510 +msgid "show debugging data" +msgstr "hiển thị dữ liệu gỡ lỗi" + +#: builtin/ls-tree.c:27 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>...]" + +#: builtin/ls-tree.c:125 +msgid "only show trees" +msgstr "chỉ hiển thị các tree" + +#: builtin/ls-tree.c:127 +msgid "recurse into subtrees" +msgstr "đệ quy vào các thư mục con" + +#: builtin/ls-tree.c:129 +msgid "show trees when recursing" +msgstr "hiển thị cây khi đệ quy" + +#: builtin/ls-tree.c:132 +msgid "terminate entries with NUL byte" +msgstr "chấm dứt mục tin với byte NUL" + +#: builtin/ls-tree.c:133 +msgid "include object size" +msgstr "gồm cả kích thước đối tượng" + +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +msgid "list only filenames" +msgstr "chỉ liệt kê tên tập tin" + +#: builtin/ls-tree.c:140 +msgid "use full path names" +msgstr "dùng tên đường dẫn đầy đủ" + +#: builtin/ls-tree.c:142 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)" + +#: builtin/merge.c:43 +msgid "git merge [options] [<commit>...]" +msgstr "git merge [các-tùy-chọn] [<commit>...]" + +#: builtin/merge.c:44 +msgid "git merge [options] <msg> HEAD <commit>" +msgstr "git merge [các-tùy-chọn] <tin-nhắn> HEAD <commit>" + +#: builtin/merge.c:45 +msgid "git merge --abort" +msgstr "git merge --abort" + +#: builtin/merge.c:90 +msgid "switch `m' requires a value" +msgstr "switch `m' yêu cầu một giá trị" + +#: builtin/merge.c:127 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Không tìm thấy chiến lược hòa trộn `%s'.\n" + +#: builtin/merge.c:128 +#, c-format +msgid "Available strategies are:" +msgstr "Các chiến lược sẵn sàng là:" + +#: builtin/merge.c:133 +#, c-format +msgid "Available custom strategies are:" +msgstr "Các chiến lược tùy chỉnh sẵn sàng là:" + +#: builtin/merge.c:183 +msgid "do not show a diffstat at the end of the merge" +msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn" + +#: builtin/merge.c:186 +msgid "show a diffstat at the end of the merge" +msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn" + +#: builtin/merge.c:187 +msgid "(synonym to --stat)" +msgstr "(đồng nghĩa với --stat)" + +#: builtin/merge.c:189 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn" + +#: builtin/merge.c:192 +msgid "create a single commit instead of doing a merge" +msgstr "tạo một lần chuyển giao (commit) đưon thay vì thực hiện việc hòa trộn" + +#: builtin/merge.c:194 +msgid "perform a commit if the merge succeeds (default)" +msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)" + +#: builtin/merge.c:196 +msgid "edit message before committing" +msgstr "sửa chú thích trước khi chuyển giao (commit)" + +#: builtin/merge.c:198 +msgid "allow fast-forward (default)" +msgstr "cho phép fast-forward (mặc định)" + +#: builtin/merge.c:200 +msgid "abort if fast-forward is not possible" +msgstr "bỏ qua nếu fast-forward không thể được" + +#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112 +msgid "strategy" +msgstr "chiến lược" + +#: builtin/merge.c:203 +msgid "merge strategy to use" +msgstr "chiến lược hòa trộn sẽ dùng" + +#: builtin/merge.c:204 +msgid "option=value" +msgstr "tùy_chọn=giá_trị" + +#: builtin/merge.c:205 +msgid "option for selected merge strategy" +msgstr "tùy chọn cho chiến lược hòa trộn đã chọn" + +#: builtin/merge.c:207 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "" +"hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn non-fast-forward)" + +#: builtin/merge.c:211 +msgid "abort the current in-progress merge" +msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện" + +#: builtin/merge.c:240 +msgid "could not run stash." +msgstr "không thể chạy stash." + +#: builtin/merge.c:245 +msgid "stash failed" +msgstr "stash gặp lỗi" + +#: builtin/merge.c:250 +#, c-format +msgid "not a valid object: %s" +msgstr "không phải là một đối tượng hợp lệ: %s" + +#: builtin/merge.c:269 builtin/merge.c:286 +msgid "read-tree failed" +msgstr "read-tree gặp lỗi" + +#: builtin/merge.c:316 +msgid " (nothing to squash)" +msgstr " (không có gì để squash)" + +#: builtin/merge.c:329 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Squash commit -- không cập nhật HEAD\n" + +#: builtin/merge.c:361 +msgid "Writing SQUASH_MSG" +msgstr "Đang ghi SQUASH_MSG" + +#: builtin/merge.c:363 +msgid "Finishing SQUASH_MSG" +msgstr "Hoàn thành SQUASH_MSG" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "Không thông điệp hòa trộn -- không cập nhật HEAD\n" + +#: builtin/merge.c:436 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "`%s' không chỉ đến một lần chuyển giao (commit) nào cả" + +#: builtin/merge.c:535 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Chuỗi branch.%s.mergeoptions sai: %s" + +#: builtin/merge.c:628 +msgid "git write-tree failed to write a tree" +msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" + +#: builtin/merge.c:678 +msgid "failed to read the cache" +msgstr "gặp lỗi khi đọc bộ nhớ tạm" + +#: builtin/merge.c:709 +msgid "Not handling anything other than two heads merge." +msgstr "Không cầm nắm gì ngoài hai head hòa trộn" + +#: builtin/merge.c:723 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s" + +#: builtin/merge.c:737 +#, c-format +msgid "unable to write %s" +msgstr "không thể ghi %s" + +#: builtin/merge.c:876 +#, c-format +msgid "Could not read from '%s'" +msgstr "Không thể đọc từ `%s'" + +#: builtin/merge.c:885 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" +"Vẫn chưa hòa trộn các lần chuyển giao (commit); sử dụng lệnh `git commit' để " +"hoàn tất việc hòa trộn.\n" + +#: builtin/merge.c:891 +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 '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" +"Hãy nhập vào các thông tin để giải thích tại sao sự hòa trộn này là cần " +"thiết,\n" +"đặc biệt là khi nó hòa trộn thượng nguồn đã cập nhật vào trong một nhánh " +"topic.\n" +"\n" +"Những dòng được bắt đầu bằng '#' sẽ được bỏ qua, và phần chú thích này nếu " +"rỗng\n" +"sẽ làm hủy bỏ lần chuyển giao (commit).\n" + +#: builtin/merge.c:915 +msgid "Empty commit message." +msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." + +#: builtin/merge.c:927 +#, c-format +msgid "Wonderful.\n" +msgstr "Thần kỳ.\n" + +#: builtin/merge.c:992 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" +"Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao " +"(commit) kết quả.\n" + +#: builtin/merge.c:1008 +#, c-format +msgid "'%s' is not a commit" +msgstr "%s không phải là một lần commit (chuyển giao)" + +#: builtin/merge.c:1049 +msgid "No current branch." +msgstr "không phải nhánh hiện hành" + +#: builtin/merge.c:1051 +msgid "No remote for the current branch." +msgstr "Không có máy chủ cho nhánh hiện hành." + +#: builtin/merge.c:1053 +msgid "No default upstream defined for the current branch." +msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành." + +#: builtin/merge.c:1058 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "Không nhánh mạng theo vết cho %s từ %s" + +#: builtin/merge.c:1145 builtin/merge.c:1302 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn" + +#: builtin/merge.c:1213 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" +"Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)." + +#: builtin/merge.c:1229 git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại).\n" +"Hãy chuyển giao (commit) các thay đổi trước khi bạn có thể hòa trộn." + +#: builtin/merge.c:1232 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại)." + +#: builtin/merge.c:1236 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n" +"Hãy chuyển giao (commit) các thay đổi trước khi bạn có thể hòa trộn." + +#: builtin/merge.c:1239 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)." + +#: builtin/merge.c:1248 +msgid "You cannot combine --squash with --no-ff." +msgstr "Bạn không thể kết hợp --squash với --no-ff." + +#: builtin/merge.c:1253 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "Bạn không thể kết hợp --no-ff với --ff-only." + +#: builtin/merge.c:1260 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "" +"Không chỉ ra lần chuyển giao (commit) và merge.defaultToUpstream chưa được " +"đặt." + +#: builtin/merge.c:1292 +msgid "Can merge only exactly one commit into empty head" +msgstr "" +"Không thể hòa trộn một cách đúng đắn một lần chuyển giao (commit) vào một " +"head rỗng" + +#: builtin/merge.c:1295 +msgid "Squash commit into empty head not supported yet" +msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ" + +#: builtin/merge.c:1297 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" +"Chuyển giao (commit) không-fast-forward không hợp lý ở trong một head trống " +"rỗng" + +#: builtin/merge.c:1412 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Đang cập nhật %s..%s\n" + +#: builtin/merge.c:1450 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "Đang thử hòa trộn kiểu 'trivial in-index'...\n" + +#: builtin/merge.c:1457 +#, c-format +msgid "Nope.\n" +msgstr "Không.\n" + +#: builtin/merge.c:1489 +msgid "Not possible to fast-forward, aborting." +msgstr "Thực hiện lệnh fast-forward là không thể được, đang bỏ qua." + +#: builtin/merge.c:1512 builtin/merge.c:1591 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "Đang tua lại cây thành thời xa xưa...\n" + +#: builtin/merge.c:1516 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Đang thử chiến lược hòa trộn %s...\n" + +#: builtin/merge.c:1582 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n" + +#: builtin/merge.c:1584 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n" + +#: builtin/merge.c:1593 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n" + +#: builtin/merge.c:1605 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" +"Hòa trộn tự động đã trở nên tốt; bị dừng trước khi việc chuyển giao được yêu " +"cầu\n" + +#: builtin/merge-base.c:26 +msgid "git merge-base [-a|--all] <commit> <commit>..." +msgstr "git merge-base [-a|--all] <commit> <commit>..." + +#: builtin/merge-base.c:27 +msgid "git merge-base [-a|--all] --octopus <commit>..." +msgstr "git merge-base [-a|--all] --octopus <lần commit>..." + +#: builtin/merge-base.c:28 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <lần commit>..." + +#: builtin/merge-base.c:29 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <commit> <commit>" + +#: builtin/merge-base.c:98 +msgid "output all common ancestors" +msgstr "xuất ra tất cả các ông bà, tổ tiên chung" + +#: builtin/merge-base.c:99 +msgid "find ancestors for a single n-way merge" +msgstr "tìm tổ tiên của hòa trộn n-way đơn" + +#: builtin/merge-base.c:100 +msgid "list revs not reachable from others" +msgstr "liệt kê các 'rev' mà nó không thể đọc được từ cái khác" + +#: builtin/merge-base.c:102 +msgid "is the first one ancestor of the other?" +msgstr "là cha mẹ đầu tiên của cái khác?" + +#: builtin/merge-file.c:8 +msgid "" +"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " +"file2" +msgstr "" +"git merge-file [các-tùy-chọn] [-L tên1 [-L gốc [-L tên2]]] tập-tin1 tập-tin-" +"gốc tập-tin2" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "gửi kết quả vào đầu ra tiêu chuẩn" + +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "dùng kiểu hòa dựa trên diff3" + +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "để tránh xung đột, sử dụng phiên bản của chúng ta" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "để tránh xung đột, sử dụng phiên bản của họ" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "để tránh xung đột, sử dụng phiên bản kết hợp" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "để tránh xung đột, hãy sử dụng kích thước bộ tạo này" + +#: builtin/merge-file.c:43 +msgid "do not warn about conflicts" +msgstr "không cảnh báo về các xung đột xảy ra" + +#: builtin/merge-file.c:45 +msgid "set labels for file1/orig_file/file2" +msgstr "đặt nhãn cho tập-tin-1/tập-tin-gốc/tập-tin-2" + +#: builtin/mktree.c:67 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" + +#: builtin/mktree.c:153 +msgid "input is NUL terminated" +msgstr "đầu vào được chấm dứt bởi NUL" + +#: builtin/mktree.c:154 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "cho phép thiếu đối tượng" + +#: builtin/mktree.c:155 +msgid "allow creation of more than one tree" +msgstr "cho phép tạo nhiều hơn một cây" + +#: builtin/mv.c:14 +msgid "git mv [options] <source>... <destination>" +msgstr "git mv [các-tùy-chọn] <nguồn>... <đích>" + +#: builtin/mv.c:64 +msgid "force move/rename even if target exists" +msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã tồn tại" + +#: builtin/mv.c:65 +msgid "skip move/rename errors" +msgstr "bỏ qua các lỗi liên quan đến di chuyển, đổi tên" + +#: builtin/mv.c:108 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "Đang kiểm tra việc đổi tên của `%s' thành `%s'\n" + +#: builtin/mv.c:112 +msgid "bad source" +msgstr "nguồn sai" + +#: builtin/mv.c:115 +msgid "can not move directory into itself" +msgstr "không thể di chuyển một thư mục vào trong chính nó được" + +#: builtin/mv.c:118 +msgid "cannot move directory over file" +msgstr "không di chuyển được thư mục thông qua tập tin" + +#: builtin/mv.c:128 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "Hả? %.*s trong bảng mục lục à?" + +#: builtin/mv.c:140 +msgid "source directory is empty" +msgstr "thư mục nguồn là trống rỗng" + +#: builtin/mv.c:171 +msgid "not under version control" +msgstr "không nằm dưới sự quản lý mã nguồn" + +#: builtin/mv.c:173 +msgid "destination exists" +msgstr "đích đã tồn tại sẵn rồi" + +#: builtin/mv.c:181 +#, c-format +msgid "overwriting '%s'" +msgstr "đang ghi đè lên `%s'" + +#: builtin/mv.c:184 +msgid "Cannot overwrite" +msgstr "Không thể ghi đè" + +#: builtin/mv.c:187 +msgid "multiple sources for the same target" +msgstr "Nhiều nguồn cho cùng một đích" + +#: builtin/mv.c:202 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, nguồn=%s, đích=%s" + +#: builtin/mv.c:212 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Đổi tên %s thành %s\n" + +#: builtin/mv.c:215 builtin/remote.c:731 +#, c-format +msgid "renaming '%s' failed" +msgstr "đổi tên %s gặp lỗi" + +#: builtin/name-rev.c:175 +msgid "git name-rev [options] <commit>..." +msgstr "git name-rev [các-tùy-chọn] <commit>..." + +#: builtin/name-rev.c:176 +msgid "git name-rev [options] --all" +msgstr "git name-rev [các-tùy-chọn] --all" + +#: builtin/name-rev.c:177 +msgid "git name-rev [options] --stdin" +msgstr "git name-rev [các-tùy-chọn] --stdin" + +#: builtin/name-rev.c:229 +msgid "print only names (no SHA-1)" +msgstr "chỉ hiển thị tên (không SHA-1)" + +#: builtin/name-rev.c:230 +msgid "only use tags to name the commits" +msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao" + +#: builtin/name-rev.c:232 +msgid "only use refs matching <pattern>" +msgstr "chỉ sử dụng các tham chiếu (refs) khớp với <mẫu>" + +#: builtin/name-rev.c:234 +msgid "list all commits reachable from all refs" +msgstr "" +"liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu" + +#: builtin/name-rev.c:235 +msgid "read from stdin" +msgstr "đọc từ đầu vào tiêu chuẩn" + +#: builtin/name-rev.c:236 +msgid "allow to print `undefined` names" +msgstr "cho phép hiển thị các tên `chưa định nghĩa'" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgstr "git notes [--ref <notes_ref>] [list [<đối-tượng>]]" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <notes_ref>] add [-f] [-m <lời-nhắn> | -F <tập-tin> | (-c | " +"-C) <đối-tượng>] [<đối-tượng>]" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgstr "git notes [--ref <notes_ref>] copy [-f] <từ-đối-tượng> <đến-đối-tượng>" + +#: builtin/notes.c:29 +msgid "" +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <notes_ref>] append [-m <lời-nhắn> | -F <tập-tin> | (-c | -" +"C) <đối-tượng>] [<đối-tượng>]" + +#: builtin/notes.c:30 +msgid "git notes [--ref <notes_ref>] edit [<object>]" +msgstr "git notes [--ref <notes_ref>] edit [<đối-tượng>]" + +#: builtin/notes.c:31 +msgid "git notes [--ref <notes_ref>] show [<object>]" +msgstr "git notes [--ref <notes_ref>] show [<đối-tượng>]" + +#: builtin/notes.c:32 +msgid "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +msgstr "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <chiến-lược> ] <notes_ref>" + +#: builtin/notes.c:33 +msgid "git notes merge --commit [-v | -q]" +msgstr "git notes merge --commit [-v | -q]" + +#: builtin/notes.c:34 +msgid "git notes merge --abort [-v | -q]" +msgstr "git notes merge --abort [-v | -q]" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgstr "git notes [--ref <notes_ref>] remove [<đối-tượng>...]" + +#: builtin/notes.c:36 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgstr "git notes [--ref <notes_ref>] prune [-n | -v]" + +#: builtin/notes.c:37 +msgid "git notes [--ref <notes_ref>] get-ref" +msgstr "git notes [--ref <notes_ref>] get-ref" + +#: builtin/notes.c:42 +msgid "git notes [list [<object>]]" +msgstr "git notes [list [<đối tượng>]]" + +#: builtin/notes.c:47 +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<các-tùy-chọn>] [<đối-tượng>]" + +#: builtin/notes.c:52 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "git notes copy [<các-tùy-chọn>] <từ-đối-tượng> <đến-đối-tượng>" + +#: builtin/notes.c:53 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "git notes copy --stdin [<từ-đối-tượng> <đến-đối-tượng>]..." + +#: builtin/notes.c:58 +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<các-tùy-chọn>] [<đối-tượng>]" + +#: builtin/notes.c:63 +msgid "git notes edit [<object>]" +msgstr "git notes edit [<đối tượng>]" + +#: builtin/notes.c:68 +msgid "git notes show [<object>]" +msgstr "git notes show [<đối tượng>]" + +#: builtin/notes.c:73 +msgid "git notes merge [<options>] <notes_ref>" +msgstr "git notes merge [<các-tùy-chọn>] <notes_ref>" + +#: builtin/notes.c:74 +msgid "git notes merge --commit [<options>]" +msgstr "git notes merge --commit [<các-tùy-chọn>]" + +#: builtin/notes.c:75 +msgid "git notes merge --abort [<options>]" +msgstr "git notes merge --abort [<các-tùy-chọn>]" + +#: builtin/notes.c:80 +msgid "git notes remove [<object>]" +msgstr "git notes remove [<đối tượng>]" + +#: builtin/notes.c:85 +msgid "git notes prune [<options>]" +msgstr "git notes prune [<các-tùy-chọn>]" + +#: builtin/notes.c:90 +msgid "git notes get-ref" +msgstr "git notes get-ref" + +#: builtin/notes.c:142 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "không thể khởi chạy 'show' cho đối tượng `%s'" + +#: builtin/notes.c:148 +msgid "can't fdopen 'show' output fd" +msgstr "không thể fdopen 'show' (lệnh hiển thị) mô tả tập tin (fd) kết xuất" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "gặp lỗi khi đóng đường ống cho lệnh 'show' cho đối tượng `%s'" + +#: builtin/notes.c:161 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "gặp lỗi khi hoàn thành `show' cho đối tượng `%s'" + +#: builtin/notes.c:178 builtin/tag.c:347 +#, c-format +msgid "could not create file '%s'" +msgstr "không thể tạo tập tin `%s'" + +#: builtin/notes.c:192 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" +"Xin hãy áp dụng nội dung của ghi chú sử dụng hoặc là tùy chọn -m hoặc là -F" + +#: builtin/notes.c:213 builtin/notes.c:976 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Đang gỡ bỏ ghi chú (note) cho đối tượng %s\n" + +#: builtin/notes.c:218 +msgid "unable to write note object" +msgstr "không thể ghi đối tượng ghi chú (note)" + +#: builtin/notes.c:220 +#, c-format +msgid "The note contents has been left in %s" +msgstr "Nội dung ghi chú còn lại %s" + +#: builtin/notes.c:254 builtin/tag.c:542 +#, c-format +msgid "cannot read '%s'" +msgstr "không thể đọc `%s'" + +#: builtin/notes.c:256 builtin/tag.c:545 +#, c-format +msgid "could not open or read '%s'" +msgstr "không thể mở để đọc hay ghi `%s'" + +#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 +#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 +#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 +#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Gặp lỗi khi giải quyết `%s' như là một tham chiếu (ref) hợp lệ." + +#: builtin/notes.c:278 +#, c-format +msgid "Failed to read object '%s'." +msgstr "Gặp lỗi khi đọc đối tượng `%s'." + +#: builtin/notes.c:302 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" +"Không thể chuyển giao (commit) chưa được khởi tạo hoặc không được tham chiếu " +"cây ghi chú" + +#: builtin/notes.c:343 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Giá trị notes.rewriteMode sai: `%s'" + +#: builtin/notes.c:353 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài của refs/notes/)" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:380 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Giá trị %s sai: `%s'" + +#: builtin/notes.c:444 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Dòng nhập vào dị hình: `%s'." + +#: builtin/notes.c:459 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Gặp lỗi khi sao chép ghi chú (note) từ `%s' tới `%s'" + +#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630 +#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 +#: builtin/notes.c:1036 +msgid "too many parameters" +msgstr "quá nhiều đối số" + +#: builtin/notes.c:516 builtin/notes.c:775 +#, c-format +msgid "No note found for object %s." +msgstr "không tìm thấy ghi chú cho đối tượng %s." + +#: builtin/notes.c:538 builtin/notes.c:695 +msgid "note contents as a string" +msgstr "nội dung ghi chú (note) nằm trong một chuỗi" + +#: builtin/notes.c:541 builtin/notes.c:698 +msgid "note contents in a file" +msgstr "nội dung ghi chú (note) nằm trong một tập tin" + +#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 +#: builtin/notes.c:703 builtin/tag.c:476 +msgid "object" +msgstr "đối tượng" + +#: builtin/notes.c:544 builtin/notes.c:701 +msgid "reuse and edit specified note object" +msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra" + +#: builtin/notes.c:547 builtin/notes.c:704 +msgid "reuse specified note object" +msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra" + +#: builtin/notes.c:549 builtin/notes.c:617 +msgid "replace existing notes" +msgstr "thay thế ghi chú trước" + +#: builtin/notes.c:583 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Không thể thêm các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối tượng " +"%s. Sử dụng tùy chọn '-f' để ghi đè lên các ghi chú cũ" + +#: builtin/notes.c:588 builtin/notes.c:665 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "Đang ghi đè lên ghi chú cũ cho đối tượng %s\n" + +#: builtin/notes.c:618 +msgid "read objects from stdin" +msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn" + +#: builtin/notes.c:620 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)" + +#: builtin/notes.c:638 +msgid "too few parameters" +msgstr "quá ít đối số" + +#: builtin/notes.c:659 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Không thể sao chép các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối " +"tượng %s. Sử dụng tùy chọn '-f' để ghi đè lên các ghi chú cũ" + +#: builtin/notes.c:671 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "Thiếu ghi chú trên đối tượng nguốn %s. Không thể sao chép." + +#: builtin/notes.c:720 +#, 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 "" +"Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con `edit'.\n" +"Xin hãy sử dụng lệnh sau để thay thế: `git notes add -f -m/-F/-c/-C'.\n" + +#: builtin/notes.c:867 +msgid "General options" +msgstr "Tùy chọn chung" + +#: builtin/notes.c:869 +msgid "Merge options" +msgstr "Tùy chọn về hòa trộn" + +#: builtin/notes.c:871 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" +"phân giải các xung đột `notes' sử dụng chiến lược đã đưa ra (manual/ours/" +"theirs/union/cat_sort_uniq)" + +#: builtin/notes.c:873 +msgid "Committing unmerged notes" +msgstr "Chuyển giao các note chưa được hòa trộn" + +#: builtin/notes.c:875 +msgid "finalize notes merge by committing unmerged notes" +msgstr "" +"các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển " +"giao" + +#: builtin/notes.c:877 +msgid "Aborting notes merge resolution" +msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn" + +#: builtin/notes.c:879 +msgid "abort notes merge" +msgstr "bỏ qua hòa trộn các ghi chú (note)" + +#: builtin/notes.c:974 +#, c-format +msgid "Object %s has no note\n" +msgstr "Đối tượng %s không có ghi chú (note)\n" + +#: builtin/notes.c:986 +msgid "attempt to remove non-existent note is not an error" +msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi" + +#: builtin/notes.c:989 +msgid "read object names from the standard input" +msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn" + +#: builtin/notes.c:1070 +msgid "notes_ref" +msgstr "notes_ref" + +#: builtin/notes.c:1071 +msgid "use notes from <notes_ref>" +msgstr "dùng `notes' từ <notes_ref>" + +#: builtin/notes.c:1106 builtin/remote.c:1598 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Không hiểu câu lệnh con: %s" + +#: builtin/pack-objects.c:23 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "" +"git pack-objects --stdout [các-tùy-chọn...] [< danh-sách-ref | < danh-sách-" +"đối-tượng]" + +#: builtin/pack-objects.c:24 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgstr "" +"git pack-objects [các-tùy-chọn...] base-name [< danh-sách-ref | < danh-sách-" +"đối-tượng]" + +#: builtin/pack-objects.c:183 builtin/pack-objects.c:186 +#, c-format +msgid "deflate error (%d)" +msgstr "lỗi giải nén (%d)" + +#: builtin/pack-objects.c:2398 +#, c-format +msgid "unsupported index version %s" +msgstr "phiên bản mục lục không được hỗ trợ %s" + +#: builtin/pack-objects.c:2402 +#, c-format +msgid "bad index version '%s'" +msgstr "phiên bản mục lục sai `%s'" + +#: builtin/pack-objects.c:2425 +#, c-format +msgid "option %s does not accept negative form" +msgstr "tùy chọn %s không chấp nhận dạng thức âm" + +#: builtin/pack-objects.c:2429 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "không thể phân tích giá trị `%s' cho tùy chọn %s" + +#: builtin/pack-objects.c:2448 +msgid "do not show progress meter" +msgstr "không hiển thị bộ đo tiến trình" + +#: builtin/pack-objects.c:2450 +msgid "show progress meter" +msgstr "hiển thị bộ đo tiến trình" + +#: builtin/pack-objects.c:2452 +msgid "show progress meter during object writing phase" +msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng" + +#: builtin/pack-objects.c:2455 +msgid "similar to --all-progress when progress meter is shown" +msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện" + +#: builtin/pack-objects.c:2456 +msgid "version[,offset]" +msgstr "phiên bản[,offset]" + +#: builtin/pack-objects.c:2457 +msgid "write the pack index file in the specified idx format version" +msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho" + +#: builtin/pack-objects.c:2460 +msgid "maximum size of each output pack file" +msgstr "kcíh thước tối đa cho tập tin gói được tạo" + +#: builtin/pack-objects.c:2462 +msgid "ignore borrowed objects from alternate object store" +msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế" + +#: builtin/pack-objects.c:2464 +msgid "ignore packed objects" +msgstr "bỏ qua các đối tượng đóng gói" + +#: builtin/pack-objects.c:2466 +msgid "limit pack window by objects" +msgstr "giới hạn cửa sổ đóng gói theo đối tượng" + +#: builtin/pack-objects.c:2468 +msgid "limit pack window by memory in addition to object limit" +msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng" + +#: builtin/pack-objects.c:2470 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "độ dài tối đa của chuỗi móc xích `delta' được phép trong gói kết quả" + +#: builtin/pack-objects.c:2472 +msgid "reuse existing deltas" +msgstr "dùng lại các delta sẵn có" + +#: builtin/pack-objects.c:2474 +msgid "reuse existing objects" +msgstr "dùng lại các đối tượng sẵn có" + +#: builtin/pack-objects.c:2476 +msgid "use OFS_DELTA objects" +msgstr "dùng các đối tượng OFS_DELTA" + +#: builtin/pack-objects.c:2478 +msgid "use threads when searching for best delta matches" +msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất" + +#: builtin/pack-objects.c:2480 +msgid "do not create an empty pack output" +msgstr "không thể tạo kết xuất gói (pack) trống rỗng" + +#: builtin/pack-objects.c:2482 +msgid "read revision arguments from standard input" +msgstr " đọc tham số `revision' từ thiết bị nhập chuẩn" + +#: builtin/pack-objects.c:2484 +msgid "limit the objects to those that are not yet packed" +msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói" + +#: builtin/pack-objects.c:2487 +msgid "include objects reachable from any reference" +msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào" + +#: builtin/pack-objects.c:2490 +msgid "include objects referred by reflog entries" +msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog" + +#: builtin/pack-objects.c:2493 +msgid "output pack to stdout" +msgstr "xuất gói ra đầu ra tiêu chuẩn" + +#: builtin/pack-objects.c:2495 +msgid "include tag objects that refer to objects to be packed" +msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói" + +#: builtin/pack-objects.c:2497 +msgid "keep unreachable objects" +msgstr "giữ lại các đối tượng không thể đọc được" + +#: builtin/pack-objects.c:2498 parse-options.h:141 +msgid "time" +msgstr "thời-gian" + +#: builtin/pack-objects.c:2499 +msgid "unpack unreachable objects newer than <time>" +msgstr "" +"xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>" + +#: builtin/pack-objects.c:2502 +msgid "create thin packs" +msgstr "tạo gói nhẹ" + +#: builtin/pack-objects.c:2504 +msgid "ignore packs that have companion .keep file" +msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm" + +#: builtin/pack-objects.c:2506 +msgid "pack compression level" +msgstr "mức nén gói" + +#: builtin/pack-objects.c:2508 +msgid "do not hide commits by grafts" +msgstr "không ẩn các lần chuyển giao bởi `grafts'" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [options]" +msgstr "git pack-refs [các-tùy-chọn]" + +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "đóng gói mọi thứ" + +#: builtin/pack-refs.c:15 +msgid "prune loose refs (default)" +msgstr "prune (cắt cụt) những tham chiếu (refs) bị mất (mặc định)" + +#: builtin/prune-packed.c:7 +msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" + +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--expire <thời-gian>] [--] [<head>...]" + +#: builtin/prune.c:132 +msgid "do not remove, show only" +msgstr "không gỡ bỏ, chỉ hiển thị" + +#: builtin/prune.c:133 +msgid "report pruned objects" +msgstr "báo cáo các đối tượng đã prune" + +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>" + +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git push [<các-tùy-chọn>] [<kho-chứa> [<refspec>...]]" + +#: builtin/push.c:45 +msgid "tag shorthand without <tag>" +msgstr "dùng tốc ký tag không có <thẻ>" + +#: builtin/push.c:64 +msgid "--delete only accepts plain target ref names" +msgstr "--delete chỉ chấp nhận các tên tham chiếu (ref) dạng thường" + +#: builtin/push.c:99 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "" +"\n" +"Để chọn mỗi tùy chọn một cách cố định, xem push.default trong `git help " +"config'." + +#: 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 "" +"Nhánh thượng nguồn (upstream) của nhánh hiện tại của bạn không khớp\n" +"với tên của nhánh hiện tại của bạn. Để push đến nhánh thượng nguồn\n" +"trên máy chủ, sử dụng\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"Để push tới nhánh cùng tên trên máy chủ, sử dụng\n" +"\n" +" git push %s %s\n" +"%s" + +#: 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 "" +"Bạn hiện nay không ở một nhánh.\n" +"Để push lịch sử hướng tới trạng thái hiện hành (HEAD đã bị tách rời)\n" +"ngay bây giờ, sử dụng\n" +"\n" +" git push %s HEAD:<tên-của-nhánh-máy-chủ>\n" + +#: 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 "" +"Nhánh hiện tại %s không có nhánh thượng nguồn (upstream) nào.\n" +"Để push (đẩy lên) nhánh hiện tại và đặt máy chủ như là thượng nguồn " +"(upstream), sử dụng\n" +"\n" +" git push --set-upstream %s %s\n" + +#: builtin/push.c:136 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "Nhánh hiện tại %s có đa nhánh thượng nguồn (upstream), từ chối push." + +#: 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 "" +"Bạn đang push (đẩy lên) máy chủ `%s', mà nó không phải là thượng nguồn " +"(upstream) của\n" +"nhánh hiện tại `%s' của bạn, mà không báo cho tôi biết là cái gì được push\n" +"để cập nhật nhánh máy chủ nào." + +#: 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 "" +"biến push.default chưa được đặt; giá trị ngầm định của nó\n" +"đã được thay đổi trong Git 2.0 từ 'matching' thành 'simple'.\n" +"Để không hiển thị nhắc nhở này và duy trì cách xử lý sau\n" +"những thay đổi mặc định này, hãy chạy lệnh:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"Để không hiển thị nhắc nhở này và áp dụng cách xử lý mới, hãy chạy lệnh:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"Xem `git help config' và tìm đến `push.default' để có thêm thông tin.\n" +"(chế độ 'simple' được bắt đầu sử dụng từ Git 1.7.11. Sử dụng chế độ tương " +"tự\n" +"`current' thay vì `simple' nếu bạn thỉnh thoảng phải sử dụng bản Git cũ)" + +#: builtin/push.c:199 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Bạn đã không chỉ ra một refspecs nào để push, và push.default là \"không là " +"gì cả\"." + +#: 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 "" +"Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bộ\n" +"phận tương ứng của máy chủ. Hòa trộn với các thay đổi từ máy chủ (v.d. `git " +"pull')\n" +"trước khi lại push lần nữa.\n" +"Xem trong phần 'Note about fast-forwards' từ lệnh `git push --help' để có " +"thông tin chi tiết." + +#: 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 "" +"Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bộ\n" +"phận tương ứng của máy chủ. Nếu bạn không có ý định push nhánh đó, bạn có lẽ " +"muốn\n" +"chỉ định các nhánh để push hoặt là đặt nội dung cho biến cấu hình 'push." +"default'\n" +"thành 'simple', 'current' hoặc 'upstream' để chỉ push nhánh hiện hành mà " +"thôi." + +#: 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 "" +"Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bộ\n" +"phận tương ứng của máy chủ. Checkou nhánh này và hòa trộn với các thay đổi " +"từ máy chủ\n" +"(v.d. `git pull') trước khi lại push lần nữa.\n" +"Xem trong phần 'Note about fast-forwards' từ lệnh `git push --help' để có " +"thông tin chi tiết." + +#: builtin/push.c:258 +#, c-format +msgid "Pushing to %s\n" +msgstr "Đang push (đẩy) lên %s\n" + +#: builtin/push.c:262 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "gặp lỗi khi push (đẩy lên) một số tham chiếu (ref) đến `%s'" + +#: builtin/push.c:294 +#, c-format +msgid "bad repository '%s'" +msgstr "repository (kho) sai `%s'" + +#: builtin/push.c:295 +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 "" +"Chưa cấu hình đích để push (đẩy lên).\n" +"Hoặc là chỉ ra URL từ dòng lệnh hoặc là cấu hình một kho máy chủ sử dụng\n" +"\n" +" git remote add <tên> <url>\n" +"\n" +"và sau đó push sử dụng tên máy chủ\n" +"\n" +" git push <tên>\n" + +#: builtin/push.c:310 +msgid "--all and --tags are incompatible" +msgstr "--all và --tags xung khắc nhau" + +#: builtin/push.c:311 +msgid "--all can't be combined with refspecs" +msgstr "--all không thể được tổ hợp cùng với refspecs" + +#: builtin/push.c:316 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror và --tags xung khắc nhau" + +#: builtin/push.c:317 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror không thể được tổ hợp cùng với refspecs" + +#: builtin/push.c:322 +msgid "--all and --mirror are incompatible" +msgstr "--all và --mirror xung khắc nhau" + +#: builtin/push.c:382 +msgid "repository" +msgstr "kho" + +#: builtin/push.c:383 +msgid "push all refs" +msgstr "push tất cả refs" + +#: builtin/push.c:384 +msgid "mirror all refs" +msgstr "mirror tất cả refs" + +#: builtin/push.c:386 +msgid "delete refs" +msgstr "xóa refs" + +#: builtin/push.c:387 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "" +"các thẻ push (không thể sử dụng cùng với các tùy chọn --all hay --mirror)" + +#: builtin/push.c:390 +msgid "force updates" +msgstr "ép buộc cập nhật" + +#: builtin/push.c:391 +msgid "check" +msgstr "kiểm tra" + +#: builtin/push.c:392 +msgid "control recursive pushing of submodules" +msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con" + +#: builtin/push.c:394 +msgid "use thin pack" +msgstr "tạo gói nhẹ" + +#: builtin/push.c:395 builtin/push.c:396 +msgid "receive pack program" +msgstr "nhận về chương trình pack" + +#: builtin/push.c:397 +msgid "set upstream for git pull/status" +msgstr "đặt thượng nguồn (upstream) cho git pull/status" + +#: builtin/push.c:400 +msgid "prune locally removed refs" +msgstr "prune (cắt cụt) những tham chiếu (refs) bị gỡ bỏ" + +#: builtin/push.c:410 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags" + +#: builtin/push.c:412 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu (refs) nào" + +#: 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 "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<tiền-" +"tố>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] " +"[--index-output=<tập-tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-" +"ish3>]])" + +#: builtin/read-tree.c:108 +msgid "write resulting index to <file>" +msgstr "ghi mục lục kết quả vào <tập-tin>" + +#: builtin/read-tree.c:111 +msgid "only empty the index" +msgstr "chỉ với bảng mục lục trống rỗng" + +#: builtin/read-tree.c:113 +msgid "Merging" +msgstr "Hòa trộn" + +#: builtin/read-tree.c:115 +msgid "perform a merge in addition to a read" +msgstr "thực hiện một hòa trộn thêm vào việc đọc" + +#: builtin/read-tree.c:117 +msgid "3-way merge if no file level merging required" +msgstr "" +"hòa trộn kiểu `3-way' nếu không có tập tin mức hòa trộn nào được yêu cầu " + +#: builtin/read-tree.c:119 +msgid "3-way merge in presence of adds and removes" +msgstr "hòa trộn 3-way trong sự hiện diện của `adds' và `removes'" + +#: builtin/read-tree.c:121 +msgid "same as -m, but discard unmerged entries" +msgstr "giống với -m, nhưng bỏ qua các mục chưa được hòa trộn" + +#: builtin/read-tree.c:122 +msgid "<subdirectory>/" +msgstr "<thư-mục-con>/" + +#: builtin/read-tree.c:123 +msgid "read the tree into the index under <subdirectory>/" +msgstr "đọc cây vào trong bảng mục lục dưới <thư_mục_con>/" + +#: builtin/read-tree.c:126 +msgid "update working tree with merge result" +msgstr "cập nhật cây làm việc với kết quả hòa trộn" + +#: builtin/read-tree.c:128 +msgid "gitignore" +msgstr "gitignore" + +#: builtin/read-tree.c:129 +msgid "allow explicitly ignored files to be overwritten" +msgstr "cho phép các tập tin rõ ràng bị lờ đi được ghi đè" + +#: builtin/read-tree.c:132 +msgid "don't check the working tree after merging" +msgstr "không kiểm tra cây làm việc sau hòa trộn" + +#: builtin/read-tree.c:133 +msgid "don't update the index or the work tree" +msgstr "không cập nhật bảng mục lục hay cây làm việc" + +#: builtin/read-tree.c:135 +msgid "skip applying sparse checkout filter" +msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt" + +#: builtin/read-tree.c:137 +msgid "debug unpack-trees" +msgstr "gỡ lỗi unpack-trees" + +#: builtin/remote.c:11 +msgid "git remote [-v | --verbose]" +msgstr "git remote [-v | --verbose]" + +#: builtin/remote.c:12 +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <name> <url>" +msgstr "" +"git remote add [-t <nhánh>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <tên> <url>" + +#: builtin/remote.c:13 builtin/remote.c:32 +msgid "git remote rename <old> <new>" +msgstr "git remote rename <tên-cũ> <tên-mới>" + +#: builtin/remote.c:14 builtin/remote.c:37 +msgid "git remote remove <name>" +msgstr "git remote remove <tên>" + +#: builtin/remote.c:15 +msgid "git remote set-head <name> (-a | -d | <branch>)" +msgstr "git remote set-head <tên> (-a | -d | <nhánh>)" + +#: builtin/remote.c:16 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "git remote [-v | --verbose] show [-n] <tên>" + +#: builtin/remote.c:17 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "git remote prune [-n | --dry-run] <tên>" + +#: builtin/remote.c:18 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<nhóm> | <máy-chủ>)...]" + +#: builtin/remote.c:19 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "git remote set-branches [--add] <tên> <nhánh>..." + +#: builtin/remote.c:20 builtin/remote.c:68 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "git remote set-url [--push] <tên> <url-mới> [<url-cũ>]" + +#: builtin/remote.c:21 builtin/remote.c:69 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <tên> <url-mới>" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <tên> <url>" + +#: builtin/remote.c:27 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<các-tùy-chọn>] <tên> <url>" + +#: builtin/remote.c:42 +msgid "git remote set-head <name> (-a | -d | <branch>])" +msgstr "git remote set-head <tên> (-a | -d | <nhánh>])" + +#: builtin/remote.c:47 +msgid "git remote set-branches <name> <branch>..." +msgstr "git remote set-branches <tên> <nhánh>..." + +#: builtin/remote.c:48 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "git remote set-branches --add <tên> <nhánh>..." + +#: builtin/remote.c:53 +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<các-tùy-chọn>] <tên>" + +#: builtin/remote.c:58 +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<các-tùy-chọn>] <tên>" + +#: builtin/remote.c:63 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<các-tùy-chọn>] [<nhóm> | <máy-chủ>]..." + +#: builtin/remote.c:98 +#, c-format +msgid "Updating %s" +msgstr "Đang cập nhật %s" + +#: builtin/remote.c:130 +msgid "" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" +msgstr "" +"--mirror nguy hiểm và không dùng nữa; xin hãy\n" +"\t sử dụng tùy chọn --mirror=fetch hoặc --mirror=push để thay thế" + +#: builtin/remote.c:147 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "không hiểu tham số máy bản sao (mirror): %s" + +#: builtin/remote.c:163 +msgid "fetch the remote branches" +msgstr "lấy về (fetch) các nhánh từ máy chủ" + +#: builtin/remote.c:165 +msgid "import all tags and associated objects when fetching" +msgstr "" +"nhập vào tất cả các đối tượng thẻ và thành phần liên quan khi lấy về (fetch)" + +#: builtin/remote.c:168 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "hoặc không lấy về (fetch) bất kỳ thẻ nào (--no-tags)" + +#: builtin/remote.c:170 +msgid "branch(es) to track" +msgstr "các nhánh theo vết" + +#: builtin/remote.c:171 +msgid "master branch" +msgstr "nhánh master" + +#: builtin/remote.c:172 +msgid "push|fetch" +msgstr "push|fetch" + +#: builtin/remote.c:173 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "đặt máy chủ (remote) như là một máy bản sao để push hay fetch từ đó" + +#: builtin/remote.c:185 +msgid "specifying a master branch makes no sense with --mirror" +msgstr "đang chỉ định một nhánh master không hợp lý với tùy chọn --mirror" + +#: builtin/remote.c:187 +msgid "specifying branches to track makes sense only with fetch mirrors" +msgstr "chỉ định những nhánh để theo vết chỉ hợp lý với các 'fetch mirror'" + +#: builtin/remote.c:195 builtin/remote.c:646 +#, c-format +msgid "remote %s already exists." +msgstr "máy chủ %s đã tồn tại rồi." + +#: builtin/remote.c:199 builtin/remote.c:650 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "`%s' không phải tên máy chủ hợp lệ" + +#: builtin/remote.c:243 +#, c-format +msgid "Could not setup master '%s'" +msgstr "Không thể cài đặt nhánh master `%s'" + +#: builtin/remote.c:299 +#, c-format +msgid "more than one %s" +msgstr "nhiều hơn một %s" + +#: builtin/remote.c:339 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "Không thể lấy ánh xạ (map) fetch cho refspec %s" + +#: builtin/remote.c:440 builtin/remote.c:448 +msgid "(matching)" +msgstr "(mẫu)" + +#: builtin/remote.c:452 +msgid "(delete)" +msgstr "(xoá)" + +#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "Không thể nối thêm `%s' vào `%s'" + +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#, c-format +msgid "No such remote: %s" +msgstr "Không có máy chủ nào như thế: %s" + +#: builtin/remote.c:656 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "Không thể đổi tên chương (section) cấu hình từ `%s' thành `%s'" + +#: builtin/remote.c:662 builtin/remote.c:799 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Không thể gỡ bỏ chương (section) cấu hình `%s'" + +#: 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 "" +"Không cập nhật 'non-default fetch respec'\n" +"\t%s\n" +"\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết." + +#: builtin/remote.c:683 +#, c-format +msgid "Could not append '%s'" +msgstr "Không thể nối thêm `%s'" + +#: builtin/remote.c:694 +#, c-format +msgid "Could not set '%s'" +msgstr "Không thể đặt `%s'" + +#: builtin/remote.c:716 +#, c-format +msgid "deleting '%s' failed" +msgstr "việc xoá %s gặp lỗi" + +#: builtin/remote.c:750 +#, c-format +msgid "creating '%s' failed" +msgstr "tạo %s gặp lỗi" + +#: builtin/remote.c:764 +#, c-format +msgid "Could not remove branch %s" +msgstr "Không thể gỡ bỏ nhánh %s" + +#: 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] "" +"Chú ý: Một nhánh nằm ngoài hệ thống refs/remotes/ đã không được gỡ bỏ đi;\n" +"để xóa đi, sử dụng:" +msgstr[1] "" +"Chú ý: Một số nhánh nằm ngoài hệ thống refs/remotes/ đã không được gỡ bỏ " +"đi;\n" +"để xóa đi, sử dụng:" + +#: builtin/remote.c:943 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " mới (lần lấy về tiếp theo sẽ lưu trong remotes/%s)" + +#: builtin/remote.c:946 +msgid " tracked" +msgstr " được theo vết" + +#: builtin/remote.c:948 +msgid " stale (use 'git remote prune' to remove)" +msgstr " cũ (dùng `git remote prune' để gỡ bỏ)" + +#: builtin/remote.c:950 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:991 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "branch.%s.merge không hợp lệ; không thể rebase về phía > 1 nhánh" + +#: builtin/remote.c:998 +#, c-format +msgid "rebases onto remote %s" +msgstr "thực hiện rebase trên máy chủ %s" + +#: builtin/remote.c:1001 +#, c-format +msgid " merges with remote %s" +msgstr " hòa trộn với máy chủ %s" + +#: builtin/remote.c:1002 +msgid " and with remote" +msgstr " và với máy chủ" + +#: builtin/remote.c:1004 +#, c-format +msgid "merges with remote %s" +msgstr "hòa trộn với máy chủ %s" + +#: builtin/remote.c:1005 +msgid " and with remote" +msgstr " và với máy chủ" + +#: builtin/remote.c:1051 +msgid "create" +msgstr "tạo" + +#: builtin/remote.c:1054 +msgid "delete" +msgstr "xoá" + +#: builtin/remote.c:1058 +msgid "up to date" +msgstr "đã cập nhật" + +#: builtin/remote.c:1061 +msgid "fast-forwardable" +msgstr "có-thể-fast-forward" + +#: builtin/remote.c:1064 +msgid "local out of date" +msgstr "dữ liệu nội bộ đã cũ" + +#: builtin/remote.c:1071 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s ép buộc thành %-*s (%s)" + +#: builtin/remote.c:1074 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s push tới %-*s (%s)" + +#: builtin/remote.c:1078 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s ép buộc thành %s" + +#: builtin/remote.c:1081 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s push tới %s" + +#: builtin/remote.c:1091 +msgid "do not query remotes" +msgstr "không truy vấn các máy chủ" + +#: builtin/remote.c:1118 +#, c-format +msgid "* remote %s" +msgstr "* máy chủ %s" + +#: builtin/remote.c:1119 +#, c-format +msgid " Fetch URL: %s" +msgstr " URL để lấy về (fetch): %s" + +#: builtin/remote.c:1120 builtin/remote.c:1285 +msgid "(no URL)" +msgstr "(không có URL)" + +#: builtin/remote.c:1129 builtin/remote.c:1131 +#, c-format +msgid " Push URL: %s" +msgstr " URL để đẩy lên (push): %s" + +#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#, c-format +msgid " HEAD branch: %s" +msgstr " Nhánh HEAD: %s" + +#: builtin/remote.c:1139 +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr " nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n" + +#: builtin/remote.c:1151 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " Nhánh trên máy chủ:%s" +msgstr[1] " Những nhánh trên máy chủ:%s" + +#: builtin/remote.c:1154 builtin/remote.c:1181 +msgid " (status not queried)" +msgstr " (trạng thái không được yêu cầu)" + +#: builtin/remote.c:1163 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] " Nhánh nội bộ đã được cấu hình cho lệnh `git pull':" +msgstr[1] " Những nhánh nội bộ đã được cấu hình cho lệnh `git pull':" + +#: builtin/remote.c:1171 +msgid " Local refs will be mirrored by 'git push'" +msgstr " refs nội bộ sẽ được phản chiếu bởi lệnh `git push'" + +#: 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] " Tham chiếu nội bộ được cấu hình cho lệnh `git push'%s:" +msgstr[1] " Những tham chiếu nội bộ được cấu hình cho lệnh `git push'%s:" + +#: builtin/remote.c:1199 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ" + +#: builtin/remote.c:1201 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "xóa refs/remotes/<tên>/HEAD" + +#: builtin/remote.c:1216 +msgid "Cannot determine remote HEAD" +msgstr "Không thể xác định được HEAD máy chủ" + +#: builtin/remote.c:1218 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "Nhiều nhánh HEAD máy chủ. Hãy chọn rõ ràng một:" + +#: builtin/remote.c:1228 +#, c-format +msgid "Could not delete %s" +msgstr "Không thể xóa bỏ %s" + +#: builtin/remote.c:1236 +#, c-format +msgid "Not a valid ref: %s" +msgstr "Không phải là tham chiếu (ref) hợp lệ: %s" + +#: builtin/remote.c:1238 +#, c-format +msgid "Could not setup %s" +msgstr "Không thể cài đặt %s" + +#: builtin/remote.c:1274 +#, c-format +msgid " %s will become dangling!" +msgstr " %s sẽ trở thành không đầu (không được quản lý)!" + +#: builtin/remote.c:1275 +#, c-format +msgid " %s has become dangling!" +msgstr " %s đã trở thành không đầu (không được quản lý)!" + +#: builtin/remote.c:1281 +#, c-format +msgid "Pruning %s" +msgstr "Đang xén bớt %s" + +#: builtin/remote.c:1282 +#, c-format +msgid "URL: %s" +msgstr "URL: %s" + +#: builtin/remote.c:1295 +#, c-format +msgid " * [would prune] %s" +msgstr " * [nên xén bớt] %s" + +#: builtin/remote.c:1298 +#, c-format +msgid " * [pruned] %s" +msgstr " *[đã xén bớ] %s" + +#: builtin/remote.c:1321 +msgid "prune remotes after fetching" +msgstr "cắt máy chủ sau khi lấy về" + +#: builtin/remote.c:1387 builtin/remote.c:1461 +#, c-format +msgid "No such remote '%s'" +msgstr "Không có máy chủ nào có tên `%s'" + +#: builtin/remote.c:1407 +msgid "add branch" +msgstr "thêm nhánh" + +#: builtin/remote.c:1414 +msgid "no remote specified" +msgstr "chưa chỉ ra máy chủ nào" + +#: builtin/remote.c:1436 +msgid "manipulate push URLs" +msgstr "đẩy các `URL' bằng tay" + +#: builtin/remote.c:1438 +msgid "add URL" +msgstr "thêm URL" + +#: builtin/remote.c:1440 +msgid "delete URLs" +msgstr "xóa URLs" + +#: builtin/remote.c:1447 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete không hợp lý" + +#: builtin/remote.c:1487 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "Kiểu mẫu URL cũ không hợp lệ: %s" + +#: builtin/remote.c:1495 +#, c-format +msgid "No such URL found: %s" +msgstr "Không tìm thấy URL như vậy: %s" + +#: builtin/remote.c:1497 +msgid "Will not delete all non-push URLs" +msgstr "Sẽ không xóa những địa chỉ URL không-push" + +#: builtin/remote.c:1569 +msgid "be verbose; must be placed before a subcommand" +msgstr "chi tiết; phải được đặt trước một lệnh-con" + +#: builtin/replace.c:17 +msgid "git replace [-f] <object> <replacement>" +msgstr "git replace [-f] <đối-tượng> <thay-thế>" + +#: builtin/replace.c:18 +msgid "git replace -d <object>..." +msgstr "git replace -d <đối tượng>..." + +#: builtin/replace.c:19 +msgid "git replace -l [<pattern>]" +msgstr "git replace -l [<mẫu>]" + +#: builtin/replace.c:118 +msgid "list replace refs" +msgstr "liệt kê các refs thay thế" + +#: builtin/replace.c:119 +msgid "delete replace refs" +msgstr "xóa tham chiếu (refs) thay thế" + +#: builtin/replace.c:120 +msgid "replace the ref if it exists" +msgstr "thay thế tham chiếu (ref) nếu nó đã sẵn có" + +#: builtin/rerere.c:11 +msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" + +#: builtin/rerere.c:56 +msgid "register clean resolutions in index" +msgstr "sổ ghi dọn sạch các phân giải trong bản mục lục" + +#: builtin/reset.c:25 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" + +#: builtin/reset.c:26 +msgid "git reset [-q] <commit> [--] <paths>..." +msgstr "git reset [-q] <commit> [--] <các-đường-dẫn>..." + +#: builtin/reset.c:27 +msgid "git reset --patch [<commit>] [--] [<paths>...]" +msgstr "git reset --patch [<commit>] [--] [<các-đường-dẫn>...]" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "pha trộn" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "mềm" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "cứng" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "hòa trộn" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "giữ lại" + +#: builtin/reset.c:77 +msgid "You do not have a valid HEAD." +msgstr "Bạn không có HEAD nào hợp lệ." + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "Gặp lỗi khi tìm cây của HEAD." + +#: builtin/reset.c:85 +#, c-format +msgid "Failed to find tree of %s." +msgstr "Gặp lỗi khi tìm cây của %s." + +#: builtin/reset.c:96 +msgid "Could not write new index file." +msgstr "Không thể ghi tập tin lưu bảng mục lục mới." + +#: builtin/reset.c:106 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD hiện giờ tại %s" + +#: builtin/reset.c:130 +msgid "Could not read index" +msgstr "Không thể đọc bảng mục lục" + +#: builtin/reset.c:133 +msgid "Unstaged changes after reset:" +msgstr "Những thay đổi bị bỏ trạng thái (stage) sau khi reset:" + +#: builtin/reset.c:223 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn." + +#: builtin/reset.c:238 +msgid "be quiet, only report errors" +msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi" + +#: builtin/reset.c:240 +msgid "reset HEAD and index" +msgstr "đặt lại (reset) HEAD và bảng mục lục" + +#: builtin/reset.c:241 +msgid "reset only HEAD" +msgstr "chỉ đặt lại (reset) HEAD" + +#: builtin/reset.c:243 builtin/reset.c:245 +msgid "reset HEAD, index and working tree" +msgstr "đặt lại HEAD, bảng mục lục và cây làm việc" + +#: builtin/reset.c:247 +msgid "reset HEAD but keep local changes" +msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ" + +#: builtin/reset.c:303 +#, c-format +msgid "Could not parse object '%s'." +msgstr "không thể phân tích đối tượng `%s'." + +#: builtin/reset.c:308 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch xung khắc với --{hard,mixed,soft}" + +#: builtin/reset.c:317 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "" +"--mixed với các đường dẫn không còn dùng nữa; hãy thay thế bằng lệnh `git " +"reset -- <đường_dẫn>'." + +#: builtin/reset.c:319 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "Không thể thực hiện lệnh %s reset với các đường dẫn." + +#: builtin/reset.c:331 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "%s reset không được phép trên kho bare (trên máy chủ)" + +#: builtin/reset.c:347 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét lại `%s'." + +#: builtin/rev-parse.c:339 +msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgstr "git rev-parse --parseopt [các-tùy-chọn] -- [<th.số>...]" + +#: builtin/rev-parse.c:344 +msgid "keep the `--` passed as an arg" +msgstr "giữ '--' chuyển qua làm tham số" + +#: builtin/rev-parse.c:346 +msgid "stop parsing after the first non-option argument" +msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn" + +#: 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 "" +"git rev-parse --parseopt [các-tùy-chọn] -- [<đ.số>...]\n" +" or: git rev-parse --sq-quote [<đ.số>...]\n" +" or: git rev-parse [các-tùy-chọn] [<đ.số>...]\n" +"\n" +"Chạy lệnh \"git rev-parse --parseopt -h\" để có thêm thông tin về cách dùng." + +#: builtin/revert.c:22 +msgid "git revert [options] <commit-ish>" +msgstr "git revert [các-tùy-chọn] <commit-ish>" + +#: builtin/revert.c:23 +msgid "git revert <subcommand>" +msgstr "git revert <lệnh-con>" + +#: builtin/revert.c:28 +msgid "git cherry-pick [options] <commit-ish>" +msgstr "git cherry-pick [các-tùy-chọn] <commit-ish>" + +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "git cherry-pick <lệnh-con>" + +#: builtin/revert.c:70 builtin/revert.c:92 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s không thể được sử dụng với %s" + +#: builtin/revert.c:103 +msgid "end revert or cherry-pick sequence" +msgstr "kết thúc cherry-pick hay revert liên tiếp nhau" + +#: builtin/revert.c:104 +msgid "resume revert or cherry-pick sequence" +msgstr "phục hồi lại cherry-pick hay revert liên tiếp nhau" + +#: builtin/revert.c:105 +msgid "cancel revert or cherry-pick sequence" +msgstr "không cherry-pick hay revert liên tiếp nhau" + +#: builtin/revert.c:106 +msgid "don't automatically commit" +msgstr "không commit một cách tự động." + +#: builtin/revert.c:107 +msgid "edit the commit message" +msgstr "sửa lại chú thích cho commit" + +#: builtin/revert.c:110 +msgid "parent number" +msgstr "số của cha mẹ" + +#: builtin/revert.c:112 +msgid "merge strategy" +msgstr "chiến lược hòa trộn" + +#: builtin/revert.c:113 +msgid "option" +msgstr "tùy chọn" + +#: builtin/revert.c:114 +msgid "option for merge strategy" +msgstr "tùy chọn cho chiến lược hòa trộn" + +#: builtin/revert.c:125 +msgid "append commit name" +msgstr "nối thêm tên lần chuyển giao (commit)" + +#: builtin/revert.c:126 +msgid "allow fast-forward" +msgstr "cho phép fast-forward" + +#: builtin/revert.c:127 +msgid "preserve initially empty commits" +msgstr "cấm khởi tạo lần chuyển giao trống rỗng" + +#: builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "chấp nhận chuyển giao (commit) mà không ghi chú gì" + +#: builtin/revert.c:129 +msgid "keep redundant, empty commits" +msgstr "giữ lại các lần chuyển giao dư thừa, rỗng" + +#: builtin/revert.c:133 +msgid "program error" +msgstr "lỗi chương trình" + +#: builtin/revert.c:223 +msgid "revert failed" +msgstr "revert gặp lỗi" + +#: builtin/revert.c:238 +msgid "cherry-pick failed" +msgstr "cherry-pick gặp lỗi" + +#: builtin/rm.c:14 +msgid "git rm [options] [--] <file>..." +msgstr "git rm [các-tùy-chọn] [--] <tập-tin>..." + +#: builtin/rm.c:109 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" +"`%s' có nội dung được lưu trạng thái khác biệt từ cả tập tin và cả HEAD\n" +"(dùng tùy chọn -f để ép buộc gỡ bỏ)" + +#: builtin/rm.c:115 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"`%s' có các thay đổi được lưu trạng thái trong bảng mục lục\n" +"(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" + +#: builtin/rm.c:119 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"`%s' có các thay đổi nội bộ\n" +"(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" + +#: builtin/rm.c:134 +msgid "do not list removed files" +msgstr "không liệt kê các tập tin đã gỡ bỏ" + +#: builtin/rm.c:135 +msgid "only remove from the index" +msgstr "chỉ gỡ bỏ từ mục lục" + +#: builtin/rm.c:136 +msgid "override the up-to-date check" +msgstr "ghi đè lên kiểm tra cập nhật" + +#: builtin/rm.c:137 +msgid "allow recursive removal" +msgstr "cho phép gỡ bỏ đệ qui" + +#: builtin/rm.c:139 +msgid "exit with a zero status even if nothing matched" +msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "không thể gỡ bỏ `%s' một cách đệ qui mà không có tùy chọn -r" + +#: builtin/rm.c:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: không thể gỡ bỏ %s" + +#: builtin/shortlog.c:13 +msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +msgstr "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "Thiếu tên tác giả: %s" + +#: builtin/shortlog.c:253 +msgid "sort output according to the number of commits per author" +msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên mỗi tác giả" + +#: builtin/shortlog.c:255 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "Chặn mọi mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao" + +#: builtin/shortlog.c:257 +msgid "Show the email address of each author" +msgstr "Hiển thị thư điện tử cho từng tác giả" + +#: builtin/shortlog.c:258 +msgid "w[,i1[,i2]]" +msgstr "w[,i1[,i2]]" + +#: builtin/shortlog.c:259 +msgid "Linewrap output" +msgstr "Ngắt dòng khi quá dài" + +#: 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 "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<khi>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" + +#: builtin/show-branch.c:10 +msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g|--reflog)[=<n>[,<nền>]] [--list] [<ref>]" + +#: builtin/show-branch.c:651 +msgid "show remote-tracking and local branches" +msgstr "hiển thị các nhánh remote-tracking và nội bộ" + +#: builtin/show-branch.c:653 +msgid "show remote-tracking branches" +msgstr "hiển thị các nhánh remote-tracking" + +#: builtin/show-branch.c:655 +msgid "color '*!+-' corresponding to the branch" +msgstr "màu '*!+-' tương ứng với nhánh" + +#: builtin/show-branch.c:657 +msgid "show <n> more commits after the common ancestor" +msgstr "hiển thị thêm <n> lần chuyển giao sau cha mẹ chung" + +#: builtin/show-branch.c:659 +msgid "synonym to more=-1" +msgstr "đồng nghĩa với more=-1" + +#: builtin/show-branch.c:660 +msgid "suppress naming strings" +msgstr "chặn các chuỗi đặt tên" + +#: builtin/show-branch.c:662 +msgid "include the current branch" +msgstr "bao gồm nhánh hiện hành" + +#: builtin/show-branch.c:664 +msgid "name commits with their object names" +msgstr "đặt tên các lần chuyển giao bằng các tên của đối tượng của chúng" + +#: builtin/show-branch.c:666 +msgid "show possible merge bases" +msgstr "hiển thị mọi cơ sở có thể dùng để hòa trộn" + +#: builtin/show-branch.c:668 +msgid "show refs unreachable from any other ref" +msgstr "hiển thị các tham chiếu không thể được đọc bởi bất kỳ tham chiếu khác" + +#: builtin/show-branch.c:670 +msgid "show commits in topological order" +msgstr "hiển thị các lần chuyển giao theo thứ tự tôpô" + +#: builtin/show-branch.c:672 +msgid "show only commits not on the first branch" +msgstr "chỉ hiển thị các lần chuyển giao không nằm trên nhánh đầu tiên" + +#: builtin/show-branch.c:674 +msgid "show merges reachable from only one tip" +msgstr "hiển thị các lần hòa trộn có thể đọc được chỉ từ một đầu mút" + +#: builtin/show-branch.c:676 +msgid "show commits where no parent comes before its children" +msgstr "hiển thị các lần chuyển giao nơi mà cha mẹ đến trước con của nó" + +#: builtin/show-branch.c:678 +msgid "<n>[,<base>]" +msgstr "<n>[,<cơ sở>]" + +#: builtin/show-branch.c:679 +msgid "show <n> most recent ref-log entries starting at base" +msgstr "hiển thị <n> các mục `ref-log' gần nhất kể từ nền (base)" + +#: builtin/show-ref.c:10 +msgid "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +msgstr "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mẫu*] " + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgstr "git show-ref --exclude-existing[=mẫu] < ref-list" + +#: builtin/show-ref.c:182 +msgid "only show tags (can be combined with heads)" +msgstr "chỉ hiển thị thẻ (có thể tổ hợp cùng với đầu)" + +#: builtin/show-ref.c:183 +msgid "only show heads (can be combined with tags)" +msgstr "chỉ hiển thị đầu (có thể tổ hợp cùng với thẻ)" + +#: builtin/show-ref.c:184 +msgid "stricter reference checking, requires exact ref path" +msgstr "" +"việc kiểm tra tham chiếu chính xác, đòi hỏi chính xác đường dẫn tham chiếu " +"(ref)" + +#: builtin/show-ref.c:187 builtin/show-ref.c:189 +msgid "show the HEAD reference" +msgstr "hiển thị tham chiếu của HEAD" + +#: builtin/show-ref.c:191 +msgid "dereference tags into object IDs" +msgstr "bãi bỏ tham chiếu các thẻ thành ra các ID đối tượng" + +#: builtin/show-ref.c:193 +msgid "only show SHA1 hash using <n> digits" +msgstr "chỉ hiển thị mã băm SHA1 sử dụng <n> chữ số" + +#: builtin/show-ref.c:197 +msgid "do not print results to stdout (useful with --verify)" +msgstr "" +"không hiển thị kết quả ra đầu ra chuẩn (stdout) (chỉ hữu dụng với --verify)" + +#: builtin/show-ref.c:199 +msgid "show refs from stdin that aren't in local repository" +msgstr "" +"hiển thị các tham chiếu (refs) từ đầu vào tiêu chuẩn (stdin) cái mà không ở " +"kho nội bộ" + +#: builtin/symbolic-ref.c:7 +msgid "git symbolic-ref [options] name [ref]" +msgstr "git symbolic-ref [các-tùy-chọn] tên [t.chiếu]" + +#: builtin/symbolic-ref.c:38 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "" +"chặn các thông tin lỗi cho các tham chiếu (refs) `non-symbolic' (bị tách ra)" + +#: builtin/symbolic-ref.c:39 +msgid "shorten ref output" +msgstr "làm ngắn kết xuất ref (tham chiếu)" + +#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +msgid "reason" +msgstr "lý do" + +#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +msgid "reason of the update" +msgstr "lý do cập nhật" + +#: builtin/tag.c:22 +msgid "" +"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +msgstr "" +"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <tập-tin>] <tên-thẻ> [<head>]" + +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "git tag -d <tên-thẻ>..." + +#: builtin/tag.c:24 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"\t\t[<pattern>...]" +msgstr "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <đối-tượng>] \n" +"\t\t[<mẫu>...]" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "git tag -v <tên-thẻ>..." + +#: builtin/tag.c:60 +#, c-format +msgid "malformed object at '%s'" +msgstr "đối tượng dị hình tại `%s'" + +#: builtin/tag.c:207 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "tên thẻ quá dài: %.*s..." + +#: builtin/tag.c:212 +#, c-format +msgid "tag '%s' not found." +msgstr "không tìm thấy tìm thấy thẻ `%s'." + +#: builtin/tag.c:227 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Thẻ đã bị xóa `%s' (trước là %s)\n" + +#: builtin/tag.c:239 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "không thể thẩm tra thẻ `%s'" + +#: builtin/tag.c:249 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# Viết các ghi chú cho (thẻ) tag\n" +"# Những dòng được bắt đầu bằng '#' sẽ được bỏ qua.\n" +"#\n" + +#: builtin/tag.c:256 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# Viết các ghi chú cho (thẻ) tag\n" +"# Những dòng được bắt đầu bằng '#' sẽ được bỏ qua; bạn có thể xóa chúng đi " +"nếu muốn.\n" +"#\n" + +#: builtin/tag.c:298 +msgid "unable to sign the tag" +msgstr "không thể ký thẻ" + +#: builtin/tag.c:300 +msgid "unable to write tag file" +msgstr "không thể ghi vào tập tin lưu thẻ" + +#: builtin/tag.c:325 +msgid "bad object type." +msgstr "kiểu đối tượng sai." + +#: builtin/tag.c:338 +msgid "tag header too big." +msgstr "đầu thẻ (tag) quá lớn." + +#: builtin/tag.c:370 +msgid "no tag message?" +msgstr "không có thông điệp (message) cho thẻ (tag)?" + +#: builtin/tag.c:376 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "Nội dung ghi chú còn lại %s\n" + +#: builtin/tag.c:425 +msgid "switch 'points-at' requires an object" +msgstr "chuyển đến 'points-at' yêu cần một đối tượng" + +#: builtin/tag.c:427 +#, c-format +msgid "malformed object name '%s'" +msgstr "tên đối tượng dị hình `%s'" + +#: builtin/tag.c:447 +msgid "list tag names" +msgstr "chỉ liệt kê tên các thẻ" + +#: builtin/tag.c:449 +msgid "print <n> lines of each tag message" +msgstr "hiển thị <n> dòng cho mỗi ghi chú" + +#: builtin/tag.c:451 +msgid "delete tags" +msgstr "xóa thẻ" + +#: builtin/tag.c:452 +msgid "verify tags" +msgstr "thẩm tra thẻ" + +#: builtin/tag.c:454 +msgid "Tag creation options" +msgstr "Tùy chọn tạo tag" + +#: builtin/tag.c:456 +msgid "annotated tag, needs a message" +msgstr "để chú giải cho thẻ, cần một lời ghi chú" + +#: builtin/tag.c:458 +msgid "tag message" +msgstr "tin nhắn cho thẻ (tag)" + +#: builtin/tag.c:460 +msgid "annotated and GPG-signed tag" +msgstr "thẻ chú giải và ký kiểu GPG" + +#: builtin/tag.c:464 +msgid "use another key to sign the tag" +msgstr "dùng kháo khác để ký thẻ" + +#: builtin/tag.c:465 +msgid "replace the tag if exists" +msgstr "thay thế nếu tag đó đã có trước" + +#: builtin/tag.c:466 +msgid "show tag list in columns" +msgstr "hiển thị danh sách thẻ trong các cột" + +#: builtin/tag.c:468 +msgid "Tag listing options" +msgstr "Các tùy chọn liệt kê thẻ" + +#: builtin/tag.c:471 +msgid "print only tags that contain the commit" +msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" + +#: builtin/tag.c:477 +msgid "print only tags of the object" +msgstr "chỉ hiển thị các thẻ của đối tượng" + +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "--column và -n xung khắc nhau" + +#: builtin/tag.c:523 +msgid "-n option is only allowed with -l." +msgstr "tùy chọn -n chỉ cho phép dùng với -l." + +#: builtin/tag.c:525 +msgid "--contains option is only allowed with -l." +msgstr "tùy chọn --contains chỉ cho phép dùng với -l." + +#: builtin/tag.c:527 +msgid "--points-at option is only allowed with -l." +msgstr "tùy chọn --points-at chỉ cho phép dùng với -l." + +#: builtin/tag.c:535 +msgid "only one -F or -m option is allowed." +msgstr "chỉ có một tùy chọn -F hoặc -m là được phép." + +#: builtin/tag.c:555 +msgid "too many params" +msgstr "quá nhiều đối số" + +#: builtin/tag.c:561 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "`%s' không phải thẻ hợp lệ." + +#: builtin/tag.c:566 +#, c-format +msgid "tag '%s' already exists" +msgstr "Thẻ `%s' đã tồn tại rồi" + +#: builtin/tag.c:584 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s: không thể khóa ref (tham chiếu)" + +#: builtin/tag.c:586 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s: không thể cập nhật ref (tham chiếu)" + +#: builtin/tag.c:588 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Thẻ đã cập nhật `%s' (cũ là %s)\n" + +#: builtin/update-index.c:401 +msgid "git update-index [options] [--] [<file>...]" +msgstr "git update-index [các-tùy-chọn] [<tập-tin>...]" + +#: builtin/update-index.c:717 +msgid "continue refresh even when index needs update" +msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật" + +#: builtin/update-index.c:720 +msgid "refresh: ignore submodules" +msgstr "refresh: lờ đi mô-đun-con" + +#: builtin/update-index.c:723 +msgid "do not ignore new files" +msgstr "không bỏ qua các tập tin mới tạo" + +#: builtin/update-index.c:725 +msgid "let files replace directories and vice-versa" +msgstr "để các tập tin thay thế các thư mục và `vice-versa'" + +#: builtin/update-index.c:727 +msgid "notice files missing from worktree" +msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc" + +#: builtin/update-index.c:729 +msgid "refresh even if index contains unmerged entries" +msgstr "" +"làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn" + +#: builtin/update-index.c:732 +msgid "refresh stat information" +msgstr "lấy lại thông tin thống kê" + +#: builtin/update-index.c:736 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "giống --refresh, nhưng bỏ qua các cài đặt `assume-unchanged'" + +#: builtin/update-index.c:740 +msgid "<mode> <object> <path>" +msgstr "<mode> <đối tượng> <đường dẫn>" + +#: builtin/update-index.c:741 +msgid "add the specified entry to the index" +msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục" + +#: builtin/update-index.c:745 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/update-index.c:746 +msgid "override the executable bit of the listed files" +msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê" + +#: builtin/update-index.c:750 +msgid "mark files as \"not changing\"" +msgstr "Đánh dấu các tập tin là \"không thay đổi\"" + +#: builtin/update-index.c:753 +msgid "clear assumed-unchanged bit" +msgstr "xóa bít assumed-unchanged" + +#: builtin/update-index.c:756 +msgid "mark files as \"index-only\"" +msgstr "đánh dấu các tập tin là `chỉ-đọc'" + +#: builtin/update-index.c:759 +msgid "clear skip-worktree bit" +msgstr "xóa bít skip-worktree" + +#: builtin/update-index.c:762 +msgid "add to index only; do not add content to object database" +msgstr "" +"chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng" + +#: builtin/update-index.c:764 +msgid "remove named paths even if present in worktree" +msgstr "" +"gỡ bỏ các đường dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục " +"làm việc" + +#: builtin/update-index.c:766 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "với tùy chọn --stdin: các dòng đầu vào được chấm dứt bởi ký tự null" + +#: builtin/update-index.c:768 +msgid "read list of paths to be updated from standard input" +msgstr "đọc danh sách đường dẫn cần cập nhật từ đầu vào tiêu chuẩn" + +#: builtin/update-index.c:772 +msgid "add entries from standard input to the index" +msgstr "không thể đọc các mục từ đầu vào tiêu chuẩn vào bảng mục lục" + +#: builtin/update-index.c:776 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "phục hồi các trạng thái #2 và #3 cho các đường dẫn được liệt kê" + +#: builtin/update-index.c:780 +msgid "only update entries that differ from HEAD" +msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD" + +#: builtin/update-index.c:784 +msgid "ignore files missing from worktree" +msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc" + +#: builtin/update-index.c:787 +msgid "report actions to standard output" +msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn" + +#: builtin/update-index.c:789 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "(cho `porcelains') quên các xung đột chưa được giải quyết đã ghi" + +#: builtin/update-index.c:793 +msgid "write index in this format" +msgstr "ghi mục lục ở định dạng này" + +#: builtin/update-ref.c:7 +msgid "git update-ref [options] -d <refname> [<oldval>]" +msgstr "git update-ref [các-tùy-chọn] -d <refname> [<biến-cũ>]" + +#: builtin/update-ref.c:8 +msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgstr "git update-ref [các-tùy-chọn] <refname> <biến-mới> [<biến-cũ>]" + +#: builtin/update-ref.c:19 +msgid "delete the reference" +msgstr "xóa tham chiếu" + +#: builtin/update-ref.c:21 +msgid "update <refname> not the one it points to" +msgstr "cập nhật <tên-tham-chiếu> không phải cái nó chỉ tới" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "git update-server-info [--force]" + +#: builtin/update-server-info.c:14 +msgid "update the info files from scratch" +msgstr "cập nhật các tập tin thông tin từ điểm xuất phát" + +#: builtin/verify-pack.c:56 +msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <gói>..." + +#: builtin/verify-pack.c:66 +msgid "verbose" +msgstr "chi tiết" + +#: builtin/verify-pack.c:68 +msgid "show statistics only" +msgstr "chỉ hiển thị thống kê" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v|--verbose] <tag>..." +msgstr "git verify-tag [-v|--verbose] <thẻ>..." + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "hiển thị nội dung của thẻ" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "git write-tree [--missing-ok] [--prefix=<tiền-tố>/]" + +#: builtin/write-tree.c:26 +msgid "<prefix>/" +msgstr "<iền tố>/" + +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" +msgstr "ghi đối tượng cây (tree) cho <tiền tố> thư mục con" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" +msgstr "chỉ hữu ích khi cần gỡ lỗi" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "" +"Chạy lệnh `git help <tên-lệnh>' để có thêm thông tin về lệnh được chỉ ra." + +#: parse-options.h:156 +msgid "no-op (backward compatibility)" +msgstr "no-op (tương thích ngược)" + +#: parse-options.h:228 +msgid "be more verbose" +msgstr "chi tiết hơn nữa" + +#: parse-options.h:230 +msgid "be more quiet" +msgstr "im lặng hơn nữa" + +#: parse-options.h:236 +msgid "use <n> digits to display SHA-1s" +msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" + +#: common-cmds.h:8 +msgid "Add file contents to the index" +msgstr "Thêm nội dung tập tin vào bảng mục lục" + +#: common-cmds.h:9 +msgid "Find by binary search the change that introduced a bug" +msgstr "Tìm kiếm bằng điều tra nhị phân các thay đổi mà nó bắt đầu lỗi" + +#: common-cmds.h:10 +msgid "List, create, or delete branches" +msgstr "Liệt kê, tạo hay là xóa các nhánh" + +#: common-cmds.h:11 +msgid "Checkout a branch or paths to the working tree" +msgstr "Checkout một nhánh hay các đường dẫn tới cây làm việc" + +#: common-cmds.h:12 +msgid "Clone a repository into a new directory" +msgstr "Nhân bản một kho chứa đến một thư mục mới" + +#: common-cmds.h:13 +msgid "Record changes to the repository" +msgstr "Ghi các thay đổi vào kho chứa" + +#: common-cmds.h:14 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "" +"Hiển thị các thay đổi giữa những lần chuyển giao (commit), commit và cây làm " +"việc, v.v.." + +#: common-cmds.h:15 +msgid "Download objects and refs from another repository" +msgstr "Các đối tượng và tham chiếu được tải về từ kho chứa khác" + +#: common-cmds.h:16 +msgid "Print lines matching a pattern" +msgstr "In ra những dòng khớp với một mẫu" + +#: common-cmds.h:17 +msgid "Create an empty git repository or reinitialize an existing one" +msgstr "" +"Tạo một kho git trống rỗng hay khởi tạo lại một kho đã tồn tại từ trước" + +#: common-cmds.h:18 +msgid "Show commit logs" +msgstr "hiển thị nhật ký các lần commit (chuyển giao)" + +#: common-cmds.h:19 +msgid "Join two or more development histories together" +msgstr "" +"Hợp nhất hai hay nhiều hơn lịch sử của các nhà phát triển phần mềm lại với " +"nhau" + +#: common-cmds.h:20 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "Di chuyển, đổi tên một tập tin, thư mục hay liên kết tượng trưng" + +#: common-cmds.h:21 +msgid "Fetch from and merge with another repository or a local branch" +msgstr "Fetch (lấy về) và hòa trộng với kho khác hay nhánh nội bộ" + +#: common-cmds.h:22 +msgid "Update remote refs along with associated objects" +msgstr "" +"Cập nhật tham chiếu (refs) máy chủ cùng với các đối tượng liên quan đến nó" + +#: common-cmds.h:23 +msgid "Forward-port local commits to the updated upstream head" +msgstr "" +"Forward-port những lần chuyển giao nội bộ tới head thượng nguồn đã cập nhật" + +#: common-cmds.h:24 +msgid "Reset current HEAD to the specified state" +msgstr "Đặt lại HEAD hiện hành thành một trạng thái được chỉ ra" + +#: common-cmds.h:25 +msgid "Remove files from the working tree and from the index" +msgstr "Gỡ bỏ các tập tin từ cây làm việc và từ bảng mục lục" + +#: common-cmds.h:26 +msgid "Show various types of objects" +msgstr "Hiển thị các kiểu khác nhau của các đối tượng" + +#: common-cmds.h:27 +msgid "Show the working tree status" +msgstr "Hiển thị trạng thái cây làm việc" + +#: common-cmds.h:28 +msgid "Create, list, delete or verify a tag object signed with GPG" +msgstr "" +"Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ (tag) mà nó được ký sử dụng " +"GPG" + +#: git-am.sh:50 +msgid "You need to set your committer info first" +msgstr "Bạn cần đặt thông tin về người chuyển giao mã nguồn trước đã" + +#: git-am.sh:95 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" +"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần 'am' thất bại cuối cùng.\n" +"Không thể chuyển tới ORIG_HEAD" + +#: 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 "" +"Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"$cmdline --resolved\".\n" +"Nếu bạn có ý định bỏ qua miếng vá, thay vào đó bạn chạy \"$cmdline --skip" +"\".\n" +"Để phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy " +"\"$cmdline --abort\"." + +#: git-am.sh:121 +msgid "Cannot fall back to three-way merge." +msgstr "Đang trở lại để hòa trộn kiểu 'three-way'." + +#: git-am.sh:137 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên '3-way merge'." + +#: git-am.sh:139 +msgid "Using index info to reconstruct a base tree..." +msgstr "" +"Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở..." + +#: git-am.sh:154 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n" +"Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó." + +#: git-am.sh:163 +msgid "Falling back to patching base and 3-way merge..." +msgstr "Đang trở lại để vá cơ sở và '3-way merge'..." + +#: git-am.sh:179 +msgid "Failed to merge in the changes." +msgstr "Gặp lỗi khi trộn vào các thay đổi." + +#: git-am.sh:274 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc" + +#: git-am.sh:361 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "Định dạng miếng vá $patch_format không được hỗ trợ." + +#: git-am.sh:363 +msgid "Patch format detection failed." +msgstr "Dò tìm định dạng miếng vá gặp lỗi." + +#: 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 "" +"Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n" +"nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa." + +#: git-am.sh:477 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "thư mục rebase trước $dotest vẫn chưa sẵn sàng nhưng mbox được đưa ra." + +#: git-am.sh:482 +msgid "Please make up your mind. --skip or --abort?" +msgstr "Xin hãy rõ ràng. --skip hay --abort?" + +#: git-am.sh:509 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" +"Thao tác phân giải không đang được tiến hành, chúng ta không phục hồi lại." + +#: git-am.sh:575 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "Bảng mục lục sai: không thể áp dụng các miếng vá (sai: $files)" + +#: 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 "" +"Miếng vá trống rỗng. Nó đã bị chia cắt sai phải không?\n" +"Nếu bạn thích bỏ qua miếng vá này, hãy chạy lệnh sau để thay thế \"$cmdline " +"--skip\".\n" +"Để phục hồi lại nhánh nguyên thủy và dừng vá lại hãy chạy lệnh \"$cmdline --" +"abort\"." + +#: git-am.sh:706 +msgid "Patch does not have a valid e-mail address." +msgstr "Miếng vá không có địa chỉ e-mail hợp lệ." + +#: git-am.sh:753 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" +"không thể được tương tác mà không có stdin kết nối với một thiết bị cuối" + +#: git-am.sh:757 +msgid "Commit Body is:" +msgstr "Thân của lần chuyển giao (commit) là:" + +#. 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 "" +"Áp dụng? đồng ý [y]/không [n]/chỉnh sửa [e]/hiển thị miếng [v]á/đồng ý tất " +"cả [a] " + +#: git-am.sh:800 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "Đang áp dụng (miếng vá): $FIRSTLINE" + +#: 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 "" +"Không có thay đổi nào - bạn đã quên sử dụng lệnh `git add' à?\n" +"Nếu ở đây không có gì còn lại stage, tình cờ là có một số thứ khác\n" +"đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng " +"vá này." + +#: git-am.sh:829 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" +"Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của mình\n" +"bạn đã quên sử dụng lệnh `git add' à?" + +#: git-am.sh:845 +msgid "No changes -- Patch already applied." +msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi." + +#: git-am.sh:855 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "Vá gặp lỗi tại $msgnum $FIRSTLINE" + +#: git-am.sh:858 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "" +"Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong:\n" +" $dotest/patch" + +#: git-am.sh:876 +msgid "applying to an empty history" +msgstr "áp dụng vào một lịch sử trống rỗng" + +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "Bạn cần khởi đầu bằng \"git bisect start\"" + +#. 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 "Bạn có muốn tôi thực hiện điều này cho bạn không [Y/n]? " + +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "không công nhận tùy chọn: '$arg'" + +#: git-bisect.sh:99 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "'$arg' không có vẻ như là một sự xét lại hợp lệ" + +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" +msgstr "HEAD sai - Tôi cần một HEAD" + +#: git-bisect.sh:130 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +msgstr "" +"Việc checkout '$start_head' gặp lỗi. Hãy thử `git bisect reset " +"<nhánh_hợp_lệ>'." + +#: git-bisect.sh:140 +msgid "won't bisect on seeked tree" +msgstr "sẽ không bisect trêm cây được seek" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "HEAD sai - tham chiếu (ref) tượng trưng kỳ lạ" + +#: git-bisect.sh:189 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "Đối số bisect_write sai: $state" + +#: git-bisect.sh:218 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "Đầu vào rev sai: $arg" + +#: git-bisect.sh:232 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "Hãy gọi lệnhl 'bisect_state' với ít nhất một đối số." + +#: git-bisect.sh:244 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "Đầu vào rev sai: $rev" + +#: git-bisect.sh:250 +msgid "'git bisect bad' can take only one argument." +msgstr "`git bisect bad' có thể lấy chỉ một đối số." + +#. 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 "" +"Cảnh báo: chỉ thực hiện việc bisect với một lần chuyển giao (commit) sai." + +#. 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 "Bạn có chắc chắn chưa [Y/n]? " + +#: 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 "" +"Bạn phải chỉ cho tôi ít nhất một điểm xét duyệt tốt và một điểm sai.\n" +"(Bạn có thể sử dụng \"git bisect bad\" và \"git bisect good\" cho cái đó.)" + +#: 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 "" +"Bạn cần bắt đầu bằng lệnh \"git bisect start\".\n" +"Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt đúng và một điểm " +"sai.\n" +"(Bạn có thể sử dụng \"git bisect bad\" và \"git bisect good\" cho chúng.)" + +#: git-bisect.sh:347 git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "Chúng tôi không bisect." + +#: git-bisect.sh:354 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "'$invalid' không phải là lần chuyển giao (commit) hợp lệ" + +#: git-bisect.sh:363 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." +msgstr "" +"Không thể check-out HEAD nguyên thủy của '$branch'.\n" +"Hãy thử `git bisect reset <lần-chuyển-giao>'." + +#: git-bisect.sh:390 +msgid "No logfile given" +msgstr "Chưa chỉ ra tập tin ghi nhật ký" + +#: git-bisect.sh:391 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "không thể đọc $file để thao diễn lại" + +#: git-bisect.sh:408 +msgid "?? what are you talking about?" +msgstr "?? bạn đang nói gì thế?" + +#: git-bisect.sh:420 +#, sh-format +msgid "running $command" +msgstr "đang chạy lệnh $command" + +#: git-bisect.sh:427 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" +"chạy bisect gặp lỗi:\n" +"mã trả về $res từ lệnh '$command' là < 0 hoặc >= 128" + +#: git-bisect.sh:453 +msgid "bisect run cannot continue any more" +msgstr "bisect không thể tiếp tục thêm được nữa" + +#: git-bisect.sh:459 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" +"chạy bisect gặp lỗi:\n" +"'bisect_state $state' đã thoát ra với mã lỗi $res" + +#: git-bisect.sh:466 +msgid "bisect run success" +msgstr "bisect chạy thành công" + +#: 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 "" +"Pull là không thể được bởi vì bạn có những tập tin chưa được hòa trộn.\n" +"Xin hãy sửa chữa chúng trước, và sau đó sử dụng lệnh `git add/rm <tập-tin>'\n" +"để phê chuẩn việc đánh dấu đây cần được giải quyết, hoặc là sử dụng `git " +"commit -a'." + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "" +"Full là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn." + +#: git-pull.sh:197 +msgid "updating an unborn branch with changes added to the index" +msgstr "" +"đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào " +"bảng mục lục" + +#. 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:228 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" +"Cảnh báo: fetch đã cập nhật head nhánh hiện tại.\n" +"Cảnh báo: đang fast-forward cây làm việc của bạn từ\n" +"Cảnh báo: commit $orig_head." + +#: git-pull.sh:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "Không thể hòa trộn nhiều nhánh và trong một head trống rỗng" + +#: git-pull.sh:257 +msgid "Cannot rebase onto multiple branches" +msgstr "Không thể thực hiện lệnh rebase (cơ cấu lại) trên nhiều nhánh" + +#: 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 "" +"Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"git rebase --continue\".\n" +"Nếu bạn có ý định bỏ qua miếng vá, thay vào đó bạn chạy \"git rebase --skip" +"\".\n" +"Để phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy \"git " +"rebase --abort\"." + +#: git-rebase.sh:160 +msgid "The pre-rebase hook refused to rebase." +msgstr "hook (chương trình móc vào git) pre-rebase từ chối rebase." + +#: git-rebase.sh:165 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "" +"Hình như đang trong quá trình thực hiện lệnh git-am. Không thể chạy lệnh " +"rebase." + +#: git-rebase.sh:296 +msgid "The --exec option must be used with the --interactive option" +msgstr "Tùy chọn --exec phải được sử dụng cùng với tùy chọn --interactive" + +#: git-rebase.sh:301 +msgid "No rebase in progress?" +msgstr "Không có tiến trình rebase nào phải không?" + +#: git-rebase.sh:312 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "" +"Hành động `--edit-todo' chỉ có thể dùng trong quá trình `rebase' (sửa lịch " +"sử) tương tác." + +#: git-rebase.sh:319 +msgid "Cannot read HEAD" +msgstr "Không thể đọc HEAD" + +#: git-rebase.sh:322 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n" +"đó đánh dấu chúng là cần xử lý sử dụng lệnh git add" + +#: git-rebase.sh:340 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Không thể quay trở lại $head_name" + +#: 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 "" +"Hình như là ở đây sẵn có một thư mục $state_dir_base directory, và\n" +"Tôi tự hỏi có phải bạn đang ở giữa một lệnh rebase khác. Nếu đúng là\n" +"như vậy, xin hãy thử\n" +"\t$cmd_live_rebase\n" +"Nếu không phải thế, hãy thử\n" +"\t$cmd_clear_stale_rebase\n" +"và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n" +"có một số thứ quý giá ở đây.\n" +"\n" +"TÔI: là lệnh bạn vừa gọi!" + +#: git-rebase.sh:404 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "thượng nguồn không hợp lệ $upstream_name" + +#: git-rebase.sh:428 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "$onto_name: ở đây có nhiều hơn một" + +#: git-rebase.sh:431 git-rebase.sh:435 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: ở đây không có gì để hòa trộn" + +#: git-rebase.sh:440 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "Không chỉ đến một lần chuyển giao (commit) không hợp lệ: $onto_name" + +#: git-rebase.sh:463 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "nghiêm trọng: không có nhánh như thế: $branch_name" + +#: git-rebase.sh:483 +msgid "Please commit or stash them." +msgstr "Xin hãy commit hoặc stash chúng." + +#: git-rebase.sh:501 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi." + +#: git-rebase.sh:504 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc." + +#: git-rebase.sh:515 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "Thay đổi từ $mb thành $onto:" + +#. Detach HEAD and reset the tree +#: git-rebase.sh:524 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "" +"Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó..." + +#: git-rebase.sh:532 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "Fast-forward $branch_name thành $onto_name." + +#: git-stash.sh:51 +msgid "git stash clear with parameters is unimplemented" +msgstr "" +"git stash clear với các tham số là chưa được thực hiện (không nhận đối số)" + +#: git-stash.sh:74 +msgid "You do not have the initial commit yet" +msgstr "Bạn chưa còn có lần chuyển giao (commit) khởi tạo" + +#: git-stash.sh:89 +msgid "Cannot save the current index state" +msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành" + +#: git-stash.sh:123 git-stash.sh:136 +msgid "Cannot save the current worktree state" +msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành" + +#: git-stash.sh:140 +msgid "No changes selected" +msgstr "Chưa có thay đổi nào được chọn" + +#: git-stash.sh:143 +msgid "Cannot remove temporary index (can't happen)" +msgstr "Không thể gỡ bỏ bảng mục lục tạm thời (không thể xảy ra)" + +#: git-stash.sh:156 +msgid "Cannot record working tree state" +msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành" + +#. 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 "" +"lỗi: không hiểu tùy chọn cho 'stash save': $option\n" +" Để cung cấp một thông điệp, sử dụng git stash save -- '$option'" + +#: git-stash.sh:223 +msgid "No local changes to save" +msgstr "Không có thay đổi nội bộ nào được ghi lại" + +#: git-stash.sh:227 +msgid "Cannot initialize stash" +msgstr "Không thể khởi tạo stash" + +#: git-stash.sh:235 +msgid "Cannot save the current status" +msgstr "Không thể ghi lại trạng thái hiện hành" + +#: git-stash.sh:253 +msgid "Cannot remove worktree changes" +msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc" + +#: git-stash.sh:352 +msgid "No stash found." +msgstr "Không tìm thấy stash nào." + +#: git-stash.sh:359 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "Chỉ ra quá nhiều điểm xét lại: $REV" + +#: git-stash.sh:365 +#, sh-format +msgid "$reference is not valid reference" +msgstr "$reference không phải là tham chiếu hợp lệ" + +#: git-stash.sh:393 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "'$args' không phải là lần chuyển giao (commit) giống-stash" + +#: git-stash.sh:404 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "'$args' không phải tham chiếu đến stash" + +#: git-stash.sh:412 +msgid "unable to refresh index" +msgstr "không thể làm tươi mới bảng mục lục" + +#: git-stash.sh:416 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn" + +#: git-stash.sh:424 +msgid "Conflicts in index. Try without --index." +msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index." + +#: git-stash.sh:426 +msgid "Could not save index tree" +msgstr "Không thể ghi lại cây chỉ mục" + +#: git-stash.sh:460 +msgid "Cannot unstage modified files" +msgstr "Không thể bỏ trạng thía của các tập tin đã được sửa chữa" + +#: git-stash.sh:475 +msgid "Index was not unstashed." +msgstr "Bảng mục lục đã không được bỏ stash." + +#: git-stash.sh:492 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "Đã hạ xuống ${REV} ($s)" + +#: git-stash.sh:493 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}: Không thể xóa bỏ mục stash" + +#: git-stash.sh:500 +msgid "No branch name specified" +msgstr "Chưa chỉ ra tên của nhánh" + +#: git-stash.sh:571 +msgid "(To restore them type \"git stash apply\")" +msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")" + +#: git-submodule.sh:88 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "không thể tháo bỏ một thành phần ra khỏi url '$remoteurl'" + +#: git-submodule.sh:167 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "" +"Không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn " +"'$sm_path'" + +#: git-submodule.sh:211 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "Nhân bản '$url' vào đường dẫn mô-đun-con '$sm_path' gặp lỗi" + +#: git-submodule.sh:223 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "" +"Gitdir '$a' là bộ phận của đường dẫn mô-đun-con '$b' hoặc \"vice versa\"" + +#: git-submodule.sh:312 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" +"repo URL: '$repo' phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../" + +#: git-submodule.sh:329 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "'$sm_path' thực sự đã tồn tại ở bảng mục lục rồi" + +#: git-submodule.sh:333 +#, 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 "" +"Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " +"của bạn:\n" +"$sm_path\n" +"Sử dụng -f nếu bạn thực sự muốn thêm nó vào." + +#: git-submodule.sh:344 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "Đang thêm repo có sẵn tại '$sm_path' vào bảng mục lục" + +#: git-submodule.sh:346 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "'$sm_path' đã tồn tại từ trước và không phải là một kho git hợp lệ" + +#: git-submodule.sh:360 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "Không thể checkout mô-đun con '$sm_path'" + +#: git-submodule.sh:365 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "Gặp lỗi khi thêm mô-đun con '$sm_path'" + +#: git-submodule.sh:370 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun con '$sm_path'" + +#: git-submodule.sh:413 +#, sh-format +msgid "Entering '$prefix$sm_path'" +msgstr "Đang nhập '$prefix$sm_path'" + +#: git-submodule.sh:427 +#, sh-format +msgid "Stopping at '$sm_path'; script returned non-zero status." +msgstr "Dừng lại tại '$sm_path'; script trả về trạng thái khác không." + +#: git-submodule.sh:471 +#, sh-format +msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgstr "" +"Không tìm thấy url cho đường dẫn mô-đun-con '$sm_path' trong .gitmodules" + +#: git-submodule.sh:480 +#, sh-format +msgid "Failed to register url for submodule path '$sm_path'" +msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:482 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgstr "Mô-đun-con '$name' ($url) được đăng ký cho đường dẫn '$sm_path'" + +#: git-submodule.sh:490 +#, sh-format +msgid "Failed to register update mode for submodule path '$sm_path'" +msgstr "" +"Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:590 +#, sh-format +msgid "" +"Submodule path '$sm_path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" +"Đường dẫn mô-đun-con '$sm_path' chưa được khởi tạo\n" +"Có lẽ bạn muốn sử dụng lệnh 'update --init'?" + +#: git-submodule.sh:603 +#, sh-format +msgid "Unable to find current revision in submodule path '$sm_path'" +msgstr "" +"Không tìm thấy điểm xét lại hiện hành trong đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:622 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "Không thể lấy về (fetch) trong đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:636 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgstr "Không thể rebase '$sha1' trong đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:637 +#, sh-format +msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgstr "Đường dẫn mô-đun-con '$sm_path': được rebase vào trong '$sha1'" + +#: git-submodule.sh:642 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgstr "" +"Không thể hòa trộn (merge) '$sha1' trong đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:643 +#, sh-format +msgid "Submodule path '$sm_path': merged in '$sha1'" +msgstr "Đường dẫn mô-đun-con '$sm_path': được hòa trộn vào '$sha1'" + +#: git-submodule.sh:648 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgstr "Không thể checkout '$sha1' trong đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:649 +#, sh-format +msgid "Submodule path '$sm_path': checked out '$sha1'" +msgstr "Đường dẫn mô-đun-con '$sm_path': được checkout '$sha1'" + +#: git-submodule.sh:671 git-submodule.sh:995 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:779 +msgid "The --cached option cannot be used with the --files option" +msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files" + +#. unexpected type +#: git-submodule.sh:819 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "chế độ không như mong chờ $mod_dst" + +#: git-submodule.sh:837 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr " Cảnh báo: $name không chứa lần chuyển giao (commit) $sha1_src" + +#: git-submodule.sh:840 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr " Cảnh báo: $name không chứa lần chuyển giao (commit) $sha1_dst" + +#: git-submodule.sh:843 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" +" Cảnh báo: $name không chứa những lần chuyển giao (commit) $sha1_src và " +"$sha1_dst" + +#: git-submodule.sh:868 +msgid "blob" +msgstr "blob" + +#: git-submodule.sh:906 +msgid "# Submodules changed but not updated:" +msgstr "# Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:" + +#: git-submodule.sh:908 +msgid "# Submodule changes to be committed:" +msgstr "# Những thay đổi mô-đun-con được chuyển giao (commit):" + +#: git-submodule.sh:1054 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "Đang đồng bộ hóa url mô-đun-con cho '$name'" + +#~ msgid " 0 files changed" +#~ msgstr " 0 có tập tin nào thay đổi cả" + +#~ msgid " %d file changed" +#~ msgid_plural " %d files changed" +#~ msgstr[0] " %d tập tin thay đổi" +#~ msgstr[1] " %d tập tin thay đổi" + +#~ msgid ", %d insertion(+)" +#~ msgid_plural ", %d insertions(+)" +#~ msgstr[0] ", %d thêm(+)" +#~ msgstr[1] ", %d thêm(+)" + +#~ msgid ", %d deletion(-)" +#~ msgid_plural ", %d deletions(-)" +#~ msgstr[0] ", %d xóa(-)" +#~ msgstr[1] ", %d xóa(-)" + +#~ msgid "Auto packing the repository for optimum performance.\n" +#~ msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n" + +#~ msgid " (use \"git add\" to track)" +#~ msgstr " (dùng \"git add\" để theo dõi dấu vết)" + +#~ msgid "-B cannot be used with -b" +#~ msgstr "tùy chọn -B không thể dùng -b" + +#~ msgid "--patch is incompatible with all other options" +#~ msgstr "--patch xung khắc với tất cả các tùy chọn khác" + +#~ msgid "--detach cannot be used with -b/-B/--orphan" +#~ msgstr "--detach không thể được sử dụng với tùy chọn -b/-B/--orphan" + +#~ msgid "--detach cannot be used with -t" +#~ msgstr "--detach không thể được sử dụng với tùy chọn -t" + +#~ msgid "--orphan and -b|-B are mutually exclusive" +#~ msgstr "Tùy chọn --orphan và -b|-B loại từ lẫn nhau" + +#~ msgid "--orphan cannot be used with -t" +#~ msgstr "--orphan không thể được sử dụng với tùy chọn -t" + +#~ msgid "git checkout: -f and -m are incompatible" +#~ msgstr "git checkout: hai tùy chọn -f và -m xung khắc nhau" + +#~ msgid "" +#~ "git checkout: updating paths is incompatible with switching branches." +#~ msgstr "" +#~ "git checkout: việc cập nhật các đường dẫn là xung khắc với việc chuyển " +#~ "đổi các nhánh." + +#~ msgid "diff setup failed" +#~ msgstr "cài đặt diff gặp lỗi" + +#~ msgid "merge-recursive: disk full?" +#~ msgstr "merge-recursive: đĩa bị đầy?" + +#~ msgid "diff_setup_done failed" +#~ msgstr "diff_setup_done gặp lỗi" + +#~ msgid "-d option is no longer supported. Do not use." +#~ msgstr "Tùy chọn -d không còn được hỗ trợ nữa. Xin đừng sử dụng." + +#~ msgid "%s: has been deleted/renamed" +#~ msgstr "%s: đã được xóa/thay-tên" + +#~ msgid "'%s': not a documentation directory." +#~ msgstr "'%s': không phải là một thư mục tài liệu." + +#~ msgid "--" +#~ msgstr "--" + +#~ msgid "Could not extract email from committer identity." +#~ msgstr "" +#~ "Không thể rút trích địa chỉ thư điện tử từ định danh người chuyển giao" + +#, fuzzy +#~ msgid "could not parse commit %s\n" +#~ msgstr "Không thể phân tích commit (lần chuyển giao) %s\n" + +#, fuzzy +#~ msgid "cherry-pick" +#~ msgstr "< Chọn D-Mod" diff --git a/po/zh_CN.po b/po/zh_CN.po new file mode 100644 index 0000000..46d158f --- /dev/null +++ b/po/zh_CN.po @@ -0,0 +1,9520 @@ +# Chinese translations for Git package +# Git 软件包的简体中文翻译. +# Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com> +# This file is distributed under the same license as the Git package. +# Contributers: +# - Jiang Xin <worldhello.net AT gmail.com> +# - Riku <lu.riku AT gmail.com> +# - Zhuang Ya <zhuangya AT me.com> +# - Lian Cheng <rhythm.mail AT gmail.com> +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2012-09-15 10:21+0800\n" +"PO-Revision-Date: 2012-09-07 17:56+0800\n" +"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" +"Language-Team: GitHub <https://github.com/gotgit/git/>\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: advice.c:40 +#, c-format +msgid "hint: %.*s\n" +msgstr "提示:%.*s\n" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:70 +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 "" +"请先在工作区改正文件,然后酌情使用\n" +"'git add/rm <file>' 标记解决方案,\n" +"或使用 'git commit -a'。" + +#: archive.c:10 +#, fuzzy +msgid "git archive [options] <tree-ish> [<path>...]" +msgstr "git apply [选项] [<补丁>...]" + +#: archive.c:11 +#, fuzzy +msgid "git archive --list" +msgstr "git archive:NACK %s" + +#: 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:322 +msgid "fmt" +msgstr "" + +#: archive.c:322 +msgid "archive format" +msgstr "" + +#: archive.c:323 builtin/log.c:1079 +msgid "prefix" +msgstr "" + +#: archive.c:324 +msgid "prepend prefix to each pathname in the archive" +msgstr "" + +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332 +#: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642 +#: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537 +#: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "文件" + +#: archive.c:326 builtin/archive.c:92 +msgid "write the archive to this file" +msgstr "" + +#: archive.c:328 +#, fuzzy +msgid "read .gitattributes in working directory" +msgstr "%s:已经存在于工作区中" + +#: archive.c:329 +msgid "report archived files on stderr" +msgstr "" + +#: archive.c:330 +msgid "store only" +msgstr "" + +#: archive.c:331 +msgid "compress faster" +msgstr "" + +#: archive.c:339 +msgid "compress better" +msgstr "" + +#: archive.c:342 +msgid "list supported archive formats" +msgstr "" + +#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +msgid "repo" +msgstr "" + +#: archive.c:345 builtin/archive.c:94 +msgid "retrieve the archive from remote repository <repo>" +msgstr "" + +#: archive.c:346 builtin/archive.c:95 builtin/notes.c:616 +#, fuzzy +msgid "command" +msgstr "运行 $command" + +#: archive.c:347 builtin/archive.c:96 +msgid "path to the remote git-upload-archive command" +msgstr "" + +#: bundle.c:36 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "'%s' 不像是一个 v2 版本的包文件" + +#: bundle.c:63 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "未能识别的包头:%s%s (%d)" + +#: bundle.c:89 builtin/commit.c:714 +#, c-format +msgid "could not open '%s'" +msgstr "不能打开 '%s'" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "版本库缺少这些必备的提交:" + +#: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 +#: builtin/shortlog.c:181 +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] "这个包中含有 %d 个引用" +msgstr[1] "这个包中含有 %d 个引用" + +#: 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] "这个包需要 %d 个这些引用" + +#: bundle.c:294 +msgid "rev-list died" +msgstr "rev-list 终止" + +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "未能识别的参数:%s" + +#: bundle.c:335 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "引用 '%s' 被 rev-list 选项排除" + +#: bundle.c:380 +msgid "Refusing to create empty bundle." +msgstr "不能创建空包。" + +#: bundle.c:398 +msgid "Could not spawn pack-objects" +msgstr "不能生成 pack-objects 进程" + +#: bundle.c:416 +msgid "pack-objects died" +msgstr "pack-objects 终止" + +#: bundle.c:419 +#, c-format +msgid "cannot create '%s'" +msgstr "不能创建 '%s'" + +#: bundle.c:441 +msgid "index-pack died" +msgstr "index-pack 终止" + +#: commit.c:48 +#, c-format +msgid "could not parse %s" +msgstr "不能解析 %s" + +#: commit.c:50 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s 不是一个提交!" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "内存耗尽" + +#: connected.c:39 +msgid "Could not run 'git rev-list'" +msgstr "不能执行 'git rev-list'" + +#: connected.c:48 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "无法写入 rev-list:%s" + +#: connected.c:56 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "无法关闭 rev-list 的标准输入:%s" + +#: date.c:95 +msgid "in the future" +msgstr "在将来" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "%lu 秒钟之前" +msgstr[1] "%lu 秒钟之前" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "%lu 分钟之前" +msgstr[1] "%lu 分钟之前" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "%lu 小时之前" +msgstr[1] "%lu 小时之前" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "%lu 天之前" +msgstr[1] "%lu 天之前" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "%lu 周之前" +msgstr[1] "%lu 周之前" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "%lu 个月之前" +msgstr[1] "%lu 个月之前" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "%lu 年" +msgstr[1] "%lu 年" + +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "%s,%lu 个月之前" +msgstr[1] "%s,%lu 个月之前" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "%lu 年前" +msgstr[1] "%lu 年前" + +# 译者:注意保持前导空格 +#: diff.c:105 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr " 无法解析 dirstat 阈值 '%.*s'\n" + +# 译者:注意保持前导空格 +#: diff.c:110 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr " 未知 dirstat 参数 '%.*s'\n" + +#: diff.c:210 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"发现配置变量 'diff.dirstat' 中的错误:\n" +"%s" + +#: diff.c:1401 +msgid " 0 files changed" +msgstr " 0 个文件被修改" + +#: diff.c:1405 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] " %d 个文件被修改" +msgstr[1] " %d 个文件被修改" + +#: diff.c:1422 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] ",插入 %d 行(+)" +msgstr[1] ",插入 %d 行(+)" + +#: diff.c:1433 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] ",删除 %d 行(-)" +msgstr[1] ",删除 %d 行(-)" + +#: diff.c:3460 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"无法解析 --dirstat/-X 选项的参数:\n" +"%s" + +#: gpg-interface.c:59 +msgid "could not run gpg." +msgstr "不能执行 gpg。" + +#: gpg-interface.c:71 +msgid "gpg did not accept the data" +msgstr "gpg 没有接受数据" + +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "gpg 无法为数据签名" + +#: grep.c:1320 +#, c-format +msgid "'%s': unable to read %s" +msgstr "'%s':无法读取 %s" + +#: grep.c:1337 +#, c-format +msgid "'%s': %s" +msgstr "'%s':%s" + +#: grep.c:1348 +#, c-format +msgid "'%s': short read %s" +msgstr "'%s':读取不完整 %s" + +#: help.c:212 +#, c-format +msgid "available git commands in '%s'" +msgstr "在 '%s' 下可用的 git 命令" + +#: help.c:219 +msgid "git commands available from elsewhere on your $PATH" +msgstr "在 $PATH 路径中的其他地方可用的 git 命令" + +#: help.c:275 +#, 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 "" +"'%s' 像是一个 git 命令,但却无法运行。\n" +"可能是 git-%s 受损?" + +#: help.c:332 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "唉呀,您的系统中未发现 Git 命令。" + +#: help.c:354 +#, 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 "" +"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" +"是 '%s'" + +#: help.c:359 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "在 %0.1f 秒钟后自动运行..." + +#: help.c:366 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" + +#: help.c:370 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"您指的是这个么?" +msgstr[1] "" +"\n" +"您指的是这其中的某一个么?" + +#: merge-recursive.c:190 +#, c-format +msgid "(bad commit)\n" +msgstr "(坏提交)\n" + +#: merge-recursive.c:206 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "为路径 '%s' addinfo_cache 失败" + +#: merge-recursive.c:268 +msgid "error building trees" +msgstr "无法创建树" + +#: merge-recursive.c:672 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "无法创建路径 '%s'%s" + +#: merge-recursive.c:683 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "删除 %s 以便为子目录留出空间\n" + +#. 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 "拒绝丢弃 '%s' 中的未跟踪文件" + +#: merge-recursive.c:748 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "不能读取对象 %s '%s'" + +#: merge-recursive.c:750 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "%s '%s' 应为二进制对象(blob)" + +#: merge-recursive.c:773 builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "无法打开 '%s'" + +#: merge-recursive.c:781 +#, c-format +msgid "failed to symlink '%s'" +msgstr "无法创建符号链接 '%s'" + +#: merge-recursive.c:784 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "不知道如何处理 %06o %s '%s'" + +#: 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 "不能添加 %s 至对象库" + +#: 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 "" +"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" +"的版本被保留。" + +#: 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 "" +"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" +"的版本保留于 %8$s 中。" + +#: 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 "%s 是 %s 中的一个目录而以 %s 为名被添加" + +#: merge-recursive.c:1159 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" +"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " +"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" + +#: 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 "" +"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" +"%5$s" + +#: merge-recursive.c:1248 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "而是重命名 %s 至 %s 以及 %s 至 %s" + +#: merge-recursive.c:1447 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" + +#: merge-recursive.c:1457 +#, c-format +msgid "Adding merged %s" +msgstr "添加合并后的 %s" + +#: merge-recursive.c:1462 merge-recursive.c:1660 +#, c-format +msgid "Adding as %s instead" +msgstr "而是以 %s 为名添加" + +#: merge-recursive.c:1513 +#, c-format +msgid "cannot read object %s" +msgstr "不能读取对象 %s" + +#: merge-recursive.c:1516 +#, c-format +msgid "object %s is not a blob" +msgstr "对象 %s 不是一个二进制对象(blob)" + +#: 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 "略过 %s(已经做过相同合并)" + +#: merge-recursive.c:1629 +#, c-format +msgid "Auto-merging %s" +msgstr "自动合并 %s" + +#: merge-recursive.c:1633 git-submodule.sh:869 +msgid "submodule" +msgstr "子模组" + +#: merge-recursive.c:1634 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "冲突(%s):合并冲突于 %s" + +#: merge-recursive.c:1724 +#, c-format +msgid "Removing %s" +msgstr "删除 %s" + +#: 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 "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" + +#: merge-recursive.c:1770 +#, c-format +msgid "Adding %s" +msgstr "添加 %s" + +#: 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 "无法合并树 %s 和 %s" + +#: merge-recursive.c:1845 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "未处理的路径??? %s" + +#: 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] "发现 %u 个共同祖先:" +msgstr[1] "发现 %u 个共同祖先:" + +#: merge-recursive.c:1940 +msgid "merge returned no commit" +msgstr "合并未返回提交" + +#: merge-recursive.c:1997 +#, c-format +msgid "Could not parse object '%s'" +msgstr "不能解析对象 '%s'" + +#: merge-recursive.c:2009 builtin/merge.c:696 +msgid "Unable to write index." +msgstr "不能写入索引。" + +#: parse-options.c:494 +msgid "..." +msgstr "..." + +#: parse-options.c:512 +#, c-format +msgid "usage: %s" +msgstr "用法:%s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:516 +#, c-format +msgid " or: %s" +msgstr " 或:%s" + +# 译者:为保证在输出中对齐,注意调整句中空格! +#: parse-options.c:519 +#, c-format +msgid " %s" +msgstr " %s" + +#: remote.c:1632 +#, 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] "您的分支领先 '%s' 共 %d 个提交。\n" +msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" + +#: remote.c:1638 +#, 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] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" +msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" + +#: remote.c:1646 +#, 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] "" +"您的分支和 '%s' 出现了偏离,\n" +"并且分别有 %d 和 %d 处不同的提交。\n" +msgstr[1] "" +"您的分支和 '%s' 出现了偏离,\n" +"并且分别有 %d 和 %d 处不同的提交。\n" + +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "不能为写入打开 '%s'" + +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 +#: builtin/merge.c:1089 builtin/merge.c:1102 +#, c-format +msgid "Could not write to '%s'" +msgstr "不能写入 '%s'" + +#: sequencer.c:144 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" +"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n" +"命令标记修正后的文件" + +#: sequencer.c:147 +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 "" +"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n" +"对修正后的文件做标记,然后用 'git commit' 提交" + +#: sequencer.c:160 sequencer.c:765 sequencer.c:848 +#, c-format +msgid "Could not write to %s" +msgstr "不能写入 %s" + +#: sequencer.c:163 +#, c-format +msgid "Error wrapping up %s" +msgstr "错误收尾 %s" + +#: sequencer.c:178 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "您的本地修改将被拣选操作覆盖。" + +#: sequencer.c:180 +msgid "Your local changes would be overwritten by revert." +msgstr "您的本地修改将被还原操作覆盖。" + +#: sequencer.c:183 +msgid "Commit your changes or stash them to proceed." +msgstr "提交您的修改或保存进度后再继续。" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:233 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s:无法写入新索引文件" + +#: sequencer.c:261 +msgid "Could not resolve HEAD commit\n" +msgstr "不能解析 HEAD 提交\n" + +#: sequencer.c:282 +msgid "Unable to update cache tree\n" +msgstr "不能更新缓存\n" + +#: sequencer.c:327 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "不能解析提交 %s\n" + +#: sequencer.c:332 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "不能解析父提交 %s\n" + +#: sequencer.c:398 +msgid "Your index file is unmerged." +msgstr "您的索引文件未完成合并。" + +#: sequencer.c:401 +msgid "You do not have a valid HEAD" +msgstr "您没有一个有效的 HEAD" + +#: sequencer.c:416 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" + +#: sequencer.c:424 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "提交 %s 没有父提交 %d" + +#: sequencer.c:428 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "指定了主线但提交 %s 不是一个合并。" + +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: sequencer.c:439 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s:不能解析父提交 %s" + +#: sequencer.c:443 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "不能得到 %s 的提交说明" + +#: sequencer.c:527 +#, c-format +msgid "could not revert %s... %s" +msgstr "不能还原 %s... %s" + +#: sequencer.c:528 +#, c-format +msgid "could not apply %s... %s" +msgstr "不能应用 %s... %s" + +#: sequencer.c:560 +msgid "empty commit set passed" +msgstr "提供了空的提交集" + +#: sequencer.c:568 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s:无法读取索引" + +#: sequencer.c:573 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s:无法刷新索引" + +#: sequencer.c:631 +#, c-format +msgid "Cannot %s during a %s" +msgstr "无法 %s 在一个 %s 过程中" + +#: sequencer.c:653 +#, c-format +msgid "Could not parse line %d." +msgstr "不能解析第 %d 行。" + +#: sequencer.c:658 +msgid "No commits parsed." +msgstr "没有提交被解析。" + +#: sequencer.c:671 +#, c-format +msgid "Could not open %s" +msgstr "不能打开 %s" + +#: sequencer.c:675 +#, c-format +msgid "Could not read %s." +msgstr "不能读取 %s。" + +#: sequencer.c:682 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "无用的指令表单:%s" + +#: sequencer.c:710 +#, c-format +msgid "Invalid key: %s" +msgstr "无效键名:%s" + +#: sequencer.c:713 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "%s 的值无效:%s" + +#: sequencer.c:725 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "非法的选项表单:%s" + +#: sequencer.c:746 +msgid "a cherry-pick or revert is already in progress" +msgstr "一个拣选或还原操作已在进行" + +#: sequencer.c:747 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" + +#: sequencer.c:751 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "不能创建序列目录 %s" + +#: sequencer.c:767 sequencer.c:852 +#, c-format +msgid "Error wrapping up %s." +msgstr "错误收尾 %s。" + +#: sequencer.c:786 sequencer.c:920 +msgid "no cherry-pick or revert in progress" +msgstr "拣选或还原操作并未进行" + +#: sequencer.c:788 +msgid "cannot resolve HEAD" +msgstr "不能解析 HEAD" + +#: sequencer.c:790 +msgid "cannot abort from a branch yet to be born" +msgstr "不能从尚未建立的分支终止" + +#: sequencer.c:812 builtin/apply.c:4005 +#, c-format +msgid "cannot open %s: %s" +msgstr "不能打开 %s:%s" + +#: sequencer.c:815 +#, c-format +msgid "cannot read %s: %s" +msgstr "不能读取 %s:%s" + +#: sequencer.c:816 +msgid "unexpected end of file" +msgstr "意外的文件结束" + +#: sequencer.c:822 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" + +#: sequencer.c:845 +#, c-format +msgid "Could not format %s." +msgstr "不能格式化 %s。" + +#: sequencer.c:1007 +msgid "Can't revert as initial commit" +msgstr "不能作为初始提交还原" + +#: sequencer.c:1008 +msgid "Can't cherry-pick into empty head" +msgstr "不能拣选到空分支" + +#: sha1_name.c:1044 +msgid "HEAD does not point to a branch" +msgstr "HEAD 没有指向一个分支" + +#: sha1_name.c:1047 +#, c-format +msgid "No such branch: '%s'" +msgstr "没有此分支:'%s'" + +#: sha1_name.c:1049 +#, c-format +msgid "No upstream configured for branch '%s'" +msgstr "尚未给分支 '%s' 设置上游" + +#: sha1_name.c:1052 +#, c-format +msgid "Upstream branch '%s' not stored as a remote-tracking branch" +msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" + +#: wrapper.c:408 +#, fuzzy, c-format +msgid "unable to access '%s': %s" +msgstr "不能创建 '%s'" + +#: wrapper.c:426 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "无法在 passwd 文件中查询到该用户:%s" + +#: wrapper.c:427 +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 " (使用 \"git reset %s <file>...\" 撤出暂存区)" + +# 译者:注意保持前导空格 +#: wt-status.c:169 wt-status.c:196 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)" + +# 译者:注意保持前导空格 +#: wt-status.c:173 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " (使用 \"git add <file>...\" 标记解决方案)" + +# 译者:注意保持前导空格 +#: wt-status.c:175 wt-status.c:179 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)" + +# 译者:注意保持前导空格 +#: wt-status.c:177 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " (使用 \"git rm <file>...\" 标记解决方案)" + +#: 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 " (使用 \"git add <file>...\" 更新要提交的内容)" + +# 译者:注意保持前导空格 +#: wt-status.c:212 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)" + +# 译者:注意保持前导空格 +#: wt-status.c:213 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)" + +# 译者:注意保持前导空格 +#: 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 " (使用 \"git %s <file>...\" 以包含要提交的内容)" + +#: wt-status.c:244 +msgid "bug" +msgstr "bug" + +#: 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 "新文件: %s" + +# 译者:为保证在输出中对齐,注意调整句中空格! +#: wt-status.c:306 +#, c-format +msgid "copied: %s -> %s" +msgstr "拷贝: %s -> %s" + +# 译者:为保证在输出中对齐,注意调整句中空格! +#: wt-status.c:309 +#, c-format +msgid "deleted: %s" +msgstr "删除: %s" + +# 译者:为保证在输出中对齐,注意调整句中空格! +#: wt-status.c:312 +#, c-format +msgid "modified: %s" +msgstr "修改: %s" + +# 译者:为保证在输出中对齐,注意调整句中空格! +#: wt-status.c:315 +#, c-format +msgid "renamed: %s -> %s" +msgstr "重命名: %s -> %s" + +# 译者:为保证在输出中对齐,注意调整句中空格! +#: wt-status.c:318 +#, c-format +msgid "typechange: %s" +msgstr "类型变更: %s" + +# 译者:为保证在输出中对齐,注意调整句中空格! +#: wt-status.c:321 +#, c-format +msgid "unknown: %s" +msgstr "未知: %s" + +# 译者:为保证在输出中对齐,注意调整句中空格! +#: wt-status.c:324 +#, c-format +msgid "unmerged: %s" +msgstr "未合并: %s" + +#: wt-status.c:327 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "bug:未处理的差异状态 %c" + +#: wt-status.c:785 +msgid "You have unmerged paths." +msgstr "您有尚未合并的路径。" + +# 译者:注意保持前导空格 +#: wt-status.c:788 wt-status.c:912 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (解决冲突并运行 \"git commit\")" + +#: wt-status.c:791 +msgid "All conflicts fixed but you are still merging." +msgstr "所有冲突已解决但您仍处于合并中。" + +# 译者:注意保持前导空格 +#: wt-status.c:794 +msgid " (use \"git commit\" to conclude merge)" +msgstr " (使用 \"git commit\" 结束合并)" + +#: wt-status.c:804 +msgid "You are in the middle of an am session." +msgstr "您正处于一个 am 过程中。" + +#: wt-status.c:807 +msgid "The current patch is empty." +msgstr "当前的补丁为空。" + +# 译者:注意保持前导空格 +#: wt-status.c:811 +msgid " (fix conflicts and then run \"git am --resolved\")" +msgstr " (解决冲突,然后运行 \"git am --resolved\")" + +# 译者:注意保持前导空格 +#: wt-status.c:813 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (使用 \"git am --skip\" 跳过此补丁)" + +# 译者:注意保持前导空格 +#: wt-status.c:815 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " (使用 \"git am --abort\" 恢复原有分支)" + +#: wt-status.c:873 wt-status.c:883 +msgid "You are currently rebasing." +msgstr "您正在变基。" + +# 译者:注意保持前导空格 +#: wt-status.c:876 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " (解决冲突,然后运行 \"git rebase --continue\")" + +# 译者:注意保持前导空格 +#: wt-status.c:878 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" + +# 译者:注意保持前导空格 +#: wt-status.c:880 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" + +# 译者:注意保持前导空格 +#: wt-status.c:886 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" + +#: wt-status.c:888 +msgid "You are currently splitting a commit during a rebase." +msgstr "您正在变基过程中拆分一个提交。" + +# 译者:注意保持前导空格 +#: wt-status.c:891 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" + +#: wt-status.c:893 +msgid "You are currently editing a commit during a rebase." +msgstr "您正在变基过程中编辑一个提交。" + +# 译者:注意保持前导空格 +#: wt-status.c:896 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr " (使用 \"git commit --amend\" 修补当前提交)" + +# 译者:注意保持前导空格 +#: wt-status.c:898 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" + +#: wt-status.c:908 +msgid "You are currently cherry-picking." +msgstr "您正在做拣选操作。" + +# 译者:注意保持前导空格 +#: wt-status.c:915 +msgid " (all conflicts fixed: run \"git commit\")" +msgstr " (解决所有冲突后,执行 \"git commit\")" + +#: wt-status.c:924 +msgid "You are currently bisecting." +msgstr "您正在做二分查找。" + +# 译者:注意保持前导空格 +#: wt-status.c:927 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr " (使用 \"git bisect reset\" 以回到原有分支)" + +#: wt-status.c:978 +msgid "On branch " +msgstr "位于分支 " + +#: wt-status.c:985 +msgid "Not currently on any branch." +msgstr "当前不在任何分支上。" + +#: wt-status.c:997 +msgid "Initial commit" +msgstr "初始提交" + +#: wt-status.c:1011 +#, fuzzy +msgid "Untracked files" +msgstr "未跟踪的" + +#: wt-status.c:1013 +#, fuzzy +msgid "Ignored files" +msgstr "忽略的" + +#: wt-status.c:1015 +#, c-format +msgid "Untracked files not listed%s" +msgstr "未跟踪的文件没有列出%s" + +# 译者:中文字符串拼接,可删除前导空格 +#: wt-status.c:1017 +msgid " (use -u option to show untracked files)" +msgstr "(使用 -u 参数显示未跟踪的文件)" + +#: wt-status.c:1023 +msgid "No changes" +msgstr "没有修改" + +# 译者:中文字符串拼接,可删除前导空格 +#: wt-status.c:1028 +#, fuzzy, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "(使用 \"git add\" 和/或 \"git commit -a\")" + +#: wt-status.c:1031 +#, fuzzy, c-format +msgid "no changes added to commit\n" +msgstr "修改尚未加入提交%s\n" + +#: wt-status.c:1034 +#, fuzzy, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "空提交但存在未跟踪文件%s\n" + +#: wt-status.c:1037 +#, fuzzy, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "空提交但存在未跟踪文件%s\n" + +# 译者:中文字符串拼接,可删除前导空格 +#: wt-status.c:1040 +#, fuzzy, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)" + +#: wt-status.c:1043 wt-status.c:1048 +#, fuzzy, c-format +msgid "nothing to commit\n" +msgstr "无须提交%s\n" + +# 译者:中文字符串拼接,可删除前导空格 +#: wt-status.c:1046 +#, fuzzy, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "(使用 -u 显示未跟踪文件)" + +# 译者:中文字符串拼接,可删除前导空格 +#: wt-status.c:1050 +#, fuzzy, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "(干净的工作区)" + +#: wt-status.c:1158 +msgid "HEAD (no branch)" +msgstr "HEAD(非分支)" + +# 译者:注意保持句尾空格 +#: wt-status.c:1164 +msgid "Initial commit on " +msgstr "初始提交于 " + +# 译者:注意保持句尾空格 +#: wt-status.c:1179 +msgid "behind " +msgstr "落后 " + +# 译者:注意保持句尾空格 +#: wt-status.c:1182 wt-status.c:1185 +msgid "ahead " +msgstr "领先 " + +# 译者:注意保持句尾空格 +#: wt-status.c:1187 +msgid ", behind " +msgstr ",落后 " + +#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "无法删除 '%s'" + +#: builtin/add.c:19 +#, fuzzy +msgid "git add [options] [--] <filepattern>..." +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "意外的差异状态 %c" + +#: builtin/add.c:67 builtin/commit.c:229 +msgid "updating files failed" +msgstr "更新文件失败" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "删除 '%s'\n" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "路径 '%s' 属于模组 '%.*s'" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "刷新索引之后尚未被暂存的变更:" + +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "路径 '%s' 未匹配任何文件" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "'%s' 位于符号链接中" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "不能读取索引" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "不能打开 '%s' 以写入。" + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "不能生成补丁" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "不能查看文件状态 '%s'" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "空补丁。异常终止。" + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "不能应用 '%s'" + +#: builtin/add.c:313 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" + +#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 +#: builtin/rm.c:133 +msgid "dry run" +msgstr "" + +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477 +#: builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "冗长输出" + +#: builtin/add.c:322 +#, fuzzy +msgid "interactive picking" +msgstr "交互式添加失败" + +#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248 +msgid "select hunks interactively" +msgstr "" + +#: builtin/add.c:324 +msgid "edit current diff and apply" +msgstr "" + +#: builtin/add.c:325 +msgid "allow adding otherwise ignored files" +msgstr "" + +#: builtin/add.c:326 +#, fuzzy +msgid "update tracked files" +msgstr "无法存储包文件" + +#: builtin/add.c:327 +msgid "record only the fact that the path will be added later" +msgstr "" + +#: builtin/add.c:328 +msgid "add changes from all tracked and untracked files" +msgstr "" + +#: builtin/add.c:329 +#, fuzzy +msgid "don't add, only refresh the index" +msgstr "git %s:无法刷新索引" + +#: builtin/add.c:330 +msgid "just skip files which cannot be added because of errors" +msgstr "" + +#: builtin/add.c:331 +msgid "check if - even missing - files are ignored in dry run" +msgstr "" + +#: builtin/add.c:353 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "使用 -f 参数如果您确实要添加它们。\n" + +#: builtin/add.c:354 +msgid "no files added" +msgstr "没有文件被添加" + +#: builtin/add.c:360 +msgid "adding files failed" +msgstr "添加文件失败" + +#: builtin/add.c:392 +msgid "-A and -u are mutually incompatible" +msgstr "-A 和 -u 选项互斥" + +#: builtin/add.c:394 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" + +#: builtin/add.c:414 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "没有指定文件,也没有文件被添加。\n" + +#: builtin/add.c:415 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "也许您想要执行 'git add .'?\n" + +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "索引文件损坏" + +#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "无法写入新索引文件" + +#: builtin/apply.c:57 +msgid "git apply [options] [<patch>...]" +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/apply.c:110 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "未能识别的空白字符选项 '%s'" + +#: builtin/apply.c:125 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "未能识别的空白字符忽略选项 '%s'" + +#: builtin/apply.c:823 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "无法准备时间戳正则表达式 %s" + +#: builtin/apply.c:832 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec 返回 %d,输入为:%s" + +#: builtin/apply.c:913 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "不能在补丁的第 %d 行找到文件名" + +#: builtin/apply.c:945 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" + +#: builtin/apply.c:949 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" + +#: builtin/apply.c:950 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" + +#: builtin/apply.c:957 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" + +#: builtin/apply.c:1420 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount:意外的行:%.*s" + +#: builtin/apply.c:1477 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "第 %d 行的补丁片段没有头信息:%.*s" + +#: builtin/apply.c:1494 +#, 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] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" +msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" + +#: builtin/apply.c:1654 +msgid "new file depends on old contents" +msgstr "新文件依赖旧内容" + +#: builtin/apply.c:1656 +msgid "deleted file still has contents" +msgstr "删除的文件仍有内容" + +#: builtin/apply.c:1682 +#, c-format +msgid "corrupt patch at line %d" +msgstr "补丁在第 %d 行损坏" + +#: builtin/apply.c:1718 +#, c-format +msgid "new file %s depends on old contents" +msgstr "新文件 %s 依赖旧内容" + +#: builtin/apply.c:1720 +#, c-format +msgid "deleted file %s still has contents" +msgstr "删除的文件 %s 仍有内容" + +#: builtin/apply.c:1723 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** 警告:文件 %s 成为空文件但并未删除" + +#: builtin/apply.c:1869 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "二进制补丁在第 %d 行损坏:%.*s" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1898 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "未能识别的二进制补丁位于第 %d 行" + +#: builtin/apply.c:1984 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "补丁文件的第 %d 行只有垃圾数据" + +#: builtin/apply.c:2074 +#, c-format +msgid "unable to read symlink %s" +msgstr "无法读取符号链接 %s" + +#: builtin/apply.c:2078 +#, c-format +msgid "unable to open or read %s" +msgstr "不能打开或读取 %s" + +#: builtin/apply.c:2149 +msgid "oops" +msgstr "哎哟" + +#: builtin/apply.c:2671 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "无效的行首字符:'%c'" + +#: builtin/apply.c:2789 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行)" +msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行)" + +#: builtin/apply.c:2801 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" + +#: builtin/apply.c:2807 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"当查询:\n" +"%.*s" + +#: builtin/apply.c:2826 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "缺失 '%s' 的二进制补丁数据" + +#: builtin/apply.c:2929 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "二进制补丁未应用到 '%s'" + +#: builtin/apply.c:2935 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" + +#: builtin/apply.c:2956 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "打补丁失败:%s:%ld" + +#: builtin/apply.c:3078 +#, c-format +msgid "cannot checkout %s" +msgstr "不能检出 %s" + +#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#, c-format +msgid "read of %s failed" +msgstr "读取 %s 失败" + +#: builtin/apply.c:3156 builtin/apply.c:3378 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "路径 %s 已经被重命名/删除" + +#: builtin/apply.c:3237 builtin/apply.c:3392 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s:不存在于索引中" + +#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#, c-format +msgid "%s: %s" +msgstr "%s:%s" + +#: builtin/apply.c:3246 builtin/apply.c:3400 +#, c-format +msgid "%s: does not match index" +msgstr "%s:和索引不匹配" + +#: builtin/apply.c:3348 +msgid "removal patch leaves file contents" +msgstr "移除补丁仍留下了文件内容" + +#: builtin/apply.c:3417 +#, c-format +msgid "%s: wrong type" +msgstr "%s:错误类型" + +#: builtin/apply.c:3419 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s 的类型是 %o,应为 %o" + +#: builtin/apply.c:3520 +#, c-format +msgid "%s: already exists in index" +msgstr "%s:已经存在于索引中" + +#: builtin/apply.c:3523 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s:已经存在于工作区中" + +#: builtin/apply.c:3543 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" + +#: builtin/apply.c:3548 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" + +#: builtin/apply.c:3556 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s:补丁未应用" + +#: builtin/apply.c:3569 +#, c-format +msgid "Checking patch %s..." +msgstr "检查补丁 %s..." + +#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "对路径 '%s' 的 make_cache_entry 操作失败" + +#: builtin/apply.c:3767 +#, c-format +msgid "unable to remove %s from index" +msgstr "不能从索引中移除 %s" + +#: builtin/apply.c:3795 +#, c-format +msgid "corrupt patch for subproject %s" +msgstr "子项目 %s 损坏的补丁" + +#: builtin/apply.c:3799 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "不能枚举新建文件 '%s' 的状态" + +#: builtin/apply.c:3804 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "不能为新建文件 %s 创建后端存储" + +#: builtin/apply.c:3807 builtin/apply.c:3915 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "无法为 %s 添加缓存条目" + +#: builtin/apply.c:3840 +#, c-format +msgid "closing file '%s'" +msgstr "关闭文件 '%s'" + +#: builtin/apply.c:3889 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "不能写文件 '%s' 权限 %o" + +#: builtin/apply.c:3976 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "成功应用补丁 %s。" + +#: builtin/apply.c:3984 +msgid "internal error" +msgstr "内部错误" + +#. Say this even without --verbose +#: builtin/apply.c:3987 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." +msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." + +#: builtin/apply.c:3997 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "截短 .rej 文件名为 %.*s.rej" + +#: builtin/apply.c:4018 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "第 #%d 个片段成功应用。" + +#: builtin/apply.c:4021 +#, c-format +msgid "Rejected hunk #%d." +msgstr "拒绝第 #%d 个片段。" + +#: builtin/apply.c:4171 +msgid "unrecognized input" +msgstr "未能识别的输入" + +#: builtin/apply.c:4182 +msgid "unable to read index file" +msgstr "无法读取索引文件" + +#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/fetch.c:63 +msgid "path" +msgstr "路径" + +#: builtin/apply.c:4302 +msgid "don't apply changes matching the given path" +msgstr "不要应用与给出路径向匹配的变更" + +#: builtin/apply.c:4305 +msgid "apply changes matching the given path" +msgstr "应用与给出路径向匹配的变更" + +#: builtin/apply.c:4307 +msgid "num" +msgstr "数字" + +#: builtin/apply.c:4308 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "从传统的 diff 路径中移除 <数字> 个前导路径" + +#: builtin/apply.c:4311 +msgid "ignore additions made by the patch" +msgstr "忽略补丁中的添加的文件" + +#: builtin/apply.c:4313 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" + +#: builtin/apply.c:4317 +#, fuzzy +msgid "show number of added and deleted lines in decimal notation" +msgstr "以数字方式显示添加或删除行的数量" + +#: builtin/apply.c:4319 +msgid "instead of applying the patch, output a summary for the input" +msgstr "不应用补丁,而是显示输入的概要" + +#: builtin/apply.c:4321 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "不应用补丁,而是查看补丁是否可应用" + +#: builtin/apply.c:4323 +msgid "make sure the patch is applicable to the current index" +msgstr "确认补丁可以应用到当前索引" + +#: builtin/apply.c:4325 +msgid "apply a patch without touching the working tree" +msgstr "应用补丁而不修改工作区" + +#: builtin/apply.c:4327 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" + +#: builtin/apply.c:4329 +msgid "attempt three-way merge if a patch does not apply" +msgstr "如果一个补丁不能应用则尝试三路合并" + +#: builtin/apply.c:4331 +msgid "build a temporary index based on embedded index information" +msgstr "创建一个临时索引基于嵌入的索引信息" + +#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +msgid "paths are separated with NUL character" +msgstr "路径以 NUL 字符分隔" + +#: builtin/apply.c:4336 +msgid "ensure at least <n> lines of context match" +msgstr "确保至少匹配 <n> 行上下文" + +#: builtin/apply.c:4337 +msgid "action" +msgstr "动作" + +#: builtin/apply.c:4338 +msgid "detect new or modified lines that have whitespace errors" +msgstr "检查新增和修改的行中间的空白字符滥用" + +#: builtin/apply.c:4341 builtin/apply.c:4344 +msgid "ignore changes in whitespace when finding context" +msgstr "查找上下文时忽略空白字符的变更" + +#: builtin/apply.c:4347 +msgid "apply the patch in reverse" +msgstr "反向应用补丁" + +#: builtin/apply.c:4349 +msgid "don't expect at least one line of context" +msgstr "无需至少一行上下文" + +#: builtin/apply.c:4351 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" + +#: builtin/apply.c:4353 +msgid "allow overlapping hunks" +msgstr "允许重叠的补丁片段" + +#: builtin/apply.c:4356 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "允许不正确的文件末尾换行符" + +#: builtin/apply.c:4359 +msgid "do not trust the line counts in the hunk headers" +msgstr "不信任补丁片段的头信息中的行号" + +#: builtin/apply.c:4361 +msgid "root" +msgstr "根目录" + +#: builtin/apply.c:4362 +msgid "prepend <root> to all filenames" +msgstr "为所有文件名前添加 <根目录>" + +#: builtin/apply.c:4384 +msgid "--3way outside a repository" +msgstr "--3way 在一个版本库之外" + +#: builtin/apply.c:4392 +msgid "--index outside a repository" +msgstr "--index 在一个版本库之外" + +#: builtin/apply.c:4395 +msgid "--cached outside a repository" +msgstr "--cached 在一个版本库之外" + +#: builtin/apply.c:4411 +#, c-format +msgid "can't open patch '%s'" +msgstr "不能打开补丁 '%s'" + +#: builtin/apply.c:4425 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "抑制下仍有 %d 个空白字符误用" +msgstr[1] "抑制下仍有 %d 个空白字符误用" + +#: builtin/apply.c:4431 builtin/apply.c:4441 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d 行有空白字符误用。" +msgstr[1] "%d 行有空白字符误用。" + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "不能创建归档文件 '%s'" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "不能重定向输出" + +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" +msgstr "git archive:未提供远程URL" + +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive:应为ACK/NACK,却得到EOF" + +#: builtin/archive.c:63 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive:NACK %s" + +#: builtin/archive.c:65 +#, c-format +msgid "remote error: %s" +msgstr "远程错误:%s" + +#: builtin/archive.c:66 +msgid "git archive: protocol error" +msgstr "git archive:协议错误" + +#: builtin/archive.c:71 +msgid "git archive: expected a flush" +msgstr "git archive:应为刷新" + +#: 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:2316 +msgid "Show blame entries as we find them, incrementally" +msgstr "" + +#: builtin/blame.c:2317 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "" + +#: builtin/blame.c:2318 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "" + +#: builtin/blame.c:2319 +#, fuzzy +msgid "Show work cost statistics" +msgstr "显示工作区状态" + +#: builtin/blame.c:2320 +msgid "Show output score for blame entries" +msgstr "" + +#: builtin/blame.c:2321 +msgid "Show original filename (Default: auto)" +msgstr "" + +#: builtin/blame.c:2322 +msgid "Show original linenumber (Default: off)" +msgstr "" + +#: builtin/blame.c:2323 +msgid "Show in a format designed for machine consumption" +msgstr "" + +#: builtin/blame.c:2324 +msgid "Show porcelain format with per-line commit information" +msgstr "" + +#: builtin/blame.c:2325 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "" + +#: builtin/blame.c:2326 +msgid "Show raw timestamp (Default: off)" +msgstr "" + +#: builtin/blame.c:2327 +msgid "Show long commit SHA1 (Default: off)" +msgstr "" + +#: builtin/blame.c:2328 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "" + +#: builtin/blame.c:2329 +msgid "Show author email instead of name (Default: off)" +msgstr "" + +#: builtin/blame.c:2330 +msgid "Ignore whitespace differences" +msgstr "" + +#: builtin/blame.c:2331 +msgid "Spend extra cycles to find better match" +msgstr "" + +#: builtin/blame.c:2332 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "" + +#: builtin/blame.c:2333 +#, fuzzy +msgid "Use <file>'s contents as the final image" +msgstr "添加文件内容至索引" + +#: builtin/blame.c:2334 builtin/blame.c:2335 +msgid "score" +msgstr "" + +#: builtin/blame.c:2334 +msgid "Find line copies within and across files" +msgstr "" + +#: builtin/blame.c:2335 +msgid "Find line movements within and across files" +msgstr "" + +#: builtin/blame.c:2336 +#, fuzzy +msgid "n,m" +msgstr "数字" + +#: builtin/blame.c:2336 +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 +#, fuzzy +msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/branch.c:26 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgstr "" + +# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 +#: builtin/branch.c:145 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" +"将要删除的分支 '%s' 已经被合并到\n" +" '%s',但未合并到 HEAD。" + +# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 +#: 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 "" +"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" +" 然而却尚未被合并到分支 '%s' 。" + +#: builtin/branch.c:181 +msgid "cannot use -a with -d" +msgstr "不能将 -a 和 -d 同时使用" + +#: builtin/branch.c:187 +msgid "Couldn't look up commit object for HEAD" +msgstr "无法查询 HEAD 指向的提交对象" + +#: builtin/branch.c:192 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "无法删除您当前所在的分支 '%s'。" + +#: builtin/branch.c:203 +#, c-format +msgid "remote branch '%s' not found." +msgstr "远程分支 '%s' 未发现。" + +#: builtin/branch.c:204 +#, c-format +msgid "branch '%s' not found." +msgstr "分支 '%s' 未发现。" + +#: builtin/branch.c:211 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "无法查询 '%s' 指向的提交对象" + +#: builtin/branch.c:217 +#, 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 "" +"分支 '%s' 没有完全合并。\n" +"如果您确认要删除它,执行 'git branch -D %s'。" + +#: builtin/branch.c:226 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "删除远程分支 '%s' 时出错" + +#: builtin/branch.c:227 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "删除分支 '%s' 时出错" + +#: builtin/branch.c:234 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "已删除远程分支 %s(曾为 %s)。\n" + +#: builtin/branch.c:235 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "已删除分支 %s(曾为 %s)。\n" + +#: builtin/branch.c:240 +msgid "Update of config-file failed" +msgstr "无法更新 config 文件" + +#: builtin/branch.c:338 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "分支 '%s' 未指向一个提交" + +#: builtin/branch.c:410 +#, c-format +msgid "[%s: behind %d]" +msgstr "[%s:落后 %d]" + +#: builtin/branch.c:412 +#, c-format +msgid "[behind %d]" +msgstr "[落后 %d]" + +#: builtin/branch.c:416 +#, c-format +msgid "[%s: ahead %d]" +msgstr "[%s:领先 %d]" + +#: builtin/branch.c:418 +#, c-format +msgid "[ahead %d]" +msgstr "[领先 %d]" + +#: builtin/branch.c:421 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "[%s:领先 %d,落后 %d]" + +#: builtin/branch.c:424 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "[领先 %d,落后 %d]" + +#: builtin/branch.c:537 +msgid "(no branch)" +msgstr "(非分支)" + +#: builtin/branch.c:602 +msgid "some refs could not be read" +msgstr "一些引用不能读取" + +#: builtin/branch.c:615 +msgid "cannot rename the current branch while not on any." +msgstr "无法重命名当前分支因为不处于任何分支上。" + +#: builtin/branch.c:625 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "无效的分支名:'%s'" + +#: builtin/branch.c:640 +msgid "Branch rename failed" +msgstr "分支重命名失败" + +#: builtin/branch.c:644 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "重命名掉一个错误命名的旧分支 '%s'" + +#: builtin/branch.c:648 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "分支重命名为 %s,但 HEAD 没有更新!" + +#: builtin/branch.c:655 +msgid "Branch is renamed, but update of config-file failed" +msgstr "分支被重命名,但更新 config 文件失败" + +#: builtin/branch.c:670 +#, c-format +msgid "malformed object name %s" +msgstr "非法的对象名 %s" + +#: builtin/branch.c:694 +#, c-format +msgid "could not write branch description template: %s" +msgstr "不能写分支描述模版:%s" + +#: builtin/branch.c:724 +#, fuzzy +msgid "Generic options" +msgstr "无效选项:%s" + +#: builtin/branch.c:726 +msgid "show hash and subject, give twice for upstream branch" +msgstr "" + +#: builtin/branch.c:727 +msgid "suppress informational messages" +msgstr "" + +#: builtin/branch.c:728 +msgid "set up tracking mode (see git-pull(1))" +msgstr "" + +#: builtin/branch.c:730 +msgid "change upstream info" +msgstr "" + +#: builtin/branch.c:734 +#, fuzzy +msgid "use colored output" +msgstr "不能输出重定向" + +#: builtin/branch.c:735 +#, fuzzy +msgid "act on remote-tracking branches" +msgstr "%s 没有来自 %s 的远程跟踪分支" + +#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765 +#: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396 +#: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470 +#, fuzzy +msgid "commit" +msgstr "(坏提交)\n" + +#: builtin/branch.c:739 builtin/branch.c:745 +msgid "print only branches that contain the commit" +msgstr "" + +#: builtin/branch.c:751 +msgid "Specific git-branch actions:" +msgstr "" + +#: builtin/branch.c:752 +msgid "list both remote-tracking and local branches" +msgstr "" + +#: builtin/branch.c:754 +msgid "delete fully merged branch" +msgstr "" + +#: builtin/branch.c:755 +msgid "delete branch (even if not merged)" +msgstr "" + +#: builtin/branch.c:756 +msgid "move/rename a branch and its reflog" +msgstr "" + +#: builtin/branch.c:757 +msgid "move/rename a branch, even if target exists" +msgstr "" + +#: builtin/branch.c:758 +#, fuzzy +msgid "list branch names" +msgstr "无效的分支名:'%s'" + +#: builtin/branch.c:759 +msgid "create the branch's reflog" +msgstr "" + +#: builtin/branch.c:761 +msgid "edit the description for the branch" +msgstr "" + +#: builtin/branch.c:762 +#, fuzzy +msgid "force creation (when already exists)" +msgstr "远程 %s 已经存在。" + +#: builtin/branch.c:765 +#, fuzzy +msgid "print only not merged branches" +msgstr "无法移除分支 %s" + +#: builtin/branch.c:771 +msgid "print only merged branches" +msgstr "" + +#: builtin/branch.c:775 +msgid "list branches in columns" +msgstr "" + +#: builtin/branch.c:788 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "无法将 HEAD 解析为有效引用。" + +#: builtin/branch.c:793 builtin/clone.c:561 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD 没有位于 /refs/heads 之下!" + +#: builtin/branch.c:813 +msgid "--column and --verbose are incompatible" +msgstr "--column 和 --verbose 不兼容" + +#: builtin/branch.c:864 +#, fuzzy, c-format +msgid "branch '%s' does not exist" +msgstr "版本库 '%s' 不存在" + +#: builtin/branch.c:876 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "" + +#: builtin/branch.c:891 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" + +#: builtin/branch.c:894 +#, 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:911 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" + +#: builtin/branch.c:912 +#, fuzzy, c-format +msgid " git branch -d %s\n" +msgstr " HEAD分支:%s" + +#: builtin/branch.c:913 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr "" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s 可以\n" + +#: 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 +#, fuzzy +msgid "show object type" +msgstr "坏的对象类型。" + +#: builtin/cat-file.c:268 +#, fuzzy +msgid "show object size" +msgstr "坏对象 %s" + +#: 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 +#, fuzzy +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 [-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/hash-object.c:75 +#, fuzzy +msgid "read file names from stdin" +msgstr "(正从标准输入中读取日志信息)\n" + +#: builtin/check-attr.c:23 +#, fuzzy +msgid "input paths are terminated by a null character" +msgstr "路径以 NUL 字符分隔" + +#: 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 +#, fuzzy +msgid "don't checkout new files" +msgstr "不能检出 %s" + +#: builtin/checkout-index.c:194 +#, fuzzy +msgid "update stat information in the index file" +msgstr "无法写新的索引文件" + +#: builtin/checkout-index.c:200 +#, fuzzy +msgid "read list of paths from the standard input" +msgstr "(正从标准输入中读取日志信息)\n" + +#: 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 +#, fuzzy +msgid "git checkout [options] <branch>" +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/checkout.c:26 +#, fuzzy +msgid "git checkout [options] [<branch>] -- <file>..." +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/checkout.c:116 builtin/checkout.c:149 +#, c-format +msgid "path '%s' does not have our version" +msgstr "路径 '%s' 没有我们的版本" + +#: builtin/checkout.c:118 builtin/checkout.c:151 +#, c-format +msgid "path '%s' does not have their version" +msgstr "路径 '%s' 没有他们的版本" + +#: builtin/checkout.c:134 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "路径 '%s' 没有全部必须的版本" + +#: builtin/checkout.c:178 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "路径 '%s' 没有必须的版本" + +#: builtin/checkout.c:195 +#, c-format +msgid "path '%s': cannot merge" +msgstr "path '%s':无法合并" + +#: builtin/checkout.c:212 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "无法为 '%s' 添加合并结果" + +#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 +#: builtin/checkout.c:245 +#, fuzzy, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "%s:%s 不能和 %s 同时使用" + +#: builtin/checkout.c:248 builtin/checkout.c:251 +#, fuzzy, c-format +msgid "'%s' cannot be used with %s" +msgstr "%s:%s 不能和 %s 同时使用" + +#: 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 "路径 '%s' 未合并" + +#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586 +#: builtin/merge.c:811 +msgid "unable to write new index file" +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 "不能对 '%s' 执行 reflog 操作\n" + +#: builtin/checkout.c:602 +msgid "HEAD is now at" +msgstr "HEAD 目前位于" + +#: builtin/checkout.c:609 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "重置分支 '%s'\n" + +#: builtin/checkout.c:612 +#, c-format +msgid "Already on '%s'\n" +msgstr "已经位于 '%s'\n" + +#: builtin/checkout.c:616 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "切换并重置分支 '%s'\n" + +#: builtin/checkout.c:618 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "切换到一个新分支 '%s'\n" + +#: builtin/checkout.c:620 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "切换到分支 '%s'\n" + +# 译者:注意保持前导空格 +#: builtin/checkout.c:676 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... 及其它 %d 个。\n" + +#. 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] "" +"警告:您正丢下 %d 个提交,未和任何分支关联:\n" +"\n" +"%s\n" +msgstr[1] "" +"警告:您正丢下 %d 个提交,未和任何分支关联:\n" +"\n" +"%s\n" + +#: 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 "" +"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n" +"如下操作:\n" +"\n" +" git branch new_branch_name %s\n" +"\n" + +#: builtin/checkout.c:730 +msgid "internal error in revision walk" +msgstr "在版本遍历时遇到内部错误" + +#: builtin/checkout.c:734 +msgid "Previous HEAD position was" +msgstr "之前的 HEAD 位置是" + +#: 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 "无效引用:%s" + +#. case (1): want a tree +#: builtin/checkout.c:925 +#, c-format +msgid "reference is not a tree: %s" +msgstr "引用不是一个树:%s" + +#: builtin/checkout.c:961 +#, fuzzy +msgid "paths cannot be used with switching branches" +msgstr "--ours/--theirs 和切换分支不兼容。" + +#: builtin/checkout.c:964 builtin/checkout.c:968 +#, fuzzy, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "%s:%s 不能和 %s 同时使用" + +#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980 +#: builtin/checkout.c:983 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "%s:%s 不能和 %s 同时使用" + +#: builtin/checkout.c:988 +#, fuzzy, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "无法切换分支到一个非提交。" + +#: builtin/checkout.c:1009 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "" + +#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89 +#: builtin/remote.c:169 builtin/remote.c:171 +#, fuzzy +msgid "branch" +msgstr "位于分支 " + +#: builtin/checkout.c:1011 +msgid "create and checkout a new branch" +msgstr "" + +#: builtin/checkout.c:1013 +msgid "create/reset and checkout a branch" +msgstr "" + +#: builtin/checkout.c:1014 +#, fuzzy +msgid "create reflog for new branch" +msgstr "列出、创建或删除分支" + +#: builtin/checkout.c:1015 +msgid "detach the HEAD at named commit" +msgstr "" + +#: builtin/checkout.c:1016 +#, fuzzy +msgid "set upstream info for new branch" +msgstr "尚未给分支 '%s' 设置上游" + +#: builtin/checkout.c:1018 +#, fuzzy +msgid "new branch" +msgstr "[新分支]" + +#: builtin/checkout.c:1018 +#, fuzzy +msgid "new unparented branch" +msgstr "没有当前分支。" + +#: builtin/checkout.c:1019 +msgid "checkout our version for unmerged files" +msgstr "" + +#: builtin/checkout.c:1021 +msgid "checkout their version for unmerged files" +msgstr "" + +#: builtin/checkout.c:1023 +msgid "force checkout (throw away local modifications)" +msgstr "" + +#: builtin/checkout.c:1024 +msgid "perform a 3-way merge with the new branch" +msgstr "" + +#: builtin/checkout.c:1025 builtin/merge.c:215 +#, fuzzy +msgid "update ignored files (default)" +msgstr "更新文件失败" + +#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241 +msgid "style" +msgstr "" + +#: builtin/checkout.c:1027 +msgid "conflict style (merge or diff3)" +msgstr "" + +#: builtin/checkout.c:1030 +msgid "second guess 'git checkout no-such-branch'" +msgstr "" + +#: builtin/checkout.c:1054 +#, fuzzy +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "-n 和 -k 互斥。" + +#: builtin/checkout.c:1071 +msgid "--track needs a branch name" +msgstr "--track 需要一个分支名" + +#: builtin/checkout.c:1078 +msgid "Missing branch name; try -b" +msgstr "缺少分支名;尝试 -b" + +#: builtin/checkout.c:1113 +msgid "invalid path specification" +msgstr "无效的路径规格" + +#: builtin/checkout.c:1120 +#, fuzzy, 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 "" +"git checkout:更新路径和切换分支不兼容。\n" +"您是想要检出 '%s' 但未能将其解析为提交么?" + +#: builtin/checkout.c:1125 +#, fuzzy, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout:--detach 不跟路径参数" + +#: builtin/checkout.c:1129 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" +"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" + +#: builtin/clean.c:19 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" + +#: builtin/clean.c:51 +msgid "do not print names of files removed" +msgstr "" + +#: builtin/clean.c:53 +msgid "force" +msgstr "" + +#: builtin/clean.c:55 +#, fuzzy +msgid "remove whole directories" +msgstr "两个输出目录?" + +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199 +msgid "pattern" +msgstr "" + +#: builtin/clean.c:57 +msgid "add <pattern> to ignore rules" +msgstr "" + +#: builtin/clean.c:58 +msgid "remove ignored files, too" +msgstr "" + +#: builtin/clean.c:60 +msgid "remove only ignored files" +msgstr "" + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "-x 和 -X 不能同时使用" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" +"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" +"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作" + +#: builtin/clean.c:155 builtin/clean.c:176 +#, c-format +msgid "Would remove %s\n" +msgstr "将删除 %s\n" + +#: builtin/clean.c:159 builtin/clean.c:179 +#, c-format +msgid "Removing %s\n" +msgstr "正删除 %s\n" + +#: builtin/clean.c:162 builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" +msgstr "无法删除 %s" + +#: builtin/clean.c:166 +#, c-format +msgid "Would not remove %s\n" +msgstr "不会删除 %s\n" + +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" +msgstr "未删除 %s\n" + +#: 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:399 +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 +#, fuzzy +msgid "create a bare repository" +msgstr "不是一个 git 版本库" + +#: 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 +#, fuzzy +msgid "setup as shared repository" +msgstr "不是一个 git 版本库" + +#: builtin/clone.c:80 builtin/clone.c:82 +msgid "initialize submodules in the clone" +msgstr "" + +#: builtin/clone.c:83 builtin/init-db.c:485 +#, fuzzy +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 +#, fuzzy +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:747 +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 +#, fuzzy +msgid "set config inside the new repository" +msgstr "记录变更到版本库" + +#: builtin/clone.c:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "引用版本库 '%s' 不是一个本地目录。" + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "无法创建目录 '%s'" + +#: builtin/clone.c:308 builtin/diff.c:77 +#, c-format +msgid "failed to stat '%s'" +msgstr "无法枚举 '%s' 状态" + +#: builtin/clone.c:310 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s 存在且不是一个目录" + +#: builtin/clone.c:324 +#, c-format +msgid "failed to stat %s\n" +msgstr "无法枚举 %s 状态\n" + +#: builtin/clone.c:346 +#, c-format +msgid "failed to create link '%s'" +msgstr "无法创建链接 '%s'" + +#: builtin/clone.c:350 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "无法拷贝文件至 '%s'" + +#: builtin/clone.c:373 +#, c-format +msgid "done.\n" +msgstr "完成。\n" + +#: builtin/clone.c:443 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "不能发现要克隆的远程分支 %s。" + +#: builtin/clone.c:552 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" + +#: builtin/clone.c:642 +msgid "Too many arguments." +msgstr "太多参数。" + +#: builtin/clone.c:646 +msgid "You must specify a repository to clone." +msgstr "您必须指定一个版本库来克隆。" + +#: builtin/clone.c:657 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "--bare 和 --origin %s 选项不兼容。" + +#: builtin/clone.c:671 +#, c-format +msgid "repository '%s' does not exist" +msgstr "版本库 '%s' 不存在" + +#: builtin/clone.c:676 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" + +#: builtin/clone.c:686 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" + +#: builtin/clone.c:696 +#, c-format +msgid "working tree '%s' already exists." +msgstr "工作区 '%s' 已经存在。" + +#: builtin/clone.c:709 builtin/clone.c:723 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "不能为 '%s' 创建先导目录" + +#: builtin/clone.c:712 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "不能为 '%s' 创建工作区目录。" + +#: builtin/clone.c:731 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "克隆到裸版本库 '%s'...\n" + +#: builtin/clone.c:733 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "正克隆到 '%s'...\n" + +#: builtin/clone.c:789 +#, c-format +msgid "Don't know how to clone %s" +msgstr "不知道如何克隆 %s" + +#: builtin/clone.c:838 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "远程分支 %s 在上游 %s 未发现" + +#: builtin/clone.c:845 +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 +#, fuzzy +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 "--command 必须是第一个参数" + +#: builtin/commit.c:33 +#, fuzzy +msgid "git commit [options] [--] <filepattern>..." +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/commit.c:38 +#, fuzzy +msgid "git status [options] [--] <filepattern>..." +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/commit.c:43 +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 "" +"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" +"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:55 +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 "" +"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" +"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" + +#: builtin/commit.c:60 +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 "" +"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" +"也要提交,使用命令:\n" +"\n" +" git commit --allow-empty\n" +"\n" +"否则,请使用命令 'git reset'\n" + +#: builtin/commit.c:256 +msgid "failed to unpack HEAD tree object" +msgstr "无法解包 HEAD 树对象" + +#: builtin/commit.c:298 +msgid "unable to create temporary index" +msgstr "不能创建临时索引" + +#: builtin/commit.c:304 +msgid "interactive add failed" +msgstr "交互式添加失败" + +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 +msgid "unable to write new_index file" +msgstr "无法写 new_index 文件" + +#: builtin/commit.c:389 +msgid "cannot do a partial commit during a merge." +msgstr "在合并过程中不能做部分提交。" + +#: builtin/commit.c:391 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "在拣选过程中不能做部分提交。" + +#: builtin/commit.c:401 +msgid "cannot read the index" +msgstr "无法读取索引" + +#: builtin/commit.c:421 +msgid "unable to write temporary index file" +msgstr "无法写临时索引文件" + +#: builtin/commit.c:510 builtin/commit.c:516 +#, c-format +msgid "invalid commit: %s" +msgstr "无效的提交:%s" + +#: builtin/commit.c:539 +msgid "malformed --author parameter" +msgstr "非法的 --author 参数" + +#: builtin/commit.c:600 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "非法的身份字符串:'%s'" + +#: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985 +#, c-format +msgid "could not lookup commit %s" +msgstr "不能查询提交 %s" + +#: builtin/commit.c:650 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(正从标准输入中读取日志信息)\n" + +#: builtin/commit.c:652 +msgid "could not read log from standard input" +msgstr "不能从标准输入中读取日志信息" + +#: builtin/commit.c:656 +#, c-format +msgid "could not read log file '%s'" +msgstr "不能读取日志文件 '%s'" + +#: builtin/commit.c:662 +msgid "commit has empty message" +msgstr "提交说明为空" + +#: builtin/commit.c:678 +msgid "could not read MERGE_MSG" +msgstr "不能读取 MERGE_MSG" + +#: builtin/commit.c:682 +msgid "could not read SQUASH_MSG" +msgstr "不能读取 SQUASH_MSG" + +#: builtin/commit.c:686 +#, c-format +msgid "could not read '%s'" +msgstr "不能读取 '%s'" + +#: builtin/commit.c:738 +msgid "could not write commit template" +msgstr "不能写提交模版" + +#: builtin/commit.c:749 +#, 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 "" +"\n" +"似乎您正在做一个合并提交。如果不对,请删除文件\n" +"\t%s\n" +"然后重试。\n" + +#: builtin/commit.c:754 +#, 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 "" +"\n" +"似乎您正在做一个拣选提交。如果不对,请删除文件\n" +"\t%s\n" +"然后重试。\n" + +#: builtin/commit.c:766 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n" +"说明将会终止提交。\n" + +#: builtin/commit.c:771 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n" +"如果您想这样做的话。而一个空的提交说明将会终止提交。\n" + +# 译者:为保证在输出中对齐,注意调整句中空格! +#: builtin/commit.c:784 +#, c-format +msgid "%sAuthor: %s" +msgstr "%s作者: %s" + +# 译者:为保证在输出中对齐,注意调整句中空格! +#: builtin/commit.c:791 +#, c-format +msgid "%sCommitter: %s" +msgstr "%s提交者: %s" + +#: builtin/commit.c:811 +msgid "Cannot read index" +msgstr "无法读取索引" + +#: builtin/commit.c:848 +msgid "Error building trees" +msgstr "无法创建树对象" + +#: builtin/commit.c:863 builtin/tag.c:361 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" + +#: builtin/commit.c:960 +#, c-format +msgid "No existing author found with '%s'" +msgstr "没有找到匹配 '%s' 的作者" + +#: builtin/commit.c:975 builtin/commit.c:1175 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "无效的未追踪文件参数 '%s'" + +#: builtin/commit.c:1015 +msgid "Using both --reset-author and --author does not make sense" +msgstr "同时使用 --reset-author 和 --author 没有意义" + +#: builtin/commit.c:1026 +msgid "You have nothing to amend." +msgstr "您没有可修补的提交。" + +#: builtin/commit.c:1029 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "您正处于一个合并过程中 -- 无法修补提交。" + +#: builtin/commit.c:1031 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "您正处于一个拣选过程中 -- 无法修补提交。" + +#: builtin/commit.c:1034 +msgid "Options --squash and --fixup cannot be used together" +msgstr "选项 --squash 和 --fixup 不能同时使用" + +#: builtin/commit.c:1044 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "只能用一个 -c/-C/-F/--fixup 选项。" + +#: builtin/commit.c:1046 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" + +#: builtin/commit.c:1054 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" + +#: builtin/commit.c:1071 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" + +#: builtin/commit.c:1073 +msgid "No paths with --include/--only does not make sense." +msgstr "参数 --include/--only 不跟路径没有意义。" + +#: builtin/commit.c:1075 +msgid "Clever... amending the last one with dirty index." +msgstr "聪明... 在索引不干净下修补最后的提交。" + +#: builtin/commit.c:1077 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..." + +#: builtin/commit.c:1087 builtin/tag.c:577 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "无效的清理模式 %s" + +#: builtin/commit.c:1092 +msgid "Paths with -a does not make sense." +msgstr "路径和 -a 选项同时使用没有意义。" + +#: builtin/commit.c:1189 builtin/commit.c:1417 +msgid "show status concisely" +msgstr "" + +#: builtin/commit.c:1191 builtin/commit.c:1419 +msgid "show branch information" +msgstr "" + +#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389 +msgid "machine-readable output" +msgstr "" + +#: builtin/commit.c:1196 builtin/commit.c:1423 +msgid "terminate entries with NUL" +msgstr "" + +#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636 +#: builtin/fast-export.c:639 builtin/tag.c:461 +msgid "mode" +msgstr "" + +#: builtin/commit.c:1199 builtin/commit.c:1426 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "" + +#: builtin/commit.c:1202 +msgid "show ignored files" +msgstr "" + +#: builtin/commit.c:1203 parse-options.h:151 +msgid "when" +msgstr "何时" + +#: builtin/commit.c:1204 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" + +#: builtin/commit.c:1206 +#, fuzzy +msgid "list untracked files in columns" +msgstr "无效的未追踪文件参数 '%s'" + +#: builtin/commit.c:1275 +msgid "couldn't look up newly created commit" +msgstr "无法找到新创建的提交" + +#: builtin/commit.c:1277 +msgid "could not parse newly created commit" +msgstr "不能解析新创建的提交" + +#: builtin/commit.c:1318 +msgid "detached HEAD" +msgstr "分离头指针" + +# 译者:中文字符串拼接,可删除前导空格 +#: builtin/commit.c:1320 +msgid " (root-commit)" +msgstr "(根提交)" + +#: builtin/commit.c:1387 +msgid "suppress summary after successful commit" +msgstr "" + +#: builtin/commit.c:1388 +msgid "show diff in commit message template" +msgstr "" + +#: builtin/commit.c:1390 +#, fuzzy +msgid "Commit message options" +msgstr "不能得到 %s 的提交说明" + +#: builtin/commit.c:1391 builtin/tag.c:459 +msgid "read message from file" +msgstr "" + +#: builtin/commit.c:1392 +msgid "author" +msgstr "" + +#: builtin/commit.c:1392 +#, fuzzy +msgid "override author for commit" +msgstr "合并未返回提交" + +#: builtin/commit.c:1393 builtin/gc.c:178 +msgid "date" +msgstr "" + +#: builtin/commit.c:1393 +#, fuzzy +msgid "override date for commit" +msgstr "合并未返回提交" + +#: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534 +#: builtin/notes.c:691 builtin/tag.c:457 +#, fuzzy +msgid "message" +msgstr "无 tag 说明?" + +#: builtin/commit.c:1394 +#, fuzzy +msgid "commit message" +msgstr "空提交信息。" + +#: builtin/commit.c:1395 +msgid "reuse and edit message from specified commit" +msgstr "" + +#: builtin/commit.c:1396 +msgid "reuse message from specified commit" +msgstr "" + +#: builtin/commit.c:1397 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" + +#: builtin/commit.c:1398 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" + +#: builtin/commit.c:1399 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "" + +#: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109 +msgid "add Signed-off-by:" +msgstr "" + +#: builtin/commit.c:1401 +msgid "use specified template file" +msgstr "" + +#: builtin/commit.c:1402 +#, fuzzy +msgid "force edit of commit" +msgstr "合并未返回提交" + +#: builtin/commit.c:1403 +msgid "default" +msgstr "" + +#: builtin/commit.c:1403 builtin/tag.c:462 +msgid "how to strip spaces and #comments from message" +msgstr "" + +#: builtin/commit.c:1404 +#, fuzzy +msgid "include status in commit message template" +msgstr "不能写提交模版" + +#: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463 +msgid "key id" +msgstr "" + +#: builtin/commit.c:1406 builtin/merge.c:214 +msgid "GPG sign commit" +msgstr "" + +#. end commit message options +#: builtin/commit.c:1409 +msgid "Commit contents options" +msgstr "" + +#: builtin/commit.c:1410 +msgid "commit all changed files" +msgstr "" + +#: builtin/commit.c:1411 +msgid "add specified files to index for commit" +msgstr "" + +#: builtin/commit.c:1412 +#, fuzzy +msgid "interactively add files" +msgstr "交互式添加失败" + +#: builtin/commit.c:1413 +#, fuzzy +msgid "interactively add changes" +msgstr "交互式添加失败" + +#: builtin/commit.c:1414 +#, fuzzy +msgid "commit only specified files" +msgstr "无法还原修改的文件" + +#: builtin/commit.c:1415 +msgid "bypass pre-commit hook" +msgstr "" + +#: builtin/commit.c:1416 +#, fuzzy +msgid "show what would be committed" +msgstr "要提交的变更:" + +#: builtin/commit.c:1424 +msgid "amend previous commit" +msgstr "" + +#: builtin/commit.c:1425 +msgid "bypass post-rewrite hook" +msgstr "" + +#: builtin/commit.c:1430 +msgid "ok to record an empty change" +msgstr "" + +#: builtin/commit.c:1433 +msgid "ok to record a change with an empty message" +msgstr "" + +#: builtin/commit.c:1464 +msgid "could not parse HEAD commit" +msgstr "不能解析 HEAD 提交" + +#: builtin/commit.c:1502 builtin/merge.c:508 +#, c-format +msgid "could not open '%s' for reading" +msgstr "不能为读入打开 '%s'" + +#: builtin/commit.c:1509 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "损坏的 MERGE_HEAD 文件(%s)" + +#: builtin/commit.c:1516 +msgid "could not read MERGE_MODE" +msgstr "不能读取 MERGE_MODE" + +#: builtin/commit.c:1535 +#, c-format +msgid "could not read commit message: %s" +msgstr "不能读取提交说明:%s" + +#: builtin/commit.c:1549 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "终止提交;您未更改来自模版的提交说明。\n" + +#: builtin/commit.c:1554 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "终止提交因为提交说明为空。\n" + +#: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960 +msgid "failed to write commit object" +msgstr "无法写提交对象" + +#: builtin/commit.c:1590 +msgid "cannot lock HEAD ref" +msgstr "无法锁定 HEAD 引用" + +#: builtin/commit.c:1594 +msgid "cannot update HEAD ref" +msgstr "无法更新 HEAD 引用" + +#: builtin/commit.c:1605 +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 "" +"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" +"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" + +#: builtin/config.c:7 +msgid "git config [options]" +msgstr "" + +#: builtin/config.c:52 +msgid "Config file location" +msgstr "" + +#: builtin/config.c:53 +#, fuzzy +msgid "use global config file" +msgstr "无法更新 config 文件" + +#: builtin/config.c:54 +msgid "use system config file" +msgstr "" + +#: builtin/config.c:55 +#, fuzzy +msgid "use repository config file" +msgstr "需要一个版本库来解包。" + +#: builtin/config.c:56 +#, fuzzy +msgid "use given config file" +msgstr "未预期的文件结束" + +#: builtin/config.c:57 +#, fuzzy +msgid "Action" +msgstr "动作" + +#: builtin/config.c:58 +msgid "get value: name [value-regex]" +msgstr "" + +#: builtin/config.c:59 +msgid "get all values: key [value-regex]" +msgstr "" + +#: builtin/config.c:60 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "" + +#: builtin/config.c:61 +msgid "replace all matching variables: name value [value_regex]" +msgstr "" + +#: builtin/config.c:62 +msgid "add a new variable: name value" +msgstr "" + +#: builtin/config.c:63 +msgid "remove a variable: name [value-regex]" +msgstr "" + +#: builtin/config.c:64 +msgid "remove all matches: name [value-regex]" +msgstr "" + +#: builtin/config.c:65 +msgid "rename section: old-name new-name" +msgstr "" + +#: builtin/config.c:66 +msgid "remove a section: name" +msgstr "" + +#: builtin/config.c:67 +msgid "list all" +msgstr "" + +#: builtin/config.c:68 +msgid "open an editor" +msgstr "" + +#: builtin/config.c:69 builtin/config.c:70 +msgid "slot" +msgstr "" + +#: builtin/config.c:69 +msgid "find the color configured: [default]" +msgstr "" + +#: builtin/config.c:70 +msgid "find the color setting: [stdout-is-tty]" +msgstr "" + +#: builtin/config.c:71 +msgid "Type" +msgstr "" + +#: builtin/config.c:72 +msgid "value is \"true\" or \"false\"" +msgstr "" + +#: builtin/config.c:73 +msgid "value is decimal number" +msgstr "" + +#: builtin/config.c:74 +msgid "value is --bool or --int" +msgstr "" + +#: builtin/config.c:75 +msgid "value is a path (file or directory name)" +msgstr "" + +#: builtin/config.c:76 +msgid "Other" +msgstr "" + +#: builtin/config.c:77 +msgid "terminate values with NUL byte" +msgstr "" + +#: builtin/config.c:78 +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 "注释 tag %s 无效" + +#: builtin/describe.c:238 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "注释 tag %s 没有嵌入名称" + +#: builtin/describe.c:240 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "tag '%s' 的确是在 '%s'" + +#: builtin/describe.c:267 +#, c-format +msgid "Not a valid object name %s" +msgstr "不是一个有效的对象名 %s" + +#: builtin/describe.c:270 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s 不是一个有效的 '%s' 对象" + +#: builtin/describe.c:287 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "没有 tag 准确匹配 '%s'" + +#: builtin/describe.c:289 +#, c-format +msgid "searching to describe %s\n" +msgstr "搜索描述 %s\n" + +#: builtin/describe.c:329 +#, c-format +msgid "finished search at %s\n" +msgstr "完成搜索 %s\n" + +#: builtin/describe.c:353 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"没有注释 tag 能描述 '%s'。\n" +"然而,有非注释 tag:尝试 --tags。" + +#: builtin/describe.c:357 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"没有注释 tag 能描述 '%s'。\n" +"尝试 --always,或者创建一些 tag。" + +#: builtin/describe.c:378 +#, c-format +msgid "traversed %lu commits\n" +msgstr "已遍历 %lu 个提交\n" + +#: builtin/describe.c:381 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" +"发现多于 %i 个 tag,列出最近的 %i 个\n" +"在 %s 放弃搜索\n" + +#: 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 +#, fuzzy +msgid "only output exact matches" +msgstr "没有 tag 准确匹配 '%s'" + +#: builtin/describe.c:412 +msgid "consider <n> most recent tags (default: 10)" +msgstr "" + +#: builtin/describe.c:414 +#, fuzzy +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 "--long 与 --abbrev=0 不兼容" + +#: builtin/describe.c:462 +msgid "No names found, cannot describe anything." +msgstr "没有发现名称,无法描述任何东西。" + +#: builtin/describe.c:482 +msgid "--dirty is incompatible with committishes" +msgstr "--dirty 不能与提交同时使用" + +#: builtin/diff.c:79 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "'%s':不是一个正规文件或符号链接" + +#: builtin/diff.c:224 +#, c-format +msgid "invalid option: %s" +msgstr "无效选项:%s" + +#: builtin/diff.c:301 +msgid "Not a git repository" +msgstr "不是一个 git 版本库" + +#: builtin/diff.c:344 +#, c-format +msgid "invalid object '%s' given." +msgstr "提供了无效对象 '%s'。" + +#: builtin/diff.c:349 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "提供了超过 %d 个树对象:'%s'" + +#: builtin/diff.c:359 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "提供了超过两个二进制对象(blob):'%s'" + +#: builtin/diff.c:367 +#, c-format +msgid "unhandled object '%s' given." +msgstr "提供了无法处理的对象 '%s'。" + +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" +msgstr "" + +#: builtin/fast-export.c:635 +#, fuzzy +msgid "show progress after <n> objects" +msgstr "显示各种类型的对象" + +#: builtin/fast-export.c:637 +msgid "select handling of signed tags" +msgstr "" + +#: builtin/fast-export.c:640 +msgid "select handling of tags that tag filtered objects" +msgstr "" + +#: builtin/fast-export.c:643 +msgid "Dump marks to this file" +msgstr "" + +#: builtin/fast-export.c:645 +msgid "Import marks from this file" +msgstr "" + +#: builtin/fast-export.c:647 +msgid "Fake a tagger when tags lack one" +msgstr "" + +#: builtin/fast-export.c:649 +msgid "Output full tree for each commit" +msgstr "" + +#: builtin/fast-export.c:651 +msgid "Use the done feature to terminate the stream" +msgstr "" + +#: builtin/fast-export.c:652 +msgid "Skip output of blob data" +msgstr "" + +#: builtin/fetch.c:20 +#, fuzzy +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git apply [选项] [<补丁>...]" + +#: 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 +#, fuzzy +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 +#, fuzzy +msgid "prune remote-tracking branches no longer on remote" +msgstr "%s 没有来自 %s 的远程跟踪分支" + +#: 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 +#, fuzzy +msgid "allow updating of HEAD ref" +msgstr "无法更新 HEAD 引用" + +#: builtin/fetch.c:84 +msgid "deepen history of shallow clone" +msgstr "" + +#: builtin/fetch.c:85 builtin/log.c:1083 +msgid "dir" +msgstr "" + +#: builtin/fetch.c:86 +#, fuzzy +msgid "prepend this to submodule path output" +msgstr "无法递归进子模组路径 '$sm_path'" + +#: builtin/fetch.c:89 +msgid "default mode for recursion" +msgstr "" + +#: builtin/fetch.c:201 +msgid "Couldn't find remote ref HEAD" +msgstr "无法发现远程 HEAD 引用" + +#: builtin/fetch.c:254 +#, c-format +msgid "object %s not found" +msgstr "对象 %s 未发现" + +#: builtin/fetch.c:260 +msgid "[up to date]" +msgstr "[最新]" + +#: builtin/fetch.c:274 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)" + +#: builtin/fetch.c:275 builtin/fetch.c:361 +msgid "[rejected]" +msgstr "[已拒绝]" + +#: builtin/fetch.c:286 +msgid "[tag update]" +msgstr "[tag更新]" + +# 译者:注意保持前导空格 +#: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341 +msgid " (unable to update local ref)" +msgstr " (不能更新本地引用)" + +#: builtin/fetch.c:306 +msgid "[new tag]" +msgstr "[新tag]" + +#: builtin/fetch.c:309 +msgid "[new branch]" +msgstr "[新分支]" + +#: builtin/fetch.c:312 +msgid "[new ref]" +msgstr "[新引用]" + +#: builtin/fetch.c:357 +msgid "unable to update local ref" +msgstr "不能更新本地引用" + +#: builtin/fetch.c:357 +msgid "forced update" +msgstr "强制更新" + +#: builtin/fetch.c:363 +msgid "(non-fast-forward)" +msgstr "(非快进式)" + +#: builtin/fetch.c:394 builtin/fetch.c:686 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "无法打开 %s:%s\n" + +#: builtin/fetch.c:403 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s 未发送所有必须的对象\n" + +#: builtin/fetch.c:489 +#, c-format +msgid "From %.*s\n" +msgstr "来自 %.*s\n" + +#: builtin/fetch.c:500 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"一些本地引用不能被更新;尝试运行\n" +" 'git remote prune %s' 来删除旧的、有冲突的分支" + +# 译者:注意保持前导空格 +#: builtin/fetch.c:550 +#, c-format +msgid " (%s will become dangling)" +msgstr " (%s 将成为悬空状态)" + +# 译者:注意保持前导空格 +#: builtin/fetch.c:551 +#, c-format +msgid " (%s has become dangling)" +msgstr " (%s 已成为悬空状态)" + +#: builtin/fetch.c:558 +msgid "[deleted]" +msgstr "[已删除]" + +#: builtin/fetch.c:559 builtin/remote.c:1055 +msgid "(none)" +msgstr "(无)" + +#: builtin/fetch.c:676 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "拒绝获取到非裸版本库的当前分支 %s" + +#: builtin/fetch.c:710 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "不知道如何从 %s 获取" + +#: builtin/fetch.c:787 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" + +#: builtin/fetch.c:790 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "选项 \"%s\" 为 %s 所忽略\n" + +#: builtin/fetch.c:892 +#, c-format +msgid "Fetching %s\n" +msgstr "正在获取 %s\n" + +#: builtin/fetch.c:894 builtin/remote.c:100 +#, c-format +msgid "Could not fetch %s" +msgstr "不能获取 %s" + +#: builtin/fetch.c:913 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。" + +#: builtin/fetch.c:933 +msgid "You need to specify a tag name." +msgstr "您需要指定一个 tag 名称。" + +#: builtin/fetch.c:985 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all 不能带一个版本库参数" + +#: builtin/fetch.c:987 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all 带引用表达式没有任何意义" + +#: builtin/fetch.c:998 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "没有这样的远程或远程组:%s" + +#: builtin/fetch.c:1006 +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:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "数字" + +#: builtin/fmt-merge-msg.c:654 +msgid "populate log with at most <n> entries from shortlog" +msgstr "" + +#: builtin/fmt-merge-msg.c:657 +msgid "alias for --log (deprecated)" +msgstr "" + +#: builtin/fmt-merge-msg.c:660 +msgid "text" +msgstr "" + +#: builtin/fmt-merge-msg.c:661 +msgid "use <text> as start of message" +msgstr "" + +#: builtin/fmt-merge-msg.c:662 +#, fuzzy +msgid "file to read from" +msgstr "不能读 %s" + +#: builtin/for-each-ref.c:979 +#, fuzzy +msgid "git for-each-ref [options] [<pattern>]" +msgstr "git apply [选项] [<补丁>...]" + +#: 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 +#, fuzzy +msgid "git fsck [options] [<object>...]" +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/fsck.c:614 +msgid "show unreachable objects" +msgstr "" + +#: builtin/fsck.c:615 +#, fuzzy +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 "无效的 %s:'%s'" + +#: builtin/gc.c:90 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "不正常的长对象目录 %.*s" + +#: 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:221 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "自动打包版本库以求最佳性能。\n" + +#: builtin/gc.c:224 +#, 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 "" +"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" +"参见 \"git help gc\" 以获取更多信息。\n" + +#: builtin/gc.c:251 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" + +#: builtin/grep.c:22 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "" + +#: builtin/grep.c:216 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep:无法创建线程:%s" + +#: builtin/grep.c:454 +#, c-format +msgid "Failed to chdir: %s" +msgstr "无法切换目录:%s" + +#: builtin/grep.c:530 builtin/grep.c:564 +#, c-format +msgid "unable to read tree (%s)" +msgstr "无法读取树(%s)" + +#: builtin/grep.c:578 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "无法抓取来自于 %s 类型的对象" + +#: builtin/grep.c:636 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "开关 `%c' 期望一个数字值" + +#: builtin/grep.c:653 +#, c-format +msgid "cannot open '%s'" +msgstr "不能打开 '%s'" + +#: builtin/grep.c:728 +msgid "search in index instead of in the work tree" +msgstr "" + +#: builtin/grep.c:730 +msgid "find in contents not managed by git" +msgstr "" + +# 译者:中文字符串拼接,可删除前导空格 +#: builtin/grep.c:732 +#, fuzzy +msgid "search in both tracked and untracked files" +msgstr "(使用 -u 参数显示未跟踪的文件)" + +#: builtin/grep.c:734 +msgid "search also in ignored files" +msgstr "" + +#: builtin/grep.c:737 +msgid "show non-matching lines" +msgstr "" + +#: builtin/grep.c:739 +msgid "case insensitive matching" +msgstr "" + +#: builtin/grep.c:741 +msgid "match patterns only at word boundaries" +msgstr "" + +#: builtin/grep.c:743 +msgid "process binary files as text" +msgstr "" + +#: builtin/grep.c:745 +msgid "don't match patterns in binary files" +msgstr "" + +#: builtin/grep.c:748 +msgid "descend at most <depth> levels" +msgstr "" + +#: builtin/grep.c:752 +msgid "use extended POSIX regular expressions" +msgstr "" + +#: builtin/grep.c:755 +msgid "use basic POSIX regular expressions (default)" +msgstr "" + +#: builtin/grep.c:758 +msgid "interpret patterns as fixed strings" +msgstr "" + +#: builtin/grep.c:761 +msgid "use Perl-compatible regular expressions" +msgstr "" + +#: builtin/grep.c:764 +msgid "show line numbers" +msgstr "" + +#: builtin/grep.c:765 +msgid "don't show filenames" +msgstr "" + +#: builtin/grep.c:766 +#, fuzzy +msgid "show filenames" +msgstr "%s文件:" + +#: builtin/grep.c:768 +msgid "show filenames relative to top directory" +msgstr "" + +#: builtin/grep.c:770 +msgid "show only filenames instead of matching lines" +msgstr "" + +#: builtin/grep.c:772 +msgid "synonym for --files-with-matches" +msgstr "" + +#: builtin/grep.c:775 +msgid "show only the names of files without match" +msgstr "" + +#: builtin/grep.c:777 +#, fuzzy +msgid "print NUL after filenames" +msgstr "为所有文件名前添加 <根目录>" + +#: builtin/grep.c:779 +msgid "show the number of matches instead of matching lines" +msgstr "" + +#: builtin/grep.c:780 +msgid "highlight matches" +msgstr "" + +#: builtin/grep.c:782 +msgid "print empty line between matches from different files" +msgstr "" + +#: builtin/grep.c:784 +msgid "show filename only once above matches from same file" +msgstr "" + +#: builtin/grep.c:787 +msgid "show <n> context lines before and after matches" +msgstr "" + +#: builtin/grep.c:790 +msgid "show <n> context lines before matches" +msgstr "" + +#: builtin/grep.c:792 +msgid "show <n> context lines after matches" +msgstr "" + +#: builtin/grep.c:793 +msgid "shortcut for -C NUM" +msgstr "" + +#: builtin/grep.c:796 +msgid "show a line with the function name before matches" +msgstr "" + +#: builtin/grep.c:798 +msgid "show the surrounding function" +msgstr "" + +#: builtin/grep.c:801 +msgid "read patterns from file" +msgstr "" + +#: builtin/grep.c:803 +msgid "match <pattern>" +msgstr "" + +#: builtin/grep.c:805 +msgid "combine patterns specified with -e" +msgstr "" + +#: builtin/grep.c:817 +msgid "indicate hit with exit status without output" +msgstr "" + +#: builtin/grep.c:819 +msgid "show only matches from files that match all patterns" +msgstr "" + +#: builtin/grep.c:822 +msgid "pager" +msgstr "" + +#: builtin/grep.c:822 +msgid "show matching files in the pager" +msgstr "" + +#: builtin/grep.c:825 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "" + +#: builtin/grep.c:826 builtin/show-ref.c:201 +msgid "show usage" +msgstr "" + +#: builtin/grep.c:917 +msgid "no pattern given." +msgstr "未提供模式匹配。" + +#: builtin/grep.c:931 +#, c-format +msgid "bad object %s" +msgstr "坏对象 %s" + +#: builtin/grep.c:972 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager 仅用于工作区" + +#: builtin/grep.c:995 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" + +#: builtin/grep.c:1000 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "--no-index 或 --untracked 不能和版本同时使用。" + +#: builtin/grep.c:1003 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" + +#: builtin/grep.c:1011 +msgid "both --cached and trees are given." +msgstr "同时给出了 --cached 和树对象。" + +#: 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 +#, fuzzy +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:43 +#, fuzzy +msgid "print all available commands" +msgstr "在 '%s' 下可用的 git 命令" + +#: builtin/help.c:44 +msgid "show man page" +msgstr "" + +#: builtin/help.c:45 +msgid "show manual in web browser" +msgstr "" + +#: builtin/help.c:47 +msgid "show info page" +msgstr "" + +#: builtin/help.c:53 +msgid "git help [--all] [--man|--web|--info] [command]" +msgstr "" + +#: builtin/help.c:65 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "未能识别的帮助格式 '%s'" + +#: builtin/help.c:93 +msgid "Failed to start emacsclient." +msgstr "无法启动 emacsclient。" + +#: builtin/help.c:106 +msgid "Failed to parse emacsclient version." +msgstr "无法解析 emacsclient 版本。" + +#: builtin/help.c:114 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "emacsclient 版本 '%d' 太老 (< 22)。" + +#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "无法执行 '%s':%s" + +#: builtin/help.c:217 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "" +"'%s':不支持的 man 手册查看器的路径。\n" +"请使用 'man.<tool>.cmd'。" + +#: builtin/help.c:229 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "" +"'%s': 支持的 man 手册查看器命令。\n" +"请使用 'man.<tool>.path'。" + +#: builtin/help.c:299 +msgid "The most commonly used git commands are:" +msgstr "最常用的 git 命令有:" + +#: builtin/help.c:367 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "'%s':未知的 man 查看器。" + +#: builtin/help.c:384 +msgid "no man viewer handled the request" +msgstr "没有 man 查看器处理此请求" + +#: builtin/help.c:392 +msgid "no info viewer handled the request" +msgstr "没有 info 查看器处理此请求" + +#: builtin/help.c:447 builtin/help.c:454 +#, c-format +msgid "usage: %s%s" +msgstr "用法:%s%s" + +#: builtin/help.c:470 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "`git %s' 是 `%s' 的别名" + +#: builtin/index-pack.c:170 +#, c-format +msgid "object type mismatch at %s" +msgstr "%s 的对象类型不匹配" + +#: 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] "无法填充 %d 字节" +msgstr[1] "无法填充 %d 字节" + +#: builtin/index-pack.c:237 +msgid "early EOF" +msgstr "过早的文件结束符(EOF)" + +#: 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 "包太大超过了当前 off_t 的定义" + +#: builtin/index-pack.c:273 +#, c-format +msgid "unable to create '%s'" +msgstr "不能创建 '%s'" + +#: builtin/index-pack.c:278 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "无法打开包文件 '%s'" + +#: 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 "包中有错误的对象位于 %lu:%s" + +#: builtin/index-pack.c:434 +#, c-format +msgid "inflate returned %d" +msgstr "解压缩返回 %d" + +#: builtin/index-pack.c:483 +msgid "offset value overflow for delta base object" +msgstr "偏移值覆盖了 delta 基准对象" + +#: builtin/index-pack.c:491 +msgid "delta base offset is out of bound" +msgstr "delta 基准偏移越界" + +#: builtin/index-pack.c:499 +#, c-format +msgid "unknown object type %d" +msgstr "未知对象类型 %d" + +#: 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] "包文件过早结束,缺少 %lu 字节" +msgstr[1] "包文件过早结束,缺少 %lu 字节" + +#: 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 "发现 %s 出现 SHA1 冲突!" + +#: builtin/index-pack.c:652 builtin/pack-objects.c:170 +#: builtin/pack-objects.c:262 +#, c-format +msgid "unable to read %s" +msgstr "不能读 %s" + +#: builtin/index-pack.c:718 +#, c-format +msgid "cannot read existing object %s" +msgstr "不能读取现存对象 %s" + +#: builtin/index-pack.c:732 +#, c-format +msgid "invalid blob object %s" +msgstr "无效的二进制对象(blob)%s" + +#: builtin/index-pack.c:747 +#, c-format +msgid "invalid %s" +msgstr "无效的 %s" + +#: 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 "%s 的所有子对象并非都可达" + +#: builtin/index-pack.c:821 builtin/index-pack.c:847 +msgid "failed to apply delta" +msgstr "无法应用 delta" + +#: 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 "包冲突(SHA1 不匹配)" + +#: 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 "parse_pack_objects() 中遇到不可理喻的问题" + +#: builtin/index-pack.c:1054 +msgid "Resolving deltas" +msgstr "处理 delta 中" + +#: builtin/index-pack.c:1064 +#, fuzzy, c-format +msgid "unable to create thread: %s" +msgstr "grep:无法创建线程:%s" + +#: 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] "包有 %d 个未解决的 delta" +msgstr[1] "包有 %d 个未解决的 delta" + +#: builtin/index-pack.c:1150 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "不能缩小附加对象(%d)" + +#: builtin/index-pack.c:1229 +#, c-format +msgid "local object %s is corrupt" +msgstr "本地对象 %s 已损坏" + +#: 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 "无法写保留文件 '%s'" + +#: builtin/index-pack.c:1274 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "无法关闭保留文件 '%s'" + +#: 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 +#, fuzzy, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "坏的索引版本 '%s'" + +#: 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 "无法打开现存包文件 '%s'" + +#: builtin/index-pack.c:1401 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "无法为 %s 打开包索引文件" + +#: builtin/index-pack.c:1448 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "非 delta:%d 个对象" +msgstr[1] "非 delta:%d 个对象" + +#: builtin/index-pack.c:1455 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "链长 = %d: %lu 对象" +msgstr[1] "链长 = %d: %lu 对象" + +#: 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 "错误选项 %s" + +#: builtin/index-pack.c:1559 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin 不能和 --stdin 同时使用" + +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "包名 '%s' 没有以 '.pack' 结尾" + +#: builtin/index-pack.c:1582 +msgid "--verify with no packfile name given" +msgstr "--verify 没有提供包名参数" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "不能设置 %s 为组可写" + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "太长的模版名 %s" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "不能枚举 '%s' 状态" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "不能枚举模版 '%s' 状态" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "不能打开目录 '%s'" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "不能读取链接 '%s'" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "太长的符号链接 %s" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "不能自 '%s' 到 '%s' 创建符号链接" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "不能拷贝 '%s' 至 '%s'" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "忽略模版 %s" + +#: builtin/init-db.c:133 +#, c-format +msgid "insanely long template path %s" +msgstr "太长的模版路径 %s" + +#: builtin/init-db.c:141 +#, c-format +msgid "templates not found %s" +msgstr "模版未找到 %s" + +#: builtin/init-db.c:154 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" + +#: builtin/init-db.c:192 +#, c-format +msgid "insane git directory %s" +msgstr "不正常的 git 目录 %s" + +#: builtin/init-db.c:323 builtin/init-db.c:326 +#, c-format +msgid "%s already exists" +msgstr "%s 已经存在" + +#: builtin/init-db.c:355 +#, c-format +msgid "unable to handle file type %d" +msgstr "不能处理 %d 类型的文件" + +#: builtin/init-db.c:358 +#, c-format +msgid "unable to move %s to %s" +msgstr "不能移动 %s 至 %s" + +#: builtin/init-db.c:363 +#, c-format +msgid "Could not create git link %s" +msgstr "不能创建 git link %s" + +#. +#. * 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 "%s%s Git 版本库于 %s%s\n" + +#: 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 +#, fuzzy +msgid "be quiet" +msgstr "更加安静" + +#: builtin/init-db.c:522 builtin/init-db.c:529 +#, c-format +msgid "cannot mkdir %s" +msgstr "不能创建目录 %s" + +#: builtin/init-db.c:533 +#, c-format +msgid "cannot chdir to %s" +msgstr "不能切换目录到 %s" + +#: builtin/init-db.c:555 +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" +"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-" +"dir=<directory>)" + +#: 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 "不能访问工作区 '%s'" + +#: builtin/log.c:37 +#, fuzzy +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/log.c:38 +#, fuzzy +msgid " or: git show [options] <object>..." +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/log.c:100 +msgid "suppress diff output" +msgstr "" + +#: builtin/log.c:101 +#, fuzzy +msgid "show source" +msgstr "坏的源" + +#: builtin/log.c:102 +msgid "decorate options" +msgstr "" + +#: builtin/log.c:189 +#, c-format +msgid "Final output: %d %s\n" +msgstr "最终输出:%d %s\n" + +#: builtin/log.c:403 builtin/log.c:494 +#, c-format +msgid "Could not read object %s" +msgstr "不能读取对象 %s" + +#: builtin/log.c:518 +#, c-format +msgid "Unknown type: %d" +msgstr "未知类型:%d" + +#: builtin/log.c:608 +msgid "format.headers without value" +msgstr "format.headers 没有值" + +#: builtin/log.c:682 +msgid "name of output directory is too long" +msgstr "输出目录名太长" + +#: builtin/log.c:693 +#, c-format +msgid "Cannot open patch file %s" +msgstr "无法打开补丁文件 %s" + +#: builtin/log.c:707 +msgid "Need exactly one range." +msgstr "只需要一个范围。" + +#: builtin/log.c:715 +msgid "Not a range." +msgstr "不是一个范围。" + +#: builtin/log.c:789 +msgid "Cover letter needs email format" +msgstr "信封需要邮件地址格式" + +#: builtin/log.c:862 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "不正常的 in-reply-to:%s" + +#: builtin/log.c:890 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "" + +#: builtin/log.c:935 +msgid "Two output directories?" +msgstr "两个输出目录?" + +#: builtin/log.c:1063 +msgid "use [PATCH n/m] even with a single patch" +msgstr "" + +#: builtin/log.c:1066 +msgid "use [PATCH] even with multiple patches" +msgstr "" + +#: builtin/log.c:1070 +msgid "print patches to standard out" +msgstr "" + +#: builtin/log.c:1072 +msgid "generate a cover letter" +msgstr "" + +#: builtin/log.c:1074 +msgid "use simple number sequence for output file names" +msgstr "" + +#: builtin/log.c:1075 +msgid "sfx" +msgstr "" + +#: builtin/log.c:1076 +msgid "use <sfx> instead of '.patch'" +msgstr "" + +#: builtin/log.c:1078 +msgid "start numbering patches at <n> instead of 1" +msgstr "" + +#: builtin/log.c:1080 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "" + +#: builtin/log.c:1083 +msgid "store resulting files in <dir>" +msgstr "" + +#: builtin/log.c:1086 +msgid "don't strip/add [PATCH]" +msgstr "" + +#: builtin/log.c:1089 +msgid "don't output binary diffs" +msgstr "" + +#: builtin/log.c:1091 +msgid "don't include a patch matching a commit upstream" +msgstr "" + +#: builtin/log.c:1093 +msgid "show patch format instead of default (patch + stat)" +msgstr "" + +#: builtin/log.c:1095 +#, fuzzy +msgid "Messaging" +msgstr "合并:" + +# 译者:注意保持句尾空格 +#: builtin/log.c:1096 +#, fuzzy +msgid "header" +msgstr "领先 " + +#: builtin/log.c:1097 +msgid "add email header" +msgstr "" + +#: builtin/log.c:1098 builtin/log.c:1100 +msgid "email" +msgstr "" + +#: builtin/log.c:1098 +msgid "add To: header" +msgstr "" + +#: builtin/log.c:1100 +msgid "add Cc: header" +msgstr "" + +#: builtin/log.c:1102 +msgid "message-id" +msgstr "" + +#: builtin/log.c:1103 +msgid "make first mail a reply to <message-id>" +msgstr "" + +#: builtin/log.c:1104 builtin/log.c:1107 +msgid "boundary" +msgstr "" + +#: builtin/log.c:1105 +msgid "attach the patch" +msgstr "" + +#: builtin/log.c:1108 +#, fuzzy +msgid "inline the patch" +msgstr "忽略补丁中的添加的文件" + +#: builtin/log.c:1112 +msgid "enable message threading, styles: shallow, deep" +msgstr "" + +#: builtin/log.c:1114 +msgid "signature" +msgstr "" + +#: builtin/log.c:1115 +msgid "add a signature" +msgstr "" + +#: builtin/log.c:1117 +#, fuzzy +msgid "don't print the patch filenames" +msgstr "无法打开补丁文件 %s" + +#: builtin/log.c:1157 +#, c-format +msgid "bogus committer info %s" +msgstr "虚假的提交者信息 %s" + +#: builtin/log.c:1202 +msgid "-n and -k are mutually exclusive." +msgstr "-n 和 -k 互斥。" + +#: builtin/log.c:1204 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix 和 -k 互斥。" + +#: builtin/log.c:1212 +msgid "--name-only does not make sense" +msgstr "--name-only 无意义" + +#: builtin/log.c:1214 +msgid "--name-status does not make sense" +msgstr "--name-status 无意义" + +#: builtin/log.c:1216 +msgid "--check does not make sense" +msgstr "--check 无意义" + +#: builtin/log.c:1239 +msgid "standard output, or directory, which one?" +msgstr "标准输出或目录,哪一个?" + +#: builtin/log.c:1241 +#, c-format +msgid "Could not create directory '%s'" +msgstr "不能创建目录 '%s'" + +#: builtin/log.c:1394 +msgid "Failed to create output files" +msgstr "无法创建输出文件" + +#: builtin/log.c:1443 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "" + +#: builtin/log.c:1498 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n" + +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#, c-format +msgid "Unknown commit %s" +msgstr "未知提交 %s" + +#: builtin/ls-files.c:408 +#, fuzzy +msgid "git ls-files [options] [<file>...]" +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/ls-files.c:463 +msgid "identify the file status with tags" +msgstr "" + +#: builtin/ls-files.c:465 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "" + +#: builtin/ls-files.c:467 +msgid "show cached files in the output (default)" +msgstr "" + +#: builtin/ls-files.c:469 +#, fuzzy +msgid "show deleted files in the output" +msgstr "删除的文件 %s 仍有内容" + +#: builtin/ls-files.c:471 +msgid "show modified files in the output" +msgstr "" + +#: builtin/ls-files.c:473 +msgid "show other files in the output" +msgstr "" + +#: builtin/ls-files.c:475 +msgid "show ignored files in the output" +msgstr "" + +#: builtin/ls-files.c:478 +msgid "show staged contents' object name in the output" +msgstr "" + +#: builtin/ls-files.c:480 +msgid "show files on the filesystem that need to be removed" +msgstr "" + +#: builtin/ls-files.c:482 +msgid "show 'other' directories' name only" +msgstr "" + +#: builtin/ls-files.c:485 +#, fuzzy +msgid "don't show empty directories" +msgstr "两个输出目录?" + +#: builtin/ls-files.c:488 +msgid "show unmerged files in the output" +msgstr "" + +#: builtin/ls-files.c:490 +msgid "show resolve-undo information" +msgstr "" + +#: builtin/ls-files.c:492 +#, fuzzy +msgid "skip files matching pattern" +msgstr "输出和模式匹配的行" + +#: builtin/ls-files.c:495 +msgid "exclude patterns are read from <file>" +msgstr "" + +#: builtin/ls-files.c:498 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "" + +#: builtin/ls-files.c:500 +msgid "add the standard git exclusions" +msgstr "" + +#: builtin/ls-files.c:503 +msgid "make the output relative to the project top directory" +msgstr "" + +#: builtin/ls-files.c:506 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "" + +#: builtin/ls-files.c:507 +msgid "tree-ish" +msgstr "" + +#: builtin/ls-files.c:508 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "" + +#: builtin/ls-files.c:510 +msgid "show debugging data" +msgstr "" + +#: builtin/ls-tree.c:27 +#, fuzzy +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/ls-tree.c:125 +msgid "only show trees" +msgstr "" + +#: builtin/ls-tree.c:127 +#, fuzzy +msgid "recurse into subtrees" +msgstr "变基到远程 %s" + +#: 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 +#, fuzzy +msgid "include object size" +msgstr "提供了无效对象 '%s'。" + +#: 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 +#, fuzzy +msgid "git merge [options] [<commit>...]" +msgstr "git apply [选项] [<补丁>...]" + +#: 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 "开关 `m' 需要一个值" + +#: builtin/merge.c:127 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "不能找到合并策略 '%s'。\n" + +#: 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 +#, fuzzy +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 +#, fuzzy +msgid "edit message before committing" +msgstr "尚未暂存以备提交的变更:" + +#: builtin/merge.c:198 +#, fuzzy +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:867 builtin/revert.c:112 +msgid "strategy" +msgstr "" + +#: builtin/merge.c:203 +#, fuzzy +msgid "merge strategy to use" +msgstr "尝试合并策略 %s...\n" + +#: 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 +#, fuzzy +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 "不是一个有效对象:%s" + +#: 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 "压缩提交 -- 未更新 HEAD\n" + +#: builtin/merge.c:361 +msgid "Writing SQUASH_MSG" +msgstr "写入 SQUASH_MSG" + +#: builtin/merge.c:363 +msgid "Finishing SQUASH_MSG" +msgstr "完成 SQUASH_MSG" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "无合并信息 -- 未更新 HEAD\n" + +#: builtin/merge.c:436 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "'%s' 没有指向一个提交" + +#: builtin/merge.c:535 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "坏的 branch.%s.mergeoptions 字符串:%s" + +#: builtin/merge.c:628 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree 无法写入一树对象" + +#: builtin/merge.c:678 +msgid "failed to read the cache" +msgstr "无法读取缓存" + +#: builtin/merge.c:709 +msgid "Not handling anything other than two heads merge." +msgstr "不能处理两个头合并之外的任何操作。" + +#: builtin/merge.c:723 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "merge-recursive 的未知选项:-X%s" + +#: builtin/merge.c:737 +#, c-format +msgid "unable to write %s" +msgstr "不能写 %s" + +#: builtin/merge.c:876 +#, c-format +msgid "Could not read from '%s'" +msgstr "不能从 '%s' 读取" + +#: builtin/merge.c:885 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" + +#: builtin/merge.c:891 +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 '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" +"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" +"合并到主题分支。\n" +"\n" +"以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n" + +#: builtin/merge.c:915 +msgid "Empty commit message." +msgstr "空提交信息。" + +#: builtin/merge.c:927 +#, c-format +msgid "Wonderful.\n" +msgstr "太棒了。\n" + +#: builtin/merge.c:992 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" + +#: builtin/merge.c:1008 +#, c-format +msgid "'%s' is not a commit" +msgstr "'%s' 不是一个提交" + +#: builtin/merge.c:1049 +msgid "No current branch." +msgstr "没有当前分支。" + +#: builtin/merge.c:1051 +msgid "No remote for the current branch." +msgstr "当前分支没有对应的远程版本库。" + +#: builtin/merge.c:1053 +msgid "No default upstream defined for the current branch." +msgstr "当前分支没有定义默认的上游分支。" + +#: builtin/merge.c:1058 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "%s 没有来自 %s 的远程跟踪分支" + +#: builtin/merge.c:1145 builtin/merge.c:1302 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - 不能被合并" + +#: builtin/merge.c:1213 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" + +#: builtin/merge.c:1229 git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"您尚未结束您的合并(存在 MERGE_HEAD)。\n" +"请在合并前先提交您的修改。" + +#: builtin/merge.c:1232 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" + +#: builtin/merge.c:1236 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" +"请在合并前先提交您的修改。" + +#: builtin/merge.c:1239 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" + +#: builtin/merge.c:1248 +msgid "You cannot combine --squash with --no-ff." +msgstr "您不能将 --squash 与 --no-ff 同时使用。" + +#: builtin/merge.c:1253 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "您不能将 --no-ff 与 --ff-only 同时使用。" + +#: builtin/merge.c:1260 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" + +#: builtin/merge.c:1292 +msgid "Can merge only exactly one commit into empty head" +msgstr "只能将一个提交合并到空分支上" + +#: builtin/merge.c:1295 +msgid "Squash commit into empty head not supported yet" +msgstr "尚不支持到空分支的压缩提交" + +#: builtin/merge.c:1297 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "到空分支的非快进式提交没有意义" + +#: builtin/merge.c:1412 +#, c-format +msgid "Updating %s..%s\n" +msgstr "更新 %s..%s\n" + +#: builtin/merge.c:1450 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "尝试非常小的索引内合并...\n" + +#: builtin/merge.c:1457 +#, c-format +msgid "Nope.\n" +msgstr "无。\n" + +#: builtin/merge.c:1489 +msgid "Not possible to fast-forward, aborting." +msgstr "无法快进,终止。" + +#: builtin/merge.c:1512 builtin/merge.c:1591 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "将树回滚至原始状态...\n" + +#: builtin/merge.c:1516 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "尝试合并策略 %s...\n" + +#: builtin/merge.c:1582 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "没有合并策略处理此合并。\n" + +#: builtin/merge.c:1584 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "使用策略 %s 合并失败。\n" + +#: builtin/merge.c:1593 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "使用 %s 以准备手工解决。\n" + +#: builtin/merge.c:1605 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "自动合并进展顺利,按要求在提交前停止\n" + +#: 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 +#, fuzzy +msgid "output all common ancestors" +msgstr "发现 %u 个共同祖先:" + +#: 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 +#, fuzzy +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 +#, fuzzy +msgid "skip move/rename errors" +msgstr "程序错误" + +#: builtin/mv.c:108 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "检查 '%s' 到 '%s' 的重命名\n" + +#: 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 "嗯?%.*s 在索引中?" + +#: 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 "覆盖 '%s'" + +#: 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 "%s,源=%s,目标=%s" + +#: builtin/mv.c:212 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "重命名 %s 至 %s\n" + +#: builtin/mv.c:215 builtin/remote.c:731 +#, c-format +msgid "renaming '%s' failed" +msgstr "重命名 '%s' 失败" + +#: builtin/name-rev.c:175 +#, fuzzy +msgid "git name-rev [options] <commit>..." +msgstr "git apply [选项] [<补丁>...]" + +#: 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 +#, fuzzy +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:23 +msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgstr "" + +#: builtin/notes.c:24 +msgid "" +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" + +#: builtin/notes.c:25 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgstr "" + +#: builtin/notes.c:26 +msgid "" +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" + +#: builtin/notes.c:27 +msgid "git notes [--ref <notes_ref>] edit [<object>]" +msgstr "" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes_ref>] show [<object>]" +msgstr "" + +#: builtin/notes.c:29 +msgid "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +msgstr "" + +#: builtin/notes.c:30 +msgid "git notes merge --commit [-v | -q]" +msgstr "" + +#: builtin/notes.c:31 +msgid "git notes merge --abort [-v | -q]" +msgstr "" + +#: builtin/notes.c:32 +msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgstr "" + +#: builtin/notes.c:33 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgstr "" + +#: builtin/notes.c:34 +msgid "git notes [--ref <notes_ref>] get-ref" +msgstr "" + +#: builtin/notes.c:39 +msgid "git notes [list [<object>]]" +msgstr "" + +#: builtin/notes.c:44 +#, fuzzy +msgid "git notes add [<options>] [<object>]" +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/notes.c:49 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "" + +#: builtin/notes.c:50 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "" + +#: builtin/notes.c:55 +#, fuzzy +msgid "git notes append [<options>] [<object>]" +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/notes.c:60 +msgid "git notes edit [<object>]" +msgstr "" + +#: builtin/notes.c:65 +msgid "git notes show [<object>]" +msgstr "" + +#: builtin/notes.c:70 +msgid "git notes merge [<options>] <notes_ref>" +msgstr "" + +#: builtin/notes.c:71 +msgid "git notes merge --commit [<options>]" +msgstr "" + +#: builtin/notes.c:72 +msgid "git notes merge --abort [<options>]" +msgstr "" + +#: builtin/notes.c:77 +msgid "git notes remove [<object>]" +msgstr "" + +#: builtin/notes.c:82 +msgid "git notes prune [<options>]" +msgstr "" + +#: builtin/notes.c:87 +msgid "git notes get-ref" +msgstr "" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "不能为对象 '%s' 开始 'show'" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "不能打开 'show' 输出文件句柄" + +#: builtin/notes.c:155 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "无法为对象 '%s' 的 'show' 关闭管道" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "无法为对象 '%s' 完成 'show'" + +#: builtin/notes.c:175 builtin/tag.c:347 +#, c-format +msgid "could not create file '%s'" +msgstr "不能创建文件 '%s'" + +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "请通过 -m 或 -F 选项为注解提供内容" + +#: builtin/notes.c:210 builtin/notes.c:973 +#, c-format +msgid "Removing note for object %s\n" +msgstr "删除对象 %s 的注解\n" + +#: builtin/notes.c:215 +msgid "unable to write note object" +msgstr "不能写注解对象" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "注解内容被留在文件 %s 中" + +#: builtin/notes.c:251 builtin/tag.c:542 +#, c-format +msgid "cannot read '%s'" +msgstr "不能读取 '%s'" + +#: builtin/notes.c:253 builtin/tag.c:545 +#, c-format +msgid "could not open or read '%s'" +msgstr "不能打开或读取 '%s'" + +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "无法解析 '%s' 为一个有效引用。" + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "无法读取对象 '%s'。" + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "不能提交未初始化/未引用的注解树" + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "坏的 notes.rewriteMode 值:'%s'" + +#: builtin/notes.c:350 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:377 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "坏的 %s 值:'%s'" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "非法的输入行:'%s'。" + +#: builtin/notes.c:456 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "无法从 '%s' 到 '%s' 拷贝注解" + +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 +#: builtin/notes.c:1033 +msgid "too many parameters" +msgstr "参数太多" + +#: builtin/notes.c:513 builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "未发现对象 %s 的注解。" + +#: builtin/notes.c:535 builtin/notes.c:692 +#, fuzzy +msgid "note contents as a string" +msgstr "注解内容被留在文件 %s 中" + +#: builtin/notes.c:538 builtin/notes.c:695 +#, fuzzy +msgid "note contents in a file" +msgstr "无法存储索引文件" + +#: builtin/notes.c:540 builtin/notes.c:543 builtin/notes.c:697 +#: builtin/notes.c:700 builtin/tag.c:476 +#, fuzzy +msgid "object" +msgstr "坏对象 %s" + +#: builtin/notes.c:541 builtin/notes.c:698 +#, fuzzy +msgid "reuse and edit specified note object" +msgstr "不能写注解对象" + +#: builtin/notes.c:544 builtin/notes.c:701 +#, fuzzy +msgid "reuse specified note object" +msgstr "不能写注解对象" + +#: builtin/notes.c:546 builtin/notes.c:614 +#, fuzzy +msgid "replace existing notes" +msgstr "不能读取现存对象 %s" + +#: builtin/notes.c:580 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" + +#: builtin/notes.c:585 builtin/notes.c:662 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "覆盖对象 %s 现存注解\n" + +#: builtin/notes.c:615 +#, fuzzy +msgid "read objects from stdin" +msgstr "坏对象 %s" + +#: builtin/notes.c:617 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "" + +#: builtin/notes.c:635 +msgid "too few parameters" +msgstr "参数太少" + +#: builtin/notes.c:656 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" + +#: builtin/notes.c:668 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "源对象 %s 缺少注解。不能拷贝。" + +#: builtin/notes.c:717 +#, 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 "" +"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" +"请换用 'git notes add -f -m/-F/-c/-C'。\n" + +#: builtin/notes.c:864 +#, fuzzy +msgid "General options" +msgstr "无效选项:%s" + +#: builtin/notes.c:866 +msgid "Merge options" +msgstr "" + +#: builtin/notes.c:868 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" + +#: builtin/notes.c:870 +msgid "Committing unmerged notes" +msgstr "" + +#: builtin/notes.c:872 +msgid "finalize notes merge by committing unmerged notes" +msgstr "" + +#: builtin/notes.c:874 +msgid "Aborting notes merge resolution" +msgstr "" + +#: builtin/notes.c:876 +#, fuzzy +msgid "abort notes merge" +msgstr "path '%s':无法合并" + +#: builtin/notes.c:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "对象 %s 没有注解\n" + +#: builtin/notes.c:983 +msgid "attempt to remove non-existent note is not an error" +msgstr "" + +#: builtin/notes.c:986 +#, fuzzy +msgid "read object names from the standard input" +msgstr "(正从标准输入中读取日志信息)\n" + +#: builtin/notes.c:1067 +msgid "notes_ref" +msgstr "" + +#: builtin/notes.c:1068 +msgid "use notes from <notes_ref>" +msgstr "" + +#: builtin/notes.c:1103 builtin/remote.c:1598 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "未知子命令:%s" + +#: 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 "压缩错误 (%d)" + +#: builtin/pack-objects.c:2398 +#, c-format +msgid "unsupported index version %s" +msgstr "不支持的索引版本 %s" + +#: builtin/pack-objects.c:2402 +#, c-format +msgid "bad index version '%s'" +msgstr "坏的索引版本 '%s'" + +#: builtin/pack-objects.c:2425 +#, c-format +msgid "option %s does not accept negative form" +msgstr "选项 %s 不接受否定格式" + +#: builtin/pack-objects.c:2429 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "不能解析选项 %1$s 的值 '%2$s'" + +#: builtin/pack-objects.c:2448 +msgid "do not show progress meter" +msgstr "" + +#: builtin/pack-objects.c:2450 +msgid "show progress meter" +msgstr "" + +#: builtin/pack-objects.c:2452 +msgid "show progress meter during object writing phase" +msgstr "" + +#: builtin/pack-objects.c:2455 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" + +#: builtin/pack-objects.c:2456 +msgid "version[,offset]" +msgstr "" + +#: builtin/pack-objects.c:2457 +msgid "write the pack index file in the specified idx format version" +msgstr "" + +#: builtin/pack-objects.c:2460 +#, fuzzy +msgid "maximum size of each output pack file" +msgstr "无法创建输出文件" + +#: builtin/pack-objects.c:2462 +msgid "ignore borrowed objects from alternate object store" +msgstr "" + +#: builtin/pack-objects.c:2464 +#, fuzzy +msgid "ignore packed objects" +msgstr "不能读取对象 %s" + +#: builtin/pack-objects.c:2466 +msgid "limit pack window by objects" +msgstr "" + +#: builtin/pack-objects.c:2468 +msgid "limit pack window by memory in addition to object limit" +msgstr "" + +#: builtin/pack-objects.c:2470 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "" + +#: builtin/pack-objects.c:2472 +#, fuzzy +msgid "reuse existing deltas" +msgstr "处理 delta 中" + +#: builtin/pack-objects.c:2474 +#, fuzzy +msgid "reuse existing objects" +msgstr "不能读取现存对象 %s" + +#: builtin/pack-objects.c:2476 +msgid "use OFS_DELTA objects" +msgstr "" + +#: builtin/pack-objects.c:2478 +msgid "use threads when searching for best delta matches" +msgstr "" + +#: builtin/pack-objects.c:2480 +msgid "do not create an empty pack output" +msgstr "" + +#: builtin/pack-objects.c:2482 +#, fuzzy +msgid "read revision arguments from standard input" +msgstr "(正从标准输入中读取日志信息)\n" + +#: builtin/pack-objects.c:2484 +msgid "limit the objects to those that are not yet packed" +msgstr "" + +#: builtin/pack-objects.c:2487 +msgid "include objects reachable from any reference" +msgstr "" + +#: builtin/pack-objects.c:2490 +msgid "include objects referred by reflog entries" +msgstr "" + +#: builtin/pack-objects.c:2493 +msgid "output pack to stdout" +msgstr "" + +#: builtin/pack-objects.c:2495 +msgid "include tag objects that refer to objects to be packed" +msgstr "" + +#: builtin/pack-objects.c:2497 +msgid "keep unreachable objects" +msgstr "" + +#: builtin/pack-objects.c:2498 parse-options.h:141 +msgid "time" +msgstr "时间" + +#: builtin/pack-objects.c:2499 +msgid "unpack unreachable objects newer than <time>" +msgstr "" + +#: builtin/pack-objects.c:2502 +msgid "create thin packs" +msgstr "" + +#: builtin/pack-objects.c:2504 +msgid "ignore packs that have companion .keep file" +msgstr "" + +#: builtin/pack-objects.c:2506 +msgid "pack compression level" +msgstr "" + +#: builtin/pack-objects.c:2508 +#, fuzzy +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 +#, fuzzy +msgid "do not remove, show only" +msgstr "不会删除 %s\n" + +#: builtin/prune.c:133 +#, fuzzy +msgid "report pruned objects" +msgstr "不能读取对象 %s" + +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "" + +#: builtin/push.c:14 +#, fuzzy +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/push.c:45 +msgid "tag shorthand without <tag>" +msgstr "tag 简写没有跟 <tag> 参数" + +#: builtin/push.c:64 +msgid "--delete only accepts plain target ref names" +msgstr "--delete 只接受简单的目标引用名" + +#: builtin/push.c:99 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "" +"\n" +"为了永久地选择任一选项,参见 'git help config' 中的 push.default。" + +#: 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 "" +"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" +"上游分支,使用\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"为推送至远程同名分支,使用\n" +"\n" +" git push %s %s\n" +"%s" + +#: 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 "" +"您当前不在一个分支上。\n" +"现在为推送当前(分离头指针)的历史,使用\n" +"\n" +" git push %s HEAD:<name-of-remote-branch>\n" + +#: 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 "" +"当前分支 %s 没有对应的上游分支。\n" +"为推送当前分支并建立与远程上游的跟踪,使用\n" +"\n" +" git push --set-upstream %s %s\n" + +#: builtin/push.c:136 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "当前分支 %s 有多个上游分支,拒绝推送。" + +#: 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 "" +"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" +"而没有告诉我要推送什么、更新哪个远程分支。" + +# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短 +#: 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 "" +"push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n" +"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n" +"进行如下设置:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" +"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n" +"为保持兼容,请用 'current' 代替 'simple' 模式)" + +#: builtin/push.c:199 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。" + +#: 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 "" +"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" +"再次推送前,先与远程变更合并(如 'git pull')。详见\n" +"'git push --help' 中的 'Note about fast-forwards' 小节。" + +#: 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 "" +"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" +"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n" +"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n" +"以便只推送当前分支。" + +#: 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 "" +"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" +"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n" +"'git push --help' 中的 'Note about fast-forwards' 小节。" + +#: builtin/push.c:258 +#, c-format +msgid "Pushing to %s\n" +msgstr "推送到 %s\n" + +#: builtin/push.c:262 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "无法推送一些引用到 '%s'" + +#: builtin/push.c:294 +#, c-format +msgid "bad repository '%s'" +msgstr "坏的版本库 '%s'" + +#: builtin/push.c:295 +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 "" +"没有配置推送目标。\n" +"或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"然后使用该远程版本库名执行推送\n" +"\n" +" git push <name>\n" + +#: builtin/push.c:310 +msgid "--all and --tags are incompatible" +msgstr "--all 和 --tags 不兼容" + +#: builtin/push.c:311 +msgid "--all can't be combined with refspecs" +msgstr "--all 不能和引用表达式同时使用" + +#: builtin/push.c:316 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror 和 --tags 不兼容" + +#: builtin/push.c:317 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror 不能和引用表达式同时使用" + +#: builtin/push.c:322 +msgid "--all and --mirror are incompatible" +msgstr "--all 和 --mirror 不兼容" + +#: builtin/push.c:382 +#, fuzzy +msgid "repository" +msgstr "坏的版本库 '%s'" + +#: builtin/push.c:383 +msgid "push all refs" +msgstr "" + +#: builtin/push.c:384 +msgid "mirror all refs" +msgstr "" + +#: builtin/push.c:386 +#, fuzzy +msgid "delete refs" +msgstr "删除" + +#: builtin/push.c:387 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "" + +#: builtin/push.c:390 +#, fuzzy +msgid "force updates" +msgstr "强制更新" + +#: builtin/push.c:391 +msgid "check" +msgstr "" + +#: builtin/push.c:392 +msgid "control recursive pushing of submodules" +msgstr "" + +#: builtin/push.c:394 +msgid "use thin pack" +msgstr "" + +#: builtin/push.c:395 builtin/push.c:396 +msgid "receive pack program" +msgstr "" + +#: builtin/push.c:397 +msgid "set upstream for git pull/status" +msgstr "" + +#: builtin/push.c:400 +msgid "prune locally removed refs" +msgstr "" + +#: builtin/push.c:410 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" + +#: builtin/push.c:412 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete 未接任何引用没有意义" + +#: 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 +#, fuzzy +msgid "write resulting index to <file>" +msgstr "损坏的索引文件" + +#: builtin/read-tree.c:111 +#, fuzzy +msgid "only empty the index" +msgstr "不能读取索引" + +#: builtin/read-tree.c:113 +#, fuzzy +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 +#, fuzzy +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 +#, fuzzy +msgid "gitignore" +msgstr "忽略的" + +#: builtin/read-tree.c:129 +msgid "allow explicitly ignored files to be overwritten" +msgstr "" + +#: builtin/read-tree.c:132 +#, fuzzy +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 +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:42 +msgid "git remote set-head <name> (-a | -d | <branch>])" +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 "更新 %s 中" + +#: builtin/remote.c:130 +msgid "" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" +msgstr "" +"--mirror 选项危险且过时,请使用 --mirror=fetch\n" +"\t 或 --mirror=push" + +#: builtin/remote.c:147 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "未知的镜像参数:%s" + +#: builtin/remote.c:163 +#, fuzzy +msgid "fetch the remote branches" +msgstr " 远程分支:%s" + +#: 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 +#, fuzzy +msgid "master branch" +msgstr " 远程分支:%s" + +#: 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 "指定一个 master 分支并使用 --mirror 选项没有意义" + +#: 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 "远程 %s 已经存在。" + +#: builtin/remote.c:199 builtin/remote.c:650 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' 不是一个有效的远程名称" + +#: builtin/remote.c:243 +#, c-format +msgid "Could not setup master '%s'" +msgstr "无法设置 master '%s'" + +#: builtin/remote.c:299 +#, c-format +msgid "more than one %s" +msgstr "多于一个 %s" + +#: builtin/remote.c:339 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "无法得到引用表达式 %s 的获取列表" + +#: 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 "不能添加 '%s' 至 '%s'" + +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#, c-format +msgid "No such remote: %s" +msgstr "没有这样的远程:%s" + +#: builtin/remote.c:656 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "不能重命名配置小节 '%s' 到 '%s'" + +#: builtin/remote.c:662 builtin/remote.c:799 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "不能移除配置小节 '%s'" + +#: 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 "" +"没有更新非默认的获取引用表达式\n" +"\t%s\n" +"\t如果必要请手动更新配置。" + +#: builtin/remote.c:683 +#, c-format +msgid "Could not append '%s'" +msgstr "不能追加 '%s'" + +#: builtin/remote.c:694 +#, c-format +msgid "Could not set '%s'" +msgstr "不能设置 '%s'" + +#: builtin/remote.c:716 +#, c-format +msgid "deleting '%s' failed" +msgstr "删除 '%s' 失败" + +#: builtin/remote.c:750 +#, c-format +msgid "creating '%s' failed" +msgstr "创建 '%s' 失败" + +#: builtin/remote.c:764 +#, c-format +msgid "Could not remove branch %s" +msgstr "无法移除分支 %s" + +#: 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] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" +msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" + +#: builtin/remote.c:943 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " 新的(下一次获取将存储于 remotes/%s)" + +#: builtin/remote.c:946 +msgid " tracked" +msgstr " 已跟踪" + +#: builtin/remote.c:948 +msgid " stale (use 'git remote prune' to remove)" +msgstr " 过时(使用 'git remote prune' 来移除)" + +#: builtin/remote.c:950 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:991 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" + +#: builtin/remote.c:998 +#, c-format +msgid "rebases onto remote %s" +msgstr "变基到远程 %s" + +#: builtin/remote.c:1001 +#, c-format +msgid " merges with remote %s" +msgstr " 与远程 %s 合并" + +#: builtin/remote.c:1002 +msgid " and with remote" +msgstr " 且有远程" + +#: builtin/remote.c:1004 +#, c-format +msgid "merges with remote %s" +msgstr "与远程 %s 合并" + +#: 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 " %-*s 强制推送至 %-*s (%s)" + +#: builtin/remote.c:1074 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s 推送至 %-*s (%s)" + +#: builtin/remote.c:1078 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s 强制推送至 %s" + +#: builtin/remote.c:1081 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s 推送至 %s" + +#: builtin/remote.c:1091 +#, fuzzy +msgid "do not query remotes" +msgstr "不会删除 %s\n" + +#: builtin/remote.c:1118 +#, c-format +msgid "* remote %s" +msgstr "* 远程 %s" + +#: builtin/remote.c:1119 +#, c-format +msgid " Fetch URL: %s" +msgstr " 获取地址:%s" + +#: builtin/remote.c:1120 builtin/remote.c:1285 +msgid "(no URL)" +msgstr "(无 URL)" + +#: builtin/remote.c:1129 builtin/remote.c:1131 +#, c-format +msgid " Push URL: %s" +msgstr " 推送地址:%s" + +#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#, c-format +msgid " HEAD branch: %s" +msgstr " HEAD分支:%s" + +#: builtin/remote.c:1139 +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" + +#: builtin/remote.c:1151 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " 远程分支:%s" +msgstr[1] " 远程分支:%s" + +# 译者:中文字符串拼接,可删除前导空格 +#: 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] " 为 'git pull' 配置的本地分支:" +msgstr[1] " 为 'git pull' 配置的本地分支:" + +#: builtin/remote.c:1171 +msgid " Local refs will be mirrored by 'git push'" +msgstr " 本地引用将在 'git push' 时被镜像" + +#: 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] " 为 'git push' 配置的本地引用%s:" +msgstr[1] " 为 'git push' 配置的本地引用%s:" + +#: 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 "无法确定远程 HEAD" + +#: builtin/remote.c:1218 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" + +#: builtin/remote.c:1228 +#, c-format +msgid "Could not delete %s" +msgstr "无法删除 %s" + +#: builtin/remote.c:1236 +#, c-format +msgid "Not a valid ref: %s" +msgstr "不是一个有效引用:%s" + +#: builtin/remote.c:1238 +#, c-format +msgid "Could not setup %s" +msgstr "不能设置 %s" + +# 译者:注意保持前导空格 +#: builtin/remote.c:1274 +#, c-format +msgid " %s will become dangling!" +msgstr " %s 将成为悬空状态!" + +# 译者:注意保持前导空格 +#: builtin/remote.c:1275 +#, c-format +msgid " %s has become dangling!" +msgstr " %s 已成为悬空状态!" + +#: builtin/remote.c:1281 +#, c-format +msgid "Pruning %s" +msgstr "修剪 %s" + +#: builtin/remote.c:1282 +#, c-format +msgid "URL: %s" +msgstr "URL:%s" + +#: builtin/remote.c:1295 +#, c-format +msgid " * [would prune] %s" +msgstr " * [将删除] %s" + +#: builtin/remote.c:1298 +#, c-format +msgid " * [pruned] %s" +msgstr " * [已删除] %s" + +#: 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 "没有此远程 '%s'" + +#: builtin/remote.c:1407 +#, fuzzy +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 +#, fuzzy +msgid "delete URLs" +msgstr "删除" + +#: builtin/remote.c:1447 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete 无意义" + +#: builtin/remote.c:1487 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "无效的旧URL匹配模版:%s" + +#: builtin/remote.c:1495 +#, c-format +msgid "No such URL found: %s" +msgstr "未找到此URL:%s" + +#: builtin/remote.c:1497 +msgid "Will not delete all non-push URLs" +msgstr "将不会删除所有非推送URL地址" + +#: 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:118 +msgid "list replace refs" +msgstr "" + +#: builtin/replace.c:119 +msgid "delete replace refs" +msgstr "" + +#: builtin/replace.c:120 +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 +#, fuzzy +msgid "register clean resolutions in index" +msgstr "%s:已经存在于索引中" + +#: builtin/reset.c:25 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" + +#: builtin/reset.c:26 +msgid "git reset [-q] <commit> [--] <paths>..." +msgstr "" + +#: builtin/reset.c:27 +msgid "git reset --patch [<commit>] [--] [<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:77 +msgid "You do not have a valid HEAD." +msgstr "您没有一个有效的 HEAD。" + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "无法找到 HEAD 指向的树。" + +#: builtin/reset.c:85 +#, c-format +msgid "Failed to find tree of %s." +msgstr "无法找到 %s 指向的树。" + +#: builtin/reset.c:96 +msgid "Could not write new index file." +msgstr "不能写入新的索引文件。" + +#: builtin/reset.c:106 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD 现在位于 %s" + +#: builtin/reset.c:130 +msgid "Could not read index" +msgstr "不能读取索引" + +#: builtin/reset.c:133 +msgid "Unstaged changes after reset:" +msgstr "重置后撤出暂存区的变更:" + +# 译者:汉字之间无空格,故删除%s前后空格 +#: builtin/reset.c:223 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "在合并过程中不能做%s重置操作。" + +#: builtin/reset.c:238 +msgid "be quiet, only report errors" +msgstr "" + +#: builtin/reset.c:240 +msgid "reset HEAD and index" +msgstr "" + +#: builtin/reset.c:241 +msgid "reset only HEAD" +msgstr "" + +#: builtin/reset.c:243 builtin/reset.c:245 +msgid "reset HEAD, index and working tree" +msgstr "" + +#: builtin/reset.c:247 +msgid "reset HEAD but keep local changes" +msgstr "" + +#: builtin/reset.c:303 +#, c-format +msgid "Could not parse object '%s'." +msgstr "不能解析对象 '%s'。" + +#: builtin/reset.c:308 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch 与 --{hard,mixed,soft} 不兼容" + +#: builtin/reset.c:317 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。" + +# 译者:汉字之间无空格,故删除%s前后空格 +#: builtin/reset.c:319 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "不能带路径进行%s重置。" + +# 译者:汉字之间无空格,故删除%s前后空格 +#: builtin/reset.c:331 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "不能对裸版本库进行%s重置" + +#: builtin/reset.c:347 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "不能重置索引文件至版本 '%s'。" + +#: builtin/rev-parse.c:339 +#, fuzzy +msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgstr "git apply [选项] [<补丁>...]" + +#: 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 +#, fuzzy +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 "%s:%s 不能和 %s 同时使用" + +#: 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 +#, fuzzy +msgid "don't automatically commit" +msgstr "不能作为初始提交还原" + +#: builtin/revert.c:107 +#, fuzzy +msgid "edit the commit message" +msgstr "空提交信息。" + +#: builtin/revert.c:110 +msgid "parent number" +msgstr "" + +#: builtin/revert.c:112 +#, fuzzy +msgid "merge strategy" +msgstr "尝试合并策略 %s...\n" + +#: builtin/revert.c:113 +#, fuzzy +msgid "option" +msgstr "动作" + +#: builtin/revert.c:114 +#, fuzzy +msgid "option for merge strategy" +msgstr "尝试合并策略 %s...\n" + +#: builtin/revert.c:125 +msgid "append commit name" +msgstr "" + +#: builtin/revert.c:126 +#, fuzzy +msgid "allow fast-forward" +msgstr "(非快进式)" + +#: builtin/revert.c:127 +#, fuzzy +msgid "preserve initially empty commits" +msgstr "不能作为初始提交还原" + +#: builtin/revert.c:128 +#, fuzzy +msgid "allow commits with empty messages" +msgstr "提交说明为空" + +#: builtin/revert.c:129 +#, fuzzy +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:14 +#, fuzzy +msgid "git rm [options] [--] <file>..." +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/rm.c:109 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" +"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n" +"(使用 -f 强制删除)" + +#: builtin/rm.c:115 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"'%s' 有变更已暂存至索引中\n" +"(使用 --cached 保存文件,或用 -f 强制删除)" + +#: builtin/rm.c:119 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"'%s' 有本地修改\n" +"(使用 --cached 保存文件,或用 -f 强制删除)" + +#: builtin/rm.c:134 +#, fuzzy +msgid "do not list removed files" +msgstr "无法还原修改的文件" + +#: builtin/rm.c:135 +#, fuzzy +msgid "only remove from the index" +msgstr "不能从索引中移除 %s" + +#: builtin/rm.c:136 +msgid "override the up-to-date check" +msgstr "" + +#: builtin/rm.c:137 +msgid "allow recursive removal" +msgstr "" + +#: builtin/rm.c:139 +msgid "exit with a zero status even if nothing matched" +msgstr "" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "未提供 -r 选项不会递归删除 '%s'" + +#: builtin/rm.c:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm:不能删除 %s" + +#: builtin/shortlog.c:13 +msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +msgstr "" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "缺少作者:%s" + +#: builtin/shortlog.c:253 +msgid "sort output according to the number of commits per author" +msgstr "" + +#: builtin/shortlog.c:255 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "" + +#: builtin/shortlog.c:257 +msgid "Show the email address of each author" +msgstr "" + +#: builtin/shortlog.c:258 +msgid "w[,i1[,i2]]" +msgstr "" + +#: builtin/shortlog.c:259 +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 +#, fuzzy +msgid "show remote-tracking and local branches" +msgstr "%s 没有来自 %s 的远程跟踪分支" + +#: builtin/show-branch.c:653 +#, fuzzy +msgid "show remote-tracking branches" +msgstr "%s 没有来自 %s 的远程跟踪分支" + +#: 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 +#, fuzzy +msgid "include the current branch" +msgstr "没有当前分支。" + +#: builtin/show-branch.c:664 +#, fuzzy +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:182 +#, fuzzy +msgid "only show tags (can be combined with heads)" +msgstr "--all 不能和引用表达式同时使用" + +#: builtin/show-ref.c:183 +#, fuzzy +msgid "only show heads (can be combined with tags)" +msgstr "--all 不能和引用表达式同时使用" + +#: builtin/show-ref.c:184 +msgid "stricter reference checking, requires exact ref path" +msgstr "" + +#: builtin/show-ref.c:187 builtin/show-ref.c:189 +msgid "show the HEAD reference" +msgstr "" + +#: builtin/show-ref.c:191 +#, fuzzy +msgid "dereference tags into object IDs" +msgstr "引用不是一个树:%s" + +#: builtin/show-ref.c:193 +msgid "only show SHA1 hash using <n> digits" +msgstr "" + +#: builtin/show-ref.c:197 +msgid "do not print results to stdout (useful with --verify)" +msgstr "" + +#: builtin/show-ref.c:199 +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:38 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "" + +#: builtin/symbolic-ref.c:39 +msgid "shorten ref output" +msgstr "" + +#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +msgid "reason" +msgstr "" + +#: builtin/symbolic-ref.c:40 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 "非法的对象于 '%s'" + +#: builtin/tag.c:207 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "tag 名字太长:%.*s..." + +#: builtin/tag.c:212 +#, c-format +msgid "tag '%s' not found." +msgstr "tag '%s' 未发现。" + +#: builtin/tag.c:227 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "已删除 tag '%s'(曾为 %s)\n" + +#: builtin/tag.c:239 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "不能校验 tag '%s'" + +#: builtin/tag.c:249 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# 输入一个 tag 说明\n" +"# 以 '#' 开头的行将被忽略。\n" +"#\n" + +#: builtin/tag.c:256 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# 输入一个 tag 说明\n" +"# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n" +"#\n" + +#: builtin/tag.c:298 +msgid "unable to sign the tag" +msgstr "无法签署 tag" + +#: builtin/tag.c:300 +msgid "unable to write tag file" +msgstr "无法写 tag 文件" + +#: builtin/tag.c:325 +msgid "bad object type." +msgstr "坏的对象类型。" + +#: builtin/tag.c:338 +msgid "tag header too big." +msgstr "tag 头信息太大。" + +#: builtin/tag.c:370 +msgid "no tag message?" +msgstr "无 tag 说明?" + +#: builtin/tag.c:376 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "tag 说明被保留在 %s\n" + +#: builtin/tag.c:425 +msgid "switch 'points-at' requires an object" +msgstr "开关 'points-at' 需要一个对象" + +#: builtin/tag.c:427 +#, c-format +msgid "malformed object name '%s'" +msgstr "非法的对象名 '%s'" + +#: builtin/tag.c:447 +msgid "list tag names" +msgstr "" + +#: builtin/tag.c:449 +msgid "print <n> lines of each tag message" +msgstr "" + +#: builtin/tag.c:451 +#, fuzzy +msgid "delete tags" +msgstr "删除" + +#: builtin/tag.c:452 +msgid "verify tags" +msgstr "" + +#: builtin/tag.c:454 +msgid "Tag creation options" +msgstr "" + +#: builtin/tag.c:456 +#, fuzzy +msgid "annotated tag, needs a message" +msgstr "注释 tag %s 没有嵌入名称" + +#: builtin/tag.c:458 +#, fuzzy +msgid "tag message" +msgstr "无 tag 说明?" + +#: builtin/tag.c:460 +msgid "annotated and GPG-signed tag" +msgstr "" + +#: builtin/tag.c:464 +#, fuzzy +msgid "use another key to sign the tag" +msgstr "无法签署 tag" + +#: builtin/tag.c:465 +msgid "replace the tag if exists" +msgstr "" + +#: builtin/tag.c:466 +msgid "show tag list in columns" +msgstr "" + +#: builtin/tag.c:468 +msgid "Tag listing options" +msgstr "" + +#: builtin/tag.c:471 +msgid "print only tags that contain the commit" +msgstr "" + +#: builtin/tag.c:477 +msgid "print only tags of the object" +msgstr "" + +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "--column 和 -n 不兼容" + +#: builtin/tag.c:523 +msgid "-n option is only allowed with -l." +msgstr "-n 选项只允许和 -l 同时使用。" + +#: builtin/tag.c:525 +msgid "--contains option is only allowed with -l." +msgstr "--contains 选项只允许和 -l 同时使用。" + +#: builtin/tag.c:527 +msgid "--points-at option is only allowed with -l." +msgstr "--points-at 选项只允许和 -l 同时使用。" + +#: builtin/tag.c:535 +msgid "only one -F or -m option is allowed." +msgstr "只允许一个 -F 或 -m 选项。" + +#: builtin/tag.c:555 +msgid "too many params" +msgstr "太多参数" + +#: builtin/tag.c:561 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "'%s' 不是一个有效的tag名称。" + +#: builtin/tag.c:566 +#, c-format +msgid "tag '%s' already exists" +msgstr "tag '%s' 已存在" + +#: builtin/tag.c:584 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s:不能锁定引用" + +#: builtin/tag.c:586 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s:不能更新引用" + +#: builtin/tag.c:588 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "已更新tag '%s'(曾为 %s)\n" + +#: builtin/update-index.c:401 +#, fuzzy +msgid "git update-index [options] [--] [<file>...]" +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/update-index.c:717 +msgid "continue refresh even when index needs update" +msgstr "" + +#: builtin/update-index.c:720 +msgid "refresh: ignore submodules" +msgstr "" + +#: builtin/update-index.c:723 +#, fuzzy +msgid "do not ignore new files" +msgstr "无法存储索引文件" + +#: builtin/update-index.c:725 +msgid "let files replace directories and vice-versa" +msgstr "" + +#: builtin/update-index.c:727 +msgid "notice files missing from worktree" +msgstr "" + +#: builtin/update-index.c:729 +msgid "refresh even if index contains unmerged entries" +msgstr "" + +#: builtin/update-index.c:732 +msgid "refresh stat information" +msgstr "" + +#: builtin/update-index.c:736 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "" + +#: builtin/update-index.c:740 +msgid "<mode> <object> <path>" +msgstr "" + +#: builtin/update-index.c:741 +#, fuzzy +msgid "add the specified entry to the index" +msgstr "添加文件内容至索引" + +#: builtin/update-index.c:745 +msgid "(+/-)x" +msgstr "" + +#: builtin/update-index.c:746 +msgid "override the executable bit of the listed files" +msgstr "" + +#: builtin/update-index.c:750 +msgid "mark files as \"not changing\"" +msgstr "" + +#: builtin/update-index.c:753 +msgid "clear assumed-unchanged bit" +msgstr "" + +#: builtin/update-index.c:756 +msgid "mark files as \"index-only\"" +msgstr "" + +#: builtin/update-index.c:759 +msgid "clear skip-worktree bit" +msgstr "" + +#: builtin/update-index.c:762 +msgid "add to index only; do not add content to object database" +msgstr "" + +#: builtin/update-index.c:764 +msgid "remove named paths even if present in worktree" +msgstr "" + +#: builtin/update-index.c:766 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "" + +#: builtin/update-index.c:768 +#, fuzzy +msgid "read list of paths to be updated from standard input" +msgstr "(正从标准输入中读取日志信息)\n" + +#: builtin/update-index.c:772 +#, fuzzy +msgid "add entries from standard input to the index" +msgstr "不能从标准输入中读取日志信息" + +#: builtin/update-index.c:776 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "" + +#: builtin/update-index.c:780 +msgid "only update entries that differ from HEAD" +msgstr "" + +#: builtin/update-index.c:784 +msgid "ignore files missing from worktree" +msgstr "" + +#: builtin/update-index.c:787 +msgid "report actions to standard output" +msgstr "" + +#: builtin/update-index.c:789 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "" + +#: builtin/update-index.c:793 +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 +#, fuzzy +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 "参见 'git help <command>' 以获得该特定命令的详细信息。" + +#: parse-options.h:156 +msgid "no-op (backward compatibility)" +msgstr "空操作(向后兼容)" + +#: parse-options.h:228 +msgid "be more verbose" +msgstr "更加详细" + +#: parse-options.h:230 +msgid "be more quiet" +msgstr "更加安静" + +#: parse-options.h:236 +msgid "use <n> digits to display SHA-1s" +msgstr "用 <n> 位数字显示 SHA-1 哈希值" + +#: 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 "通过二分查找定位引入 bug 的变更" + +#: 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 "创建一个空的 git 版本库或者重新初始化一个" + +#: 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 "重置当前HEAD到指定状态" + +#: 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 "创建、列出、删除或校验一个GPG签名的 tag 对象" + +#: 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 "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" + +#: 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 "" +"当您解决了此问题后,执行 \"$cmdline --resolved\"。\n" +"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n" +"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" + +#: 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 "版本库缺乏必要的二进制对象(blob)以进行三路合并。" + +#: 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 "" +"您是否曾手动编辑过您的补丁?\n" +"无法应用补丁到索引中的二进制对象(blob)上。" + +#: 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 "一次只能有一个 StGIT 补丁队列被应用" + +#: git-am.sh:361 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "不支持 $patch_format 补丁格式。" + +#: 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 "" +"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n" +"请不要再使用它了。" + +#: git-am.sh:477 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。" + +#: git-am.sh:482 +msgid "Please make up your mind. --skip or --abort?" +msgstr "请下决心。--skip 或是 --abort ?" + +#: 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 "脏的索引:不能应用补丁(脏文件:$files)" + +#: 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 "" +"补丁为空。是不是切分错误?\n" +"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n" +"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" + +#: 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 "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " + +#: git-am.sh:800 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "正应用:$FIRSTLINE" + +#: 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 add'?\n" +"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" +"您也许想要跳过这个补丁。" + +#: git-am.sh:829 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?" + +#: git-am.sh:845 +msgid "No changes -- Patch already applied." +msgstr "没有变更 -- 补丁已经应用过。" + +#: git-am.sh:855 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "补丁失败于 $msgnum $FIRSTLINE" + +#: 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 "您需要执行 \"git bisect start\" 来开始" + +# 译者:注意保持句尾空格 +#. 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 "您想让我为您这样做么[Y/n]? " + +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "未能识别的选项:'$arg'" + +#: git-bisect.sh:99 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "'$arg' 看起来不像是一个有效的版本" + +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" +msgstr "坏的 HEAD - 我需要一个 HEAD" + +#: git-bisect.sh:130 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。" + +#: git-bisect.sh:140 +msgid "won't bisect on seeked tree" +msgstr "不会在已查找过的树上二分查找" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "坏的 HEAD - 奇怪的符号引用" + +#: git-bisect.sh:189 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "坏的 bisect_write 参数:$state" + +#: git-bisect.sh:218 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "输入坏的版本:$arg" + +#: git-bisect.sh:232 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "请在调用 'bisect_state' 时跟至少一个参数。" + +#: git-bisect.sh:244 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "输入坏的版本:$rev" + +#: git-bisect.sh:250 +msgid "'git bisect bad' can take only one argument." +msgstr "'git bisect bad' 只能带一个参数。" + +#. 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 "您确认么[Y/n]? " + +#: 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 "" +"您需要给我至少一个好版本和一个坏版本。\n" +"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)" + +#: 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 start\" 来开始。\n" +"然后需要提供我至少一个好版本和一个坏版本。\n" +"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)" + +#: 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 "'$invalid' 不是一个有效的提交" + +#: git-bisect.sh:363 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." +msgstr "" +"不能检出原始 HEAD '$branch'。\n" +"尝试 'git bisect reset <commit>'。" + +#: git-bisect.sh:390 +msgid "No logfile given" +msgstr "未提供日志文件" + +#: git-bisect.sh:391 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "不能读取 $file 来重放" + +#: git-bisect.sh:408 +msgid "?? what are you talking about?" +msgstr "?? 您在说什么?" + +#: git-bisect.sh:420 +#, sh-format +msgid "running $command" +msgstr "运行 $command" + +#: git-bisect.sh:427 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" +"二分查找运行失败:\n" +"命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128" + +#: 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 "" +"二分查找运行失败:\n" +"'bisect_state $state' 退出码为 $res" + +#: 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 "" +"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n" +"然后酌情使用 'git add/rm <file>' 标记解决方案,\n" +"或者使用 'git commit -a'。" + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "Pull 不可用,因为您尚有未合并的文件。" + +#: 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:228 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" +"警告:fetch 更新了当前的分支。您的工作区\n" +"警告:从原提交 $orig_head 快进。" + +#: git-pull.sh:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "无法将多个分支合并到空分支" + +#: git-pull.sh:257 +msgid "Cannot rebase onto multiple branches" +msgstr "无法变基到多个分支" + +#: git-rebase.sh:52 +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 --continue\"。\n" +"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" +"要恢复原分支并停止变基,执行 \"git rebase --abort\"。" + +#: git-rebase.sh:159 +msgid "The pre-rebase hook refused to rebase." +msgstr "钩子 pre-rebase 拒绝变基。" + +#: git-rebase.sh:164 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" + +#: git-rebase.sh:295 +msgid "The --exec option must be used with the --interactive option" +msgstr "选项 --exec 必须和选项 --interactive 同时使用" + +#: git-rebase.sh:300 +msgid "No rebase in progress?" +msgstr "没有正在进行的变基?" + +#: git-rebase.sh:313 +msgid "Cannot read HEAD" +msgstr "不能读取 HEAD" + +#: git-rebase.sh:316 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"您必须编辑所有的合并冲突,然后通过 git add\n" +"命令将它们标记为已解决" + +#: git-rebase.sh:334 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "无法移回 $head_name" + +#: git-rebase.sh:350 +#, 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 "" +"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n" +"如果是这样,请尝试执行\n" +"\t$cmd_live_rebase\n" +"如果不是这样,请执行\n" +"\t$cmd_clear_stale_rebase\n" +"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。" + +#: git-rebase.sh:395 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "无效的上游 $upstream_name" + +#: git-rebase.sh:419 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "$onto_name: 有一个以上的合并基准" + +#: git-rebase.sh:422 git-rebase.sh:426 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: 没有合并基准" + +#: git-rebase.sh:431 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "没有指向一个有效的提交:$onto_name" + +#: git-rebase.sh:454 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "严重错误:无此分支:$branch_name" + +#: git-rebase.sh:474 +msgid "Please commit or stash them." +msgstr "请提交或为它们保存进度。" + +#: git-rebase.sh:492 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "当前分支 $branch_name 是最新的。" + +#: git-rebase.sh:495 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "当前分支 $branch_name 是最新的,强制变基。" + +#: git-rebase.sh:506 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "变更从 $mb 到 $onto:" + +#. Detach HEAD and reset the tree +#: git-rebase.sh:515 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "首先,重置头指针以便在上面重放您的工作..." + +#: git-rebase.sh:523 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "快进 $branch_name 至 $onto_name。" + +#: git-stash.sh:51 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash clear 不支持参数" + +#: 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 "" +"错误:'stash save' 的未知选项:$option\n" +" 要提供一个描述信息,使用 git stash save -- '$option'" + +#: git-stash.sh:223 +msgid "No local changes to save" +msgstr "没有要保存的本地修改" + +#: git-stash.sh:227 +msgid "Cannot initialize stash" +msgstr "无法初始化 stash" + +#: 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 "未发现 stash。" + +#: git-stash.sh:359 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "指定了太多的版本:$REV" + +#: git-stash.sh:365 +#, sh-format +msgid "$reference is not valid reference" +msgstr "$reference 不是有效的引用" + +#: git-stash.sh:393 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "'$args' 不是 stash 样提交" + +#: git-stash.sh:404 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "'$args' 不是一个 stash 引用" + +#: 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 "索引中有冲突。尝试不使用 --index。" + +#: 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 "丢弃了 ${REV} ($s)" + +#: git-stash.sh:493 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}:不能丢弃进度条目" + +#: git-stash.sh:500 +msgid "No branch name specified" +msgstr "未指定分支名" + +#: git-stash.sh:571 +msgid "(To restore them type \"git stash apply\")" +msgstr "(为恢复数据输入 \"git stash apply\")" + +#: git-submodule.sh:88 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "无法从 url '$remoteurl' 剥离一个组件" + +#: git-submodule.sh:167 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" + +#: git-submodule.sh:211 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" + +#: git-submodule.sh:223 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反" + +#: git-submodule.sh:312 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始" + +#: git-submodule.sh:329 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "'$sm_path' 已经存在于索引中" + +#: git-submodule.sh:333 +#, 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 "" +"以下路径被您的一个 .gitignore 文件所忽略:\n" +"$sm_path\n" +"如果您确实想添加它,使用 -f 参数。" + +#: git-submodule.sh:344 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "添加位于 '$sm_path' 的现存版本库到索引" + +#: git-submodule.sh:346 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" + +#: git-submodule.sh:360 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "不能检出子模组 '$sm_path'" + +#: git-submodule.sh:365 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "无法添加子模组 '$sm_path'" + +#: git-submodule.sh:370 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "无法注册子模组 '$sm_path'" + +#: git-submodule.sh:413 +#, sh-format +msgid "Entering '$prefix$sm_path'" +msgstr "正在进入 '$prefix$sm_path'" + +#: git-submodule.sh:427 +#, sh-format +msgid "Stopping at '$sm_path'; script returned non-zero status." +msgstr "停止于 '$sm_path',脚本返回非零值。" + +#: git-submodule.sh:471 +#, sh-format +msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url" + +#: git-submodule.sh:480 +#, sh-format +msgid "Failed to register url for submodule path '$sm_path'" +msgstr "无法为子模组路径 '$sm_path' 注册 url" + +#: git-submodule.sh:482 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" + +#: git-submodule.sh:490 +#, sh-format +msgid "Failed to register update mode for submodule path '$sm_path'" +msgstr "无法为子模组路径 '$sm_path' 注册更新模式" + +#: git-submodule.sh:590 +#, sh-format +msgid "" +"Submodule path '$sm_path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" +"子模组路径 '$sm_path' 没有初始化\n" +"也许您想用 'update --init'?" + +#: git-submodule.sh:603 +#, sh-format +msgid "Unable to find current revision in submodule path '$sm_path'" +msgstr "无法在子模组路径 '$sm_path' 中找到当前版本" + +#: git-submodule.sh:622 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "无法在子模组路径 '$sm_path' 中获取" + +#: git-submodule.sh:636 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'" + +#: git-submodule.sh:637 +#, sh-format +msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgstr "子模组路径 '$sm_path':变基至 '$sha1'" + +#: git-submodule.sh:642 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中" + +#: git-submodule.sh:643 +#, sh-format +msgid "Submodule path '$sm_path': merged in '$sha1'" +msgstr "子模组路径 '$sm_path':已合并入 '$sha1'" + +#: git-submodule.sh:648 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'" + +#: git-submodule.sh:649 +#, sh-format +msgid "Submodule path '$sm_path': checked out '$sha1'" +msgstr "子模组路径 '$sm_path':检出 '$sha1'" + +#: git-submodule.sh:671 git-submodule.sh:995 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "无法递归进子模组路径 '$sm_path'" + +#: git-submodule.sh:779 +msgid "The --cached option cannot be used with the --files option" +msgstr "选项 --cached 不能和选项 --files 同时使用" + +#. unexpected type +#: git-submodule.sh:819 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "意外的模式 $mod_dst" + +# 译者:注意保持前导空格 +#: git-submodule.sh:837 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr " 警告:$name 未包含提交 $sha1_src" + +# 译者:注意保持前导空格 +#: git-submodule.sh:840 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr " 警告:$name 未包含提交 $sha1_dst" + +# 译者:注意保持前导空格 +#: git-submodule.sh:843 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst" + +#: git-submodule.sh:868 +msgid "blob" +msgstr "二进制对象" + +#: git-submodule.sh:906 +msgid "# Submodules changed but not updated:" +msgstr "# 子模组已修改但尚未更新:" + +#: git-submodule.sh:908 +msgid "# Submodule changes to be committed:" +msgstr "要提交的子模组变更:" + +#: git-submodule.sh:1054 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "为 '$name' 同步子模组 url" + +# 译者:中文字符串拼接,可删除前导空格 +#~ msgid " (use \"git add\" to track)" +#~ msgstr "(使用 \"git add\" 建立跟踪)" + +#~ msgid "-B cannot be used with -b" +#~ msgstr "-B 不能和 -b 同时使用" + +#~ msgid "--patch is incompatible with all other options" +#~ msgstr "--patch 选项和其他选项不兼容" + +#~ msgid "--detach cannot be used with -b/-B/--orphan" +#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用" + +#~ msgid "--detach cannot be used with -t" +#~ msgstr "--detach 不能和 -t 同时使用" + +#~ msgid "--orphan and -b|-B are mutually exclusive" +#~ msgstr "--orphan 和 -b|-B 互斥" + +#~ msgid "--orphan cannot be used with -t" +#~ msgstr "--orphan 不能和 -t 同时使用" + +#~ msgid "git checkout: -f and -m are incompatible" +#~ msgstr "git checkout:-f 和 -m 不兼容" + +#~ msgid "" +#~ "git checkout: updating paths is incompatible with switching branches." +#~ msgstr "git checkout:更新路径和切换分支不兼容。" + +#~ msgid "diff setup failed" +#~ msgstr "diff 设置失败" + +#~ msgid "merge-recursive: disk full?" +#~ msgstr "merge-recursive:磁盘已满?" + +#~ msgid "diff_setup_done failed" +#~ msgstr "diff_setup_done 失败" diff --git a/po/zh_cn.po b/po/zh_cn.po deleted file mode 100644 index 91c1be2..0000000 --- a/po/zh_cn.po +++ /dev/null @@ -1,1967 +0,0 @@ -# Translation of git-gui to Chinese -# Copyright (C) 2007 Shawn Pearce -# This file is distributed under the same license as the git-gui package. -# Xudong Guan <xudong.guan@gmail.com>, 2007. -# -# Please use the following translation throughout the file for consistence: -# -# repository 版本库 -# commit 提交 -# revision 版本 -# branch 分支 -# tag 标签 -# annotation 标注 -# merge 合并 -# fast forward 快速合并(??) -# stage 缓存 (译自 index/cache) -# amend 修正 -# reset 复位 -# -# 2008-01-06 Eric Miao <eric.y.miao@gmail.com> -# FIXME: checkout 的标准翻译 -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-14 07:18+0100\n" -"PO-Revision-Date: 2007-07-21 01:23-0700\n" -"Last-Translator: Eric Miao <eric.y.miao@gmail.com>\n" -"Language-Team: Chinese\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 -#: git-gui.sh:763 -msgid "git-gui: fatal error" -msgstr "git-gui: 致命错误" - -#: git-gui.sh:593 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "%s 中指定的字体无效:" - -#: git-gui.sh:620 -msgid "Main Font" -msgstr "主要字体" - -#: git-gui.sh:621 -msgid "Diff/Console Font" -msgstr "Diff/控制终端字体" - -#: git-gui.sh:635 -msgid "Cannot find git in PATH." -msgstr "PATH 中没有找到 git" - -#: git-gui.sh:662 -msgid "Cannot parse Git version string:" -msgstr "无法解析 Git 的版本信息:" - -#: git-gui.sh:680 -#, tcl-format -msgid "" -"Git version cannot be determined.\n" -"\n" -"%s claims it is version '%s'.\n" -"\n" -"%s requires at least Git 1.5.0 or later.\n" -"\n" -"Assume '%s' is version 1.5.0?\n" -msgstr "" -"无法确定 Git 的版本.\n" -"\n" -"%s 声明其版本为 '%s'.\n" -"\n" -"而 %s 需要 1.5.0 或这以后的 Git 版本.\n" -"\n" -"是否假定 '%s' 为版本 1.5.0?\n" - -#: git-gui.sh:918 -msgid "Git directory not found:" -msgstr "Git 目录无法找到:" - -#: git-gui.sh:925 -msgid "Cannot move to top of working directory:" -msgstr "无法移动到工作根目录:" - -#: git-gui.sh:932 -msgid "Cannot use funny .git directory:" -msgstr "无法使用 .git 目录:" - -#: git-gui.sh:937 -msgid "No working directory" -msgstr "没有工作目录" - -#: git-gui.sh:1084 lib/checkout_op.tcl:283 -msgid "Refreshing file status..." -msgstr "更新文件状态..." - -#: git-gui.sh:1149 -msgid "Scanning for modified files ..." -msgstr "扫描修改过的文件 ..." - -#: git-gui.sh:1324 lib/browser.tcl:246 -msgid "Ready." -msgstr "就绪" - -#: git-gui.sh:1590 -msgid "Unmodified" -msgstr "未修改" - -#: git-gui.sh:1592 -msgid "Modified, not staged" -msgstr "修改但未缓存" - -#: git-gui.sh:1593 git-gui.sh:1598 -msgid "Staged for commit" -msgstr "缓存为提交" - -#: git-gui.sh:1594 git-gui.sh:1599 -msgid "Portions staged for commit" -msgstr "部分缓存为提交" - -#: git-gui.sh:1595 git-gui.sh:1600 -msgid "Staged for commit, missing" -msgstr "缓存为提交, 不存在" - -#: git-gui.sh:1597 -msgid "Untracked, not staged" -msgstr "未跟踪, 未缓存" - -#: git-gui.sh:1602 -msgid "Missing" -msgstr "不存在" - -#: git-gui.sh:1603 -msgid "Staged for removal" -msgstr "缓存为删除" - -#: git-gui.sh:1604 -msgid "Staged for removal, still present" -msgstr "缓存为删除, 但仍存在" - -#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609 -msgid "Requires merge resolution" -msgstr "需要解决合并冲突" - -#: git-gui.sh:1644 -msgid "Starting gitk... please wait..." -msgstr "启动 gitk... 请等待..." - -#: git-gui.sh:1653 -#, tcl-format -msgid "" -"Unable to start gitk:\n" -"\n" -"%s does not exist" -msgstr "" -"无法启动 gitk:\n" -"\n" -"%s 不存在" - -#: git-gui.sh:1860 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "版本库(repository)" - -#: git-gui.sh:1861 -msgid "Edit" -msgstr "编辑" - -#: git-gui.sh:1863 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "分支(branch)" - -#: git-gui.sh:1866 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "提交(commit)" - -#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167 -msgid "Merge" -msgstr "合并(merge)" - -#: git-gui.sh:1870 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "远端(remote)" - -#: git-gui.sh:1879 -msgid "Browse Current Branch's Files" -msgstr "浏览当前分支上的文件" - -#: git-gui.sh:1883 -msgid "Browse Branch Files..." -msgstr "浏览分支上的文件..." - -#: git-gui.sh:1888 -msgid "Visualize Current Branch's History" -msgstr "图示当前分支的历史" - -#: git-gui.sh:1892 -msgid "Visualize All Branch History" -msgstr "图示所有分支的历史" - -#: git-gui.sh:1899 -#, tcl-format -msgid "Browse %s's Files" -msgstr "浏览 %s 上的文件" - -#: git-gui.sh:1901 -#, tcl-format -msgid "Visualize %s's History" -msgstr "图示 %s 分支的历史" - -#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "数据库统计信息" - -#: git-gui.sh:1909 lib/database.tcl:34 -msgid "Compress Database" -msgstr "压缩数据库" - -#: git-gui.sh:1912 -msgid "Verify Database" -msgstr "验证数据库" - -#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7 -#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 -msgid "Create Desktop Icon" -msgstr "创建桌面图标" - -#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185 -msgid "Quit" -msgstr "退出" - -#: git-gui.sh:1939 -msgid "Undo" -msgstr "撤销" - -#: git-gui.sh:1942 -msgid "Redo" -msgstr "重做" - -#: git-gui.sh:1946 git-gui.sh:2443 -msgid "Cut" -msgstr "剪切" - -#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "复制" - -#: git-gui.sh:1952 git-gui.sh:2449 -msgid "Paste" -msgstr "粘贴" - -#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "删除" - -#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71 -msgid "Select All" -msgstr "全选" - -#: git-gui.sh:1968 -msgid "Create..." -msgstr "新建..." - -#: git-gui.sh:1974 -msgid "Checkout..." -msgstr "Checkout..." - -#: git-gui.sh:1980 -msgid "Rename..." -msgstr "更名..." - -#: git-gui.sh:1985 git-gui.sh:2085 -msgid "Delete..." -msgstr "删除..." - -#: git-gui.sh:1990 -msgid "Reset..." -msgstr "复位(Reset)..." - -#: git-gui.sh:2002 git-gui.sh:2389 -msgid "New Commit" -msgstr "新建提交" - -#: git-gui.sh:2010 git-gui.sh:2396 -msgid "Amend Last Commit" -msgstr "修正上次提交" - -#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "重新扫描" - -#: git-gui.sh:2025 -msgid "Stage To Commit" -msgstr "缓存为提交" - -#: git-gui.sh:2031 -msgid "Stage Changed Files To Commit" -msgstr "缓存修改的文件为提交" - -#: git-gui.sh:2037 -msgid "Unstage From Commit" -msgstr "从本次提交撤除" - -#: git-gui.sh:2042 lib/index.tcl:395 -msgid "Revert Changes" -msgstr "撤销修改" - -#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467 -msgid "Sign Off" -msgstr "签名(Sign Off)" - -#: git-gui.sh:2053 git-gui.sh:2372 -msgid "Commit@@verb" -msgstr "提交" - -#: git-gui.sh:2064 -msgid "Local Merge..." -msgstr "本地合并..." - -#: git-gui.sh:2069 -msgid "Abort Merge..." -msgstr "中止合并..." - -#: git-gui.sh:2081 -msgid "Push..." -msgstr "上传..." - -#: git-gui.sh:2092 lib/choose_repository.tcl:41 -msgid "Apple" -msgstr "苹果" - -#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 -#, tcl-format -msgid "About %s" -msgstr "关于 %s" - -#: git-gui.sh:2099 -msgid "Preferences..." -msgstr "首选项..." - -#: git-gui.sh:2107 git-gui.sh:2639 -msgid "Options..." -msgstr "选项..." - -#: git-gui.sh:2113 lib/choose_repository.tcl:47 -msgid "Help" -msgstr "帮助" - -#: git-gui.sh:2154 -msgid "Online Documentation" -msgstr "在线文档" - -#: git-gui.sh:2238 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "致命错误: 无法获取路径 %s 的信息: 该文件或目录不存在" - -#: git-gui.sh:2271 -msgid "Current Branch:" -msgstr "当前分支:" - -#: git-gui.sh:2292 -msgid "Staged Changes (Will Commit)" -msgstr "已缓存的改动 (将被提交)" - -#: git-gui.sh:2312 -msgid "Unstaged Changes" -msgstr "未缓存的改动" - -#: git-gui.sh:2362 -msgid "Stage Changed" -msgstr "缓存改动" - -#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182 -msgid "Push" -msgstr "上传" - -#: git-gui.sh:2408 -msgid "Initial Commit Message:" -msgstr "初始的提交描述:" - -#: git-gui.sh:2409 -msgid "Amended Commit Message:" -msgstr "修正的提交描述:" - -#: git-gui.sh:2410 -msgid "Amended Initial Commit Message:" -msgstr "修正的初始提交描述:" - -#: git-gui.sh:2411 -msgid "Amended Merge Commit Message:" -msgstr "修正的合并提交描述:" - -#: git-gui.sh:2412 -msgid "Merge Commit Message:" -msgstr "合并提交描述:" - -#: git-gui.sh:2413 -msgid "Commit Message:" -msgstr "提交描述:" - -#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73 -msgid "Copy All" -msgstr "全部复制" - -#: git-gui.sh:2483 lib/blame.tcl:107 -msgid "File:" -msgstr "文件:" - -#: git-gui.sh:2589 -msgid "Apply/Reverse Hunk" -msgstr "应用/撤消此修改块" - -#: git-gui.sh:2595 -msgid "Show Less Context" -msgstr "显示更少上下文" - -#: git-gui.sh:2602 -msgid "Show More Context" -msgstr "显示更多上下文" - -#: git-gui.sh:2610 -msgid "Refresh" -msgstr "刷新" - -#: git-gui.sh:2631 -msgid "Decrease Font Size" -msgstr "缩小字体" - -#: git-gui.sh:2635 -msgid "Increase Font Size" -msgstr "放大字体" - -#: git-gui.sh:2646 -msgid "Unstage Hunk From Commit" -msgstr "从提交中撤除修改块" - -#: git-gui.sh:2648 -msgid "Stage Hunk For Commit" -msgstr "缓存修改块为提交" - -#: git-gui.sh:2667 -msgid "Initializing..." -msgstr "初始化..." - -#: git-gui.sh:2762 -#, tcl-format -msgid "" -"Possible environment issues exist.\n" -"\n" -"The following environment variables are probably\n" -"going to be ignored by any Git subprocess run\n" -"by %s:\n" -"\n" -msgstr "" -"可能存在环境变量的问题.\n" -"\n" -"由 %s 执行的 Git 子进程可能忽略下列环境变量:\n" -"\n" - -#: git-gui.sh:2792 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"这是由 Cygwin 发布的 Tcl 代码中一个\n" -"已知问题所引起." - -#: git-gui.sh:2797 -#, tcl-format -msgid "" -"\n" -"\n" -"A good replacement for %s\n" -"is placing values for the user.name and\n" -"user.email settings into your personal\n" -"~/.gitconfig file.\n" -msgstr "" -"\n" -"\n" -"%s 的一个很好的替代方案是将 user.name 以及\n" -"user.email 设置放在你的个人 ~/.gitconfig 文件中.\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - Git 的图形化用户界面" - -#: lib/blame.tcl:77 -msgid "File Viewer" -msgstr "文件查看器" - -#: lib/blame.tcl:81 -msgid "Commit:" -msgstr "提交:" - -#: lib/blame.tcl:264 -msgid "Copy Commit" -msgstr "复制提交" - -#: lib/blame.tcl:384 -#, tcl-format -msgid "Reading %s..." -msgstr "读取 %s..." - -#: lib/blame.tcl:488 -msgid "Loading copy/move tracking annotations..." -msgstr "装载复制/移动跟踪标注..." - -#: lib/blame.tcl:508 -msgid "lines annotated" -msgstr "标注行" - -#: lib/blame.tcl:689 -msgid "Loading original location annotations..." -msgstr "装载原始位置标注..." - -#: lib/blame.tcl:692 -msgid "Annotation complete." -msgstr "标注完成." - -#: lib/blame.tcl:746 -msgid "Loading annotation..." -msgstr "裝載标注..." - -#: lib/blame.tcl:802 -msgid "Author:" -msgstr "作者:" - -#: lib/blame.tcl:806 -msgid "Committer:" -msgstr "提交者:" - -#: lib/blame.tcl:811 -msgid "Original File:" -msgstr "原始文件:" - -#: lib/blame.tcl:925 -msgid "Originally By:" -msgstr "最初由:" - -#: lib/blame.tcl:931 -msgid "In File:" -msgstr "在文件:" - -#: lib/blame.tcl:936 -msgid "Copied Or Moved Here By:" -msgstr "由复制或移动至此:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Checkout 分支" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "Checkout" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171 -#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 -msgid "Cancel" -msgstr "取消" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 -msgid "Revision" -msgstr "版本" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242 -msgid "Options" -msgstr "选项..." - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "获取跟踪分支" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "从本地分支脱离" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "创建分支" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "新建分支" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371 -msgid "Create" -msgstr "新建" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "分支名" - -#: lib/branch_create.tcl:43 -msgid "Name:" -msgstr "名字:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "匹配跟踪分支名字" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "起始版本" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "更新已有分支:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "号码" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "仅快速合并" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514 -msgid "Reset" -msgstr "复位" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "在创建后Checkout" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "请选择某个跟踪分支." - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "跟踪分支 %s 并不是远端版本库中的一个分支" - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "请提供分支名字." - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "'%s'不是一个可接受的分支名." - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "删除分支" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "删除本地分支" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "本地分支" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "仅在合并后删除" - -#: lib/branch_delete.tcl:54 -msgid "Always (Do not perform merge test.)" -msgstr "总是合并 (不作合并测试.)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "下列分支没有完全被合并到 %s:" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"无法删除分支:\n" -"%s" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "更改分支名:" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "更名..." - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "分支:" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "新名字:" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "请选择分支更名." - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "分支 '%s' 已经存在." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "无法更名 '%s'." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "开始..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "文件浏览器" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "装载 %s..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[上层目录]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "浏览分支文件" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:387 -#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484 -#: lib/choose_repository.tcl:987 -msgid "Browse" -msgstr "浏览" - -#: lib/checkout_op.tcl:79 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "获取 %s 自 %s" - -#: lib/checkout_op.tcl:127 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "致命错误: 无法解决 %s" - -#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31 -msgid "Close" -msgstr "关闭" - -#: lib/checkout_op.tcl:169 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "分支 '%s' 并不存在." - -#: lib/checkout_op.tcl:206 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"分支 '%s' 已经存在.\n" -"\n" -"无法快速合并到 %s.\n" -"需要普通合并." - -#: lib/checkout_op.tcl:220 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "合并策略 '%s' 不支持." - -#: lib/checkout_op.tcl:239 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "无法更新 '%s'." - -#: lib/checkout_op.tcl:251 -msgid "Staging area (index) is already locked." -msgstr "缓存区域 (index) 已被锁定." - -#: lib/checkout_op.tcl:266 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"最后一次扫描的状态和当前版本库状态不符.\n" -"\n" -"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫" -"描.\n" -"\n" -"重新扫描将自动开始.\n" - -#: lib/checkout_op.tcl:322 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "更新工作目录到 '%s'..." - -#: lib/checkout_op.tcl:323 -msgid "files checked out" -msgstr "" - -#: lib/checkout_op.tcl:353 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "中止 '%s' 的 checkout 操作 (需要做文件级合并)." - -#: lib/checkout_op.tcl:354 -msgid "File level merge required." -msgstr "需要文件级合并." - -#: lib/checkout_op.tcl:358 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "停留在分支 '%s'." - -#: lib/checkout_op.tcl:429 -msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." -msgstr "" -"你不在某个本地分支上.\n" -"\n" -"如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支." - -#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450 -#, tcl-format -msgid "Checked out '%s'." -msgstr "'%s' 已被 checkout" - -#: lib/checkout_op.tcl:478 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "复位 '%s' 到 '%s' 将导致下列提交的丢失:" - -#: lib/checkout_op.tcl:500 -msgid "Recovering lost commits may not be easy." -msgstr "恢复丢失的提交是比较困难的." - -#: lib/checkout_op.tcl:505 -#, tcl-format -msgid "Reset '%s'?" -msgstr "复位 '%s'?" - -#: lib/checkout_op.tcl:510 lib/merge.tcl:163 -msgid "Visualize" -msgstr "图示" - -#: lib/checkout_op.tcl:578 -#, tcl-format -msgid "" -"Failed to set current branch.\n" -"\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" -"\n" -"This should not have occurred. %s will now close and give up." -msgstr "" -"无法设定当前分支.\n" -"\n" -"当前工作目录仅有部分被切换出, 我们已成功的更新了您的文件但是无法更新某个内部" -"的Git文件.\n" -"\n" -"这本不该发生, %s 将关闭并放弃." - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "选择" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "字体族" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "字体大小" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "字体样例" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"这是样例文本.\n" -"如果你喜欢, 你可以设置该字体." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376 -msgid "Create New Repository" -msgstr "创建新的版本库" - -#: lib/choose_repository.tcl:87 -msgid "New..." -msgstr "新建..." - -#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460 -msgid "Clone Existing Repository" -msgstr "克隆已有版本库" - -#: lib/choose_repository.tcl:100 -msgid "Clone..." -msgstr "克隆..." - -#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976 -msgid "Open Existing Repository" -msgstr "打开已有版本库" - -#: lib/choose_repository.tcl:113 -msgid "Open..." -msgstr "打开..." - -#: lib/choose_repository.tcl:126 -msgid "Recent Repositories" -msgstr "最近版本库" - -#: lib/choose_repository.tcl:132 -msgid "Open Recent Repository:" -msgstr "打开最近版本库" - -#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303 -#: lib/choose_repository.tcl:310 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "无法创建版本库 %s:" - -#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478 -msgid "Directory:" -msgstr "目录:" - -#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537 -#: lib/choose_repository.tcl:1011 -msgid "Git Repository" -msgstr "Git 版本库" - -#: lib/choose_repository.tcl:437 -#, tcl-format -msgid "Directory %s already exists." -msgstr "目录 %s 已经存在." - -#: lib/choose_repository.tcl:441 -#, tcl-format -msgid "File %s already exists." -msgstr "文件 %s 已经存在." - -#: lib/choose_repository.tcl:455 -msgid "Clone" -msgstr "克隆" - -#: lib/choose_repository.tcl:468 -msgid "URL:" -msgstr "URL:" - -#: lib/choose_repository.tcl:489 -msgid "Clone Type:" -msgstr "克隆类型:" - -#: lib/choose_repository.tcl:495 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "标准方式 (快速, 部分备份, 作硬连接)" - -#: lib/choose_repository.tcl:501 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "全部复制 (较慢, 做备份)" - -#: lib/choose_repository.tcl:507 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "共享方式 (最快, 不推荐, 不做备份)" - -#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590 -#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806 -#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "不是一个 Git 版本库: %s" - -#: lib/choose_repository.tcl:579 -msgid "Standard only available for local repository." -msgstr "标准方式仅当是本地版本库时有效." - -#: lib/choose_repository.tcl:583 -msgid "Shared only available for local repository." -msgstr "共享方式仅当是本地版本库时有效." - -#: lib/choose_repository.tcl:604 -#, tcl-format -msgid "Location %s already exists." -msgstr "位置 %s 已经存在." - -#: lib/choose_repository.tcl:615 -msgid "Failed to configure origin" -msgstr "无法配置 origin" - -#: lib/choose_repository.tcl:627 -msgid "Counting objects" -msgstr "清点对象" - -#: lib/choose_repository.tcl:628 -#, fuzzy -msgid "buckets" -msgstr "水桶??" - -#: lib/choose_repository.tcl:652 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "无法复制 objects/info/alternates: %s" - -#: lib/choose_repository.tcl:688 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "没有东西可从 %s 克隆." - -#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904 -#: lib/choose_repository.tcl:916 -msgid "The 'master' branch has not been initialized." -msgstr "'master'分支尚未初始化." - -#: lib/choose_repository.tcl:703 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "硬连接不可用. 使用复制." - -#: lib/choose_repository.tcl:715 -#, tcl-format -msgid "Cloning from %s" -msgstr "从 %s 克隆" - -#: lib/choose_repository.tcl:746 -msgid "Copying objects" -msgstr "复制 objects" - -#: lib/choose_repository.tcl:747 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:771 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "无法复制 object: %s" - -#: lib/choose_repository.tcl:781 -msgid "Linking objects" -msgstr "链接 objects" - -#: lib/choose_repository.tcl:782 -msgid "objects" -msgstr "objects" - -#: lib/choose_repository.tcl:790 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "无法硬链接 object: %s" - -#: lib/choose_repository.tcl:845 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "无法获取分支和对象. 请查看控制终端的输出." - -#: lib/choose_repository.tcl:856 -msgid "Cannot fetch tags. See console output for details." -msgstr "无法获取标签. 请查看控制终端的输出." - -#: lib/choose_repository.tcl:880 -msgid "Cannot determine HEAD. See console output for details." -msgstr "无法确定 HEAD. 请查看控制终端的输出." - -#: lib/choose_repository.tcl:889 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "无法清理 %s" - -#: lib/choose_repository.tcl:895 -msgid "Clone failed." -msgstr "克隆失败." - -#: lib/choose_repository.tcl:902 -msgid "No default branch obtained." -msgstr "没有获取缺省分支" - -#: lib/choose_repository.tcl:913 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "无法解析 %s 为提交." - -#: lib/choose_repository.tcl:925 -msgid "Creating working directory" -msgstr "创建工作目录" - -#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127 -#: lib/index.tcl:193 -msgid "files" -msgstr "文件" - -#: lib/choose_repository.tcl:955 -msgid "Initial file checkout failed." -msgstr "初始的文件checkout失败" - -#: lib/choose_repository.tcl:971 -msgid "Open" -msgstr "打开" - -#: lib/choose_repository.tcl:981 -msgid "Repository:" -msgstr "版本库" - -#: lib/choose_repository.tcl:1031 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "无法打开版本库 %s:" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "该脱节的Checkout" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "版本表达式:" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "本地分支" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "跟踪分支:" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "标签" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "无效版本: %s" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "没有选择版本." - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "版本表达式为空." - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "已更新" - -#: lib/choose_rev.tcl:559 -msgid "URL" -msgstr "URL" - -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" -msgstr "" -"没有改动需要修正.\n" -"\n" -"你正在创建最初的提交. 在此之前没有提交可以修正.\n" - -#: lib/commit.tcl:18 -msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" -msgstr "" -"在合并时无法修正.\n" -"\n" -"你当前正在一次尚未完成的合并操作过程中. 除非中止当前合并活动,\n" -"否则无法修正之前的提交.\n" - -#: lib/commit.tcl:49 -msgid "Error loading commit data for amend:" -msgstr "为修正装载提交数据出错:" - -#: lib/commit.tcl:76 -msgid "Unable to obtain your identity:" -msgstr "无法获知你的身份:" - -#: lib/commit.tcl:81 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "无效的 GIT_COMMITTER_IDENT" - -#: lib/commit.tcl:133 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"最后一次扫描的状态和当前版本库状态不符.\n" -"\n" -"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫" -"描.\n" -"\n" -"重新扫描将自动开始.\n" - -#: lib/commit.tcl:154 -#, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" -"\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" -msgstr "" -"尚未合并的文件没有办法提交.\n" -"\n" -"文件 %s 有合并冲突, 你必须解决这些冲突并缓存该文件作提交.\n" - -#: lib/commit.tcl:162 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"检测到未知文件状态 %s.\n" -"\n" -"文件 %s 无法由该程序提交.\n" - -#: lib/commit.tcl:170 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"没有需要提交的变动.\n" -"\n" -"提交前你必须首先缓存至少一个文件.\n" - -#: lib/commit.tcl:183 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" -msgstr "" -"请提供一条提交信息.\n" -"\n" -"一条好的提交信息有下列格式:\n" -"\n" -"- 第一行: 一句话概括你做的修改.\n" -"- 第二行: 空行\n" -"- 剩余行: 请描述为什么你做的这些改动是好的.\n" - -#: lib/commit.tcl:207 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "警告: Tcl 不支持编码方式 '%s'." - -#: lib/commit.tcl:221 -msgid "Calling pre-commit hook..." -msgstr "" - -#: lib/commit.tcl:236 -msgid "Commit declined by pre-commit hook." -msgstr "" - -#: lib/commit.tcl:259 -msgid "Calling commit-msg hook..." -msgstr "" - -#: lib/commit.tcl:274 -msgid "Commit declined by commit-msg hook." -msgstr "" - -#: lib/commit.tcl:287 -msgid "Committing changes..." -msgstr "" - -#: lib/commit.tcl:303 -msgid "write-tree failed:" -msgstr "write-tree 失败:" - -#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368 -#, fuzzy -msgid "Commit failed." -msgstr "克隆失败." - -#: lib/commit.tcl:321 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "提交 %s 似乎已损坏" - -#: lib/commit.tcl:326 -msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" -"\n" -"A rescan will be automatically started now.\n" -msgstr "" -"没有改动提交.\n" -"\n" -"该提交没有改动任何文件也不是一个合并提交.\n" -"\n" -"重新扫描将自动开始.\n" - -#: lib/commit.tcl:333 -msgid "No changes to commit." -msgstr "没有改动要提交." - -#: lib/commit.tcl:347 -msgid "commit-tree failed:" -msgstr "commit-tree 失败:" - -#: lib/commit.tcl:367 -msgid "update-ref failed:" -msgstr "update-ref 失败:" - -#: lib/commit.tcl:454 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "创建了 commit %s: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "工作中... 请等待..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "成功" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "错误: 命令失败" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "松散对象的数量" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "松散对象所使用的磁盘空间" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "压缩对象数量" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "压缩包数量" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "压缩对象所使用的磁盘空间" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "压缩对象等待清理" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "垃圾文件" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "压缩对象数据库" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "使用 fsck-objects 验证对象数据库" - -#: lib/database.tcl:108 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database when more than %i loose objects exist.\n" -"\n" -"Compress the database now?" -msgstr "" -"该版本库当前约有 %i 个松散对象.\n" -"\n" -"为达到较优的性能,强烈建议你在松散对象多于 %i 时压缩数据库.\n" -"\n" -"现在就压缩数据库么?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "无效的日期: %s" - -#: lib/diff.tcl:42 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." -msgstr "" -"未检测到改动.\n" -"\n" -"该文件的修改日期被另一个程序所更新, 但其内容并没有变化.\n" -"\n" -"对于类似情况的其他文件的重新扫描将自动开始." - -#: lib/diff.tcl:81 -#, fuzzy, tcl-format -msgid "Loading diff of %s..." -msgstr "装载 %s 的 diff ..." - -#: lib/diff.tcl:114 lib/diff.tcl:184 -#, tcl-format -msgid "Unable to display %s" -msgstr "无法显示 %s" - -#: lib/diff.tcl:115 -msgid "Error loading file:" -msgstr "装载文件出错:" - -#: lib/diff.tcl:122 -msgid "Git Repository (subproject)" -msgstr "Git 版本库 (子项目)" - -#: lib/diff.tcl:134 -msgid "* Binary file (not showing content)." -msgstr "* 二进制文件 (不显示内容)." - -#: lib/diff.tcl:185 -msgid "Error loading diff:" -msgstr "装载 diff 错误:" - -#: lib/diff.tcl:303 -msgid "Failed to unstage selected hunk." -msgstr "无法将选择的代码段从缓存中删除." - -#: lib/diff.tcl:310 -msgid "Failed to stage selected hunk." -msgstr "无法缓存所选代码段." - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "错误" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "警告" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "你必须在提交前修正上述错误." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "无法解锁缓存 (index)" - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "缓存(Index)错误" - -#: lib/index.tcl:21 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "更新 Git 缓存(Index)失败, 重新扫描将自动开始以重新同步 git-gui." - -#: lib/index.tcl:27 -msgid "Continue" -msgstr "继续" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "解锁 Index" - -#: lib/index.tcl:282 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "从提交缓存中删除 %s" - -#: lib/index.tcl:313 -#, fuzzy -msgid "Ready to commit." -msgstr "缓存为提交" - -#: lib/index.tcl:326 -#, tcl-format -msgid "Adding %s" -msgstr "添加 %s" - -#: lib/index.tcl:381 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "撤销文件 %s 中的改动?" - -#: lib/index.tcl:383 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "撤销这些 (%i个) 文件的改动?" - -#: lib/index.tcl:391 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "任何未缓存的改动将在这次撤销中永久丢失." - -#: lib/index.tcl:394 -msgid "Do Nothing" -msgstr "不做操作" - -#: lib/merge.tcl:13 -msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" -msgstr "" -"修正时无法做合并.\n" -"\n" -"你必须完成对该提交的修正才能继续任何类型的合并操作.\n" - -#: lib/merge.tcl:27 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" -msgstr "" -"最后一次扫描的状态和当前版本库状态不符.\n" -"\n" -"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫" -"描.\n" -"\n" -"重新扫描将自动开始.\n" - -#: lib/merge.tcl:44 -#, tcl-format -msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" -msgstr "" -"你正处在一个有冲突的合并操作中.\n" -"\n" -"文件 %s 有合并冲突.\n" -"\n" -"你必须解决这些冲突, 缓存该文件, 并提交来完成当前的合并.仅当这样后才能开始下一" -"个合并操作.\n" - -#: lib/merge.tcl:54 -#, tcl-format -msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" -msgstr "" -"你正处在一个改动当中.\n" -"\n" -"文件 %s 已被修改.\n" -"\n" -"你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于中止一次失败的合" -"并.\n" - -#: lib/merge.tcl:106 -#, tcl-format -msgid "%s of %s" -msgstr "" - -#: lib/merge.tcl:119 -#, fuzzy, tcl-format -msgid "Merging %s and %s..." -msgstr "合并 %s 和 %s" - -#: lib/merge.tcl:130 -msgid "Merge completed successfully." -msgstr "合并成功完成." - -#: lib/merge.tcl:132 -msgid "Merge failed. Conflict resolution is required." -msgstr "合并失败. 需要解决冲突." - -#: lib/merge.tcl:157 -#, tcl-format -msgid "Merge Into %s" -msgstr "合并到 %s" - -#: lib/merge.tcl:176 -msgid "Revision To Merge" -msgstr "要合并的版本" - -#: lib/merge.tcl:211 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"修正操作中无法中止.\n" -"\n" -"你必须先完成本次修正操作.\n" - -#: lib/merge.tcl:221 -msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" -msgstr "" -"中止合并?\n" -"\n" -"中止当前的合并操作将导致 *所有* 尚未提交的改动丢失.\n" -"\n" -"是否要继续中止当前的合并操作?" - -#: lib/merge.tcl:227 -msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" -msgstr "" -"是否复位当前改动?\n" -"\n" -"复位当前的改动将导致 *所有* 未提交的改动丢失.\n" -"\n" -"是否要继续复位当前的改动?" - -#: lib/merge.tcl:238 -msgid "Aborting" -msgstr "中止" - -#: lib/merge.tcl:238 -#, fuzzy -msgid "files reset" -msgstr "文件" - -#: lib/merge.tcl:265 -msgid "Abort failed." -msgstr "中止失败" - -#: lib/merge.tcl:267 -msgid "Abort completed. Ready." -msgstr "中止完成. 就绪." - -#: lib/option.tcl:95 -msgid "Restore Defaults" -msgstr "恢复默认值" - -#: lib/option.tcl:99 -msgid "Save" -msgstr "保存" - -#: lib/option.tcl:109 -#, tcl-format -msgid "%s Repository" -msgstr "%s 版本库" - -#: lib/option.tcl:110 -msgid "Global (All Repositories)" -msgstr "全局 (所有版本库)" - -#: lib/option.tcl:116 -msgid "User Name" -msgstr "用户名" - -#: lib/option.tcl:117 -msgid "Email Address" -msgstr "Email 地址" - -#: lib/option.tcl:119 -msgid "Summarize Merge Commits" -msgstr "概述合并提交:" - -#: lib/option.tcl:120 -msgid "Merge Verbosity" -msgstr "合并冗余度" - -#: lib/option.tcl:121 -msgid "Show Diffstat After Merge" -msgstr "在合并后显示 Diffstat" - -#: lib/option.tcl:123 -msgid "Trust File Modification Timestamps" -msgstr "相信文件的改动时间" - -#: lib/option.tcl:124 -msgid "Prune Tracking Branches During Fetch" -msgstr "获取时清除跟踪分支" - -#: lib/option.tcl:125 -msgid "Match Tracking Branches" -msgstr "匹配跟踪分支" - -#: lib/option.tcl:126 -msgid "Number of Diff Context Lines" -msgstr "Diff 上下文行数" - -#: lib/option.tcl:127 -#, fuzzy -msgid "Commit Message Text Width" -msgstr "提交描述:" - -#: lib/option.tcl:128 -msgid "New Branch Name Template" -msgstr "新建分支命名模板" - -#: lib/option.tcl:192 -msgid "Spelling Dictionary:" -msgstr "" - -#: lib/option.tcl:216 -msgid "Change Font" -msgstr "更改字体" - -#: lib/option.tcl:220 -#, tcl-format -msgid "Choose %s" -msgstr "选择 %s" - -#: lib/option.tcl:226 -msgid "pt." -msgstr "磅" - -#: lib/option.tcl:240 -msgid "Preferences" -msgstr "首选项" - -#: lib/option.tcl:275 -msgid "Failed to completely save options:" -msgstr "无法完全保存选项:" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Remote Branch" -msgstr "删除远端分支" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "从版本库" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 -msgid "Remote:" -msgstr "Remote:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 -msgid "Arbitrary URL:" -msgstr "任意 URL:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "分支" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "删除仅当" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "合并到" - -#: lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "总是合并 (不作合并检查)" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "'合并到' 需要指定某个分支" - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"下列分支没有被全部合并到 %s 中:\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:189 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "" -"由于没有获取到必要的提交,一个或多个合并测试失败。请尝试从 %s 处先获取。" - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "请选择某个或多个分支来删除" - -#: lib/remote_branch_delete.tcl:216 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"恢复被删除的分支非常困难.\n" -"\n" -"是否要删除所选分支?" - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "从 %s 中删除分支" - -#: lib/remote_branch_delete.tcl:286 -msgid "No repository selected." -msgstr "没有选择版本库" - -#: lib/remote_branch_delete.tcl:291 -#, tcl-format -msgid "Scanning %s..." -msgstr "正在扫描 %s..." - -#: lib/remote.tcl:165 -msgid "Prune from" -msgstr "从..清除(prune)" - -#: lib/remote.tcl:170 -msgid "Fetch from" -msgstr "从..获取(fetch)" - -#: lib/remote.tcl:213 -msgid "Push to" -msgstr "上传到(push)" - -#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 -msgid "Cannot write shortcut:" -msgstr "无法修改快捷方式:" - -#: lib/shortcut.tcl:136 -msgid "Cannot write icon:" -msgstr "无法修改图标:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "" - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "" - -#: lib/spellcheck.tcl:180 -msgid "No Suggestions" -msgstr "" - -#: lib/spellcheck.tcl:381 -msgid "Unexpected EOF from spell checker" -msgstr "" - -#: lib/spellcheck.tcl:385 -msgid "Spell Checker Failed" -msgstr "" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i of %*i %s (%3i%%)" - -#: lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "获取(fetch)" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "从 %s 处获取新的改动" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "清除远端 %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "清除" - -#: lib/transport.tcl:25 lib/transport.tcl:71 -#, tcl-format -msgid "push %s" -msgstr "上传 %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "上传改动到 %s" - -#: lib/transport.tcl:72 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "上传 %s %s 到 %s" - -#: lib/transport.tcl:89 -msgid "Push Branches" -msgstr "上传分支" - -#: lib/transport.tcl:103 -msgid "Source Branches" -msgstr "源端分支:" - -#: lib/transport.tcl:120 -msgid "Destination Repository" -msgstr "目标版本库" - -#: lib/transport.tcl:158 -msgid "Transfer Options" -msgstr "传输选项" - -#: lib/transport.tcl:160 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "强制覆盖已有的分支 (可能会丢失改动)" - -#: lib/transport.tcl:164 -msgid "Use thin pack (for slow network connections)" -msgstr "使用 thin pack (适用于低速网络连接)" - -#: lib/transport.tcl:168 -msgid "Include tags" -msgstr "包含标签" |