diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/.gitignore | 2 | ||||
| -rw-r--r-- | po/README | 292 | ||||
| -rw-r--r-- | po/TEAMS | 27 | ||||
| -rw-r--r-- | po/de.po | 1278 | ||||
| -rw-r--r-- | po/es.po | 911 | ||||
| -rw-r--r-- | po/fr.po | 1254 | ||||
| -rw-r--r-- | po/git.pot | 3505 | ||||
| -rw-r--r-- | po/hu.po | 1295 | ||||
| -rw-r--r-- | po/is.po | 93 | ||||
| -rw-r--r-- | po/it.po | 1276 | ||||
| -rw-r--r-- | po/ja.po | 1255 | ||||
| -rw-r--r-- | po/nl.po | 3493 | ||||
| -rw-r--r-- | po/po2msg.sh | 133 | ||||
| -rw-r--r-- | po/pt_PT.po | 3583 | ||||
| -rw-r--r-- | po/pt_br.po | 1277 | ||||
| -rw-r--r-- | po/ru.po | 1085 | ||||
| -rw-r--r-- | po/sv.po | 4815 | ||||
| -rw-r--r-- | po/zh_CN.po | 3690 |
18 files changed, 18373 insertions, 10891 deletions
diff --git a/po/.gitignore b/po/.gitignore index e358dd1..796b96d 100644 --- a/po/.gitignore +++ b/po/.gitignore @@ -1 +1 @@ -*.msg +/build diff --git a/po/README b/po/README new file mode 100644 index 0000000..c1520e8 --- /dev/null +++ b/po/README @@ -0,0 +1,292 @@ +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..7fcf1ec --- /dev/null +++ b/po/TEAMS @@ -0,0 +1,27 @@ +Core Git translation language teams +(please keep the list sorted alphabetically on language field) + +Language: is (Icelandic) +Leader: Ævar Arnfjörð Bjarmason <avarab@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: 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/de.po b/po/de.po deleted file mode 100644 index bd194a3..0000000 --- a/po/de.po +++ /dev/null @@ -1,1278 +0,0 @@ -# Translation of gitk to German. -# Copyright (C) 2007 Paul Mackerras. -# This file is distributed under the same license as the gitk package. -# -# Christian Stimming <stimming@tuhh.de>, 2007. -# Frederik Schwarzer <schwarzerf@gmail.com>, 2008. -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 20:21+0100\n" -"PO-Revision-Date: 2010-01-27 20:27+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" - -#: gitk:115 -msgid "Couldn't get list of unmerged files:" -msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:" - -#: gitk:274 -msgid "Error parsing revisions:" -msgstr "Fehler beim Laden der Versionen:" - -#: gitk:329 -msgid "Error executing --argscmd command:" -msgstr "Fehler beim Ausführen des --argscmd-Kommandos:" - -#: gitk:342 -msgid "No files selected: --merge specified but no files are unmerged." -msgstr "" -"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren " -"keine nicht zusammengeführten Dateien." - -#: gitk:345 -msgid "" -"No files selected: --merge specified but no unmerged files are within file " -"limit." -msgstr "" -"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine " -"nicht zusammengeführten Dateien in der Dateiauswahl." - -#: gitk:367 gitk:514 -msgid "Error executing git log:" -msgstr "Fehler beim Ausführen von »git log«:" - -#: gitk:385 gitk:530 -msgid "Reading" -msgstr "Lesen" - -#: gitk:445 gitk:4261 -msgid "Reading commits..." -msgstr "Versionen werden gelesen ..." - -#: gitk:448 gitk:1578 gitk:4264 -msgid "No commits selected" -msgstr "Keine Versionen ausgewählt" - -#: gitk:1454 -msgid "Can't parse git log output:" -msgstr "Ausgabe von »git log« kann nicht erkannt werden:" - -#: gitk:1674 -msgid "No commit information available" -msgstr "Keine Versionsinformation verfügbar" - -#: gitk:1816 -msgid "mc" -msgstr "mc" - -#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804 -msgid "OK" -msgstr "Ok" - -#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046 -#: gitk:10586 gitk:10805 -msgid "Cancel" -msgstr "Abbrechen" - -#: gitk:1975 -msgid "Update" -msgstr "Aktualisieren" - -#: gitk:1976 -msgid "Reload" -msgstr "Neu laden" - -#: gitk:1977 -msgid "Reread references" -msgstr "Zweige neu laden" - -#: gitk:1978 -msgid "List references" -msgstr "Zweige/Markierungen auflisten" - -#: gitk:1980 -msgid "Start git gui" -msgstr "»git gui« starten" - -#: gitk:1982 -msgid "Quit" -msgstr "Beenden" - -#: gitk:1974 -msgid "File" -msgstr "Datei" - -#: gitk:1986 -msgid "Preferences" -msgstr "Einstellungen" - -#: gitk:1985 -msgid "Edit" -msgstr "Bearbeiten" - -#: gitk:1990 -msgid "New view..." -msgstr "Neue Ansicht ..." - -#: gitk:1991 -msgid "Edit view..." -msgstr "Ansicht bearbeiten ..." - -#: gitk:1992 -msgid "Delete view" -msgstr "Ansicht entfernen" - -#: gitk:1994 -msgid "All files" -msgstr "Alle Dateien" - -#: gitk:1989 gitk:3808 -msgid "View" -msgstr "Ansicht" - -#: gitk:1999 gitk:2009 gitk:2780 -msgid "About gitk" -msgstr "Über gitk" - -#: gitk:2000 gitk:2014 -msgid "Key bindings" -msgstr "Tastenkürzel" - -#: gitk:1998 gitk:2013 -msgid "Help" -msgstr "Hilfe" - -#: gitk:2091 gitk:8110 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:2122 -msgid "Row" -msgstr "Zeile" - -#: gitk:2160 -msgid "Find" -msgstr "Suche" - -#: gitk:2161 -msgid "next" -msgstr "nächste" - -#: gitk:2162 -msgid "prev" -msgstr "vorige" - -#: gitk:2163 -msgid "commit" -msgstr "Version nach" - -#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482 -#: gitk:6566 -msgid "containing:" -msgstr "Beschreibung:" - -#: gitk:2169 gitk:3290 gitk:3295 gitk:4497 -msgid "touching paths:" -msgstr "Dateien:" - -#: gitk:2170 gitk:4502 -msgid "adding/removing string:" -msgstr "Änderungen:" - -#: gitk:2179 gitk:2181 -msgid "Exact" -msgstr "Exakt" - -#: gitk:2181 gitk:4577 gitk:6378 -msgid "IgnCase" -msgstr "Kein Groß/Klein" - -#: gitk:2181 gitk:4471 gitk:4575 gitk:6374 -msgid "Regexp" -msgstr "Regexp" - -#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570 -msgid "All fields" -msgstr "Alle Felder" - -#: gitk:2184 gitk:4594 gitk:4626 gitk:6441 -msgid "Headline" -msgstr "Überschrift" - -#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003 -msgid "Comments" -msgstr "Beschreibung" - -#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285 -#: gitk:8300 -msgid "Author" -msgstr "Autor" - -#: gitk:2185 gitk:4594 gitk:6441 gitk:6940 -msgid "Committer" -msgstr "Eintragender" - -#: gitk:2216 -msgid "Search" -msgstr "Suchen" - -#: gitk:2224 -msgid "Diff" -msgstr "Vergleich" - -#: gitk:2226 -msgid "Old version" -msgstr "Alte Version" - -#: gitk:2228 -msgid "New version" -msgstr "Neue Version" - -#: gitk:2230 -msgid "Lines of context" -msgstr "Kontextzeilen" - -#: gitk:2240 -msgid "Ignore space change" -msgstr "Leerzeichenänderungen ignorieren" - -#: gitk:2299 -msgid "Patch" -msgstr "Patch" - -#: gitk:2301 -msgid "Tree" -msgstr "Baum" - -#: gitk:2456 gitk:2473 -msgid "Diff this -> selected" -msgstr "Vergleich: diese -> gewählte" - -#: gitk:2457 gitk:2474 -msgid "Diff selected -> this" -msgstr "Vergleich: gewählte -> diese" - -#: gitk:2458 gitk:2475 -msgid "Make patch" -msgstr "Patch erstellen" - -#: gitk:2459 gitk:8692 -msgid "Create tag" -msgstr "Markierung erstellen" - -#: gitk:2460 gitk:8808 -msgid "Write commit to file" -msgstr "Version in Datei schreiben" - -#: gitk:2461 gitk:8865 -msgid "Create new branch" -msgstr "Neuen Zweig erstellen" - -#: gitk:2462 -msgid "Cherry-pick this commit" -msgstr "Diese Version pflücken" - -#: gitk:2463 -msgid "Reset HEAD branch to here" -msgstr "HEAD-Zweig auf diese Version zurücksetzen" - -#: gitk:2464 -msgid "Mark this commit" -msgstr "Lesezeichen setzen" - -#: gitk:2465 -msgid "Return to mark" -msgstr "Zum Lesezeichen" - -#: gitk:2466 -msgid "Find descendant of this and mark" -msgstr "Abkömmling von Lesezeichen und dieser Version finden" - -#: gitk:2467 -msgid "Compare with marked commit" -msgstr "Mit Lesezeichen vergleichen" - -#: gitk:2481 -msgid "Check out this branch" -msgstr "Auf diesen Zweig umstellen" - -#: gitk:2482 -msgid "Remove this branch" -msgstr "Zweig löschen" - -#: gitk:2489 -msgid "Highlight this too" -msgstr "Diesen auch hervorheben" - -#: gitk:2490 -msgid "Highlight this only" -msgstr "Nur diesen hervorheben" - -#: gitk:2491 -msgid "External diff" -msgstr "Externes Diff-Programm" - -#: gitk:2492 -msgid "Blame parent commit" -msgstr "Annotieren der Elternversion" - -#: gitk:2499 -msgid "Show origin of this line" -msgstr "Herkunft dieser Zeile anzeigen" - -#: gitk:2500 -msgid "Run git gui blame on this line" -msgstr "Diese Zeile annotieren (»git gui blame«)" - -#: gitk:2782 -msgid "" -"\n" -"Gitk - a commit viewer for git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Use and redistribute under the terms of the GNU General Public License" -msgstr "" -"\n" -"Gitk - eine Visualisierung der Git-Historie\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public License" - -#: gitk:2790 gitk:2854 gitk:9230 -msgid "Close" -msgstr "Schließen" - -#: gitk:2811 -msgid "Gitk key bindings" -msgstr "Gitk-Tastaturbelegung" - -#: gitk:2814 -msgid "Gitk key bindings:" -msgstr "Gitk-Tastaturbelegung:" - -#: gitk:2816 -#, tcl-format -msgid "<%s-Q>\t\tQuit" -msgstr "<%s-Q>\t\tBeenden" - -#: gitk:2817 -msgid "<Home>\t\tMove to first commit" -msgstr "<Pos1>\t\tZur neuesten Version springen" - -#: gitk:2818 -msgid "<End>\t\tMove to last commit" -msgstr "<Ende>\t\tZur ältesten Version springen" - -#: gitk:2819 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Hoch>, p, i\tNächste neuere Version" - -#: gitk:2820 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Runter>, n, k\tNächste ältere Version" - -#: gitk:2821 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Links>, z, j\tEine Version zurückgehen" - -#: gitk:2822 -msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Rechts>, x, l\tEine Version weitergehen" - -#: gitk:2823 -msgid "<PageUp>\tMove up one page in commit list" -msgstr "<BildHoch>\tEine Seite nach oben blättern" - -#: gitk:2824 -msgid "<PageDown>\tMove down one page in commit list" -msgstr "<BildRunter>\tEine Seite nach unten blättern" - -#: gitk:2825 -#, tcl-format -msgid "<%s-Home>\tScroll to top of commit list" -msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern" - -#: gitk:2826 -#, tcl-format -msgid "<%s-End>\tScroll to bottom of commit list" -msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern" - -#: gitk:2827 -#, tcl-format -msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern" - -#: gitk:2828 -#, tcl-format -msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern" - -#: gitk:2829 -#, tcl-format -msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern" - -#: gitk:2830 -#, tcl-format -msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern" - -#: gitk:2831 -msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)" - -#: gitk:2832 -msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)" - -#: gitk:2833 -msgid "<Delete>, b\tScroll diff view up one page" -msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern" - -#: gitk:2834 -msgid "<Backspace>\tScroll diff view up one page" -msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern" - -#: gitk:2835 -msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern" - -#: gitk:2836 -msgid "u\t\tScroll diff view up 18 lines" -msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern" - -#: gitk:2837 -msgid "d\t\tScroll diff view down 18 lines" -msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern" - -#: gitk:2838 -#, tcl-format -msgid "<%s-F>\t\tFind" -msgstr "<%s-F>\t\tSuchen" - -#: gitk:2839 -#, tcl-format -msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\tWeitersuchen" - -#: gitk:2840 -msgid "<Return>\tMove to next find hit" -msgstr "<Eingabetaste>\tWeitersuchen" - -#: gitk:2841 -msgid "/\t\tFocus the search box" -msgstr "/\t\tTastaturfokus ins Suchfeld" - -#: gitk:2842 -msgid "?\t\tMove to previous find hit" -msgstr "?\t\tRückwärts weitersuchen" - -#: gitk:2843 -msgid "f\t\tScroll diff view to next file" -msgstr "f\t\tVergleich zur nächsten Datei blättern" - -#: gitk:2844 -#, tcl-format -msgid "<%s-S>\t\tSearch for next hit in diff view" -msgstr "<%s-S>\t\tWeitersuchen im Vergleich" - -#: gitk:2845 -#, tcl-format -msgid "<%s-R>\t\tSearch for previous hit in diff view" -msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich" - -#: gitk:2846 -#, tcl-format -msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern" - -#: gitk:2847 -#, tcl-format -msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-Plus>\tSchrift vergrößern" - -#: gitk:2848 -#, tcl-format -msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-Nummernblock-Minus> Schrift verkleinern" - -#: gitk:2849 -#, tcl-format -msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-Minus>\tSchrift verkleinern" - -#: gitk:2850 -msgid "<F5>\t\tUpdate" -msgstr "<F5>\t\tAktualisieren" - -#: gitk:3305 gitk:3314 -#, tcl-format -msgid "Error creating temporary directory %s:" -msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:" - -#: gitk:3327 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Fehler beim Holen von »%s« von »%s«:" - -#: gitk:3390 -msgid "command failed:" -msgstr "Kommando fehlgeschlagen:" - -#: gitk:3539 -msgid "No such commit" -msgstr "Version nicht gefunden" - -#: gitk:3553 -msgid "git gui blame: command failed:" -msgstr "git gui blame: Kommando fehlgeschlagen:" - -#: gitk:3584 -#, tcl-format -msgid "Couldn't read merge head: %s" -msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s" - -#: gitk:3592 -#, tcl-format -msgid "Error reading index: %s" -msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s" - -#: gitk:3617 -#, tcl-format -msgid "Couldn't start git blame: %s" -msgstr "»git blame« konnte nicht gestartet werden: %s" - -#: gitk:3620 gitk:6409 -msgid "Searching" -msgstr "Suchen" - -#: gitk:3652 -#, tcl-format -msgid "Error running git blame: %s" -msgstr "Fehler beim Ausführen von »git blame«: %s" - -#: gitk:3680 -#, tcl-format -msgid "That line comes from commit %s, which is not in this view" -msgstr "" -"Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird" - -#: gitk:3694 -msgid "External diff viewer failed:" -msgstr "Externes Diff-Programm fehlgeschlagen:" - -#: gitk:3812 -msgid "Gitk view definition" -msgstr "Gitk-Ansichten" - -#: gitk:3816 -msgid "Remember this view" -msgstr "Diese Ansicht speichern" - -#: gitk:3817 -msgid "References (space separated list):" -msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):" - -#: gitk:3818 -msgid "Branches & tags:" -msgstr "Zweige/Markierungen:" - -#: gitk:3819 -msgid "All refs" -msgstr "Alle Markierungen und Zweige" - -#: gitk:3820 -msgid "All (local) branches" -msgstr "Alle (lokalen) Zweige" - -#: gitk:3821 -msgid "All tags" -msgstr "Alle Markierungen" - -#: gitk:3822 -msgid "All remote-tracking branches" -msgstr "Alle Übernahmezweige" - -#: gitk:3823 -msgid "Commit Info (regular expressions):" -msgstr "Versionsinformationen (reguläre Ausdrücke):" - -#: gitk:3824 -msgid "Author:" -msgstr "Autor:" - -#: gitk:3825 -msgid "Committer:" -msgstr "Eintragender:" - -#: gitk:3826 -msgid "Commit Message:" -msgstr "Versionsbeschreibung:" - -#: gitk:3827 -msgid "Matches all Commit Info criteria" -msgstr "Alle Versionsinformationen-Kriterien erfüllen" - -#: gitk:3828 -msgid "Changes to Files:" -msgstr "Dateien:" - -#: gitk:3829 -msgid "Fixed String" -msgstr "Zeichenkette" - -#: gitk:3830 -msgid "Regular Expression" -msgstr "Regulärer Ausdruck" - -#: gitk:3831 -msgid "Search string:" -msgstr "Suchausdruck:" - -#: gitk:3832 -msgid "" -"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" -msgstr "Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)" - -#: gitk:3833 -msgid "Since:" -msgstr "Von:" - -#: gitk:3834 -msgid "Until:" -msgstr "Bis:" - -#: gitk:3835 -msgid "Limit and/or skip a number of revisions (positive integer):" -msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):" - -#: gitk:3836 -msgid "Number to show:" -msgstr "Anzeigen:" - -#: gitk:3837 -msgid "Number to skip:" -msgstr "Überspringen:" - -#: gitk:3838 -msgid "Miscellaneous options:" -msgstr "Sonstiges:" - -#: gitk:3839 -msgid "Strictly sort by date" -msgstr "Streng nach Datum sortieren" - -#: gitk:3840 -msgid "Mark branch sides" -msgstr "Zweig-Seiten markieren" - -#: gitk:3841 -msgid "Limit to first parent" -msgstr "Auf erste Elternversion beschränken" - -#: gitk:3842 -msgid "Simple history" -msgstr "Einfache Historie" - -#: gitk:3843 -msgid "Additional arguments to git log:" -msgstr "Zusätzliche Argumente für »git log«:" - -#: gitk:3844 -msgid "Enter files and directories to include, one per line:" -msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" - -#: gitk:3845 -msgid "Command to generate more commits to include:" -msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:" - -#: gitk:3967 -msgid "Gitk: edit view" -msgstr "Gitk: Ansicht bearbeiten" - -#: gitk:3975 -msgid "-- criteria for selecting revisions" -msgstr "-- Auswahl der angezeigten Versionen" - -#: gitk:3980 -msgid "View Name" -msgstr "Ansichtsname" - -#: gitk:4055 -msgid "Apply (F5)" -msgstr "Anwenden (F5)" - -#: gitk:4093 -msgid "Error in commit selection arguments:" -msgstr "Fehler in den ausgewählten Versionen:" - -#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535 -msgid "None" -msgstr "Keine" - -#: gitk:4594 gitk:6441 gitk:8287 gitk:8302 -msgid "Date" -msgstr "Datum" - -#: gitk:4594 gitk:6441 -msgid "CDate" -msgstr "Eintragedatum" - -#: gitk:4743 gitk:4748 -msgid "Descendant" -msgstr "Abkömmling" - -#: gitk:4744 -msgid "Not descendant" -msgstr "Kein Abkömmling" - -#: gitk:4751 gitk:4756 -msgid "Ancestor" -msgstr "Vorgänger" - -#: gitk:4752 -msgid "Not ancestor" -msgstr "Kein Vorgänger" - -#: gitk:5042 -msgid "Local changes checked in to index but not committed" -msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen" - -#: gitk:5078 -msgid "Local uncommitted changes, not checked in to index" -msgstr "Lokale Änderungen, nicht bereitgestellt" - -#: gitk:6759 -msgid "many" -msgstr "viele" - -#: gitk:6942 -msgid "Tags:" -msgstr "Markierungen:" - -#: gitk:6959 gitk:6965 gitk:8280 -msgid "Parent" -msgstr "Eltern" - -#: gitk:6970 -msgid "Child" -msgstr "Kind" - -#: gitk:6979 -msgid "Branch" -msgstr "Zweig" - -#: gitk:6982 -msgid "Follows" -msgstr "Folgt auf" - -#: gitk:6985 -msgid "Precedes" -msgstr "Vorgänger von" - -#: gitk:7522 -#, tcl-format -msgid "Error getting diffs: %s" -msgstr "Fehler beim Laden des Vergleichs: %s" - -#: gitk:8108 -msgid "Goto:" -msgstr "Gehe zu:" - -#: gitk:8129 -#, tcl-format -msgid "Short SHA1 id %s is ambiguous" -msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig" - -#: gitk:8136 -#, tcl-format -msgid "Revision %s is not known" -msgstr "Version »%s« ist unbekannt" - -#: gitk:8146 -#, tcl-format -msgid "SHA1 id %s is not known" -msgstr "SHA1-Hashwert »%s« ist unbekannt" - -#: gitk:8148 -#, tcl-format -msgid "Revision %s is not in the current view" -msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt" - -#: gitk:8290 -msgid "Children" -msgstr "Kinder" - -#: gitk:8348 -#, tcl-format -msgid "Reset %s branch to here" -msgstr "Zweig »%s« hierher zurücksetzen" - -#: gitk:8350 -msgid "Detached head: can't reset" -msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich" - -#: gitk:8459 gitk:8465 -msgid "Skipping merge commit " -msgstr "Überspringe Zusammenführungs-Version " - -#: gitk:8474 gitk:8479 -msgid "Error getting patch ID for " -msgstr "Fehler beim Holen der Patch-ID für " - -#: gitk:8475 gitk:8480 -msgid " - stopping\n" -msgstr " - Abbruch.\n" - -#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519 -msgid "Commit " -msgstr "Version " - -#: gitk:8489 -msgid "" -" is the same patch as\n" -" " -msgstr "" -" ist das gleiche Patch wie\n" -" " - -#: gitk:8497 -msgid "" -" differs from\n" -" " -msgstr "" -" ist unterschiedlich von\n" -" " - -#: gitk:8499 -msgid "" -"Diff of commits:\n" -"\n" -msgstr "" -"Vergleich der Versionen:\n" -"\n" - -#: gitk:8511 gitk:8520 -#, tcl-format -msgid " has %s children - stopping\n" -msgstr " hat %s Kinder. Abbruch\n" - -#: gitk:8539 -#, tcl-format -msgid "Error writing commit to file: %s" -msgstr "Fehler beim Schreiben der Version in Datei: %s" - -#: gitk:8545 -#, tcl-format -msgid "Error diffing commits: %s" -msgstr "Fehler beim Vergleichen der Versionen: %s" - -#: gitk:8575 -msgid "Top" -msgstr "Oben" - -#: gitk:8576 -msgid "From" -msgstr "Von" - -#: gitk:8581 -msgid "To" -msgstr "bis" - -#: gitk:8605 -msgid "Generate patch" -msgstr "Patch erstellen" - -#: gitk:8607 -msgid "From:" -msgstr "Von:" - -#: gitk:8616 -msgid "To:" -msgstr "bis:" - -#: gitk:8625 -msgid "Reverse" -msgstr "Umgekehrt" - -#: gitk:8627 gitk:8822 -msgid "Output file:" -msgstr "Ausgabedatei:" - -#: gitk:8633 -msgid "Generate" -msgstr "Erzeugen" - -#: gitk:8671 -msgid "Error creating patch:" -msgstr "Fehler beim Erzeugen des Patches:" - -#: gitk:8694 gitk:8810 gitk:8867 -msgid "ID:" -msgstr "ID:" - -#: gitk:8703 -msgid "Tag name:" -msgstr "Markierungsname:" - -#: gitk:8706 -msgid "Tag message is optional" -msgstr "Eine Markierungsbeschreibung ist optional" - -#: gitk:8708 -msgid "Tag message:" -msgstr "Markierungsbeschreibung:" - -#: gitk:8712 gitk:8876 -msgid "Create" -msgstr "Erstellen" - -#: gitk:8730 -msgid "No tag name specified" -msgstr "Kein Markierungsname angegeben" - -#: gitk:8734 -#, tcl-format -msgid "Tag \"%s\" already exists" -msgstr "Markierung »%s« existiert bereits." - -#: gitk:8744 -msgid "Error creating tag:" -msgstr "Fehler beim Erstellen der Markierung:" - -#: gitk:8819 -msgid "Command:" -msgstr "Kommando:" - -#: gitk:8827 -msgid "Write" -msgstr "Schreiben" - -#: gitk:8845 -msgid "Error writing commit:" -msgstr "Fehler beim Schreiben der Version:" - -#: gitk:8872 -msgid "Name:" -msgstr "Name:" - -#: gitk:8895 -msgid "Please specify a name for the new branch" -msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." - -#: gitk:8900 -#, tcl-format -msgid "Branch '%s' already exists. Overwrite?" -msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?" - -#: gitk:8966 -#, tcl-format -msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "" -"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut eintragen?" - -#: gitk:8971 -msgid "Cherry-picking" -msgstr "Version pflücken" - -#: gitk:8980 -#, tcl-format -msgid "" -"Cherry-pick failed because of local changes to file '%s'.\n" -"Please commit, reset or stash your changes and try again." -msgstr "" -"Pflücken fehlgeschlagen, da noch lokale Änderungen in Datei »%s«\n" -"vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" -"zwischenspeichern (»git stash«) und dann erneut versuchen." - -#: gitk:8986 -msgid "" -"Cherry-pick failed because of merge conflict.\n" -"Do you wish to run git citool to resolve it?" -msgstr "" -"Pflücken fehlgeschlagen, da ein Zusammenführungs-Konflikt aufgetreten\n" -"ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" -"werden, um diesen Konflikt aufzulösen?" - -#: gitk:9002 -msgid "No changes committed" -msgstr "Keine Änderungen eingetragen" - -#: gitk:9028 -msgid "Confirm reset" -msgstr "Zurücksetzen bestätigen" - -#: gitk:9030 -#, tcl-format -msgid "Reset branch %s to %s?" -msgstr "Zweig »%s« auf »%s« zurücksetzen?" - -#: gitk:9032 -msgid "Reset type:" -msgstr "Art des Zurücksetzens:" - -#: gitk:9035 -msgid "Soft: Leave working tree and index untouched" -msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert" - -#: gitk:9038 -msgid "Mixed: Leave working tree untouched, reset index" -msgstr "" -"Gemischt: Arbeitskopie unverändert,\n" -"Bereitstellung zurückgesetzt" - -#: gitk:9041 -msgid "" -"Hard: Reset working tree and index\n" -"(discard ALL local changes)" -msgstr "" -"Hart: Arbeitskopie und Bereitstellung\n" -"(Alle lokalen Änderungen werden gelöscht)" - -#: gitk:9058 -msgid "Resetting" -msgstr "Zurücksetzen" - -#: gitk:9118 -msgid "Checking out" -msgstr "Umstellen" - -#: gitk:9171 -msgid "Cannot delete the currently checked-out branch" -msgstr "" -"Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht " -"gelöscht werden." - -#: gitk:9177 -#, tcl-format -msgid "" -"The commits on branch %s aren't on any other branch.\n" -"Really delete branch %s?" -msgstr "" -"Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n" -"Zweig »%s« trotzdem löschen?" - -#: gitk:9208 -#, tcl-format -msgid "Tags and heads: %s" -msgstr "Markierungen und Zweige: %s" - -#: gitk:9223 -msgid "Filter" -msgstr "Filtern" - -#: gitk:9518 -msgid "" -"Error reading commit topology information; branch and preceding/following " -"tag information will be incomplete." -msgstr "" -"Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu " -"Vorgänger/Nachfolger werden unvollständig sein." - -#: gitk:10504 -msgid "Tag" -msgstr "Markierung" - -#: gitk:10504 -msgid "Id" -msgstr "Id" - -#: gitk:10554 -msgid "Gitk font chooser" -msgstr "Gitk-Schriften wählen" - -#: gitk:10571 -msgid "B" -msgstr "F" - -#: gitk:10574 -msgid "I" -msgstr "K" - -#: gitk:10692 -msgid "Gitk preferences" -msgstr "Gitk-Einstellungen" - -#: gitk:10694 -msgid "Commit list display options" -msgstr "Anzeige der Versionsliste" - -#: gitk:10697 -msgid "Maximum graph width (lines)" -msgstr "Maximale Graphenbreite (Zeilen)" - -#: gitk:10700 -#, tcl-format -msgid "Maximum graph width (% of pane)" -msgstr "Maximale Graphenbreite (% des Fensters)" - -#: gitk:10703 -msgid "Show local changes" -msgstr "Lokale Änderungen anzeigen" - -#: gitk:10706 -msgid "Auto-select SHA1" -msgstr "SHA1-Hashwert automatisch auswählen" - -#: gitk:10709 -msgid "Hide remote refs" -msgstr "Entfernte Zweige/Markierungen ausblenden" - -#: gitk:10713 -msgid "Diff display options" -msgstr "Anzeige des Vergleichs" - -#: gitk:10715 -msgid "Tab spacing" -msgstr "Tabulatorbreite" - -#: gitk:10718 -msgid "Display nearby tags" -msgstr "Naheliegende Markierungen anzeigen" - -#: gitk:10721 -msgid "Limit diffs to listed paths" -msgstr "Vergleich nur für angezeigte Pfade" - -#: gitk:10724 -msgid "Support per-file encodings" -msgstr "Zeichenkodierung pro Datei ermitteln" - -#: gitk:10730 gitk:10819 -msgid "External diff tool" -msgstr "Externes Diff-Programm" - -#: gitk:10731 -msgid "Choose..." -msgstr "Wählen ..." - -#: gitk:10736 -msgid "General options" -msgstr "Allgemeine Optionen" - -#: gitk:10739 -msgid "Use themed widgets" -msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen" - -#: gitk:10741 -msgid "(change requires restart)" -msgstr "(Änderungen werden erst nach Neustart wirksam)" - -#: gitk:10743 -msgid "(currently unavailable)" -msgstr "(Momentan nicht verfügbar)" - -#: gitk:10747 -msgid "Colors: press to choose" -msgstr "Farben: Klicken zum Wählen" - -#: gitk:10750 -msgid "Interface" -msgstr "Benutzeroberfläche" - -#: gitk:10751 -msgid "interface" -msgstr "Benutzeroberfläche" - -#: gitk:10754 -msgid "Background" -msgstr "Hintergrund" - -#: gitk:10755 gitk:10785 -msgid "background" -msgstr "Hintergrund" - -#: gitk:10758 -msgid "Foreground" -msgstr "Vordergrund" - -#: gitk:10759 -msgid "foreground" -msgstr "Vordergrund" - -#: gitk:10762 -msgid "Diff: old lines" -msgstr "Vergleich: Alte Zeilen" - -#: gitk:10763 -msgid "diff old lines" -msgstr "Vergleich - Alte Zeilen" - -#: gitk:10767 -msgid "Diff: new lines" -msgstr "Vergleich: Neue Zeilen" - -#: gitk:10768 -msgid "diff new lines" -msgstr "Vergleich - Neue Zeilen" - -#: gitk:10772 -msgid "Diff: hunk header" -msgstr "Vergleich: Änderungstitel" - -#: gitk:10774 -msgid "diff hunk header" -msgstr "Vergleich - Änderungstitel" - -#: gitk:10778 -msgid "Marked line bg" -msgstr "Hintergrund für markierte Zeile" - -#: gitk:10780 -msgid "marked line background" -msgstr "Hintergrund für markierte Zeile" - -#: gitk:10784 -msgid "Select bg" -msgstr "Hintergrundfarbe auswählen" - -#: gitk:10788 -msgid "Fonts: press to choose" -msgstr "Schriftart: Klicken zum Wählen" - -#: gitk:10790 -msgid "Main font" -msgstr "Programmschriftart" - -#: gitk:10791 -msgid "Diff display font" -msgstr "Schriftart für Vergleich" - -#: gitk:10792 -msgid "User interface font" -msgstr "Beschriftungen" - -#: gitk:10829 -#, tcl-format -msgid "Gitk: choose color for %s" -msgstr "Gitk: Farbe wählen für %s" - -#: gitk:11433 -msgid "Cannot find a git repository here." -msgstr "Kein Git-Projektarchiv gefunden." - -#: gitk:11437 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Git-Verzeichnis »%s« wurde nicht gefunden." - -#: gitk:11484 -#, tcl-format -msgid "Ambiguous argument '%s': both revision and filename" -msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert." - -#: gitk:11496 -msgid "Bad arguments to gitk:" -msgstr "Falsche Kommandozeilen-Parameter für gitk:" - -#: gitk:11587 -msgid "Command line" -msgstr "Kommandozeile" diff --git a/po/es.po b/po/es.po deleted file mode 100644 index 0471dd0..0000000 --- a/po/es.po +++ /dev/null @@ -1,911 +0,0 @@ -# Translation of gitk -# Copyright (C) 2005-2008 Santiago Gala -# This file is distributed under the same license as the gitk package. -# Santiago Gala <santiago.gala@gmail.com>, 2008. -# -# -msgid "" -msgstr "" -"Project-Id-Version: gitk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-18 22:03+1100\n" -"PO-Revision-Date: 2008-03-25 11:20+0100\n" -"Last-Translator: Santiago Gala <santiago.gala@gmail.com>\n" -"Language-Team: Spanish\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: gitk:113 -msgid "Couldn't get list of unmerged files:" -msgstr "Imposible obtener la lista de archivos pendientes de fusión:" - -#: gitk:340 -msgid "No files selected: --merge specified but no files are unmerged." -msgstr "" -"No hay archivos seleccionados: se seleccionó la opción --merge pero no hay " -"archivos pendientes de fusión." - -#: gitk:343 -msgid "" -"No files selected: --merge specified but no unmerged files are within file " -"limit." -msgstr "" -"No hay archivos seleccionados: se seleccionó la opción --merge pero los " -"archivos especificados no necesitan fusión." - -#: gitk:378 -msgid "Reading" -msgstr "Leyendo" - -#: gitk:438 gitk:3462 -msgid "Reading commits..." -msgstr "Leyendo revisiones..." - -#: gitk:441 gitk:1528 gitk:3465 -msgid "No commits selected" -msgstr "No se seleccionaron revisiones" - -#: gitk:1399 -msgid "Can't parse git log output:" -msgstr "Error analizando la salida de git log:" - -#: gitk:1605 -msgid "No commit information available" -msgstr "Falta información sobre las revisiones" - -#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466 -msgid "OK" -msgstr "Aceptar" - -#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766 -#: gitk:9294 gitk:9467 -msgid "Cancel" -msgstr "Cancelar" - -#: gitk:1811 -msgid "Update" -msgstr "Actualizar" - -#: gitk:1813 -msgid "Reread references" -msgstr "Releer referencias" - -#: gitk:1814 -msgid "List references" -msgstr "Lista de referencias" - -#: gitk:1815 -msgid "Quit" -msgstr "Salir" - -#: gitk:1810 -msgid "File" -msgstr "Archivo" - -#: gitk:1818 -msgid "Preferences" -msgstr "Preferencias" - -#: gitk:1817 -msgid "Edit" -msgstr "Editar" - -#: gitk:1821 -msgid "New view..." -msgstr "Nueva vista..." - -#: gitk:1822 -msgid "Edit view..." -msgstr "Modificar vista..." - -#: gitk:1823 -msgid "Delete view" -msgstr "Eliminar vista" - -#: gitk:1825 -msgid "All files" -msgstr "Todos los archivos" - -#: gitk:1820 gitk:3196 -msgid "View" -msgstr "Vista" - -#: gitk:1828 gitk:2487 -msgid "About gitk" -msgstr "Acerca de gitk" - -#: gitk:1829 -msgid "Key bindings" -msgstr "Combinaciones de teclas" - -#: gitk:1827 -msgid "Help" -msgstr "Ayuda" - -#: gitk:1887 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " - -#: gitk:1918 -msgid "Row" -msgstr "" - -#: gitk:1949 -msgid "Find" -msgstr "Buscar" - -#: gitk:1950 -msgid "next" -msgstr "<<" - -#: gitk:1951 -msgid "prev" -msgstr ">>" - -#: gitk:1952 -msgid "commit" -msgstr "revisión" - -#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621 -msgid "containing:" -msgstr "que contiene:" - -#: gitk:1958 gitk:2954 gitk:2959 gitk:3692 -msgid "touching paths:" -msgstr "que modifica la ruta:" - -#: gitk:1959 gitk:3697 -msgid "adding/removing string:" -msgstr "que añade/elimina cadena:" - -#: gitk:1968 gitk:1970 -msgid "Exact" -msgstr "Exacto" - -#: gitk:1970 gitk:3773 gitk:5518 -msgid "IgnCase" -msgstr "NoMayús" - -#: gitk:1970 gitk:3666 gitk:3771 gitk:5514 -msgid "Regexp" -msgstr "Regex" - -#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708 -msgid "All fields" -msgstr "Todos los campos" - -#: gitk:1973 gitk:3790 gitk:3822 gitk:5580 -msgid "Headline" -msgstr "Título" - -#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109 -msgid "Comments" -msgstr "Comentarios" - -#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285 -#: gitk:7300 -msgid "Author" -msgstr "Autor" - -#: gitk:1974 gitk:3790 gitk:5580 gitk:6047 -msgid "Committer" -msgstr "" - -#: gitk:2003 -msgid "Search" -msgstr "Buscar" - -#: gitk:2010 -msgid "Diff" -msgstr "Diferencia" - -#: gitk:2012 -msgid "Old version" -msgstr "Versión antigua" - -#: gitk:2014 -msgid "New version" -msgstr "Versión nueva" - -#: gitk:2016 -msgid "Lines of context" -msgstr "Líneas de contexto" - -#: gitk:2026 -msgid "Ignore space change" -msgstr "Ignora cambios de espaciado" - -#: gitk:2084 -msgid "Patch" -msgstr "Parche" - -#: gitk:2086 -msgid "Tree" -msgstr "Árbol" - -#: gitk:2213 gitk:2226 -msgid "Diff this -> selected" -msgstr "Diferencia de esta -> seleccionada" - -#: gitk:2214 gitk:2227 -msgid "Diff selected -> this" -msgstr "Diferencia de seleccionada -> esta" - -#: gitk:2215 gitk:2228 -msgid "Make patch" -msgstr "Crear patch" - -#: gitk:2216 gitk:7494 -msgid "Create tag" -msgstr "Crear etiqueta" - -#: gitk:2217 gitk:7593 -msgid "Write commit to file" -msgstr "Escribir revisiones a archivo" - -#: gitk:2218 gitk:7647 -msgid "Create new branch" -msgstr "Crear nueva rama" - -#: gitk:2219 -msgid "Cherry-pick this commit" -msgstr "Añadir esta revisión a la rama actual (cherry-pick)" - -#: gitk:2220 -msgid "Reset HEAD branch to here" -msgstr "Traer la rama HEAD aquí" - -#: gitk:2234 -msgid "Check out this branch" -msgstr "Cambiar a esta rama" - -#: gitk:2235 -msgid "Remove this branch" -msgstr "Eliminar esta rama" - -#: gitk:2242 -msgid "Highlight this too" -msgstr "Seleccionar también" - -#: gitk:2243 -msgid "Highlight this only" -msgstr "Seleccionar sólo" - -#: gitk:2245 -msgid "Blame parent commit" -msgstr "" - -#: gitk:2488 -msgid "" -"\n" -"Gitk - a commit viewer for git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Use and redistribute under the terms of the GNU General Public License" -msgstr "" -"\n" -"Gitk - un visualizador de revisiones para git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Uso y redistribución permitidos según los términos de la Licencia Pública " -"General de GNU (GNU GPL)" - -#: gitk:2496 gitk:2557 gitk:7943 -msgid "Close" -msgstr "Cerrar" - -#: gitk:2515 -msgid "Gitk key bindings" -msgstr "Combinaciones de tecla de Gitk" - -#: gitk:2517 -msgid "Gitk key bindings:" -msgstr "Combinaciones de tecla de Gitk:" - -#: gitk:2519 -#, tcl-format -msgid "<%s-Q>\t\tQuit" -msgstr "<%s-Q>\t\tSalir" - -#: gitk:2520 -msgid "<Home>\t\tMove to first commit" -msgstr "<Home>\t\tIr a la primera revisión" - -#: gitk:2521 -msgid "<End>\t\tMove to last commit" -msgstr "<End>\t\tIr a la última revisión" - -#: gitk:2522 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Up>, p, i\tSubir una revisión" - -#: gitk:2523 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Down>, n, k\tBajar una revisión" - -#: gitk:2524 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Left>, z, j\tRetroceder en la historia" - -#: gitk:2525 -msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Right>, x, l\tAvanzar en la historia" - -#: gitk:2526 -msgid "<PageUp>\tMove up one page in commit list" -msgstr "<PageUp>\tSubir una página en la lista de revisiones" - -#: gitk:2527 -msgid "<PageDown>\tMove down one page in commit list" -msgstr "<PageDown>\tBajar una página en la lista de revisiones" - -#: gitk:2528 -#, tcl-format -msgid "<%s-Home>\tScroll to top of commit list" -msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones" - -#: gitk:2529 -#, tcl-format -msgid "<%s-End>\tScroll to bottom of commit list" -msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones" - -#: gitk:2530 -#, tcl-format -msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Up>\tDesplazar una línea hacia arriba la lista de revisiones" - -#: gitk:2531 -#, tcl-format -msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Down>\tDesplazar una línea hacia abajo la lista de revisiones" - -#: gitk:2532 -#, tcl-format -msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones" - -#: gitk:2533 -#, tcl-format -msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones" - -#: gitk:2534 -msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "<Shift-Up>\tBuscar hacia atrás (arriba, revisiones siguientes)" - -#: gitk:2535 -msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Shift-Down>\tBuscar hacia adelante (abajo, revisiones anteriores)" - -#: gitk:2536 -msgid "<Delete>, b\tScroll diff view up one page" -msgstr "<Delete>, b\tDesplaza hacia arriba una página la vista de diferencias" - -#: gitk:2537 -msgid "<Backspace>\tScroll diff view up one page" -msgstr "<Backspace>\tDesplaza hacia arriba una página la vista de diferencias" - -#: gitk:2538 -msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Space>\t\tDesplaza hacia abajo una página la vista de diferencias" - -#: gitk:2539 -msgid "u\t\tScroll diff view up 18 lines" -msgstr "u\t\tDesplaza hacia arriba 18 líneas la vista de diferencias" - -#: gitk:2540 -msgid "d\t\tScroll diff view down 18 lines" -msgstr "d\t\tDesplaza hacia abajo 18 líneas la vista de diferencias" - -#: gitk:2541 -#, tcl-format -msgid "<%s-F>\t\tFind" -msgstr "<%s-F>\t\tBuscar" - -#: gitk:2542 -#, tcl-format -msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\tBuscar el siguiente" - -#: gitk:2543 -msgid "<Return>\tMove to next find hit" -msgstr "<Return>\tBuscar el siguiente" - -#: gitk:2544 -msgid "/\t\tMove to next find hit, or redo find" -msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda" - -#: gitk:2545 -msgid "?\t\tMove to previous find hit" -msgstr "?\t\tBuscar el anterior" - -#: gitk:2546 -msgid "f\t\tScroll diff view to next file" -msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente" - -#: gitk:2547 -#, tcl-format -msgid "<%s-S>\t\tSearch for next hit in diff view" -msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias" - -#: gitk:2548 -#, tcl-format -msgid "<%s-R>\t\tSearch for previous hit in diff view" -msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias" - -#: gitk:2549 -#, tcl-format -msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-KP+>\tAumentar tamaño del texto" - -#: gitk:2550 -#, tcl-format -msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-plus>\tAumentar tamaño del texto" - -#: gitk:2551 -#, tcl-format -msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-KP->\tDisminuir tamaño del texto" - -#: gitk:2552 -#, tcl-format -msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-minus>\tDisminuir tamaño del texto" - -#: gitk:2553 -msgid "<F5>\t\tUpdate" -msgstr "<F5>\t\tActualizar" - -#: gitk:3200 -msgid "Gitk view definition" -msgstr "Definición de vistas de Gitk" - -#: gitk:3225 -msgid "Name" -msgstr "Nombre" - -#: gitk:3228 -msgid "Remember this view" -msgstr "Recordar esta vista" - -#: gitk:3232 -msgid "Commits to include (arguments to git log):" -msgstr "Revisiones a incluir (argumentos a git log):" - -#: gitk:3239 -msgid "Command to generate more commits to include:" -msgstr "Comando que genera más revisiones a incluir:" - -#: gitk:3246 -msgid "Enter files and directories to include, one per line:" -msgstr "Introducir archivos y directorios a incluir, uno por línea:" - -#: gitk:3293 -msgid "Error in commit selection arguments:" -msgstr "Error en los argumentos de selección de las revisiones:" - -#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142 -msgid "None" -msgstr "Ninguno" - -#: gitk:3790 gitk:5580 gitk:7287 gitk:7302 -msgid "Date" -msgstr "Fecha" - -#: gitk:3790 gitk:5580 -msgid "CDate" -msgstr "Fecha de creación" - -#: gitk:3939 gitk:3944 -msgid "Descendant" -msgstr "Descendiente" - -#: gitk:3940 -msgid "Not descendant" -msgstr "No descendiente" - -#: gitk:3947 gitk:3952 -msgid "Ancestor" -msgstr "Antepasado" - -#: gitk:3948 -msgid "Not ancestor" -msgstr "No antepasado" - -#: gitk:4187 -msgid "Local changes checked in to index but not committed" -msgstr "Cambios locales añadidos al índice pero sin completar revisión" - -#: gitk:4220 -msgid "Local uncommitted changes, not checked in to index" -msgstr "Cambios locales sin añadir al índice" - -#: gitk:5549 -msgid "Searching" -msgstr "Buscando" - -#: gitk:6049 -msgid "Tags:" -msgstr "Etiquetas:" - -#: gitk:6066 gitk:6072 gitk:7280 -msgid "Parent" -msgstr "Padre" - -#: gitk:6077 -msgid "Child" -msgstr "Hija" - -#: gitk:6086 -msgid "Branch" -msgstr "Rama" - -#: gitk:6089 -msgid "Follows" -msgstr "Sigue-a" - -#: gitk:6092 -msgid "Precedes" -msgstr "Precede-a" - -#: gitk:6378 -msgid "Error getting merge diffs:" -msgstr "Error al leer las diferencias de fusión:" - -#: gitk:7113 -msgid "Goto:" -msgstr "Ir a:" - -#: gitk:7115 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7134 -#, tcl-format -msgid "Short SHA1 id %s is ambiguous" -msgstr "La id SHA1 abreviada %s es ambigua" - -#: gitk:7146 -#, tcl-format -msgid "SHA1 id %s is not known" -msgstr "La id SHA1 %s es desconocida" - -#: gitk:7148 -#, tcl-format -msgid "Tag/Head %s is not known" -msgstr "La etiqueta/rama %s es deconocida" - -#: gitk:7290 -msgid "Children" -msgstr "Hijas" - -#: gitk:7347 -#, tcl-format -msgid "Reset %s branch to here" -msgstr "Poner la rama %s en esta revisión" - -#: gitk:7349 -msgid "Detached head: can't reset" -msgstr "" - -#: gitk:7381 -msgid "Top" -msgstr "Origen" - -#: gitk:7382 -msgid "From" -msgstr "De" - -#: gitk:7387 -msgid "To" -msgstr "A" - -#: gitk:7410 -msgid "Generate patch" -msgstr "Generar parche" - -#: gitk:7412 -msgid "From:" -msgstr "De:" - -#: gitk:7421 -msgid "To:" -msgstr "Para:" - -#: gitk:7430 -msgid "Reverse" -msgstr "Invertir" - -#: gitk:7432 gitk:7607 -msgid "Output file:" -msgstr "Escribir a archivo:" - -#: gitk:7438 -msgid "Generate" -msgstr "Generar" - -#: gitk:7474 -msgid "Error creating patch:" -msgstr "Error en la creación del parche:" - -#: gitk:7496 gitk:7595 gitk:7649 -msgid "ID:" -msgstr "ID:" - -#: gitk:7505 -msgid "Tag name:" -msgstr "Nombre de etiqueta:" - -#: gitk:7509 gitk:7659 -msgid "Create" -msgstr "Crear" - -#: gitk:7524 -msgid "No tag name specified" -msgstr "No se ha especificado etiqueta" - -#: gitk:7528 -#, tcl-format -msgid "Tag \"%s\" already exists" -msgstr "La etiqueta \"%s\" ya existe" - -#: gitk:7534 -msgid "Error creating tag:" -msgstr "Error al crear la etiqueta:" - -#: gitk:7604 -msgid "Command:" -msgstr "Comando:" - -#: gitk:7612 -msgid "Write" -msgstr "Escribir" - -#: gitk:7628 -msgid "Error writing commit:" -msgstr "Error al escribir revisión:" - -#: gitk:7654 -msgid "Name:" -msgstr "Nombre:" - -#: gitk:7674 -msgid "Please specify a name for the new branch" -msgstr "Especifique un nombre para la nueva rama" - -#: gitk:7703 -#, tcl-format -msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?" - -#: gitk:7708 -msgid "Cherry-picking" -msgstr "Eligiendo revisiones (cherry-picking)" - -#: gitk:7720 -msgid "No changes committed" -msgstr "No se han guardado cambios" - -#: gitk:7745 -msgid "Confirm reset" -msgstr "Confirmar git reset" - -#: gitk:7747 -#, tcl-format -msgid "Reset branch %s to %s?" -msgstr "¿Reponer la rama %s a %s?" - -#: gitk:7751 -msgid "Reset type:" -msgstr "Tipo de reposición:" - -#: gitk:7755 -msgid "Soft: Leave working tree and index untouched" -msgstr "Suave: No altera la copia de trabajo ni el índice" - -#: gitk:7758 -msgid "Mixed: Leave working tree untouched, reset index" -msgstr "Mixta: Actualiza el índice, no altera la copia de trabajo" - -#: gitk:7761 -msgid "" -"Hard: Reset working tree and index\n" -"(discard ALL local changes)" -msgstr "" -"Dura: Actualiza el índice y la copia de trabajo\n" -"(abandona TODAS las modificaciones locales)" - -#: gitk:7777 -msgid "Resetting" -msgstr "Reponiendo" - -#: gitk:7834 -msgid "Checking out" -msgstr "Creando copia de trabajo" - -#: gitk:7885 -msgid "Cannot delete the currently checked-out branch" -msgstr "No se puede borrar la rama actual" - -#: gitk:7891 -#, tcl-format -msgid "" -"The commits on branch %s aren't on any other branch.\n" -"Really delete branch %s?" -msgstr "" -"Las revisiones de la rama %s no están presentes en otras ramas.\n" -"¿Borrar la rama %s?" - -#: gitk:7922 -#, tcl-format -msgid "Tags and heads: %s" -msgstr "Etiquetas y ramas: %s" - -#: gitk:7936 -msgid "Filter" -msgstr "Filtro" - -#: gitk:8230 -msgid "" -"Error reading commit topology information; branch and preceding/following " -"tag information will be incomplete." -msgstr "" -"Error al leer la topología de revisiones: la información sobre las ramas y " -"etiquetas precedentes y siguientes será incompleta." - -#: gitk:9216 -msgid "Tag" -msgstr "Etiqueta" - -#: gitk:9216 -msgid "Id" -msgstr "Id" - -#: gitk:9262 -msgid "Gitk font chooser" -msgstr "Selector de tipografías gitk" - -#: gitk:9279 -msgid "B" -msgstr "B" - -#: gitk:9282 -msgid "I" -msgstr "I" - -#: gitk:9375 -msgid "Gitk preferences" -msgstr "Preferencias de gitk" - -#: gitk:9376 -msgid "Commit list display options" -msgstr "Opciones de visualización de la lista de revisiones" - -#: gitk:9379 -msgid "Maximum graph width (lines)" -msgstr "Ancho máximo del gráfico (en líneas)" - -#: gitk:9383 -#, tcl-format -msgid "Maximum graph width (% of pane)" -msgstr "Ancho máximo del gráfico (en % del panel)" - -#: gitk:9388 -msgid "Show local changes" -msgstr "Mostrar cambios locales" - -#: gitk:9393 -msgid "Auto-select SHA1" -msgstr "Seleccionar automáticamente SHA1 hash" - -#: gitk:9398 -msgid "Diff display options" -msgstr "Opciones de visualización de diferencias" - -#: gitk:9400 -msgid "Tab spacing" -msgstr "Espaciado de tabulador" - -#: gitk:9404 -msgid "Display nearby tags" -msgstr "Mostrar etiquetas cercanas" - -#: gitk:9409 -msgid "Limit diffs to listed paths" -msgstr "Limitar las diferencias a las rutas seleccionadas" - -#: gitk:9414 -msgid "Support per-file encodings" -msgstr "" - -#: gitk:9421 -msgid "External diff tool" -msgstr "" - -#: gitk:9423 -msgid "Choose..." -msgstr "" - -#: gitk:9428 -msgid "Colors: press to choose" -msgstr "Colores: pulse para seleccionar" - -#: gitk:9431 -msgid "Background" -msgstr "Fondo" - -#: gitk:9435 -msgid "Foreground" -msgstr "Primer plano" - -#: gitk:9439 -msgid "Diff: old lines" -msgstr "Diff: líneas viejas" - -#: gitk:9444 -msgid "Diff: new lines" -msgstr "Diff: líneas nuevas" - -#: gitk:9449 -msgid "Diff: hunk header" -msgstr "Diff: cabecera de fragmento" - -#: gitk:9455 -msgid "Select bg" -msgstr "Color de fondo de la selección" - -#: gitk:9459 -msgid "Fonts: press to choose" -msgstr "Tipografías: pulse para elegir" - -#: gitk:9461 -msgid "Main font" -msgstr "Tipografía principal" - -#: gitk:9462 -msgid "Diff display font" -msgstr "Tipografía para diferencias" - -#: gitk:9463 -msgid "User interface font" -msgstr "Tipografía para interfaz de usuario" - -#: gitk:9488 -#, tcl-format -msgid "Gitk: choose color for %s" -msgstr "Gitk: elegir color para %s" - -#: gitk:9934 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"Esta versión de Tcl/Tk es demasiado antigua.\n" -" Gitk requiere Tcl/Tk versión 8.4 o superior." - -#: gitk:10047 -msgid "Cannot find a git repository here." -msgstr "No hay un repositorio git aquí." - -#: gitk:10051 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "No hay directorio git \"%s\"." - -#: gitk:10098 -#, tcl-format -msgid "Ambiguous argument '%s': both revision and filename" -msgstr "" -"Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo" - -#: gitk:10110 -msgid "Bad arguments to gitk:" -msgstr "Argumentos incorrectos a Gitk:" - -#: gitk:10170 -msgid "Command line" -msgstr "Línea de comandos" diff --git a/po/fr.po b/po/fr.po deleted file mode 100644 index 5370ddc..0000000 --- a/po/fr.po +++ /dev/null @@ -1,1254 +0,0 @@ -# French translation of the gitk package -# Copyright (C) 2005-2008 Paul Mackerras. All rights reserved. -# This file is distributed under the same license as the gitk package. -# Translators: -# Emmanuel Trillaud <etrillaud@gmail.com> -# -msgid "" -msgstr "" -"Project-Id-Version: gitk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-05 15:16+0200\n" -"PO-Revision-Date: 2009-11-19 22:13+0100\n" -"Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n" -"Language-Team: git@vger.kernel.org\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: French\n" -"X-Poedit-Country: FRANCE\n" - -#: gitk:113 -msgid "Couldn't get list of unmerged files:" -msgstr "Impossible de récupérer la liste des fichiers non fusionnés :" - -#: gitk:269 -msgid "Error parsing revisions:" -msgstr "Erreur lors du parcours des révisions :" - -#: gitk:324 -msgid "Error executing --argscmd command:" -msgstr "Erreur à l'exécution de la commande --argscmd :" - -#: gitk:337 -msgid "No files selected: --merge specified but no files are unmerged." -msgstr "" -"Aucun fichier sélectionné : --merge précisé, mais tous les fichiers sont " -"fusionnés." - -# FIXME : améliorer la traduction de 'file limite' -#: gitk:340 -#, fuzzy -msgid "" -"No files selected: --merge specified but no unmerged files are within file " -"limit." -msgstr "" -"Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné " -"n'est dans la limite des fichiers." - -#: gitk:362 gitk:509 -msgid "Error executing git log:" -msgstr "Erreur à l'exécution de git log :" - -#: gitk:380 gitk:525 -msgid "Reading" -msgstr "Lecture en cours" - -#: gitk:440 gitk:4123 -msgid "Reading commits..." -msgstr "Lecture des commits..." - -#: gitk:443 gitk:1561 gitk:4126 -msgid "No commits selected" -msgstr "Aucun commit sélectionné" - -#: gitk:1437 -msgid "Can't parse git log output:" -msgstr "Impossible de lire la sortie de git log :" - -#: gitk:1657 -msgid "No commit information available" -msgstr "Aucune information disponible sur le commit" - -#: gitk:1793 gitk:1817 gitk:3916 gitk:8786 gitk:10322 gitk:10498 -msgid "OK" -msgstr "OK" - -#: gitk:1819 gitk:3918 gitk:8383 gitk:8457 gitk:8567 gitk:8616 gitk:8788 -#: gitk:10323 gitk:10499 -msgid "Cancel" -msgstr "Annuler" - -#: gitk:1919 -msgid "Update" -msgstr "Mise à jour" - -#: gitk:1920 -msgid "Reload" -msgstr "Recharger" - -#: gitk:1921 -msgid "Reread references" -msgstr "Relire les références" - -#: gitk:1922 -msgid "List references" -msgstr "Lister les références" - -#: gitk:1924 -msgid "Start git gui" -msgstr "Démarrer git gui" - -#: gitk:1926 -msgid "Quit" -msgstr "Quitter" - -#: gitk:1918 -msgid "File" -msgstr "Fichier" - -#: gitk:1930 -msgid "Preferences" -msgstr "Préférences" - -#: gitk:1929 -msgid "Edit" -msgstr "Éditer" - -#: gitk:1934 -msgid "New view..." -msgstr "Nouvelle vue..." - -#: gitk:1935 -msgid "Edit view..." -msgstr "Éditer la vue..." - -#: gitk:1936 -msgid "Delete view" -msgstr "Supprimer la vue" - -#: gitk:1938 -msgid "All files" -msgstr "Tous les fichiers" - -#: gitk:1933 gitk:3670 -msgid "View" -msgstr "Vue" - -#: gitk:1943 gitk:1953 gitk:2654 -msgid "About gitk" -msgstr "À propos de gitk" - -#: gitk:1944 gitk:1958 -msgid "Key bindings" -msgstr "Raccourcis clavier" - -#: gitk:1942 gitk:1957 -msgid "Help" -msgstr "Aide" - -#: gitk:2018 -msgid "SHA1 ID: " -msgstr "ID SHA1 :" - -#: gitk:2049 -msgid "Row" -msgstr "Colonne" - -#: gitk:2080 -msgid "Find" -msgstr "Recherche" - -#: gitk:2081 -msgid "next" -msgstr "suivant" - -#: gitk:2082 -msgid "prev" -msgstr "précédent" - -#: gitk:2083 -msgid "commit" -msgstr "commit" - -#: gitk:2086 gitk:2088 gitk:4284 gitk:4307 gitk:4331 gitk:6272 gitk:6344 -#: gitk:6428 -msgid "containing:" -msgstr "contient :" - -#: gitk:2089 gitk:3162 gitk:3167 gitk:4359 -msgid "touching paths:" -msgstr "chemins modifiés :" - -#: gitk:2090 gitk:4364 -msgid "adding/removing string:" -msgstr "ajoute/supprime la chaîne :" - -#: gitk:2099 gitk:2101 -msgid "Exact" -msgstr "Exact" - -#: gitk:2101 gitk:4439 gitk:6240 -msgid "IgnCase" -msgstr "Ignorer la casse" - -#: gitk:2101 gitk:4333 gitk:4437 gitk:6236 -msgid "Regexp" -msgstr "Expression régulière" - -#: gitk:2103 gitk:2104 gitk:4458 gitk:4488 gitk:4495 gitk:6364 gitk:6432 -msgid "All fields" -msgstr "Tous les champs" - -#: gitk:2104 gitk:4456 gitk:4488 gitk:6303 -msgid "Headline" -msgstr "Surligner" - -#: gitk:2105 gitk:4456 gitk:6303 gitk:6432 gitk:6866 -msgid "Comments" -msgstr "Commentaires" - -#: gitk:2105 gitk:4456 gitk:4460 gitk:4495 gitk:6303 gitk:6801 gitk:8063 -#: gitk:8078 -msgid "Author" -msgstr "Auteur" - -#: gitk:2105 gitk:4456 gitk:6303 gitk:6803 -msgid "Committer" -msgstr "Auteur du commit" - -#: gitk:2134 -msgid "Search" -msgstr "Rechercher" - -#: gitk:2141 -msgid "Diff" -msgstr "Diff" - -#: gitk:2143 -msgid "Old version" -msgstr "Ancienne version" - -#: gitk:2145 -msgid "New version" -msgstr "Nouvelle version" - -#: gitk:2147 -msgid "Lines of context" -msgstr "Lignes de contexte" - -#: gitk:2157 -msgid "Ignore space change" -msgstr "Ignorer les modifications d'espace" - -#: gitk:2215 -msgid "Patch" -msgstr "Patch" - -#: gitk:2217 -msgid "Tree" -msgstr "Arbre" - -#: gitk:2361 gitk:2378 -msgid "Diff this -> selected" -msgstr "Diff entre ceci et la sélection" - -#: gitk:2362 gitk:2379 -msgid "Diff selected -> this" -msgstr "Diff entre sélection et ceci" - -#: gitk:2363 gitk:2380 -msgid "Make patch" -msgstr "Créer patch" - -#: gitk:2364 gitk:8441 -msgid "Create tag" -msgstr "Créer tag" - -#: gitk:2365 gitk:8547 -msgid "Write commit to file" -msgstr "Écrire le commit dans un fichier" - -#: gitk:2366 gitk:8604 -msgid "Create new branch" -msgstr "Créer une nouvelle branche" - -#: gitk:2367 -msgid "Cherry-pick this commit" -msgstr "Cueillir (cherry-pick) ce commit" - -#: gitk:2368 -msgid "Reset HEAD branch to here" -msgstr "Réinitialiser la branche HEAD vers cet état" - -#: gitk:2369 -msgid "Mark this commit" -msgstr "Marquer ce commit" - -#: gitk:2370 -msgid "Return to mark" -msgstr "Retourner à la marque" - -#: gitk:2371 -msgid "Find descendant of this and mark" -msgstr "Chercher le descendant de ceci et le marquer" - -#: gitk:2372 -msgid "Compare with marked commit" -msgstr "Comparer avec le commit marqué" - -#: gitk:2386 -msgid "Check out this branch" -msgstr "Récupérer cette branche" - -#: gitk:2387 -msgid "Remove this branch" -msgstr "Supprimer cette branche" - -#: gitk:2394 -msgid "Highlight this too" -msgstr "Surligner également ceci" - -#: gitk:2395 -msgid "Highlight this only" -msgstr "Surligner seulement ceci" - -#: gitk:2396 -msgid "External diff" -msgstr "Diff externe" - -#: gitk:2397 -msgid "Blame parent commit" -msgstr "Blâmer le commit parent" - -#: gitk:2404 -msgid "Show origin of this line" -msgstr "Montrer l'origine de cette ligne" - -#: gitk:2405 -msgid "Run git gui blame on this line" -msgstr "Exécuter git gui blame sur cette ligne" - -#: gitk:2656 -msgid "" -"\n" -"Gitk - a commit viewer for git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Use and redistribute under the terms of the GNU General Public License" -msgstr "" -"\n" -"Gitk - visualisateur de commit pour git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Utilisation et redistribution soumises aux termes de la GNU General Public " -"License" - -#: gitk:2664 gitk:2726 gitk:8969 -msgid "Close" -msgstr "Fermer" - -#: gitk:2683 -msgid "Gitk key bindings" -msgstr "Raccourcis clavier de Gitk" - -#: gitk:2686 -msgid "Gitk key bindings:" -msgstr "Raccourcis clavier de Gitk :" - -#: gitk:2688 -#, tcl-format -msgid "<%s-Q>\t\tQuit" -msgstr "<%s-Q>\t\tQuitter" - -#: gitk:2689 -msgid "<Home>\t\tMove to first commit" -msgstr "<Début>\t\tAller au premier commit" - -#: gitk:2690 -msgid "<End>\t\tMove to last commit" -msgstr "<Fin>\t\tAller au dernier commit" - -#: gitk:2691 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Haut>, p, i\t Aller au commit suivant" - -#: gitk:2692 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Bas>, n, k\t Aller au commit précédent" - -#: gitk:2693 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Gauche>, z, j\tReculer dans l'historique" - -#: gitk:2694 -msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Droite>, x, l\tAvancer dans l'historique" - -#: gitk:2695 -msgid "<PageUp>\tMove up one page in commit list" -msgstr "<PageUp>\tMonter d'une page dans la liste des commits" - -#: gitk:2696 -msgid "<PageDown>\tMove down one page in commit list" -msgstr "<PageDown>\tDescendre d'une page dans la liste des commits" - -#: gitk:2697 -#, tcl-format -msgid "<%s-Home>\tScroll to top of commit list" -msgstr "<%s-Début>\tAller en haut de la liste des commits" - -#: gitk:2698 -#, tcl-format -msgid "<%s-End>\tScroll to bottom of commit list" -msgstr "<%s-End>\tAller en bas de la liste des commits" - -#: gitk:2699 -#, tcl-format -msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits" - -#: gitk:2700 -#, tcl-format -msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits" - -#: gitk:2701 -#, tcl-format -msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits" - -#: gitk:2702 -#, tcl-format -msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits" - -#: gitk:2703 -msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "" -"<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)" - -#: gitk:2704 -msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "" -"<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)" - -#: gitk:2705 -msgid "<Delete>, b\tScroll diff view up one page" -msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff" - -#: gitk:2706 -msgid "<Backspace>\tScroll diff view up one page" -msgstr "<Backspace>\tMonter d'une page dans la vue des diff" - -#: gitk:2707 -msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff" - -#: gitk:2708 -msgid "u\t\tScroll diff view up 18 lines" -msgstr "u\t\tMonter de 18 lignes dans la vue des diff" - -#: gitk:2709 -msgid "d\t\tScroll diff view down 18 lines" -msgstr "d\t\tDescendre de 18 lignes dans la vue des diff" - -#: gitk:2710 -#, tcl-format -msgid "<%s-F>\t\tFind" -msgstr "<%s-F>\t\tRechercher" - -#: gitk:2711 -#, tcl-format -msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\tAller au résultat de recherche suivant" - -#: gitk:2712 -msgid "<Return>\tMove to next find hit" -msgstr "<Return>\t\tAller au résultat de recherche suivant" - -#: gitk:2713 -msgid "/\t\tFocus the search box" -msgstr "/\t\tFocus sur la zone de recherche" - -#: gitk:2714 -msgid "?\t\tMove to previous find hit" -msgstr "?\t\tAller au résultat de recherche précédent" - -#: gitk:2715 -msgid "f\t\tScroll diff view to next file" -msgstr "f\t\tAller au prochain fichier dans la vue des diff" - -#: gitk:2716 -#, tcl-format -msgid "<%s-S>\t\tSearch for next hit in diff view" -msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff" - -#: gitk:2717 -#, tcl-format -msgid "<%s-R>\t\tSearch for previous hit in diff view" -msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff" - -#: gitk:2718 -#, tcl-format -msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-KP+>\tAugmenter la taille de la police" - -#: gitk:2719 -#, tcl-format -msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-plus>\tAugmenter la taille de la police" - -#: gitk:2720 -#, tcl-format -msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-KP->\tDiminuer la taille de la police" - -#: gitk:2721 -#, tcl-format -msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-minus>\tDiminuer la taille de la police" - -#: gitk:2722 -msgid "<F5>\t\tUpdate" -msgstr "<F5>\t\tMise à jour" - -#: gitk:3177 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Erreur en obtenant \"%s\" de %s:" - -#: gitk:3234 gitk:3243 -#, tcl-format -msgid "Error creating temporary directory %s:" -msgstr "Erreur lors de la création du répertoire temporaire %s :" - -#: gitk:3255 -msgid "command failed:" -msgstr "échec de la commande :" - -#: gitk:3401 -msgid "No such commit" -msgstr "Commit inexistant" - -#: gitk:3415 -msgid "git gui blame: command failed:" -msgstr "git gui blame : échec de la commande :" - -#: gitk:3446 -#, tcl-format -msgid "Couldn't read merge head: %s" -msgstr "Impossible de lire le head de la fusion : %s" - -#: gitk:3454 -#, tcl-format -msgid "Error reading index: %s" -msgstr "Erreur à la lecture de l'index : %s" - -#: gitk:3479 -#, tcl-format -msgid "Couldn't start git blame: %s" -msgstr "Impossible de démarrer git blame : %s" - -#: gitk:3482 gitk:6271 -msgid "Searching" -msgstr "Recherche en cours" - -#: gitk:3514 -#, tcl-format -msgid "Error running git blame: %s" -msgstr "Erreur à l'exécution de git blame : %s" - -#: gitk:3542 -#, tcl-format -msgid "That line comes from commit %s, which is not in this view" -msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue" - -#: gitk:3556 -msgid "External diff viewer failed:" -msgstr "Échec de l'outil externe de visualisation des diff" - -#: gitk:3674 -msgid "Gitk view definition" -msgstr "Définition des vues de Gitk" - -#: gitk:3678 -msgid "Remember this view" -msgstr "Se souvenir de cette vue" - -#: gitk:3679 -msgid "References (space separated list):" -msgstr "Références (liste d'éléments séparés par des espaces) :" - -#: gitk:3680 -msgid "Branches & tags:" -msgstr "Branches & tags :" - -#: gitk:3681 -msgid "All refs" -msgstr "Toutes les références" - -#: gitk:3682 -msgid "All (local) branches" -msgstr "Toutes les branches (locales)" - -#: gitk:3683 -msgid "All tags" -msgstr "Tous les tags" - -#: gitk:3684 -msgid "All remote-tracking branches" -msgstr "Toutes les branches de suivi à distance" - -#: gitk:3685 -msgid "Commit Info (regular expressions):" -msgstr "Info sur les commits (expressions régulières) :" - -#: gitk:3686 -msgid "Author:" -msgstr "Auteur :" - -#: gitk:3687 -msgid "Committer:" -msgstr "Commiteur :" - -#: gitk:3688 -msgid "Commit Message:" -msgstr "Message de commit :" - -#: gitk:3689 -msgid "Matches all Commit Info criteria" -msgstr "Correspond à tous les critères d'Info sur les commits" - -#: gitk:3690 -msgid "Changes to Files:" -msgstr "Changements des fichiers :" - -#: gitk:3691 -msgid "Fixed String" -msgstr "Chaîne Figée" - -#: gitk:3692 -msgid "Regular Expression" -msgstr "Expression Régulière" - -#: gitk:3693 -msgid "Search string:" -msgstr "Recherche de la chaîne :" - -#: gitk:3694 -msgid "" -"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" -msgstr "" -"Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " -"2009 15:27:38\") :" - -#: gitk:3695 -msgid "Since:" -msgstr "De :" - -#: gitk:3696 -msgid "Until:" -msgstr "Jusqu'au :" - -#: gitk:3697 -msgid "Limit and/or skip a number of revisions (positive integer):" -msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :" - -#: gitk:3698 -msgid "Number to show:" -msgstr "Nombre à afficher :" - -#: gitk:3699 -msgid "Number to skip:" -msgstr "Nombre à sauter :" - -#: gitk:3700 -msgid "Miscellaneous options:" -msgstr "Options diverses :" - -#: gitk:3701 -msgid "Strictly sort by date" -msgstr "Trier par date" - -# FIXME : traduction de "branch sides" -#: gitk:3702 -#, fuzzy -msgid "Mark branch sides" -msgstr "Marquer les extrémités des branches" - -#: gitk:3703 -msgid "Limit to first parent" -msgstr "Limiter au premier ancêtre" - -#: gitk:3704 -msgid "Simple history" -msgstr "Historique simple" - -#: gitk:3705 -msgid "Additional arguments to git log:" -msgstr "Arguments supplémentaires de git log :" - -#: gitk:3706 -msgid "Enter files and directories to include, one per line:" -msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :" - -#: gitk:3707 -msgid "Command to generate more commits to include:" -msgstr "Commande pour générer plus de commits à inclure :" - -#: gitk:3829 -msgid "Gitk: edit view" -msgstr "Gitk : éditer la vue" - -#: gitk:3837 -msgid "-- criteria for selecting revisions" -msgstr "-- critère pour la sélection des révisions" - -#: gitk:3842 -msgid "View Name:" -msgstr "Nom de la vue :" - -#: gitk:3917 -msgid "Apply (F5)" -msgstr "Appliquer (F5)" - -#: gitk:3955 -msgid "Error in commit selection arguments:" -msgstr "Erreur dans les arguments de sélection des commits :" - -#: gitk:4008 gitk:4060 gitk:4508 gitk:4522 gitk:5783 gitk:11196 gitk:11197 -msgid "None" -msgstr "Aucun" - -#: gitk:4456 gitk:6303 gitk:8065 gitk:8080 -msgid "Date" -msgstr "Date" - -#: gitk:4456 gitk:6303 -msgid "CDate" -msgstr "CDate" - -#: gitk:4605 gitk:4610 -msgid "Descendant" -msgstr "Descendant" - -#: gitk:4606 -msgid "Not descendant" -msgstr "Pas un descendant" - -#: gitk:4613 gitk:4618 -msgid "Ancestor" -msgstr "Ancêtre" - -#: gitk:4614 -msgid "Not ancestor" -msgstr "Pas un ancêtre" - -#: gitk:4904 -msgid "Local changes checked in to index but not committed" -msgstr "Modifications locales enregistrées dans l'index mais non commitées" - -#: gitk:4940 -msgid "Local uncommitted changes, not checked in to index" -msgstr "Modifications locales non enregistrées dans l'index et non commitées" - -#: gitk:6621 -msgid "many" -msgstr "nombreux" - -#: gitk:6805 -msgid "Tags:" -msgstr "Tags :" - -#: gitk:6822 gitk:6828 gitk:8058 -msgid "Parent" -msgstr "Parent" - -#: gitk:6833 -msgid "Child" -msgstr "Enfant" - -#: gitk:6842 -msgid "Branch" -msgstr "Branche" - -#: gitk:6845 -msgid "Follows" -msgstr "Suit" - -#: gitk:6848 -msgid "Precedes" -msgstr "Précède" - -#: gitk:7346 -#, tcl-format -msgid "Error getting diffs: %s" -msgstr "Erreur lors de la récupération des diff : %s" - -#: gitk:7886 -msgid "Goto:" -msgstr "Aller à :" - -#: gitk:7888 -msgid "SHA1 ID:" -msgstr "Id SHA1 :" - -#: gitk:7907 -#, tcl-format -msgid "Short SHA1 id %s is ambiguous" -msgstr "Id SHA1 court %s est ambigu" - -#: gitk:7914 -#, tcl-format -msgid "Revision %s is not known" -msgstr "Id SHA1 %s est inconnu" - -#: gitk:7924 -#, tcl-format -msgid "SHA1 id %s is not known" -msgstr "Id SHA1 %s est inconnu" - -#: gitk:7926 -#, tcl-format -msgid "Revision %s is not in the current view" -msgstr "La révision %s n'est pas dans la vue courante" - -#: gitk:8068 -msgid "Children" -msgstr "Enfants" - -#: gitk:8125 -#, tcl-format -msgid "Reset %s branch to here" -msgstr "Réinitialiser la branche %s vers cet état" - -#: gitk:8127 -msgid "Detached head: can't reset" -msgstr "Head détaché : impossible de réinitialiser" - -#: gitk:8236 gitk:8242 -msgid "Skipping merge commit " -msgstr "Éviter le commit de la fusion " - -#: gitk:8251 gitk:8256 -msgid "Error getting patch ID for " -msgstr "Erreur à l'obtention de l'ID du patch pour " - -#: gitk:8252 gitk:8257 -msgid " - stopping\n" -msgstr " - arrêt en cours\n" - -#: gitk:8262 gitk:8265 gitk:8273 gitk:8283 gitk:8292 -msgid "Commit " -msgstr "Commit " - -#: gitk:8266 -msgid "" -" is the same patch as\n" -" " -msgstr "" -"est le même patch que \n" -" " - -#: gitk:8274 -msgid "" -" differs from\n" -" " -msgstr "" -" diffère de\n" -" " - -#: gitk:8276 -msgid "- stopping\n" -msgstr "- arrêt en cours\n" - -#: gitk:8284 gitk:8293 -#, tcl-format -msgid " has %s children - stopping\n" -msgstr "a %s enfants - arrêt en cours\n" - -#: gitk:8324 -msgid "Top" -msgstr "Haut" - -#: gitk:8325 -msgid "From" -msgstr "De" - -#: gitk:8330 -msgid "To" -msgstr "À" - -#: gitk:8354 -msgid "Generate patch" -msgstr "Générer le patch" - -#: gitk:8356 -msgid "From:" -msgstr "De :" - -#: gitk:8365 -msgid "To:" -msgstr "À :" - -#: gitk:8374 -msgid "Reverse" -msgstr "Inverser" - -#: gitk:8376 gitk:8561 -msgid "Output file:" -msgstr "Fichier de sortie :" - -#: gitk:8382 -msgid "Generate" -msgstr "Générer" - -#: gitk:8420 -msgid "Error creating patch:" -msgstr "Erreur à la création du patch :" - -#: gitk:8443 gitk:8549 gitk:8606 -msgid "ID:" -msgstr "ID :" - -#: gitk:8452 -msgid "Tag name:" -msgstr "Nom du Tag :" - -#: gitk:8456 gitk:8615 -msgid "Create" -msgstr "Créer" - -#: gitk:8473 -msgid "No tag name specified" -msgstr "Aucun nom de tag spécifié" - -#: gitk:8477 -#, tcl-format -msgid "Tag \"%s\" already exists" -msgstr "Le tag \"%s\" existe déjà" - -#: gitk:8483 -msgid "Error creating tag:" -msgstr "Erreur à la création du tag :" - -#: gitk:8558 -msgid "Command:" -msgstr "Commande :" - -#: gitk:8566 -msgid "Write" -msgstr "Écrire" - -#: gitk:8584 -msgid "Error writing commit:" -msgstr "Erreur à l'ecriture du commit :" - -#: gitk:8611 -msgid "Name:" -msgstr "Nom :" - -#: gitk:8634 -msgid "Please specify a name for the new branch" -msgstr "Veuillez spécifier un nom pour la nouvelle branche" - -#: gitk:8639 -#, tcl-format -msgid "Branch '%s' already exists. Overwrite?" -msgstr "La branche '%s' existe déjà. Écraser?" - -#: gitk:8705 -#, tcl-format -msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "" -"Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré " -"tout?" - -#: gitk:8710 -msgid "Cherry-picking" -msgstr "Cueillir (Cherry-picking)" - -#: gitk:8719 -#, tcl-format -msgid "" -"Cherry-pick failed because of local changes to file '%s'.\n" -"Please commit, reset or stash your changes and try again." -msgstr "" -"La cueillette (cherry-pick) a échouée à cause de modifications locales du " -"fichier '%s'.\n" -"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de " -"nouveau." - -#: gitk:8725 -msgid "" -"Cherry-pick failed because of merge conflict.\n" -"Do you wish to run git citool to resolve it?" -msgstr "" -"La cueillette (cherry-pick) a échouée à cause d'un conflit lors d'une " -"fusion.\n" -"Souhaitez-vous exécuter git citool pour le résoudre ?" - -#: gitk:8741 -msgid "No changes committed" -msgstr "Aucun changement commité" - -#: gitk:8767 -msgid "Confirm reset" -msgstr "Confirmer la réinitialisation" - -#: gitk:8769 -#, tcl-format -msgid "Reset branch %s to %s?" -msgstr "Réinitialiser la branche %s à %s?" - -#: gitk:8773 -msgid "Reset type:" -msgstr "Type de réinitialisation :" - -#: gitk:8777 -msgid "Soft: Leave working tree and index untouched" -msgstr "Douce : Laisse le répertoire de travail et l'index intacts" - -#: gitk:8780 -msgid "Mixed: Leave working tree untouched, reset index" -msgstr "" -"Hybride : Laisse le répertoire de travail dans son état courant, " -"réinitialise l'index" - -#: gitk:8783 -msgid "" -"Hard: Reset working tree and index\n" -"(discard ALL local changes)" -msgstr "" -"Dure : Réinitialise le répertoire de travail et l'index\n" -"(abandonne TOUS les changements locaux)" - -#: gitk:8800 -msgid "Resetting" -msgstr "Réinitialisation" - -# Fixme: Récupération est-il vraiment une mauvaise traduction? -#: gitk:8857 -#, fuzzy -msgid "Checking out" -msgstr "Récupération" - -#: gitk:8910 -msgid "Cannot delete the currently checked-out branch" -msgstr "Impossible de supprimer la branche en cours" - -#: gitk:8916 -#, tcl-format -msgid "" -"The commits on branch %s aren't on any other branch.\n" -"Really delete branch %s?" -msgstr "" -"Les commits de la branche %s ne sont dans aucune autre branche.\n" -"Voulez-vous vraiment supprimer cette branche %s ?" - -#: gitk:8947 -#, tcl-format -msgid "Tags and heads: %s" -msgstr "Tags et heads : %s" - -#: gitk:8962 -msgid "Filter" -msgstr "Filtrer" - -#: gitk:9257 -msgid "" -"Error reading commit topology information; branch and preceding/following " -"tag information will be incomplete." -msgstr "" -"Erreur à la lecture des informations sur la topologie des commits, les " -"informations sur les branches et les tags précédents/suivants seront " -"incomplètes." - -#: gitk:10243 -msgid "Tag" -msgstr "Tag" - -#: gitk:10243 -msgid "Id" -msgstr "Id" - -#: gitk:10291 -msgid "Gitk font chooser" -msgstr "Sélecteur de police de Gitk" - -#: gitk:10308 -msgid "B" -msgstr "B" - -#: gitk:10311 -msgid "I" -msgstr "I" - -#: gitk:10407 -msgid "Gitk preferences" -msgstr "Préférences de Gitk" - -#: gitk:10409 -msgid "Commit list display options" -msgstr "Options d'affichage de la liste des commits" - -#: gitk:10412 -msgid "Maximum graph width (lines)" -msgstr "Longueur maximum du graphe (lignes)" - -# FIXME : Traduction standard de "pane"? -#: gitk:10416 -#, fuzzy, tcl-format -msgid "Maximum graph width (% of pane)" -msgstr "Longueur maximum du graphe (% du panneau)" - -#: gitk:10420 -msgid "Show local changes" -msgstr "Montrer les changements locaux" - -#: gitk:10423 -msgid "Auto-select SHA1" -msgstr "Sélection auto. du SHA1" - -#: gitk:10427 -msgid "Diff display options" -msgstr "Options d'affichage des diff" - -#: gitk:10429 -msgid "Tab spacing" -msgstr "Taille des tabulations" - -#: gitk:10432 -msgid "Display nearby tags" -msgstr "Afficher les tags les plus proches" - -#: gitk:10435 -msgid "Hide remote refs" -msgstr "Cacher les refs distantes" - -#: gitk:10438 -msgid "Limit diffs to listed paths" -msgstr "Limiter les différences aux chemins listés" - -#: gitk:10441 -msgid "Support per-file encodings" -msgstr "Support pour un encodage des caractères par fichier" - -#: gitk:10447 gitk:10512 -msgid "External diff tool" -msgstr "Outil diff externe" - -#: gitk:10449 -msgid "Choose..." -msgstr "Choisir..." - -#: gitk:10454 -msgid "Colors: press to choose" -msgstr "Couleurs : cliquer pour choisir" - -#: gitk:10457 -msgid "Background" -msgstr "Arrière-plan" - -#: gitk:10458 gitk:10488 -msgid "background" -msgstr "arrière-plan" - -#: gitk:10461 -msgid "Foreground" -msgstr "Premier plan" - -#: gitk:10462 -msgid "foreground" -msgstr "premier plan" - -#: gitk:10465 -msgid "Diff: old lines" -msgstr "Diff : anciennes lignes" - -#: gitk:10466 -msgid "diff old lines" -msgstr "diff anciennes lignes" - -#: gitk:10470 -msgid "Diff: new lines" -msgstr "Diff : nouvelles lignes" - -#: gitk:10471 -msgid "diff new lines" -msgstr "diff nouvelles lignes" - -#: gitk:10475 -msgid "Diff: hunk header" -msgstr "Diff : entête du hunk" - -#: gitk:10477 -msgid "diff hunk header" -msgstr "diff : entête du hunk" - -#: gitk:10481 -msgid "Marked line bg" -msgstr "Arrière-plan de la ligne marquée" - -#: gitk:10483 -msgid "marked line background" -msgstr "Arrière-plan de la ligne marquée" - -#: gitk:10487 -msgid "Select bg" -msgstr "Sélectionner l'arrière-plan" - -#: gitk:10491 -msgid "Fonts: press to choose" -msgstr "Polices : cliquer pour choisir" - -#: gitk:10493 -msgid "Main font" -msgstr "Police principale" - -#: gitk:10494 -msgid "Diff display font" -msgstr "Police d'affichage des diff" - -#: gitk:10495 -msgid "User interface font" -msgstr "Police de l'interface utilisateur" - -#: gitk:10522 -#, tcl-format -msgid "Gitk: choose color for %s" -msgstr "Gitk : choisir la couleur de %s" - -#: gitk:10973 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n" -" Gitk requiert Tcl/Tk version 8.4 ou supérieur." - -#: gitk:11101 -msgid "Cannot find a git repository here." -msgstr "Impossible de trouver un dépôt git ici." - -#: gitk:11105 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Impossible de trouver le répertoire git \"%s\"." - -#: gitk:11152 -#, tcl-format -msgid "Ambiguous argument '%s': both revision and filename" -msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier" - -#: gitk:11164 -msgid "Bad arguments to gitk:" -msgstr "Arguments invalides pour gitk :" - -#: gitk:11249 -msgid "Command line" -msgstr "Ligne de commande" diff --git a/po/git.pot b/po/git.pot new file mode 100644 index 0000000..566c7fd --- /dev/null +++ b/po/git.pot @@ -0,0 +1,3505 @@ +# 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-03-16 20:18+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: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 "" diff --git a/po/hu.po b/po/hu.po deleted file mode 100644 index 7262b61..0000000 --- a/po/hu.po +++ /dev/null @@ -1,1295 +0,0 @@ -# Translation of gitk to Hungarian. -# Copyright (C) 2007 Paul Mackerras. -# This file is distributed under the same license as the gitk package. -# -# Laszlo Papp <laszlo.papp@arhungary.hu>, 2009. -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 13:33+0100\n" -"PO-Revision-Date: 2009-12-14 14:04+0100\n" -"Last-Translator: Laszlo Papp <djszapi@archlinux.us>\n" -"Language-Team: Hungarian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: gitk:115 -msgid "Couldn't get list of unmerged files:" -msgstr "Nem sikerült letölteni az unmerged fájl listát:" - -#: gitk:271 -msgid "Error parsing revisions:" -msgstr "Hiba történt értelmezés közben:" - -#: gitk:326 -msgid "Error executing --argscmd command:" -msgstr "Hiba történt a végrehajtáskor --argscmd parancs:" - -#: gitk:339 -msgid "No files selected: --merge specified but no files are unmerged." -msgstr "" -"Nincsen fájl kiválasztva: --merge megadve, de egyetlen fájl sem unmerged." - -#: gitk:342 -msgid "" -"No files selected: --merge specified but no unmerged files are within file " -"limit." -msgstr "" -"Nincsen fájl kiválasztva: --merge megadva, de nincsenek unmerged fájlok a " -"fájlon belül limit." - -#: gitk:364 gitk:511 -msgid "Error executing git log:" -msgstr "Hiba történt a git log végrehajtása közben:" - -#: gitk:382 gitk:527 -msgid "Reading" -msgstr "Olvasás" - -#: gitk:442 gitk:4258 -msgid "Reading commits..." -msgstr "Commitok olvasása ..." - -#: gitk:445 gitk:1575 gitk:4261 -msgid "No commits selected" -msgstr "Nincsen commit kiválasztva" - -#: gitk:1451 -msgid "Can't parse git log output:" -msgstr "Nem lehet értelmezni a git log kimenetét:" - -#: gitk:1671 -msgid "No commit information available" -msgstr "Nincsen elérhető commit információ" - -#: gitk:1813 -msgid "mc" -msgstr "mc" - -#: gitk:1848 gitk:4051 gitk:9029 gitk:10570 gitk:10789 -msgid "OK" -msgstr "OK" - -#: gitk:1850 gitk:4053 gitk:8629 gitk:8703 gitk:8813 gitk:8862 gitk:9031 -#: gitk:10571 gitk:10790 -msgid "Cancel" -msgstr "Visszavonás" - -#: gitk:1972 -msgid "Update" -msgstr "Frissités" - -#: gitk:1973 -msgid "Reload" -msgstr "Újratöltés" - -#: gitk:1974 -msgid "Reread references" -msgstr "Referenciák újraolvasása" - -#: gitk:1975 -msgid "List references" -msgstr "Referenciák listázása" - -#: gitk:1977 -msgid "Start git gui" -msgstr "Git gui indítása" - -#: gitk:1979 -msgid "Quit" -msgstr "Kilépés" - -#: gitk:1971 -msgid "File" -msgstr "Fájl" - -#: gitk:1983 -msgid "Preferences" -msgstr "Beállítások" - -#: gitk:1982 -msgid "Edit" -msgstr "Szerkesztés" - -#: gitk:1987 -msgid "New view..." -msgstr "Új nézet ..." - -#: gitk:1988 -msgid "Edit view..." -msgstr "Nézet szerkesztése ..." - -#: gitk:1989 -msgid "Delete view" -msgstr "Nézet törlése" - -#: gitk:1991 -msgid "All files" -msgstr "Minden fájl" - -#: gitk:1986 gitk:3805 -msgid "View" -msgstr "Nézet" - -#: gitk:1996 gitk:2006 gitk:2777 -msgid "About gitk" -msgstr "Gitk névjegy" - -#: gitk:1997 gitk:2011 -msgid "Key bindings" -msgstr "Billentyűkombináció" - -#: gitk:1995 gitk:2010 -msgid "Help" -msgstr "Segítség" - -#: gitk:2088 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " - -#: gitk:2119 -msgid "Row" -msgstr "Sor" - -#: gitk:2157 -msgid "Find" -msgstr "Keresés" - -#: gitk:2158 -msgid "next" -msgstr "következő" - -#: gitk:2159 -msgid "prev" -msgstr "előző" - -#: gitk:2160 -msgid "commit" -msgstr "commit" - -#: gitk:2163 gitk:2165 gitk:4419 gitk:4442 gitk:4466 gitk:6407 gitk:6479 -#: gitk:6563 -msgid "containing:" -msgstr "tartalmazás:" - -#: gitk:2166 gitk:3287 gitk:3292 gitk:4494 -msgid "touching paths:" -msgstr "érintendő útvonalak:" - -#: gitk:2167 gitk:4499 -msgid "adding/removing string:" -msgstr "string hozzáadása/törlése:" - -#: gitk:2176 gitk:2178 -msgid "Exact" -msgstr "Pontos" - -#: gitk:2178 gitk:4574 gitk:6375 -msgid "IgnCase" -msgstr "Kis/nagy betű nem számít" - -#: gitk:2178 gitk:4468 gitk:4572 gitk:6371 -msgid "Regexp" -msgstr "Regexp" - -#: gitk:2180 gitk:2181 gitk:4593 gitk:4623 gitk:4630 gitk:6499 gitk:6567 -msgid "All fields" -msgstr "Minden mező" - -#: gitk:2181 gitk:4591 gitk:4623 gitk:6438 -msgid "Headline" -msgstr "Főcím" - -#: gitk:2182 gitk:4591 gitk:6438 gitk:6567 gitk:7000 -msgid "Comments" -msgstr "Megjegyzések" - -#: gitk:2182 gitk:4591 gitk:4595 gitk:4630 gitk:6438 gitk:6935 gitk:8280 -#: gitk:8295 -msgid "Author" -msgstr "Szerző" - -#: gitk:2182 gitk:4591 gitk:6438 gitk:6937 -msgid "Committer" -msgstr "Commitoló" - -#: gitk:2213 -msgid "Search" -msgstr "Keresés" - -#: gitk:2221 -msgid "Diff" -msgstr "Diff" - -#: gitk:2223 -msgid "Old version" -msgstr "Régi verzió" - -#: gitk:2225 -msgid "New version" -msgstr "Új verzió" - -#: gitk:2227 -msgid "Lines of context" -msgstr "Tartalmi sorok" - -#: gitk:2237 -msgid "Ignore space change" -msgstr "Space váltás mellőzése" - -#: gitk:2296 -msgid "Patch" -msgstr "Patch" - -#: gitk:2298 -msgid "Tree" -msgstr "Tree" - -#: gitk:2453 gitk:2470 -msgid "Diff this -> selected" -msgstr "Diff ezeket -> kiválasztott" - -#: gitk:2454 gitk:2471 -msgid "Diff selected -> this" -msgstr "Diff kiválasztottakat -> ezt" - -#: gitk:2455 gitk:2472 -msgid "Make patch" -msgstr "Patch készítése" - -#: gitk:2456 gitk:8687 -msgid "Create tag" -msgstr "Tag készítése" - -#: gitk:2457 gitk:8793 -msgid "Write commit to file" -msgstr "Commit fáljba írása" - -#: gitk:2458 gitk:8850 -msgid "Create new branch" -msgstr "Új branch készítése" - -#: gitk:2459 -msgid "Cherry-pick this commit" -msgstr "Cherry-pick erre a commitra" - -#: gitk:2460 -msgid "Reset HEAD branch to here" -msgstr "HEAD branch újraindítása ide" - -#: gitk:2461 -msgid "Mark this commit" -msgstr "Ezen commit megjelölése" - -#: gitk:2462 -msgid "Return to mark" -msgstr "Visszatérés a megjelöléshez" - -#: gitk:2463 -msgid "Find descendant of this and mark" -msgstr "Találd meg ezen utódokat és jelöld meg" - -#: gitk:2464 -msgid "Compare with marked commit" -msgstr "Összehasonlítás a megjelölt commit-tal" - -#: gitk:2478 -msgid "Check out this branch" -msgstr "Check out ezt a branchot" - -#: gitk:2479 -msgid "Remove this branch" -msgstr "Töröld ezt a branch-ot" - -#: gitk:2486 -msgid "Highlight this too" -msgstr "Emeld ki ezt is" - -#: gitk:2487 -msgid "Highlight this only" -msgstr "Csak ezt emeld ki" - -#: gitk:2488 -msgid "External diff" -msgstr "Külső diff" - -#: gitk:2489 -msgid "Blame parent commit" -msgstr "Blame szülő kommitra" - -#: gitk:2496 -msgid "Show origin of this line" -msgstr "Mutasd meg ennek a sornak az eredetét" - -#: gitk:2497 -msgid "Run git gui blame on this line" -msgstr "Futtasd a git gui blame-t ezen a soron" - -#: gitk:2779 -msgid "" -"\n" -"Gitk - a commit viewer for git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Use and redistribute under the terms of the GNU General Public License" -msgstr "" -"\n" -"Gitk - commit nézegető a githez\n" -"\n" -"Szerzői jog \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Használd és terjeszd a GNU General Public License feltételei mellett" - -#: gitk:2787 gitk:2851 gitk:9215 -msgid "Close" -msgstr "Bezárás" - -#: gitk:2808 -msgid "Gitk key bindings" -msgstr "Gitk-billentyű hozzárendelés" - -#: gitk:2811 -msgid "Gitk key bindings:" -msgstr "Gitk-billentyű hozzaárendelés:" - -#: gitk:2813 -#, tcl-format -msgid "<%s-Q>\t\tQuit" -msgstr "<%s-Q>\t\tKilépés" - -#: gitk:2814 -msgid "<Home>\t\tMove to first commit" -msgstr "<Pos1>\t\tElső commithoz" - -#: gitk:2815 -msgid "<End>\t\tMove to last commit" -msgstr "<Ende>\t\tUtolsó commithoz" - -#: gitk:2816 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Hoch>, p, i\tEgy committal feljebb" - -#: gitk:2817 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Runter>, n, k\tEgy committal lejjebb" - -#: gitk:2818 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Links>, z, j\tVissza a history listába" - -#: gitk:2819 -msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Rechts>, x, l\tElőre a history listába" - -#: gitk:2820 -msgid "<PageUp>\tMove up one page in commit list" -msgstr "<BildHoch>\tEgy lappal feljebb a commit listába" - -#: gitk:2821 -msgid "<PageDown>\tMove down one page in commit list" -msgstr "<BildRunter>\tEgy lappal lejjebb a commit listába" - -#: gitk:2822 -#, tcl-format -msgid "<%s-Home>\tScroll to top of commit list" -msgstr "<%s-Pos1>\tGörgetés a commit lista tetejéhez" - -#: gitk:2823 -#, tcl-format -msgid "<%s-End>\tScroll to bottom of commit list" -msgstr "<%s-Ende>\tGörgetés a commit lista aljához" - -#: gitk:2824 -#, tcl-format -msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Hoch>\tEgy sorral feljebb görgetés a commit listában" - -#: gitk:2825 -#, tcl-format -msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Runter>\tEgy sorral lejjebb görgetés a commit listában" - -#: gitk:2826 -#, tcl-format -msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-BildHoch>\tEgy lappal feljebb görgetés a commit listában" - -#: gitk:2827 -#, tcl-format -msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-BildRunter>\tEgy sorral lejjebb görgetés a commit listában" - -#: gitk:2828 -msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "<Umschalt-Hoch>\tKeresés visszafele (felfele, utolsó commitok)" - -#: gitk:2829 -msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Umschalt-Runter>\tKeresés előre (lefelé; korábbi commitok)" - -#: gitk:2830 -msgid "<Delete>, b\tScroll diff view up one page" -msgstr "<Entf>, b\t\tEgy lappal feljebb görgetés a diff nézetben" - -#: gitk:2831 -msgid "<Backspace>\tScroll diff view up one page" -msgstr "<Löschtaste>\tEgy lappal feljebb görgetés a diff nézetben" - -#: gitk:2832 -msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Leertaste>\tEgy lappal lejjebb görgetés a diff nézetben" - -#: gitk:2833 -msgid "u\t\tScroll diff view up 18 lines" -msgstr "u\t\t18 sorral felfelé görgetés diff nézetben" - -#: gitk:2834 -msgid "d\t\tScroll diff view down 18 lines" -msgstr "d\t\t18 sorral lejjebb görgetés a diff nézetben" - -#: gitk:2835 -#, tcl-format -msgid "<%s-F>\t\tFind" -msgstr "<%s-F>\t\tKeresés" - -#: gitk:2836 -#, tcl-format -msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\tKövetkező találathoz" - -#: gitk:2837 -msgid "<Return>\tMove to next find hit" -msgstr "<Eingabetaste>\tKövetkező találathoz" - -#: gitk:2838 -msgid "/\t\tFocus the search box" -msgstr "/\t\tLépj a keresési mezőre" - -#: gitk:2839 -msgid "?\t\tMove to previous find hit" -msgstr "?\t\tElőző találathoz" - -#: gitk:2840 -msgid "f\t\tScroll diff view to next file" -msgstr "f\t\tKövetkező fájlra görgetés diff nézetben" - -#: gitk:2841 -#, tcl-format -msgid "<%s-S>\t\tSearch for next hit in diff view" -msgstr "<%s-S>\t\tKövetkező találatra keresés diff nézetben" - -#: gitk:2842 -#, tcl-format -msgid "<%s-R>\t\tSearch for previous hit in diff view" -msgstr "<%s-R>\t\tElőző találatra keresés diff nézetben" - -#: gitk:2843 -#, tcl-format -msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-Nummerblock-Plus>\tBetűméret növelése" - -#: gitk:2844 -#, tcl-format -msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-Plus>\tBetűméret növelése" - -#: gitk:2845 -#, tcl-format -msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-Nummernblock-Minus> Betűméret csökkentése" - -#: gitk:2846 -#, tcl-format -msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-Minus>\tBetűméret csökkentése" - -#: gitk:2847 -msgid "<F5>\t\tUpdate" -msgstr "<F5>\t\tFrissítés" - -#: gitk:3302 gitk:3311 -#, tcl-format -msgid "Error creating temporary directory %s:" -msgstr "Hiba történt az ideiglenes könyvtár létrehozása közben %s:" - -#: gitk:3324 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Hiba történt \"%s\" letöltése közben %s-ről:" - -#: gitk:3387 -msgid "command failed:" -msgstr "parancs hiba:" - -#: gitk:3536 -msgid "No such commit" -msgstr "Nincs ilyen commit" - -#: gitk:3550 -msgid "git gui blame: command failed:" -msgstr "git gui blame: parancs hiba:" - -#: gitk:3581 -#, tcl-format -msgid "Couldn't read merge head: %s" -msgstr "Nem sikerült a Merge head olvasása: %s" - -#: gitk:3589 -#, tcl-format -msgid "Error reading index: %s" -msgstr "Hiba történt az index olvasása közben: %s" - -#: gitk:3614 -#, tcl-format -msgid "Couldn't start git blame: %s" -msgstr "Nem sikerült a git blame indítása: %s" - -#: gitk:3617 gitk:6406 -msgid "Searching" -msgstr "Keresés" - -#: gitk:3649 -#, tcl-format -msgid "Error running git blame: %s" -msgstr "Hiba történt a git blame futtatása közben: %s" - -#: gitk:3677 -#, tcl-format -msgid "That line comes from commit %s, which is not in this view" -msgstr "" -"A %s commitból származik az a sor, amelyik nem található ebben a nézetben" - -#: gitk:3691 -msgid "External diff viewer failed:" -msgstr "Külső diff nézegető hiba:" - -#: gitk:3809 -msgid "Gitk view definition" -msgstr "Gitk nézet meghatározása" - -#: gitk:3813 -msgid "Remember this view" -msgstr "Maradj ennél a nézetnél" - -#: gitk:3814 -msgid "References (space separated list):" -msgstr "Referenciák (szóközzel tagolt lista" - -#: gitk:3815 -msgid "Branches & tags:" -msgstr "Branch-ek & tagek:" - -#: gitk:3816 -msgid "All refs" -msgstr "Minden ref" - -#: gitk:3817 -msgid "All (local) branches" -msgstr "Minden (helyi) branch" - -#: gitk:3818 -msgid "All tags" -msgstr "Minden tag" - -#: gitk:3819 -msgid "All remote-tracking branches" -msgstr "Minden távoli követő branch" - -#: gitk:3820 -msgid "Commit Info (regular expressions):" -msgstr "Commit Infó (reguláris kifejezés):" - -#: gitk:3821 -msgid "Author:" -msgstr "Szerző:" - -#: gitk:3822 -msgid "Committer:" -msgstr "Commitoló:" - -#: gitk:3823 -msgid "Commit Message:" -msgstr "Commit üzenet:" - -#: gitk:3824 -msgid "Matches all Commit Info criteria" -msgstr "Egyezik minen Commit Infó feltétellel" - -#: gitk:3825 -msgid "Changes to Files:" -msgstr "Fájl változások:" - -#: gitk:3826 -msgid "Fixed String" -msgstr "Fix String" - -#: gitk:3827 -msgid "Regular Expression" -msgstr "Reguláris kifejezés" - -#: gitk:3828 -msgid "Search string:" -msgstr "Keresés szöveg:" - -#: gitk:3829 -msgid "" -"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" -msgstr "" -"Commit Dátumok (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" - -#: gitk:3830 -msgid "Since:" -msgstr "Ettől:" - -#: gitk:3831 -msgid "Until:" -msgstr "Eddig:" - -#: gitk:3832 -msgid "Limit and/or skip a number of revisions (positive integer):" -msgstr "Limitálva és/vagy kihagyva egy adott számú revíziót (pozitív egész):" - -#: gitk:3833 -msgid "Number to show:" -msgstr "Mutatandó szám:" - -#: gitk:3834 -msgid "Number to skip:" -msgstr "Kihagyandó szám:" - -#: gitk:3835 -msgid "Miscellaneous options:" -msgstr "Különféle opciók:" - -#: gitk:3836 -msgid "Strictly sort by date" -msgstr "Szigorú rendezás dátum alapján" - -#: gitk:3837 -msgid "Mark branch sides" -msgstr "Jelölje meg az ágakat" - -#: gitk:3838 -msgid "Limit to first parent" -msgstr "Korlátozás az első szülőre" - -#: gitk:3839 -msgid "Simple history" -msgstr "Egyszerű history" - -#: gitk:3840 -msgid "Additional arguments to git log:" -msgstr "További argumentok a git log-hoz:" - -#: gitk:3841 -msgid "Enter files and directories to include, one per line:" -msgstr "Fájlok és könyvtárak bejegyzése amiket tartalmaz, soronként:" - -#: gitk:3842 -msgid "Command to generate more commits to include:" -msgstr "Parancs több tartalmazó commit generálására:" - -#: gitk:3964 -msgid "Gitk: edit view" -msgstr "Gitk: szerkesztés nézet" - -#: gitk:3972 -msgid "-- criteria for selecting revisions" -msgstr "-- kritériumok a revíziók kiválasztásához" - -#: gitk:3977 -msgid "View Name" -msgstr "Nézet neve" - -#: gitk:4052 -msgid "Apply (F5)" -msgstr "Alkalmaz (F5)" - -#: gitk:4090 -msgid "Error in commit selection arguments:" -msgstr "Hiba történt a commit argumentumok kiválasztása közben:" - -#: gitk:4143 gitk:4195 gitk:4643 gitk:4657 gitk:5918 gitk:11519 gitk:11520 -msgid "None" -msgstr "Keine" - -#: gitk:4591 gitk:6438 gitk:8282 gitk:8297 -msgid "Date" -msgstr "Dátum" - -#: gitk:4591 gitk:6438 -msgid "CDate" -msgstr "Dátum" - -#: gitk:4740 gitk:4745 -msgid "Descendant" -msgstr "Leszármazott" - -#: gitk:4741 -msgid "Not descendant" -msgstr "Nem leszármazott" - -#: gitk:4748 gitk:4753 -msgid "Ancestor" -msgstr "Előd" - -#: gitk:4749 -msgid "Not ancestor" -msgstr "Nem előd" - -#: gitk:5039 -msgid "Local changes checked in to index but not committed" -msgstr "" -"Lokális változtatások, melyek be vannak téve az indexbe, de még nincsenek " -"commitolva" - -#: gitk:5075 -msgid "Local uncommitted changes, not checked in to index" -msgstr "Lokális nem commitolt változások, nincsenek betéve az indexbe" - -#: gitk:6756 -msgid "many" -msgstr "sok" - -#: gitk:6939 -msgid "Tags:" -msgstr "Tagek:" - -#: gitk:6956 gitk:6962 gitk:8275 -msgid "Parent" -msgstr "Eltern" - -#: gitk:6967 -msgid "Child" -msgstr "Gyerek" - -#: gitk:6976 -msgid "Branch" -msgstr "Ág" - -#: gitk:6979 -msgid "Follows" -msgstr "Következők" - -#: gitk:6982 -msgid "Precedes" -msgstr "Megelőzők" - -#: gitk:7519 -#, tcl-format -msgid "Error getting diffs: %s" -msgstr "Hiba történt a diff-ek letöltése közben: %s" - -#: gitk:8103 -msgid "Goto:" -msgstr "Menj:" - -#: gitk:8105 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:8124 -#, tcl-format -msgid "Short SHA1 id %s is ambiguous" -msgstr "Rövid SHA1 id %s félreérthető" - -#: gitk:8131 -msgid "Revision %s is not known" -msgstr "A(z) %s revízió nem ismert" - -#: gitk:8141 -#, tcl-format -msgid "SHA1 id %s is not known" -msgstr "SHA1 id %s nem ismert" - -#: gitk:8143 -#, tcl-format -msgid "Revision %s is not in the current view" -msgstr "A(z) %s revízió nincs a jelenlegi nézetben" - -#: gitk:8285 -msgid "Children" -msgstr "Gyerekek" - -#: gitk:8343 -#, tcl-format -msgid "Reset %s branch to here" -msgstr "Állítsd vissza a %s branch-ot ide" - -#: gitk:8345 -msgid "Detached head: can't reset" -msgstr "Elkülönített head: nem lehet visszaállítani" - -#: gitk:8454 gitk:8460 -msgid "Skipping merge commit " -msgstr "Merge commit kihagyása " - -#: gitk:8469 gitk:8474 -msgid "Error getting patch ID for " -msgstr "Hiba történt a patch ID megszerzése közben a következőnél " - -#: gitk:8470 gitk:8475 -msgid " - stopping\n" -msgstr " - abbahagyás\n" - -#: gitk:8480 gitk:8483 gitk:8491 gitk:8505 gitk:8514 -msgid "Commit " -msgstr "Commit " - -#: gitk:8484 -msgid "" -" is the same patch as\n" -" " -msgstr "" -" Ugyanaz a patch mint\n" -" " - -#: gitk:8492 -msgid "" -" differs from\n" -" " -msgstr "" -" különbözik innentől\n" -" " - -#: gitk:8494 -msgid "" -"Diff of commits:\n" -"\n" -msgstr "" -"A commitok diffje:\n" -"\n" - -#: gitk:8506 gitk:8515 -#, tcl-format -msgid " has %s children - stopping\n" -msgstr " %s gyereke van. abbahagyás\n" - -#: gitk:8534 -msgid "Error writing commit to file: %s" -msgstr "Hiba történt a commit fájlba írása közben: %s" - -#: gitk:8540 -msgid "Error diffing commits: %s" -msgstr "Hiba történt a commitok diffelése közben: %s" - -#: gitk:8570 -msgid "Top" -msgstr "Teteje" - -#: gitk:8571 -msgid "From" -msgstr "Innen" - -#: gitk:8576 -msgid "To" -msgstr "Ide" - -#: gitk:8600 -msgid "Generate patch" -msgstr "Patch generálása" - -#: gitk:8602 -msgid "From:" -msgstr "Innen:" - -#: gitk:8611 -msgid "To:" -msgstr "Ide:" - -#: gitk:8620 -msgid "Reverse" -msgstr "Visszafele" - -#: gitk:8622 gitk:8807 -msgid "Output file:" -msgstr "Kimeneti fájl:" - -#: gitk:8628 -msgid "Generate" -msgstr "Generálás" - -#: gitk:8666 -msgid "Error creating patch:" -msgstr "Hiba törtét a patch készítése közben:" - -#: gitk:8689 gitk:8795 gitk:8852 -msgid "ID:" -msgstr "ID:" - -#: gitk:8698 -msgid "Tag name:" -msgstr "Tag név:" - -#: gitk:8702 gitk:8861 -msgid "Create" -msgstr "Létrehozás" - -#: gitk:8719 -msgid "No tag name specified" -msgstr "A tag neve nincsen megadva" - -#: gitk:8723 -#, tcl-format -msgid "Tag \"%s\" already exists" -msgstr "%s Tag már létezik" - -#: gitk:8729 -msgid "Error creating tag:" -msgstr "Hiba történt a tag létrehozása közben:" - -#: gitk:8804 -msgid "Command:" -msgstr "Parancs:" - -#: gitk:8812 -msgid "Write" -msgstr "Írás" - -#: gitk:8830 -msgid "Error writing commit:" -msgstr "Hiba történt a commit írása közben:" - -#: gitk:8857 -msgid "Name:" -msgstr "Név:" - -#: gitk:8880 -msgid "Please specify a name for the new branch" -msgstr "Kérem adja meg a nevét az új branchhoz" - -#: gitk:8885 -#, tcl-format -msgid "Branch '%s' already exists. Overwrite?" -msgstr "%s branch már létezik. Felülírja?" - -#: gitk:8951 -#, tcl-format -msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "" -"%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" -"eintragen?" - -#: gitk:8956 -msgid "Cherry-picking" -msgstr "Cherry-picking" - -#: gitk:8965 -#, tcl-format -msgid "" -"Cherry-pick failed because of local changes to file '%s'.\n" -"Please commit, reset or stash your changes and try again." -msgstr "" -"Cherry-pick hiba történt lokális váltotások miatt a '%s' fájlban.\n" -"Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja " -"újra." - -#: gitk:8971 -msgid "" -"Cherry-pick failed because of merge conflict.\n" -"Do you wish to run git citool to resolve it?" -msgstr "" -"Cherry-pick hiba történt merge konfliktus miatt.\n" -"Kívánja futtatni a git citool-t a probléma megoldásához?" - -#: gitk:8987 -msgid "No changes committed" -msgstr "Nincsen változás commitolva" - -#: gitk:9013 -msgid "Confirm reset" -msgstr "Újraindítás megerősítése" - -#: gitk:9015 -#, tcl-format -msgid "Reset branch %s to %s?" -msgstr "Újraindítja a %s branchot %s-ig?" - -#: gitk:9017 -msgid "Reset type:" -msgstr "Újraindítás típusa:" - -#: gitk:9020 -msgid "Soft: Leave working tree and index untouched" -msgstr "Soft: Hagyd a working tree-t és az indexet érintetlenül" - -#: gitk:9023 -msgid "Mixed: Leave working tree untouched, reset index" -msgstr "Kevert: Hagyd a working tree-t érintetlenül, töröld az indexet" - -#: gitk:9026 -msgid "" -"Hard: Reset working tree and index\n" -"(discard ALL local changes)" -msgstr "" -"Hard: Indítsd újra a working tree-t és az indexet\n" -"(MINDEN lokális változás eldobása)" - -#: gitk:9043 -msgid "Resetting" -msgstr "Újraindítás" - -#: gitk:9103 -msgid "Checking out" -msgstr "Kivesz" - -#: gitk:9156 -msgid "Cannot delete the currently checked-out branch" -msgstr "Nem lehet a jelenleg kivett branch-ot törölni" - -#: gitk:9162 -#, tcl-format -msgid "" -"The commits on branch %s aren't on any other branch.\n" -"Really delete branch %s?" -msgstr "" -"A %s branchon található commit nem található meg semelyik másik branchon.\n" -"Tényleg törli a %s branchot?" - -#: gitk:9193 -#, tcl-format -msgid "Tags and heads: %s" -msgstr "Tagek és headek: %s" - -#: gitk:9208 -msgid "Filter" -msgstr "Szűrő" - -#: gitk:9503 -msgid "" -"Error reading commit topology information; branch and preceding/following " -"tag information will be incomplete." -msgstr "" -"Hiba történt a commit topológiai információ olvasása közben; branch ésa " -"megelőző/következő információ nem lesz teljes." - -#: gitk:10489 -msgid "Tag" -msgstr "Tag" - -#: gitk:10489 -msgid "Id" -msgstr "Id" - -#: gitk:10539 -msgid "Gitk font chooser" -msgstr "Gitk-betű kiválasztó" - -#: gitk:10556 -msgid "B" -msgstr "F" - -#: gitk:10559 -msgid "I" -msgstr "K" - -#: gitk:10677 -msgid "Gitk preferences" -msgstr "Gitk beállítások" - -#: gitk:10679 -msgid "Commit list display options" -msgstr "Commit lista kijelzési opciók" - -#: gitk:10682 -msgid "Maximum graph width (lines)" -msgstr "Maximális grafikon szélesség (sorok)" - -#: gitk:10685 -#, tcl-format -msgid "Maximum graph width (% of pane)" -msgstr "Maximális grafikon szélesség (táble %-je)" - -#: gitk:10688 -msgid "Show local changes" -msgstr "Mutasd a lokális változtatásokat" - -#: gitk:10691 -msgid "Auto-select SHA1" -msgstr "SHA1 Automatikus kiválasztása" - -#: gitk:10694 -msgid "Hide remote refs" -msgstr "A távoli refek elrejtése" - -#: gitk:10698 -msgid "Diff display options" -msgstr "Diff kijelző opciók" - -#: gitk:10700 -msgid "Tab spacing" -msgstr "Tab sorköz" - -#: gitk:10703 -msgid "Display nearby tags" -msgstr "Szomszédos tagek kijelzése" - -#: gitk:10706 -msgid "Limit diffs to listed paths" -msgstr "Korlátozott diffek a kilistázott útvonalakhoz" - -#: gitk:10709 -msgid "Support per-file encodings" -msgstr "Fájlonkénti kódolás támgatása" - -#: gitk:10715 gitk:10804 -msgid "External diff tool" -msgstr "Külső diff alkalmazás" - -#: gitk:10716 -msgid "Choose..." -msgstr "Válaszd ..." - -#: gitk:10721 -msgid "General options" -msgstr "Általános opciók" - -#: gitk:10724 -msgid "Use themed widgets" -msgstr "Témázott vezérlők használata" - -#: gitk:10726 -msgid "(change requires restart)" -msgstr "(a változás újraindítást igényel)" - -#: gitk:10728 -msgid "(currently unavailable)" -msgstr "(jelenleg nem elérhető)" - -#: gitk:10732 -msgid "Colors: press to choose" -msgstr "Színek: nyomja meg a kiválasztáshoz" - -#: gitk:10735 -msgid "Interface" -msgstr "Interfész" - -#: gitk:10736 -msgid "interface" -msgstr "interfész" - -#: gitk:10739 -msgid "Background" -msgstr "Háttér" - -#: gitk:10740 gitk:10770 -msgid "background" -msgstr "háttér" - -#: gitk:10743 -msgid "Foreground" -msgstr "Előtér" - -#: gitk:10744 -msgid "foreground" -msgstr "előtér" - -#: gitk:10747 -msgid "Diff: old lines" -msgstr "Diff: régi sorok" - -#: gitk:10748 -msgid "diff old lines" -msgstr "diff régi sorok" - -#: gitk:10752 -msgid "Diff: new lines" -msgstr "Diff: új sorok" - -#: gitk:10753 -msgid "diff new lines" -msgstr "diff - új sorok" - -#: gitk:10757 -msgid "Diff: hunk header" -msgstr "Diff: nagy headerök" - -#: gitk:10759 -msgid "diff hunk header" -msgstr "diff - nagy headerök" - -#: gitk:10763 -msgid "Marked line bg" -msgstr "Megjelölt sor háttér" - -#: gitk:10765 -msgid "marked line background" -msgstr "megjelölt sor háttér" - -#: gitk:10769 -msgid "Select bg" -msgstr "Válasszon hátteret" - -#: gitk:10773 -msgid "Fonts: press to choose" -msgstr "Betű: nyomja meg a kiválasztáshoz" - -#: gitk:10775 -msgid "Main font" -msgstr "Fő betű" - -#: gitk:10776 -msgid "Diff display font" -msgstr "Diff kijelző betű" - -#: gitk:10777 -msgid "User interface font" -msgstr "Felhasználói interfész betű" - -#: gitk:10814 -#, tcl-format -msgid "Gitk: choose color for %s" -msgstr "Gitk: válasszon színt a %s-ra" - -#: gitk:11418 -msgid "Cannot find a git repository here." -msgstr "Nem találhatü git repository itt." - -#: gitk:11422 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Nem található a \"%s\" könyvtár." - -#: gitk:11469 -#, tcl-format -msgid "Ambiguous argument '%s': both revision and filename" -msgstr "Félreérthető argumentum '%s': revízió és fájlnév is" - -#: gitk:11481 -msgid "Bad arguments to gitk:" -msgstr "Rossz gitk argumentumok:" - -#: gitk:11572 -msgid "Command line" -msgstr "Parancs sor" - -#~ msgid "Use all refs" -#~ msgstr "Használd az összes referenciát" - -#~ msgid "Max count:" -#~ msgstr "Max. szám:" - -#~ msgid "Skip:" -#~ msgstr "Kihagy:" - -#~ msgid "Name" -#~ msgstr "Név" - -#~ msgid "Tag/Head %s is not known" -#~ msgstr "Tag/Head %s nem ismert" - -#~ msgid "- stopping\n" -#~ msgstr "- abbahagyás.\n" - -#~ msgid "" -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" -#~ " Gitk requires at least Tcl/Tk 8.4." -#~ msgstr "" -#~ "Sajnáljuk, de a gitk nem futtatható ezzel a Tcl/Tk verzióval.\n" -#~ "Gitk futtatásához legalább Tcl/Tk 8.4 szükséges." 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" diff --git a/po/it.po b/po/it.po deleted file mode 100644 index a730d63..0000000 --- a/po/it.po +++ /dev/null @@ -1,1276 +0,0 @@ -# Translation of gitk -# Copyright (C) 2005-2008 Paul Mackerras -# This file is distributed under the same license as the gitk package. -# Michele Ballabio <barra_cuda@katamail.com>, 2008. -# -# -msgid "" -msgstr "" -"Project-Id-Version: gitk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 18:40+0100\n" -"PO-Revision-Date: 2010-01-28 18:41+0100\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" - -#: gitk:115 -msgid "Couldn't get list of unmerged files:" -msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:" - -#: gitk:274 -msgid "Error parsing revisions:" -msgstr "Errore nella lettura delle revisioni:" - -#: gitk:329 -msgid "Error executing --argscmd command:" -msgstr "Errore nell'esecuzione del comando specificato con --argscmd:" - -#: gitk:342 -msgid "No files selected: --merge specified but no files are unmerged." -msgstr "" -"Nessun file selezionato: è stata specificata l'opzione --merge ma non ci " -"sono file in attesa di fusione." - -#: gitk:345 -msgid "" -"No files selected: --merge specified but no unmerged files are within file " -"limit." -msgstr "" -"Nessun file selezionato: è stata specificata l'opzione --merge ma i file " -"specificati non sono in attesa di fusione." - -#: gitk:367 gitk:514 -msgid "Error executing git log:" -msgstr "Errore nell'esecuzione di git log:" - -#: gitk:385 gitk:530 -msgid "Reading" -msgstr "Lettura in corso" - -#: gitk:445 gitk:4261 -msgid "Reading commits..." -msgstr "Lettura delle revisioni in corso..." - -#: gitk:448 gitk:1578 gitk:4264 -msgid "No commits selected" -msgstr "Nessuna revisione selezionata" - -#: gitk:1454 -msgid "Can't parse git log output:" -msgstr "Impossibile elaborare i dati di git log:" - -#: gitk:1674 -msgid "No commit information available" -msgstr "Nessuna informazione disponibile sulle revisioni" - -#: gitk:1816 -msgid "mc" -msgstr "" - -#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804 -msgid "OK" -msgstr "OK" - -#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046 -#: gitk:10586 gitk:10805 -msgid "Cancel" -msgstr "Annulla" - -#: gitk:1975 -msgid "Update" -msgstr "Aggiorna" - -#: gitk:1976 -msgid "Reload" -msgstr "Ricarica" - -#: gitk:1977 -msgid "Reread references" -msgstr "Rileggi riferimenti" - -#: gitk:1978 -msgid "List references" -msgstr "Elenca riferimenti" - -#: gitk:1980 -msgid "Start git gui" -msgstr "Avvia git gui" - -#: gitk:1982 -msgid "Quit" -msgstr "Esci" - -#: gitk:1974 -msgid "File" -msgstr "File" - -#: gitk:1986 -msgid "Preferences" -msgstr "Preferenze" - -#: gitk:1985 -msgid "Edit" -msgstr "Modifica" - -#: gitk:1990 -msgid "New view..." -msgstr "Nuova vista..." - -#: gitk:1991 -msgid "Edit view..." -msgstr "Modifica vista..." - -#: gitk:1992 -msgid "Delete view" -msgstr "Elimina vista" - -#: gitk:1994 -msgid "All files" -msgstr "Tutti i file" - -#: gitk:1989 gitk:3808 -msgid "View" -msgstr "Vista" - -#: gitk:1999 gitk:2009 gitk:2780 -msgid "About gitk" -msgstr "Informazioni su gitk" - -#: gitk:2000 gitk:2014 -msgid "Key bindings" -msgstr "Scorciatoie da tastiera" - -#: gitk:1998 gitk:2013 -msgid "Help" -msgstr "Aiuto" - -#: gitk:2091 gitk:8110 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:2122 -msgid "Row" -msgstr "Riga" - -#: gitk:2160 -msgid "Find" -msgstr "Trova" - -#: gitk:2161 -msgid "next" -msgstr "succ" - -#: gitk:2162 -msgid "prev" -msgstr "prec" - -#: gitk:2163 -msgid "commit" -msgstr "revisione" - -#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482 -#: gitk:6566 -msgid "containing:" -msgstr "contenente:" - -#: gitk:2169 gitk:3290 gitk:3295 gitk:4497 -msgid "touching paths:" -msgstr "che riguarda i percorsi:" - -#: gitk:2170 gitk:4502 -msgid "adding/removing string:" -msgstr "che aggiunge/rimuove la stringa:" - -#: gitk:2179 gitk:2181 -msgid "Exact" -msgstr "Esatto" - -#: gitk:2181 gitk:4577 gitk:6378 -msgid "IgnCase" -msgstr "" - -#: gitk:2181 gitk:4471 gitk:4575 gitk:6374 -msgid "Regexp" -msgstr "" - -#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570 -msgid "All fields" -msgstr "Tutti i campi" - -#: gitk:2184 gitk:4594 gitk:4626 gitk:6441 -msgid "Headline" -msgstr "Titolo" - -#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003 -msgid "Comments" -msgstr "Commenti" - -#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285 -#: gitk:8300 -msgid "Author" -msgstr "Autore" - -#: gitk:2185 gitk:4594 gitk:6441 gitk:6940 -msgid "Committer" -msgstr "Revisione creata da" - -#: gitk:2216 -msgid "Search" -msgstr "Cerca" - -#: gitk:2224 -msgid "Diff" -msgstr "" - -#: gitk:2226 -msgid "Old version" -msgstr "Vecchia versione" - -#: gitk:2228 -msgid "New version" -msgstr "Nuova versione" - -#: gitk:2230 -msgid "Lines of context" -msgstr "Linee di contesto" - -#: gitk:2240 -msgid "Ignore space change" -msgstr "Ignora modifiche agli spazi" - -#: gitk:2299 -msgid "Patch" -msgstr "Modifiche" - -#: gitk:2301 -msgid "Tree" -msgstr "Directory" - -#: gitk:2456 gitk:2473 -msgid "Diff this -> selected" -msgstr "Diff questo -> selezionato" - -#: gitk:2457 gitk:2474 -msgid "Diff selected -> this" -msgstr "Diff selezionato -> questo" - -#: gitk:2458 gitk:2475 -msgid "Make patch" -msgstr "Crea patch" - -#: gitk:2459 gitk:8692 -msgid "Create tag" -msgstr "Crea etichetta" - -#: gitk:2460 gitk:8808 -msgid "Write commit to file" -msgstr "Scrivi revisione in un file" - -#: gitk:2461 gitk:8865 -msgid "Create new branch" -msgstr "Crea un nuovo ramo" - -#: gitk:2462 -msgid "Cherry-pick this commit" -msgstr "Porta questa revisione in cima al ramo attuale" - -#: gitk:2463 -msgid "Reset HEAD branch to here" -msgstr "Aggiorna il ramo HEAD a questa revisione" - -#: gitk:2464 -msgid "Mark this commit" -msgstr "Segna questa revisione" - -#: gitk:2465 -msgid "Return to mark" -msgstr "Torna alla revisione segnata" - -#: gitk:2466 -msgid "Find descendant of this and mark" -msgstr "Trova il discendente di questa revisione e di quella segnata" - -#: gitk:2467 -msgid "Compare with marked commit" -msgstr "Confronta con la revisione segnata" - -#: gitk:2481 -msgid "Check out this branch" -msgstr "Attiva questo ramo" - -#: gitk:2482 -msgid "Remove this branch" -msgstr "Elimina questo ramo" - -#: gitk:2489 -msgid "Highlight this too" -msgstr "Evidenzia anche questo" - -#: gitk:2490 -msgid "Highlight this only" -msgstr "Evidenzia solo questo" - -#: gitk:2491 -msgid "External diff" -msgstr "Visualizza differenze in un altro programma" - -#: gitk:2492 -msgid "Blame parent commit" -msgstr "Annota la revisione precedente" - -#: gitk:2499 -msgid "Show origin of this line" -msgstr "Mostra la provenienza di questa riga" - -#: gitk:2500 -msgid "Run git gui blame on this line" -msgstr "Esegui git gui blame su questa riga" - -#: gitk:2782 -msgid "" -"\n" -"Gitk - a commit viewer for git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Use and redistribute under the terms of the GNU General Public License" -msgstr "" -"\n" -"Gitk - un visualizzatore di revisioni per git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Utilizzo e redistribuzione permessi sotto i termini della GNU General Public " -"License" - -#: gitk:2790 gitk:2854 gitk:9230 -msgid "Close" -msgstr "Chiudi" - -#: gitk:2811 -msgid "Gitk key bindings" -msgstr "Scorciatoie da tastiera di Gitk" - -#: gitk:2814 -msgid "Gitk key bindings:" -msgstr "Scorciatoie da tastiera di Gitk:" - -#: gitk:2816 -#, tcl-format -msgid "<%s-Q>\t\tQuit" -msgstr "<%s-Q>\t\tEsci" - -#: gitk:2817 -msgid "<Home>\t\tMove to first commit" -msgstr "<Home>\t\tVai alla prima revisione" - -#: gitk:2818 -msgid "<End>\t\tMove to last commit" -msgstr "<End>\t\tVai all'ultima revisione" - -#: gitk:2819 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Su>, p, i\tVai più in alto di una revisione" - -#: gitk:2820 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Giù>, n, k\tVai più in basso di una revisione" - -#: gitk:2821 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Sinistra>, z, j\tTorna indietro nella cronologia" - -#: gitk:2822 -msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Destra>, x, l\tVai avanti nella cronologia" - -#: gitk:2823 -msgid "<PageUp>\tMove up one page in commit list" -msgstr "<PaginaSu>\tVai più in alto di una pagina nella lista delle revisioni" - -#: gitk:2824 -msgid "<PageDown>\tMove down one page in commit list" -msgstr "" -"<PaginaGiù>\tVai più in basso di una pagina nella lista delle revisioni" - -#: gitk:2825 -#, tcl-format -msgid "<%s-Home>\tScroll to top of commit list" -msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni" - -#: gitk:2826 -#, tcl-format -msgid "<%s-End>\tScroll to bottom of commit list" -msgstr "<%s-End>\tScorri alla fine della lista delle revisioni" - -#: gitk:2827 -#, tcl-format -msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Su>\tScorri la lista delle revisioni in alto di una riga" - -#: gitk:2828 -#, tcl-format -msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Giù>\tScorri la lista delle revisioni in basso di una riga" - -#: gitk:2829 -#, tcl-format -msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PaginaSu>\tScorri la lista delle revisioni in alto di una pagina" - -#: gitk:2830 -#, tcl-format -msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PaginaGiù>\tScorri la lista delle revisioni in basso di una pagina" - -#: gitk:2831 -msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "<Shift-Su>\tTrova all'indietro (verso l'alto, revisioni successive)" - -#: gitk:2832 -msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Shift-Giù>\tTrova in avanti (verso il basso, revisioni precedenti)" - -#: gitk:2833 -msgid "<Delete>, b\tScroll diff view up one page" -msgstr "<Delete>, b\tScorri la vista delle differenze in alto di una pagina" - -#: gitk:2834 -msgid "<Backspace>\tScroll diff view up one page" -msgstr "<Backspace>\tScorri la vista delle differenze in alto di una pagina" - -#: gitk:2835 -msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Spazio>\t\tScorri la vista delle differenze in basso di una pagina" - -#: gitk:2836 -msgid "u\t\tScroll diff view up 18 lines" -msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee" - -#: gitk:2837 -msgid "d\t\tScroll diff view down 18 lines" -msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee" - -#: gitk:2838 -#, tcl-format -msgid "<%s-F>\t\tFind" -msgstr "<%s-F>\t\tTrova" - -#: gitk:2839 -#, tcl-format -msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\tTrova in avanti" - -#: gitk:2840 -msgid "<Return>\tMove to next find hit" -msgstr "<Invio>\tTrova in avanti" - -#: gitk:2841 -msgid "/\t\tFocus the search box" -msgstr "/\t\tCursore nel box di ricerca" - -#: gitk:2842 -msgid "?\t\tMove to previous find hit" -msgstr "?\t\tTrova all'indietro" - -#: gitk:2843 -msgid "f\t\tScroll diff view to next file" -msgstr "f\t\tScorri la vista delle differenze al file successivo" - -#: gitk:2844 -#, tcl-format -msgid "<%s-S>\t\tSearch for next hit in diff view" -msgstr "<%s-S>\t\tCerca in avanti nella vista delle differenze" - -#: gitk:2845 -#, tcl-format -msgid "<%s-R>\t\tSearch for previous hit in diff view" -msgstr "<%s-R>\t\tCerca all'indietro nella vista delle differenze" - -#: gitk:2846 -#, tcl-format -msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-KP+>\tAumenta dimensione carattere" - -#: gitk:2847 -#, tcl-format -msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-più>\tAumenta dimensione carattere" - -#: gitk:2848 -#, tcl-format -msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-KP->\tDiminuisci dimensione carattere" - -#: gitk:2849 -#, tcl-format -msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-meno>\tDiminuisci dimensione carattere" - -#: gitk:2850 -msgid "<F5>\t\tUpdate" -msgstr "<F5>\t\tAggiorna" - -#: gitk:3305 gitk:3314 -#, tcl-format -msgid "Error creating temporary directory %s:" -msgstr "Errore durante la creazione della directory temporanea %s:" - -#: gitk:3327 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Errore nella lettura di \"%s\" da %s:" - -#: gitk:3390 -msgid "command failed:" -msgstr "impossibile eseguire il comando:" - -#: gitk:3539 -msgid "No such commit" -msgstr "Revisione inesistente" - -#: gitk:3553 -msgid "git gui blame: command failed:" -msgstr "git gui blame: impossibile eseguire il comando:" - -#: gitk:3584 -#, tcl-format -msgid "Couldn't read merge head: %s" -msgstr "Impossibile leggere merge head: %s" - -#: gitk:3592 -#, tcl-format -msgid "Error reading index: %s" -msgstr "Errore nella lettura dell'indice: %s" - -#: gitk:3617 -#, tcl-format -msgid "Couldn't start git blame: %s" -msgstr "Impossibile eseguire git blame: %s" - -#: gitk:3620 gitk:6409 -msgid "Searching" -msgstr "Ricerca in corso" - -#: gitk:3652 -#, tcl-format -msgid "Error running git blame: %s" -msgstr "Errore nell'esecuzione di git blame: %s" - -#: gitk:3680 -#, tcl-format -msgid "That line comes from commit %s, which is not in this view" -msgstr "Quella riga proviene dalla revisione %s, non presente in questa vista" - -#: gitk:3694 -msgid "External diff viewer failed:" -msgstr "Impossibile eseguire il visualizzatore di differenze:" - -#: gitk:3812 -msgid "Gitk view definition" -msgstr "Scelta vista Gitk" - -#: gitk:3816 -msgid "Remember this view" -msgstr "Ricorda questa vista" - -#: gitk:3817 -msgid "References (space separated list):" -msgstr "Riferimenti (lista di elementi separati da spazi)" - -#: gitk:3818 -msgid "Branches & tags:" -msgstr "Rami ed etichette" - -#: gitk:3819 -msgid "All refs" -msgstr "Tutti i riferimenti" - -#: gitk:3820 -msgid "All (local) branches" -msgstr "Tutti i rami (locali)" - -#: gitk:3821 -msgid "All tags" -msgstr "Tutte le etichette" - -#: gitk:3822 -msgid "All remote-tracking branches" -msgstr "Tutti i rami remoti" - -#: gitk:3823 -msgid "Commit Info (regular expressions):" -msgstr "Informazioni sulla revisione (espressioni regolari):" - -#: gitk:3824 -msgid "Author:" -msgstr "Autore:" - -#: gitk:3825 -msgid "Committer:" -msgstr "Revisione creata da:" - -#: gitk:3826 -msgid "Commit Message:" -msgstr "Messaggio di revisione:" - -#: gitk:3827 -msgid "Matches all Commit Info criteria" -msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" - -#: gitk:3828 -msgid "Changes to Files:" -msgstr "Modifiche ai file:" - -#: gitk:3829 -msgid "Fixed String" -msgstr "Stringa fissa" - -#: gitk:3830 -msgid "Regular Expression" -msgstr "Espressione regolare" - -#: gitk:3831 -msgid "Search string:" -msgstr "Cerca stringa:" - -#: gitk:3832 -msgid "" -"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" -msgstr "" -"Date di revisione (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " -"2009 15:27:38\"):" - -#: gitk:3833 -msgid "Since:" -msgstr "Da:" - -#: gitk:3834 -msgid "Until:" -msgstr "A:" - -#: gitk:3835 -msgid "Limit and/or skip a number of revisions (positive integer):" -msgstr "Limita e/o salta N revisioni (intero positivo):" - -#: gitk:3836 -msgid "Number to show:" -msgstr "Numero di revisioni da mostrare:" - -#: gitk:3837 -msgid "Number to skip:" -msgstr "Numero di revisioni da saltare:" - -#: gitk:3838 -msgid "Miscellaneous options:" -msgstr "Altre opzioni:" - -#: gitk:3839 -msgid "Strictly sort by date" -msgstr "Ordina solo per data" - -#: gitk:3840 -msgid "Mark branch sides" -msgstr "Segna i lati del ramo" - -#: gitk:3841 -msgid "Limit to first parent" -msgstr "Limita al primo genitore" - -#: gitk:3842 -msgid "Simple history" -msgstr "Cronologia semplificata" - -#: gitk:3843 -msgid "Additional arguments to git log:" -msgstr "Ulteriori argomenti da passare a git log:" - -#: gitk:3844 -msgid "Enter files and directories to include, one per line:" -msgstr "Inserire file e directory da includere, uno per riga:" - -#: gitk:3845 -msgid "Command to generate more commits to include:" -msgstr "Comando che genera altre revisioni da visualizzare:" - -#: gitk:3967 -msgid "Gitk: edit view" -msgstr "Gitk: modifica vista" - -#: gitk:3975 -msgid "-- criteria for selecting revisions" -msgstr "-- criteri per la scelta delle revisioni" - -#: gitk:3980 -msgid "View Name" -msgstr "Nome vista" - -#: gitk:4055 -msgid "Apply (F5)" -msgstr "Applica (F5)" - -#: gitk:4093 -msgid "Error in commit selection arguments:" -msgstr "Errore negli argomenti di selezione delle revisioni:" - -#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535 -msgid "None" -msgstr "Nessuno" - -#: gitk:4594 gitk:6441 gitk:8287 gitk:8302 -msgid "Date" -msgstr "Data" - -#: gitk:4594 gitk:6441 -msgid "CDate" -msgstr "" - -#: gitk:4743 gitk:4748 -msgid "Descendant" -msgstr "Discendente" - -#: gitk:4744 -msgid "Not descendant" -msgstr "Non discendente" - -#: gitk:4751 gitk:4756 -msgid "Ancestor" -msgstr "Ascendente" - -#: gitk:4752 -msgid "Not ancestor" -msgstr "Non ascendente" - -#: gitk:5042 -msgid "Local changes checked in to index but not committed" -msgstr "Modifiche locali presenti nell'indice ma non nell'archivio" - -#: gitk:5078 -msgid "Local uncommitted changes, not checked in to index" -msgstr "Modifiche locali non presenti né nell'archivio né nell'indice" - -#: gitk:6759 -msgid "many" -msgstr "molti" - -#: gitk:6942 -msgid "Tags:" -msgstr "Etichette:" - -#: gitk:6959 gitk:6965 gitk:8280 -msgid "Parent" -msgstr "Genitore" - -#: gitk:6970 -msgid "Child" -msgstr "Figlio" - -#: gitk:6979 -msgid "Branch" -msgstr "Ramo" - -#: gitk:6982 -msgid "Follows" -msgstr "Segue" - -#: gitk:6985 -msgid "Precedes" -msgstr "Precede" - -#: gitk:7522 -#, tcl-format -msgid "Error getting diffs: %s" -msgstr "Errore nella lettura delle differenze:" - -#: gitk:8108 -msgid "Goto:" -msgstr "Vai a:" - -#: gitk:8129 -#, tcl-format -msgid "Short SHA1 id %s is ambiguous" -msgstr "La SHA1 id abbreviata %s è ambigua" - -#: gitk:8136 -#, tcl-format -msgid "Revision %s is not known" -msgstr "La revisione %s è sconosciuta" - -#: gitk:8146 -#, tcl-format -msgid "SHA1 id %s is not known" -msgstr "La SHA1 id %s è sconosciuta" - -#: gitk:8148 -#, tcl-format -msgid "Revision %s is not in the current view" -msgstr "La revisione %s non è presente nella vista attuale" - -#: gitk:8290 -msgid "Children" -msgstr "Figli" - -#: gitk:8348 -#, tcl-format -msgid "Reset %s branch to here" -msgstr "Aggiorna il ramo %s a questa revisione" - -#: gitk:8350 -msgid "Detached head: can't reset" -msgstr "Nessun ramo attivo: reset impossibile" - -#: gitk:8459 gitk:8465 -msgid "Skipping merge commit " -msgstr "Salto la revisione di fusione " - -#: gitk:8474 gitk:8479 -msgid "Error getting patch ID for " -msgstr "Errore nella identificazione della patch per " - -#: gitk:8475 gitk:8480 -msgid " - stopping\n" -msgstr " - fine\n" - -#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519 -msgid "Commit " -msgstr "La revisione " - -#: gitk:8489 -msgid "" -" is the same patch as\n" -" " -msgstr "" -" ha le stesse differenze di\n" -" " - -#: gitk:8497 -msgid "" -" differs from\n" -" " -msgstr "" -" è diversa da\n" -" " - -#: gitk:8499 -msgid "" -"Diff of commits:\n" -"\n" -msgstr "" -"Differenze tra le revisioni:\n" -"\n" - -#: gitk:8511 gitk:8520 -#, tcl-format -msgid " has %s children - stopping\n" -msgstr " ha %s figli - fine\n" - -#: gitk:8539 -#, tcl-format -msgid "Error writing commit to file: %s" -msgstr "Errore nella scrittura della revisione nel file: %s" - -#: gitk:8545 -#, tcl-format -msgid "Error diffing commits: %s" -msgstr "Errore nelle differenze tra le revisioni: %s" - -#: gitk:8575 -msgid "Top" -msgstr "Inizio" - -#: gitk:8576 -msgid "From" -msgstr "Da" - -#: gitk:8581 -msgid "To" -msgstr "A" - -#: gitk:8605 -msgid "Generate patch" -msgstr "Genera patch" - -#: gitk:8607 -msgid "From:" -msgstr "Da:" - -#: gitk:8616 -msgid "To:" -msgstr "A:" - -#: gitk:8625 -msgid "Reverse" -msgstr "Inverti" - -#: gitk:8627 gitk:8822 -msgid "Output file:" -msgstr "Scrivi sul file:" - -#: gitk:8633 -msgid "Generate" -msgstr "Genera" - -#: gitk:8671 -msgid "Error creating patch:" -msgstr "Errore nella creazione della patch:" - -#: gitk:8694 gitk:8810 gitk:8867 -msgid "ID:" -msgstr "ID:" - -#: gitk:8703 -msgid "Tag name:" -msgstr "Nome etichetta:" - -#: gitk:8706 -msgid "Tag message is optional" -msgstr "Il messaggio dell'etichetta è opzionale" - -#: gitk:8708 -msgid "Tag message:" -msgstr "Messaggio dell'etichetta:" - -#: gitk:8712 gitk:8876 -msgid "Create" -msgstr "Crea" - -#: gitk:8730 -msgid "No tag name specified" -msgstr "Nessuna etichetta specificata" - -#: gitk:8734 -#, tcl-format -msgid "Tag \"%s\" already exists" -msgstr "L'etichetta \"%s\" esiste già" - -#: gitk:8744 -msgid "Error creating tag:" -msgstr "Errore nella creazione dell'etichetta:" - -#: gitk:8819 -msgid "Command:" -msgstr "Comando:" - -#: gitk:8827 -msgid "Write" -msgstr "Scrivi" - -#: gitk:8845 -msgid "Error writing commit:" -msgstr "Errore nella scrittura della revisione:" - -#: gitk:8872 -msgid "Name:" -msgstr "Nome:" - -#: gitk:8895 -msgid "Please specify a name for the new branch" -msgstr "Specificare un nome per il nuovo ramo" - -#: gitk:8900 -#, tcl-format -msgid "Branch '%s' already exists. Overwrite?" -msgstr "Il ramo '%s' esiste già. Sovrascrivere?" - -#: gitk:8966 -#, tcl-format -msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?" - -#: gitk:8971 -msgid "Cherry-picking" -msgstr "" - -#: gitk:8980 -#, tcl-format -msgid "" -"Cherry-pick failed because of local changes to file '%s'.\n" -"Please commit, reset or stash your changes and try again." -msgstr "" -"Impossibile eseguire cherry-pick perché il file '%s' è stato modificato " -"nella directory di lavoro.\n" -"Prima di riprovare, bisogna creare una nuova revisione, annullare le " -"modifiche o usare 'git stash'." - -#: gitk:8986 -msgid "" -"Cherry-pick failed because of merge conflict.\n" -"Do you wish to run git citool to resolve it?" -msgstr "" -"Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n" -"Vuoi avviare git citool per risolverlo?" - -#: gitk:9002 -msgid "No changes committed" -msgstr "Nessuna modifica archiviata" - -#: gitk:9028 -msgid "Confirm reset" -msgstr "Conferma git reset" - -#: gitk:9030 -#, tcl-format -msgid "Reset branch %s to %s?" -msgstr "Aggiornare il ramo %s a %s?" - -#: gitk:9032 -msgid "Reset type:" -msgstr "Tipo di aggiornamento:" - -#: gitk:9035 -msgid "Soft: Leave working tree and index untouched" -msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono" - -#: gitk:9038 -msgid "Mixed: Leave working tree untouched, reset index" -msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice" - -#: gitk:9041 -msgid "" -"Hard: Reset working tree and index\n" -"(discard ALL local changes)" -msgstr "" -"Hard: Aggiorna la directory di lavoro e l'indice\n" -"(abbandona TUTTE le modifiche locali)" - -#: gitk:9058 -msgid "Resetting" -msgstr "git reset in corso" - -#: gitk:9118 -msgid "Checking out" -msgstr "Attivazione in corso" - -#: gitk:9171 -msgid "Cannot delete the currently checked-out branch" -msgstr "Impossibile cancellare il ramo attualmente attivo" - -#: gitk:9177 -#, tcl-format -msgid "" -"The commits on branch %s aren't on any other branch.\n" -"Really delete branch %s?" -msgstr "" -"Le revisioni nel ramo %s non sono presenti su altri rami.\n" -"Cancellare il ramo %s?" - -#: gitk:9208 -#, tcl-format -msgid "Tags and heads: %s" -msgstr "Etichette e rami: %s" - -#: gitk:9223 -msgid "Filter" -msgstr "Filtro" - -#: gitk:9518 -msgid "" -"Error reading commit topology information; branch and preceding/following " -"tag information will be incomplete." -msgstr "" -"Errore nella lettura della topologia delle revisioni: le informazioni sul " -"ramo e le etichette precedenti e seguenti saranno incomplete." - -#: gitk:10504 -msgid "Tag" -msgstr "Etichetta" - -#: gitk:10504 -msgid "Id" -msgstr "Id" - -#: gitk:10554 -msgid "Gitk font chooser" -msgstr "Scelta caratteri gitk" - -#: gitk:10571 -msgid "B" -msgstr "B" - -#: gitk:10574 -msgid "I" -msgstr "I" - -#: gitk:10692 -msgid "Gitk preferences" -msgstr "Preferenze gitk" - -#: gitk:10694 -msgid "Commit list display options" -msgstr "Opzioni visualizzazione dell'elenco revisioni" - -#: gitk:10697 -msgid "Maximum graph width (lines)" -msgstr "Larghezza massima del grafico (in linee)" - -#: gitk:10700 -#, tcl-format -msgid "Maximum graph width (% of pane)" -msgstr "Larghezza massima del grafico (% del pannello)" - -#: gitk:10703 -msgid "Show local changes" -msgstr "Mostra modifiche locali" - -#: gitk:10706 -msgid "Auto-select SHA1" -msgstr "Seleziona automaticamente SHA1 hash" - -#: gitk:10709 -msgid "Hide remote refs" -msgstr "Nascondi i riferimenti remoti" - -#: gitk:10713 -msgid "Diff display options" -msgstr "Opzioni di visualizzazione delle differenze" - -#: gitk:10715 -msgid "Tab spacing" -msgstr "Spaziatura tabulazioni" - -#: gitk:10718 -msgid "Display nearby tags" -msgstr "Mostra etichette vicine" - -#: gitk:10721 -msgid "Limit diffs to listed paths" -msgstr "Limita le differenze ai percorsi elencati" - -#: gitk:10724 -msgid "Support per-file encodings" -msgstr "Attiva codifica file per file" - -#: gitk:10730 gitk:10819 -msgid "External diff tool" -msgstr "Visualizzatore di differenze" - -#: gitk:10731 -msgid "Choose..." -msgstr "Scegli..." - -#: gitk:10736 -msgid "General options" -msgstr "Opzioni generali" - -#: gitk:10739 -msgid "Use themed widgets" -msgstr "Utilizza interfaccia a tema" - -#: gitk:10741 -msgid "(change requires restart)" -msgstr "(una modifica richiede il riavvio)" - -#: gitk:10743 -msgid "(currently unavailable)" -msgstr "(momentaneamente non disponibile)" - -#: gitk:10747 -msgid "Colors: press to choose" -msgstr "Colori: premere per scegliere" - -#: gitk:10750 -msgid "Interface" -msgstr "Interfaccia" - -#: gitk:10751 -msgid "interface" -msgstr "interfaccia" - -#: gitk:10754 -msgid "Background" -msgstr "Sfondo" - -#: gitk:10755 gitk:10785 -msgid "background" -msgstr "sfondo" - -#: gitk:10758 -msgid "Foreground" -msgstr "Primo piano" - -#: gitk:10759 -msgid "foreground" -msgstr "primo piano" - -#: gitk:10762 -msgid "Diff: old lines" -msgstr "Diff: vecchie linee" - -#: gitk:10763 -msgid "diff old lines" -msgstr "vecchie linee" - -#: gitk:10767 -msgid "Diff: new lines" -msgstr "Diff: nuove linee" - -#: gitk:10768 -msgid "diff new lines" -msgstr "nuove linee" - -#: gitk:10772 -msgid "Diff: hunk header" -msgstr "Diff: intestazione della sezione" - -#: gitk:10774 -msgid "diff hunk header" -msgstr "intestazione della sezione" - -#: gitk:10778 -msgid "Marked line bg" -msgstr "Sfondo riga selezionata" - -#: gitk:10780 -msgid "marked line background" -msgstr "sfondo riga selezionata" - -#: gitk:10784 -msgid "Select bg" -msgstr "Sfondo" - -#: gitk:10788 -msgid "Fonts: press to choose" -msgstr "Carattere: premere per scegliere" - -#: gitk:10790 -msgid "Main font" -msgstr "Carattere principale" - -#: gitk:10791 -msgid "Diff display font" -msgstr "Carattere per differenze" - -#: gitk:10792 -msgid "User interface font" -msgstr "Carattere per interfaccia utente" - -#: gitk:10829 -#, tcl-format -msgid "Gitk: choose color for %s" -msgstr "Gitk: scegliere un colore per %s" - -#: gitk:11433 -msgid "Cannot find a git repository here." -msgstr "Archivio git non trovato." - -#: gitk:11437 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Directory git \"%s\" non trovata." - -#: gitk:11484 -#, tcl-format -msgid "Ambiguous argument '%s': both revision and filename" -msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file" - -#: gitk:11496 -msgid "Bad arguments to gitk:" -msgstr "Gitk: argomenti errati:" - -#: gitk:11587 -msgid "Command line" -msgstr "Linea di comando" diff --git a/po/ja.po b/po/ja.po deleted file mode 100644 index 4f47051..0000000 --- a/po/ja.po +++ /dev/null @@ -1,1255 +0,0 @@ -# Japanese translations for gitk package. -# Copyright (C) 2005-2009 Paul Mackerras -# This file is distributed under the same license as the gitk package. -# -# Mizar <mizar.jp@gmail.com>, 2009. -# Junio C Hamano <gitster@pobox.com>, 2009. -msgid "" -msgstr "" -"Project-Id-Version: gitk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-04 00:08+0900\n" -"PO-Revision-Date: 2009-11-06 01:45+0900\n" -"Last-Translator: Mizar <mizar.jp@gmail.com>\n" -"Language-Team: Japanese\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: gitk:113 -msgid "Couldn't get list of unmerged files:" -msgstr "マージされていないファイルのリストを取得できません:" - -#: gitk:269 -msgid "Error parsing revisions:" -msgstr "リビジョン解析エラー:" - -#: gitk:324 -msgid "Error executing --argscmd command:" -msgstr "--argscmd コマンド実行エラー:" - -#: gitk:337 -msgid "No files selected: --merge specified but no files are unmerged." -msgstr "" -"ファイル未選択: --merge が指定されましたが、マージされていないファイルはあり" -"ません。" - -#: gitk:340 -msgid "" -"No files selected: --merge specified but no unmerged files are within file " -"limit." -msgstr "" -"ファイル未選択: --merge が指定されましたが、ファイル制限内にマージされていな" -"いファイルはありません。" - -#: gitk:362 gitk:509 -msgid "Error executing git log:" -msgstr "git log 実行エラー:" - -#: gitk:380 gitk:525 -msgid "Reading" -msgstr "読み込み中" - -#: gitk:440 gitk:4132 -msgid "Reading commits..." -msgstr "コミット読み込み中..." - -#: gitk:443 gitk:1561 gitk:4135 -msgid "No commits selected" -msgstr "コミットが選択されていません" - -#: gitk:1437 -msgid "Can't parse git log output:" -msgstr "git log の出力を解析できません:" - -#: gitk:1657 -msgid "No commit information available" -msgstr "有効なコミットの情報がありません" - -#: gitk:1790 -msgid "mc" -msgstr "mc" - -#: gitk:1817 gitk:3925 gitk:8842 gitk:10378 gitk:10558 -msgid "OK" -msgstr "OK" - -#: gitk:1819 gitk:3927 gitk:8439 gitk:8513 gitk:8623 gitk:8672 gitk:8844 -#: gitk:10379 gitk:10559 -msgid "Cancel" -msgstr "キャンセル" - -#: gitk:1919 -msgid "Update" -msgstr "更新" - -#: gitk:1920 -msgid "Reload" -msgstr "リロード" - -#: gitk:1921 -msgid "Reread references" -msgstr "リファレンスを再読み込み" - -#: gitk:1922 -msgid "List references" -msgstr "リファレンスリストを表示" - -#: gitk:1924 -msgid "Start git gui" -msgstr "git gui の開始" - -#: gitk:1926 -msgid "Quit" -msgstr "終了" - -#: gitk:1918 -msgid "File" -msgstr "ファイル" - -#: gitk:1930 -msgid "Preferences" -msgstr "設定" - -#: gitk:1929 -msgid "Edit" -msgstr "編集" - -#: gitk:1934 -msgid "New view..." -msgstr "新規ビュー..." - -#: gitk:1935 -msgid "Edit view..." -msgstr "ビュー編集..." - -#: gitk:1936 -msgid "Delete view" -msgstr "ビュー削除" - -#: gitk:1938 -msgid "All files" -msgstr "全てのファイル" - -#: gitk:1933 gitk:3679 -msgid "View" -msgstr "ビュー" - -#: gitk:1943 gitk:1953 gitk:2656 -msgid "About gitk" -msgstr "gitk について" - -#: gitk:1944 gitk:1958 -msgid "Key bindings" -msgstr "キーバインディング" - -#: gitk:1942 gitk:1957 -msgid "Help" -msgstr "ヘルプ" - -#: gitk:2018 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " - -#: gitk:2049 -msgid "Row" -msgstr "行" - -#: gitk:2080 -msgid "Find" -msgstr "検索" - -#: gitk:2081 -msgid "next" -msgstr "次" - -#: gitk:2082 -msgid "prev" -msgstr "前" - -#: gitk:2083 -msgid "commit" -msgstr "コミット" - -#: gitk:2086 gitk:2088 gitk:4293 gitk:4316 gitk:4340 gitk:6281 gitk:6353 -#: gitk:6437 -msgid "containing:" -msgstr "含む:" - -#: gitk:2089 gitk:3164 gitk:3169 gitk:4368 -msgid "touching paths:" -msgstr "パスの一部:" - -#: gitk:2090 gitk:4373 -msgid "adding/removing string:" -msgstr "追加/除去する文字列:" - -#: gitk:2099 gitk:2101 -msgid "Exact" -msgstr "英字の大小を区別する" - -#: gitk:2101 gitk:4448 gitk:6249 -msgid "IgnCase" -msgstr "英字の大小を区別しない" - -#: gitk:2101 gitk:4342 gitk:4446 gitk:6245 -msgid "Regexp" -msgstr "正規表現" - -#: gitk:2103 gitk:2104 gitk:4467 gitk:4497 gitk:4504 gitk:6373 gitk:6441 -msgid "All fields" -msgstr "全ての項目" - -#: gitk:2104 gitk:4465 gitk:4497 gitk:6312 -msgid "Headline" -msgstr "ヘッドライン" - -#: gitk:2105 gitk:4465 gitk:6312 gitk:6441 gitk:6875 -msgid "Comments" -msgstr "コメント" - -#: gitk:2105 gitk:4465 gitk:4469 gitk:4504 gitk:6312 gitk:6810 gitk:8091 -#: gitk:8106 -msgid "Author" -msgstr "作者" - -#: gitk:2105 gitk:4465 gitk:6312 gitk:6812 -msgid "Committer" -msgstr "コミット者" - -#: gitk:2134 -msgid "Search" -msgstr "検索" - -#: gitk:2141 -msgid "Diff" -msgstr "Diff" - -#: gitk:2143 -msgid "Old version" -msgstr "旧バージョン" - -#: gitk:2145 -msgid "New version" -msgstr "新バージョン" - -#: gitk:2147 -msgid "Lines of context" -msgstr "文脈行数" - -#: gitk:2157 -msgid "Ignore space change" -msgstr "空白の違いを無視" - -#: gitk:2215 -msgid "Patch" -msgstr "パッチ" - -#: gitk:2217 -msgid "Tree" -msgstr "ツリー" - -#: gitk:2361 gitk:2378 -msgid "Diff this -> selected" -msgstr "これと選択したコミットのdiffを見る" - -#: gitk:2362 gitk:2379 -msgid "Diff selected -> this" -msgstr "選択したコミットとこれのdiffを見る" - -#: gitk:2363 gitk:2380 -msgid "Make patch" -msgstr "パッチ作成" - -#: gitk:2364 gitk:8497 -msgid "Create tag" -msgstr "タグ生成" - -#: gitk:2365 gitk:8603 -msgid "Write commit to file" -msgstr "コミットをファイルに書き出す" - -#: gitk:2366 gitk:8660 -msgid "Create new branch" -msgstr "新規ブランチ生成" - -#: gitk:2367 -msgid "Cherry-pick this commit" -msgstr "このコミットをチェリーピックする" - -#: gitk:2368 -msgid "Reset HEAD branch to here" -msgstr "ブランチのHEADをここにリセットする" - -#: gitk:2369 -msgid "Mark this commit" -msgstr "このコミットにマークをつける" - -#: gitk:2370 -msgid "Return to mark" -msgstr "マークを付けた所に戻る" - -#: gitk:2371 -msgid "Find descendant of this and mark" -msgstr "これとマークをつけた所との子孫を見つける" - -#: gitk:2372 -msgid "Compare with marked commit" -msgstr "マークを付けたコミットと比較する" - -#: gitk:2386 -msgid "Check out this branch" -msgstr "このブランチをチェックアウトする" - -#: gitk:2387 -msgid "Remove this branch" -msgstr "このブランチを除去する" - -#: gitk:2394 -msgid "Highlight this too" -msgstr "これもハイライトさせる" - -#: gitk:2395 -msgid "Highlight this only" -msgstr "これだけをハイライトさせる" - -#: gitk:2396 -msgid "External diff" -msgstr "外部diffツール" - -#: gitk:2397 -msgid "Blame parent commit" -msgstr "親コミットから blame をかける" - -#: gitk:2404 -msgid "Show origin of this line" -msgstr "この行の出自を表示する" - -#: gitk:2405 -msgid "Run git gui blame on this line" -msgstr "この行に git gui で blame をかける" - -#: gitk:2658 -msgid "" -"\n" -"Gitk - a commit viewer for git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Use and redistribute under the terms of the GNU General Public License" -msgstr "" -"\n" -"Gitk - gitコミットビューア\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"使用および再配布は GNU General Public License に従ってください" - -#: gitk:2666 gitk:2728 gitk:9025 -msgid "Close" -msgstr "閉じる" - -#: gitk:2685 -msgid "Gitk key bindings" -msgstr "Gitk キーバインディング" - -#: gitk:2688 -msgid "Gitk key bindings:" -msgstr "Gitk キーバインディング:" - -#: gitk:2690 -#, tcl-format -msgid "<%s-Q>\t\tQuit" -msgstr "<%s-Q>\t\t終了" - -#: gitk:2691 -msgid "<Home>\t\tMove to first commit" -msgstr "<Home>\t\t最初のコミットに移動" - -#: gitk:2692 -msgid "<End>\t\tMove to last commit" -msgstr "<End>\t\t最後のコミットに移動" - -#: gitk:2693 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Up>, p, i\t一つ上のコミットに移動" - -#: gitk:2694 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Down>, n, k\t一つ下のコミットに移動" - -#: gitk:2695 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Left>, z, j\t履歴の前に戻る" - -#: gitk:2696 -msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Right>, x, l\t履歴の次へ進む" - -#: gitk:2697 -msgid "<PageUp>\tMove up one page in commit list" -msgstr "<PageUp>\tコミットリストの一つ上のページに移動" - -#: gitk:2698 -msgid "<PageDown>\tMove down one page in commit list" -msgstr "<PageDown>\tコミットリストの一つ下のページに移動" - -#: gitk:2699 -#, tcl-format -msgid "<%s-Home>\tScroll to top of commit list" -msgstr "<%s-Home>\tコミットリストの一番上にスクロールする" - -#: gitk:2700 -#, tcl-format -msgid "<%s-End>\tScroll to bottom of commit list" -msgstr "<%s-End>\tコミットリストの一番下にスクロールする" - -#: gitk:2701 -#, tcl-format -msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Up>\tコミットリストの一つ下の行にスクロールする" - -#: gitk:2702 -#, tcl-format -msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Down>\tコミットリストの一つ下の行にスクロールする" - -#: gitk:2703 -#, tcl-format -msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PageUp>\tコミットリストの上のページにスクロールする" - -#: gitk:2704 -#, tcl-format -msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PageDown>\tコミットリストの下のページにスクロールする" - -#: gitk:2705 -msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "<Shift-Up>\t後方を検索 (上方の・新しいコミット)" - -#: gitk:2706 -msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Shift-Down>\t前方を検索（下方の・古いコミット）" - -#: gitk:2707 -msgid "<Delete>, b\tScroll diff view up one page" -msgstr "<Delete>, b\tdiff画面を上のページにスクロールする" - -#: gitk:2708 -msgid "<Backspace>\tScroll diff view up one page" -msgstr "<Backspace>\tdiff画面を上のページにスクロールする" - -#: gitk:2709 -msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Space>\t\tdiff画面を下のページにスクロールする" - -#: gitk:2710 -msgid "u\t\tScroll diff view up 18 lines" -msgstr "u\t\tdiff画面を上に18行スクロールする" - -#: gitk:2711 -msgid "d\t\tScroll diff view down 18 lines" -msgstr "d\t\tdiff画面を下に18行スクロールする" - -#: gitk:2712 -#, tcl-format -msgid "<%s-F>\t\tFind" -msgstr "<%s-F>\t\t検索" - -#: gitk:2713 -#, tcl-format -msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\t次を検索して移動" - -#: gitk:2714 -msgid "<Return>\tMove to next find hit" -msgstr "<Return>\t次を検索して移動" - -#: gitk:2715 -msgid "/\t\tFocus the search box" -msgstr "/\t\t検索ボックスにフォーカス" - -#: gitk:2716 -msgid "?\t\tMove to previous find hit" -msgstr "?\t\t前を検索して移動" - -#: gitk:2717 -msgid "f\t\tScroll diff view to next file" -msgstr "f\t\t次のファイルにdiff画面をスクロールする" - -#: gitk:2718 -#, tcl-format -msgid "<%s-S>\t\tSearch for next hit in diff view" -msgstr "<%s-S>\t\tdiff画面の次を検索" - -#: gitk:2719 -#, tcl-format -msgid "<%s-R>\t\tSearch for previous hit in diff view" -msgstr "<%s-R>\t\tdiff画面の前を検索" - -#: gitk:2720 -#, tcl-format -msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-KP+>\t文字サイズを拡大" - -#: gitk:2721 -#, tcl-format -msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-plus>\t文字サイズを拡大" - -#: gitk:2722 -#, tcl-format -msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-KP->\t文字サイズを縮小" - -#: gitk:2723 -#, tcl-format -msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-minus>\t文字サイズを縮小" - -#: gitk:2724 -msgid "<F5>\t\tUpdate" -msgstr "<F5>\t\t更新" - -#: gitk:3179 gitk:3188 -#, tcl-format -msgid "Error creating temporary directory %s:" -msgstr "一時ディレクトリ %s 生成時エラー:" - -#: gitk:3201 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "\"%s\" のエラーが %s に発生:" - -#: gitk:3264 -msgid "command failed:" -msgstr "コマンド失敗:" - -#: gitk:3410 -msgid "No such commit" -msgstr "そのようなコミットはありません" - -#: gitk:3424 -msgid "git gui blame: command failed:" -msgstr "git gui blame: コマンド失敗:" - -#: gitk:3455 -#, tcl-format -msgid "Couldn't read merge head: %s" -msgstr "マージする HEAD を読み込めません: %s" - -#: gitk:3463 -#, tcl-format -msgid "Error reading index: %s" -msgstr "インデックス読み込みエラー: %s" - -#: gitk:3488 -#, tcl-format -msgid "Couldn't start git blame: %s" -msgstr "git blame を始められません: %s" - -#: gitk:3491 gitk:6280 -msgid "Searching" -msgstr "検索中" - -#: gitk:3523 -#, tcl-format -msgid "Error running git blame: %s" -msgstr "git blame 実行エラー: %s" - -#: gitk:3551 -#, tcl-format -msgid "That line comes from commit %s, which is not in this view" -msgstr "コミット %s に由来するその行は、このビューに表示されていません" - -#: gitk:3565 -msgid "External diff viewer failed:" -msgstr "外部diffビューアが失敗:" - -#: gitk:3683 -msgid "Gitk view definition" -msgstr "Gitk ビュー定義" - -#: gitk:3687 -msgid "Remember this view" -msgstr "このビューを記憶する" - -#: gitk:3688 -msgid "References (space separated list):" -msgstr "リファレンス（スペース区切りのリスト）:" - -#: gitk:3689 -msgid "Branches & tags:" -msgstr "ブランチ＆タグ:" - -#: gitk:3690 -msgid "All refs" -msgstr "全てのリファレンス" - -#: gitk:3691 -msgid "All (local) branches" -msgstr "全ての（ローカルな）ブランチ" - -#: gitk:3692 -msgid "All tags" -msgstr "全てのタグ" - -#: gitk:3693 -msgid "All remote-tracking branches" -msgstr "全てのリモート追跡ブランチ" - -#: gitk:3694 -msgid "Commit Info (regular expressions):" -msgstr "コミット情報（正規表現）:" - -#: gitk:3695 -msgid "Author:" -msgstr "作者:" - -#: gitk:3696 -msgid "Committer:" -msgstr "コミット者:" - -#: gitk:3697 -msgid "Commit Message:" -msgstr "コミットメッセージ:" - -#: gitk:3698 -msgid "Matches all Commit Info criteria" -msgstr "コミット情報の全ての条件に一致" - -#: gitk:3699 -msgid "Changes to Files:" -msgstr "変更したファイル:" - -#: gitk:3700 -msgid "Fixed String" -msgstr "固定文字列" - -#: gitk:3701 -msgid "Regular Expression" -msgstr "正規表現" - -#: gitk:3702 -msgid "Search string:" -msgstr "検索文字列:" - -#: gitk:3703 -msgid "" -"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" -msgstr "" -"コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" - -#: gitk:3704 -msgid "Since:" -msgstr "期間の始め:" - -#: gitk:3705 -msgid "Until:" -msgstr "期間の終わり:" - -#: gitk:3706 -msgid "Limit and/or skip a number of revisions (positive integer):" -msgstr "制限・省略するリビジョンの数（正の整数）:" - -#: gitk:3707 -msgid "Number to show:" -msgstr "表示する数:" - -#: gitk:3708 -msgid "Number to skip:" -msgstr "省略する数:" - -#: gitk:3709 -msgid "Miscellaneous options:" -msgstr "その他のオプション:" - -#: gitk:3710 -msgid "Strictly sort by date" -msgstr "厳密に日付順で並び替え" - -#: gitk:3711 -msgid "Mark branch sides" -msgstr "側枝マーク" - -#: gitk:3712 -msgid "Limit to first parent" -msgstr "最初の親に制限" - -#: gitk:3713 -msgid "Simple history" -msgstr "簡易な履歴" - -#: gitk:3714 -msgid "Additional arguments to git log:" -msgstr "git log への追加の引数:" - -#: gitk:3715 -msgid "Enter files and directories to include, one per line:" -msgstr "含まれるファイル・ディレクトリを一行ごとに入力:" - -#: gitk:3716 -msgid "Command to generate more commits to include:" -msgstr "コミット追加コマンド:" - -#: gitk:3838 -msgid "Gitk: edit view" -msgstr "Gitk: ビュー編集" - -#: gitk:3846 -msgid "-- criteria for selecting revisions" -msgstr "― リビジョンの選択条件" - -#: gitk:3851 -msgid "View Name:" -msgstr "ビュー名:" - -#: gitk:3926 -msgid "Apply (F5)" -msgstr "適用 (F5)" - -#: gitk:3964 -msgid "Error in commit selection arguments:" -msgstr "コミット選択引数のエラー:" - -#: gitk:4017 gitk:4069 gitk:4517 gitk:4531 gitk:5792 gitk:11263 gitk:11264 -msgid "None" -msgstr "無し" - -#: gitk:4465 gitk:6312 gitk:8093 gitk:8108 -msgid "Date" -msgstr "日付" - -#: gitk:4465 gitk:6312 -msgid "CDate" -msgstr "作成日" - -#: gitk:4614 gitk:4619 -msgid "Descendant" -msgstr "子孫" - -#: gitk:4615 -msgid "Not descendant" -msgstr "非子孫" - -#: gitk:4622 gitk:4627 -msgid "Ancestor" -msgstr "祖先" - -#: gitk:4623 -msgid "Not ancestor" -msgstr "非祖先" - -#: gitk:4913 -msgid "Local changes checked in to index but not committed" -msgstr "ステージされた、コミット前のローカルな変更" - -#: gitk:4949 -msgid "Local uncommitted changes, not checked in to index" -msgstr "ステージされていない、コミット前のローカルな変更" - -#: gitk:6630 -msgid "many" -msgstr "多数" - -#: gitk:6814 -msgid "Tags:" -msgstr "タグ:" - -#: gitk:6831 gitk:6837 gitk:8086 -msgid "Parent" -msgstr "親" - -#: gitk:6842 -msgid "Child" -msgstr "子" - -#: gitk:6851 -msgid "Branch" -msgstr "ブランチ" - -#: gitk:6854 -msgid "Follows" -msgstr "下位" - -#: gitk:6857 -msgid "Precedes" -msgstr "上位" - -#: gitk:7359 -#, tcl-format -msgid "Error getting diffs: %s" -msgstr "diff取得エラー: %s" - -#: gitk:7914 -msgid "Goto:" -msgstr "Goto:" - -#: gitk:7916 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7935 -#, tcl-format -msgid "Short SHA1 id %s is ambiguous" -msgstr "%s を含む SHA1 ID は複数存在します" - -#: gitk:7942 -#, tcl-format -msgid "Revision %s is not known" -msgstr "リビジョン %s は不明です" - -#: gitk:7952 -#, tcl-format -msgid "SHA1 id %s is not known" -msgstr "SHA1 id %s は不明です" - -#: gitk:7954 -#, tcl-format -msgid "Revision %s is not in the current view" -msgstr "リビジョン %s は現在のビューにはありません" - -#: gitk:8096 -msgid "Children" -msgstr "子" - -#: gitk:8153 -#, tcl-format -msgid "Reset %s branch to here" -msgstr "%s ブランチをここにリセットする" - -#: gitk:8155 -msgid "Detached head: can't reset" -msgstr "切り離されたHEAD: リセットできません" - -#: gitk:8264 gitk:8270 -msgid "Skipping merge commit " -msgstr "コミットマージをスキップ: " - -#: gitk:8279 gitk:8284 -msgid "Error getting patch ID for " -msgstr "パッチ取得エラー: ID " - -#: gitk:8280 gitk:8285 -msgid " - stopping\n" -msgstr " - 停止\n" - -#: gitk:8290 gitk:8293 gitk:8301 gitk:8314 gitk:8323 -msgid "Commit " -msgstr "コミット " - -#: gitk:8294 -msgid "" -" is the same patch as\n" -" " -msgstr "" -" は下記のパッチと同等\n" -" " - -#: gitk:8302 -msgid "" -" differs from\n" -" " -msgstr "" -" 下記からのdiff\n" -" " - -#: gitk:8304 -msgid "" -"Diff of commits:\n" -"\n" -msgstr "" -"コミットのdiff:\n" -"\n" - -#: gitk:8315 gitk:8324 -#, tcl-format -msgid " has %s children - stopping\n" -msgstr " には %s の子があります - 停止\n" - -#: gitk:8344 -#, tcl-format -msgid "Error writing commit to file: %s" -msgstr "ファイルへのコミット書き出しエラー: %s" - -#: gitk:8350 -#, tcl-format -msgid "Error diffing commits: %s" -msgstr "コミットのdiff実行エラー: %s" - -#: gitk:8380 -msgid "Top" -msgstr "Top" - -#: gitk:8381 -msgid "From" -msgstr "From" - -#: gitk:8386 -msgid "To" -msgstr "To" - -#: gitk:8410 -msgid "Generate patch" -msgstr "パッチ生成" - -#: gitk:8412 -msgid "From:" -msgstr "From:" - -#: gitk:8421 -msgid "To:" -msgstr "To:" - -#: gitk:8430 -msgid "Reverse" -msgstr "逆" - -#: gitk:8432 gitk:8617 -msgid "Output file:" -msgstr "出力ファイル:" - -#: gitk:8438 -msgid "Generate" -msgstr "生成" - -#: gitk:8476 -msgid "Error creating patch:" -msgstr "パッチ生成エラー:" - -#: gitk:8499 gitk:8605 gitk:8662 -msgid "ID:" -msgstr "ID:" - -#: gitk:8508 -msgid "Tag name:" -msgstr "タグ名:" - -#: gitk:8512 gitk:8671 -msgid "Create" -msgstr "生成" - -#: gitk:8529 -msgid "No tag name specified" -msgstr "タグの名称が指定されていません" - -#: gitk:8533 -#, tcl-format -msgid "Tag \"%s\" already exists" -msgstr "タグ \"%s\" は既に存在します" - -#: gitk:8539 -msgid "Error creating tag:" -msgstr "タグ生成エラー:" - -#: gitk:8614 -msgid "Command:" -msgstr "コマンド:" - -#: gitk:8622 -msgid "Write" -msgstr "書き出し" - -#: gitk:8640 -msgid "Error writing commit:" -msgstr "コミット書き出しエラー:" - -#: gitk:8667 -msgid "Name:" -msgstr "名前:" - -#: gitk:8690 -msgid "Please specify a name for the new branch" -msgstr "新しいブランチの名前を指定してください" - -#: gitk:8695 -#, tcl-format -msgid "Branch '%s' already exists. Overwrite?" -msgstr "ブランチ '%s' は既に存在します。上書きしますか？" - -#: gitk:8761 -#, tcl-format -msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "" -"コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" - -#: gitk:8766 -msgid "Cherry-picking" -msgstr "チェリーピック中" - -#: gitk:8775 -#, tcl-format -msgid "" -"Cherry-pick failed because of local changes to file '%s'.\n" -"Please commit, reset or stash your changes and try again." -msgstr "" -"ファイル '%s' のローカルな変更のためにチェリーピックは失敗しました。\n" -"あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" -"い。" - -#: gitk:8781 -msgid "" -"Cherry-pick failed because of merge conflict.\n" -"Do you wish to run git citool to resolve it?" -msgstr "" -"マージの衝突によってチェリーピックは失敗しました。\n" -"この解決のために git citool を実行したいですか？" - -#: gitk:8797 -msgid "No changes committed" -msgstr "何の変更もコミットされていません" - -#: gitk:8823 -msgid "Confirm reset" -msgstr "確認を取り消す" - -#: gitk:8825 -#, tcl-format -msgid "Reset branch %s to %s?" -msgstr "ブランチ %s を %s にリセットしますか？" - -#: gitk:8829 -msgid "Reset type:" -msgstr "Reset タイプ:" - -#: gitk:8833 -msgid "Soft: Leave working tree and index untouched" -msgstr "Soft: 作業ツリーもインデックスもそのままにする" - -#: gitk:8836 -msgid "Mixed: Leave working tree untouched, reset index" -msgstr "Mixed: 作業ツリーをそのままにして、インデックスをリセット" - -#: gitk:8839 -msgid "" -"Hard: Reset working tree and index\n" -"(discard ALL local changes)" -msgstr "" -"Hard: 作業ツリーやインデックスをリセット\n" -"（「全ての」ローカルな変更を破棄）" - -#: gitk:8856 -msgid "Resetting" -msgstr "リセット中" - -#: gitk:8913 -msgid "Checking out" -msgstr "チェックアウト" - -#: gitk:8966 -msgid "Cannot delete the currently checked-out branch" -msgstr "現在チェックアウトされているブランチを削除することはできません" - -#: gitk:8972 -#, tcl-format -msgid "" -"The commits on branch %s aren't on any other branch.\n" -"Really delete branch %s?" -msgstr "" -"ブランチ %s には他のブランチに存在しないコミットがあります。\n" -"本当にブランチ %s を削除しますか？" - -#: gitk:9003 -#, tcl-format -msgid "Tags and heads: %s" -msgstr "タグとHEAD: %s" - -#: gitk:9018 -msgid "Filter" -msgstr "フィルター" - -#: gitk:9313 -msgid "" -"Error reading commit topology information; branch and preceding/following " -"tag information will be incomplete." -msgstr "" -"コミット構造情報読み込みエラー; ブランチ及び上位/下位のタグ情報が不完全である" -"ようです。" - -#: gitk:10299 -msgid "Tag" -msgstr "タグ" - -#: gitk:10299 -msgid "Id" -msgstr "ID" - -#: gitk:10347 -msgid "Gitk font chooser" -msgstr "Gitk フォント選択" - -#: gitk:10364 -msgid "B" -msgstr "B" - -#: gitk:10367 -msgid "I" -msgstr "I" - -#: gitk:10463 -msgid "Gitk preferences" -msgstr "Gitk 設定" - -#: gitk:10465 -msgid "Commit list display options" -msgstr "コミットリスト表示オプション" - -#: gitk:10468 -msgid "Maximum graph width (lines)" -msgstr "最大グラフ幅（線の本数）" - -#: gitk:10472 -#, tcl-format -msgid "Maximum graph width (% of pane)" -msgstr "最大グラフ幅（ペインに対する％）" - -#: gitk:10476 -msgid "Show local changes" -msgstr "ローカルな変更を表示" - -#: gitk:10479 -msgid "Auto-select SHA1" -msgstr "SHA1 の自動選択" - -#: gitk:10483 -msgid "Diff display options" -msgstr "diff表示オプション" - -#: gitk:10485 -msgid "Tab spacing" -msgstr "タブ空白幅" - -#: gitk:10488 -msgid "Display nearby tags" -msgstr "近くのタグを表示する" - -#: gitk:10491 -msgid "Hide remote refs" -msgstr "リモートリファレンスを隠す" - -#: gitk:10494 -msgid "Limit diffs to listed paths" -msgstr "diff をリストのパスに制限" - -#: gitk:10497 -msgid "Support per-file encodings" -msgstr "ファイルごとのエンコーディングのサポート" - -#: gitk:10503 gitk:10572 -msgid "External diff tool" -msgstr "外部diffツール" - -#: gitk:10505 -msgid "Choose..." -msgstr "選択..." - -#: gitk:10510 -msgid "Colors: press to choose" -msgstr "色: ボタンを押して選択" - -#: gitk:10513 -msgid "Interface" -msgstr "インターフェイス" - -#: gitk:10514 -msgid "interface" -msgstr "インターフェイス" - -#: gitk:10517 -msgid "Background" -msgstr "背景" - -#: gitk:10518 gitk:10548 -msgid "background" -msgstr "背景" - -#: gitk:10521 -msgid "Foreground" -msgstr "前景" - -#: gitk:10522 -msgid "foreground" -msgstr "前景" - -#: gitk:10525 -msgid "Diff: old lines" -msgstr "Diff: 旧バージョン" - -#: gitk:10526 -msgid "diff old lines" -msgstr "diff 旧バージョン" - -#: gitk:10530 -msgid "Diff: new lines" -msgstr "Diff: 新バージョン" - -#: gitk:10531 -msgid "diff new lines" -msgstr "diff 新バージョン" - -#: gitk:10535 -msgid "Diff: hunk header" -msgstr "Diff: hunkヘッダ" - -#: gitk:10537 -msgid "diff hunk header" -msgstr "diff hunkヘッダ" - -#: gitk:10541 -msgid "Marked line bg" -msgstr "マーク行の背景" - -#: gitk:10543 -msgid "marked line background" -msgstr "マーク行の背景" - -#: gitk:10547 -msgid "Select bg" -msgstr "選択の背景" - -#: gitk:10551 -msgid "Fonts: press to choose" -msgstr "フォント: ボタンを押して選択" - -#: gitk:10553 -msgid "Main font" -msgstr "主フォント" - -#: gitk:10554 -msgid "Diff display font" -msgstr "Diff表示用フォント" - -#: gitk:10555 -msgid "User interface font" -msgstr "UI用フォント" - -#: gitk:10582 -#, tcl-format -msgid "Gitk: choose color for %s" -msgstr "Gitk: 「%s」 の色を選択" - -#: gitk:11168 -msgid "Cannot find a git repository here." -msgstr "ここにはgitリポジトリがありません。" - -#: gitk:11172 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "gitディレクトリ \"%s\" を見つけられません。" - -#: gitk:11219 -#, tcl-format -msgid "Ambiguous argument '%s': both revision and filename" -msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方に解釈できます" - -#: gitk:11231 -msgid "Bad arguments to gitk:" -msgstr "gitkへの不正な引数:" - -#: gitk:11316 -msgid "Command line" -msgstr "コマンド行" 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 c63248e..0000000 --- a/po/po2msg.sh +++ /dev/null @@ -1,133 +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} { - 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} { - puts [concat "$translated_count translated messages, " \ - "$fuzzy_count fuzzy ones, " \ - "$not_translated_count untranslated ones."] -} diff --git a/po/pt_PT.po b/po/pt_PT.po new file mode 100644 index 0000000..a0e9b0c --- /dev/null +++ b/po/pt_PT.po @@ -0,0 +1,3583 @@ +# 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-03-16 20:18+0800\n" +"PO-Revision-Date: 2012-04-01 11:26+0100\n" +"Last-Translator: Marco Sousa <marcomsousa AT gmail.com>\n" +"Language-Team: Portuguese\n" +"Language: pt\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 "dica: %.*s\n" + +#. +#. * 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 "não consigo parsear %s" + +#: commit.c:49 +#, 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 "memoria exausta" + +#: 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 " 0 ficheros modificados\n" + +#: diff.c:1340 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] " %d ficheiro modificado" +msgstr[1] " %d ficheiros modificados" + +#: diff.c:1357 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] ", %d adição(+)" +msgstr[1] ", %d adições(+)" + +#: diff.c:1368 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] ", %d eliminado(-)" +msgstr[1] ", %d eliminados(-)" + +#: 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 "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: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 "Nenhum commit parseado." + +#: 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 "Valor inválido para %s: %s" + +#: 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 " (usa \"git add/rm <ficheiro>...\" para marcar como resolvido)" + +#: wt-status.c:151 +msgid "Changes to be committed:" +msgstr "Mudanças a serem commitadas" + +#: 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 " (usa \"git add <ficheiro>...\" para actualizar o que vai ser commitado)" + +#: wt-status.c:175 +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: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 "%s ficheros:" + +#: 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 "erro" + +#: 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 "novos commits, " + +#: 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 "novo ficheiro: %s" + +#: wt-status.c:269 +#, c-format +msgid "copied: %s -> %s" +msgstr "copiado: %s -> %s" + +#: wt-status.c:272 +#, c-format +msgid "deleted: %s" +msgstr "eliminado: %s" + +#: wt-status.c:275 +#, c-format +msgid "modified: %s" +msgstr "modificado: %s" + +#: wt-status.c:278 +#, c-format +msgid "renamed: %s -> %s" +msgstr "mudado de nome: %s -> %s" + +#: wt-status.c:281 +#, c-format +msgid "typechange: %s" +msgstr "" + +#: wt-status.c:284 +#, c-format +msgid "unknown: %s" +msgstr "desconhecido: %s" + +#: 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 "Na rama" + +#: wt-status.c:720 +msgid "Not currently on any branch." +msgstr "" + +#: wt-status.c:731 +msgid "Initial commit" +msgstr "Commit inicial" + +#: wt-status.c:745 +msgid "Untracked" +msgstr "" + +#: wt-status.c:747 +msgid "Ignored" +msgstr "Ignorado" + +#: 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 "Sem mudanças" + +#: 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 " (usa \"git add\" e/ou \"git commit -a\")" + +#: 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 " (usa \"git add\" para seguir)" + +#: wt-status.c:769 +#: wt-status.c:772 +#: wt-status.c:775 +#, c-format +msgid "nothing to commit%s\n" +msgstr "nada para fazer commit%s\n" + +#: 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 " (directório de trabalho vacio)" + +#: wt-status.c:884 +msgid "HEAD (no branch)" +msgstr "HEAD (Não é rama)" + +#: wt-status.c:890 +msgid "Initial commit on " +msgstr "Commit inicial em " + +#: wt-status.c:905 +msgid "behind " +msgstr "atrás " + +#: wt-status.c:908 +#: wt-status.c:911 +msgid "ahead " +msgstr "a frente " + +#: wt-status.c:913 +msgid ", behind " +msgstr ", atrás " + +#: 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 "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 "" + +#: 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 "nenhum ficheiros adicionado" + +#: 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 "remota" + +#: 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 "(não é rama)" + +#: 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 "%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: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 "HEAD é agora em " + +#: builtin/checkout.c:572 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Reset rama '%s'\n" + +#: builtin/checkout.c:575 +#, c-format +msgid "Already on '%s'\n" +msgstr "Já em '%s'\n" + +#: 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 "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 "" + +#: 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 "juntar" + +#: builtin/commit.c:208 +msgid "cherry-pick" +msgstr "cherry-pick" + +#: 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 "commit inválido: %s" + +#: 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 "%sAutor: %s" + +#: builtin/commit.c:823 +#, c-format +msgid "%sCommitter: %s" +msgstr "%sCommitador: %s" + +#: 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 " (root-commit)" + +#: 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 "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:252 +#, c-format +msgid "object %s not found" +msgstr "" + +#: builtin/fetch.c:258 +msgid "[up to date]" +msgstr "[Actualizada]" + +#: 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 "[rejeitado]" + +#: builtin/fetch.c:284 +msgid "[tag update]" +msgstr "[etiqueta actualizada]" + +#: 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 "[nova etiqueta]" + +#: builtin/fetch.c:302 +msgid "[new branch]" +msgstr "[nova rama]" + +#: builtin/fetch.c:347 +msgid "unable to update local ref" +msgstr "" + +#: builtin/fetch.c:347 +msgid "forced update" +msgstr "actualização forçada" + +#: 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 "Para %.*s\n" + +#: 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 "[eliminado]" + +#: builtin/fetch.c:549 +msgid "(none)" +msgstr "(nenhum)" + +#: 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 "%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: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 "Commit desconhecido %s" + +#: 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 "falhou o stash" + +#: 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 " (nada para squash)" + +#: builtin/merge.c:330 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:362 +msgid "Writing SQUASH_MSG" +msgstr "Escrevendo SQUASH_MSG" + +#: builtin/merge.c:364 +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: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 "Fastastico.\n" + +#: 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 "'%s' não é um commit" + +#: builtin/merge.c:1057 +msgid "No current branch." +msgstr "Nenhuma rama actual" + +#: 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 "Actualizando %s..%s\n" + +#: 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 "Não.\n" + +#: 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 "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 "" + +#: 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 "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 "" + +#: 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 "não consegue ler '%s'" + +#: 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 "Pushing para %s\n" + +#: 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 "repositorio inválido '%s'" + +#: 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 "mistura" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "leve" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "forte" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "manter" + +#: 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 "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 "" + +#: 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 "erro do programa" + +#: builtin/revert.c:209 +msgid "revert failed" +msgstr "falhou o revert" + +#: builtin/revert.c:224 +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: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 "etiqueta '%s' não foi encontrada." + +#: 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 "demasiado parametros" + +#: 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 "Aplicar? Sim[y]/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos " + +#: git-am.sh:795 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "Aplicando: $FIRSTLINE" + +#: 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 "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 "" + +#: 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 "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 "" + +#: 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 "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 "" + +#: 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 "blob" + +#: git-submodule.sh:798 +msgid "submodule" +msgstr "submódulos" + +#: git-submodule.sh:969 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" + diff --git a/po/pt_br.po b/po/pt_br.po deleted file mode 100644 index 1486e32..0000000 --- a/po/pt_br.po +++ /dev/null @@ -1,1277 +0,0 @@ -# Translation of gitk to Brazilian Portuguese. -# Copyright (C) 2007 Paul Mackerras, et al. -# This file is distributed under the same license as the gitk package. -# -# Alexandre Erwin Ittner <alexandre@ittner.com.br>, 2010. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: gitk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2010-12-06 23:39-0200\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" - -#: gitk:115 -msgid "Couldn't get list of unmerged files:" -msgstr "Não foi possível obter a lista dos arquivos não mesclados:" - -#: gitk:274 -msgid "Error parsing revisions:" -msgstr "Erro ao interpretar revisões:" - -#: gitk:330 -msgid "Error executing --argscmd command:" -msgstr "Erro ao executar o comando--argscmd:" - -#: gitk:343 -msgid "No files selected: --merge specified but no files are unmerged." -msgstr "" -"Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-" -"mesclados." - -#: gitk:346 -msgid "" -"No files selected: --merge specified but no unmerged files are within file " -"limit." -msgstr "" -"Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-" -"mesclados dentro dos limites." - -#: gitk:368 gitk:516 -msgid "Error executing git log:" -msgstr "Erro ao executar git log:" - -#: gitk:386 gitk:532 -msgid "Reading" -msgstr "Lendo" - -#: gitk:446 gitk:4271 -msgid "Reading commits..." -msgstr "Lendo revisões..." - -#: gitk:449 gitk:1580 gitk:4274 -msgid "No commits selected" -msgstr "Nenhuma revisão foi selecionada" - -#: gitk:1456 -msgid "Can't parse git log output:" -msgstr "Não foi possível interpretar a saída do \"git log\":" - -#: gitk:1676 -msgid "No commit information available" -msgstr "Não há informações disponíveis sobre a revisão" - -#: gitk:1818 -msgid "mc" -msgstr "mc" - -#: gitk:1853 gitk:4064 gitk:9067 gitk:10607 gitk:10817 -msgid "OK" -msgstr "Ok" - -#: gitk:1855 gitk:4066 gitk:8657 gitk:8736 gitk:8851 gitk:8900 gitk:9069 -#: gitk:10608 gitk:10818 -msgid "Cancel" -msgstr "Cancelar" - -#: gitk:1980 -msgid "Update" -msgstr "Atualizar" - -#: gitk:1981 -msgid "Reload" -msgstr "Recarregar" - -#: gitk:1982 -msgid "Reread references" -msgstr "Ler as referências novamente" - -#: gitk:1983 -msgid "List references" -msgstr "Listar referências" - -#: gitk:1985 -msgid "Start git gui" -msgstr "Iniciar Git GUI" - -#: gitk:1987 -msgid "Quit" -msgstr "Sair" - -#: gitk:1979 -msgid "File" -msgstr "Arquivo" - -#: gitk:1991 -msgid "Preferences" -msgstr "Preferências" - -#: gitk:1990 -msgid "Edit" -msgstr "Editar" - -#: gitk:1995 -msgid "New view..." -msgstr "Nova vista..." - -#: gitk:1996 -msgid "Edit view..." -msgstr "Editar vista..." - -#: gitk:1997 -msgid "Delete view" -msgstr "Apagar vista" - -#: gitk:1999 -msgid "All files" -msgstr "Todos os arquivos" - -#: gitk:1994 gitk:3817 -msgid "View" -msgstr "Exibir" - -#: gitk:2004 gitk:2014 gitk:2787 -msgid "About gitk" -msgstr "Sobre o gitk" - -#: gitk:2005 gitk:2019 -msgid "Key bindings" -msgstr "Atalhos de teclado" - -#: gitk:2003 gitk:2018 -msgid "Help" -msgstr "Ajuda" - -#: gitk:2096 gitk:8132 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:2127 -msgid "Row" -msgstr "Linha" - -#: gitk:2165 -msgid "Find" -msgstr "Encontrar" - -#: gitk:2166 -msgid "next" -msgstr "Próximo" - -#: gitk:2167 -msgid "prev" -msgstr "Anterior" - -#: gitk:2168 -msgid "commit" -msgstr "Revisão" - -#: gitk:2171 gitk:2173 gitk:4432 gitk:4455 gitk:4479 gitk:6420 gitk:6492 -#: gitk:6576 -msgid "containing:" -msgstr "contendo:" - -#: gitk:2174 gitk:3298 gitk:3303 gitk:4507 -msgid "touching paths:" -msgstr "envolvendo os caminhos:" - -#: gitk:2175 gitk:4512 -msgid "adding/removing string:" -msgstr "Adicionando/removendo texto:" - -#: gitk:2184 gitk:2186 -msgid "Exact" -msgstr "Exatamente" - -#: gitk:2186 gitk:4587 gitk:6388 -msgid "IgnCase" -msgstr "Ignorar maiúsculas/minúsculas" - -#: gitk:2186 gitk:4481 gitk:4585 gitk:6384 -msgid "Regexp" -msgstr "Expressão regular" - -#: gitk:2188 gitk:2189 gitk:4606 gitk:4636 gitk:4643 gitk:6512 gitk:6580 -msgid "All fields" -msgstr "Todos os campos" - -#: gitk:2189 gitk:4604 gitk:4636 gitk:6451 -msgid "Headline" -msgstr "Assunto" - -#: gitk:2190 gitk:4604 gitk:6451 gitk:6580 gitk:7013 -msgid "Comments" -msgstr "Descrição da revisão" - -#: gitk:2190 gitk:4604 gitk:4608 gitk:4643 gitk:6451 gitk:6948 gitk:8307 -#: gitk:8322 -msgid "Author" -msgstr "Autor" - -#: gitk:2190 gitk:4604 gitk:6451 gitk:6950 -msgid "Committer" -msgstr "Revisor" - -#: gitk:2221 -msgid "Search" -msgstr "Buscar" - -#: gitk:2229 -msgid "Diff" -msgstr "Diferenças" - -#: gitk:2231 -msgid "Old version" -msgstr "Versão antiga" - -#: gitk:2233 -msgid "New version" -msgstr "Versão nova" - -#: gitk:2235 -msgid "Lines of context" -msgstr "Número de linhas de contexto" - -#: gitk:2245 -msgid "Ignore space change" -msgstr "Ignorar mudanças de caixa" - -#: gitk:2304 -msgid "Patch" -msgstr "Diferenças" - -#: gitk:2306 -msgid "Tree" -msgstr "Árvore" - -#: gitk:2463 gitk:2480 -msgid "Diff this -> selected" -msgstr "Comparar esta revisão com a selecionada" - -#: gitk:2464 gitk:2481 -msgid "Diff selected -> this" -msgstr "Comparar a revisão selecionada com esta" - -#: gitk:2465 gitk:2482 -msgid "Make patch" -msgstr "Criar patch" - -#: gitk:2466 gitk:8715 -msgid "Create tag" -msgstr "Criar etiqueta" - -#: gitk:2467 gitk:8831 -msgid "Write commit to file" -msgstr "Salvar revisão para um arquivo" - -#: gitk:2468 gitk:8888 -msgid "Create new branch" -msgstr "Criar novo ramo" - -#: gitk:2469 -msgid "Cherry-pick this commit" -msgstr "Fazer cherry-pick desta revisão" - -#: gitk:2470 -msgid "Reset HEAD branch to here" -msgstr "Redefinir HEAD para cá" - -#: gitk:2471 -msgid "Mark this commit" -msgstr "Marcar esta revisão" - -#: gitk:2472 -msgid "Return to mark" -msgstr "Voltar à marca" - -#: gitk:2473 -msgid "Find descendant of this and mark" -msgstr "Encontrar descendente e marcar" - -#: gitk:2474 -msgid "Compare with marked commit" -msgstr "Comparar com a revisão marcada" - -#: gitk:2488 -msgid "Check out this branch" -msgstr "Efetuar checkout deste ramo" - -#: gitk:2489 -msgid "Remove this branch" -msgstr "Excluir este ramo" - -#: gitk:2496 -msgid "Highlight this too" -msgstr "Marcar este também" - -#: gitk:2497 -msgid "Highlight this only" -msgstr "Marcar apenas este" - -#: gitk:2498 -msgid "External diff" -msgstr "Diff externo" - -#: gitk:2499 -msgid "Blame parent commit" -msgstr "Anotar revisão anterior" - -#: gitk:2506 -msgid "Show origin of this line" -msgstr "Exibir origem desta linha" - -#: gitk:2507 -msgid "Run git gui blame on this line" -msgstr "Executar 'git blame' nesta linha" - -#: gitk:2789 -msgid "\n" -"Gitk - a commit viewer for git\n" -"\n" -"Copyright ©9 2005-2010 Paul Mackerras\n" -"\n" -"Use and redistribute under the terms of the GNU General Public License" -msgstr "\n" -"Gitk - um visualizador de revisões para o git \n" -"\n" -"Copyright ©9 2005-2010 Paul Mackerras\n" -"\n" -"Uso e distribuição segundo os termos da Licença Pública Geral GNU" - -#: gitk:2797 gitk:2862 gitk:9253 -msgid "Close" -msgstr "Fechar" - -#: gitk:2818 -msgid "Gitk key bindings" -msgstr "Atalhos de teclado" - -#: gitk:2821 -msgid "Gitk key bindings:" -msgstr "Atalhos de teclado:" - -#: gitk:2823 -#, tcl-format -msgid "<%s-Q>\t\tQuit" -msgstr "<%s-Q>\t\tSair" - -#: gitk:2824 -#, tcl-format -msgid "<%s-W>\t\tClose window" -msgstr "<%s-W>\t\tFechar janela" - -#: gitk:2825 -msgid "<Home>\t\tMove to first commit" -msgstr "<Home>\t\tIr para a primeira revisão" - -#: gitk:2826 -msgid "<End>\t\tMove to last commit" -msgstr "<End>\t\tIr para a última revisão" - -#: gitk:2827 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Up>, p, i\tIr para uma revisão acima" - -#: gitk:2828 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Down>, n, k\tIr para uma revisão abaixo" - -#: gitk:2829 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Left>, z, j\tVoltar no histórico" - -#: gitk:2830 -msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Right>, x, l\tAvançar no histórico" - -#: gitk:2831 -msgid "<PageUp>\tMove up one page in commit list" -msgstr "<PageUp>\tSubir uma página na lista de revisões" - -#: gitk:2832 -msgid "<PageDown>\tMove down one page in commit list" -msgstr "<PageDown>\tDescer uma página na lista de revisões" - -#: gitk:2833 -#, tcl-format -msgid "<%s-Home>\tScroll to top of commit list" -msgstr "<%s-Home>\tRolar para o início da lista de revisões" - -#: gitk:2834 -#, tcl-format -msgid "<%s-End>\tScroll to bottom of commit list" -msgstr "<%s-End>\tRolar para o final da lista de revisões" - -#: gitk:2835 -#, tcl-format -msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Up>\tRolar uma linha acima na lista de revisões" - -#: gitk:2836 -#, tcl-format -msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Down>\tRolar uma linha abaixo na lista de revisões" - -#: gitk:2837 -#, tcl-format -msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PageUp>\tRolar uma página acima na lista de revisões" - -#: gitk:2838 -#, tcl-format -msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PageDown>\tRolar uma página abaixo na lista de revisões" - -#: gitk:2839 -msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "<Shift-Up>\tProcurar próxima (revisões mas recentes)" - -#: gitk:2840 -msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Shift-Down>\tProcurar anterior (revisões mais antigas)" - -#: gitk:2841 -msgid "<Delete>, b\tScroll diff view up one page" -msgstr "<Delete>, b\tRola alterações uma página acima" - -#: gitk:2842 -msgid "<Backspace>\tScroll diff view up one page" -msgstr "<Backspace>\tRolar alterações uma página abaixo" - -#: gitk:2843 -msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Space>\t\tRolar alterações uma página abaixo" - -#: gitk:2844 -msgid "u\t\tScroll diff view up 18 lines" -msgstr "u\t\tRolar alterações 18 linhas acima" - -#: gitk:2845 -msgid "d\t\tScroll diff view down 18 lines" -msgstr "d\t\tRolar alterações 18 linhas abaixo" - -#: gitk:2846 -#, tcl-format -msgid "<%s-F>\t\tFind" -msgstr "<%s-F>\t\tProcurar" - -#: gitk:2847 -#, tcl-format -msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\tIr para a próxima ocorrência" - -#: gitk:2848 -msgid "<Return>\tMove to next find hit" -msgstr "<Return>\tIr para a próxima ocorrência" - -#: gitk:2849 -msgid "/\t\tFocus the search box" -msgstr "/\t\tPor foco na caixa de busca" - -#: gitk:2850 -msgid "?\t\tMove to previous find hit" -msgstr "?\t\tIr para a ocorrência anterior" - -#: gitk:2851 -msgid "f\t\tScroll diff view to next file" -msgstr "f\t\tRolar alterações para o próximo arquivo" - -#: gitk:2852 -#, tcl-format -msgid "<%s-S>\t\tSearch for next hit in diff view" -msgstr "<%s-S>\t\tProcurar a próxima ocorrência na lista de alterações" - -#: gitk:2853 -#, tcl-format -msgid "<%s-R>\t\tSearch for previous hit in diff view" -msgstr "<%s-R>\t\tProcurar ocorrência anterior na lista de alterações" - -#: gitk:2854 -#, tcl-format -msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-KP+>\tAumentar tamanho da fonte" - -#: gitk:2855 -#, tcl-format -msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-plus>\tAumentar tamanho da fonte" - -#: gitk:2856 -#, tcl-format -msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-KP->\tReduzir tamanho da fonte" - -#: gitk:2857 -#, tcl-format -msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-minus>\tReduzir tamanho da fonte" - -#: gitk:2858 -msgid "<F5>\t\tUpdate" -msgstr "<F5>\t\tAtualizar" - -#: gitk:3313 gitk:3322 -#, tcl-format -msgid "Error creating temporary directory %s:" -msgstr "Erro ao criar o diretório temporário %s:" - -#: gitk:3335 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Erro ao ler \"%s\" de %s:" - -#: gitk:3398 -msgid "command failed:" -msgstr "O comando falhou:" - -#: gitk:3547 -msgid "No such commit" -msgstr "Revisão não encontrada" - -#: gitk:3561 -msgid "git gui blame: command failed:" -msgstr "Comando 'git gui blame' falhou:" - -#: gitk:3592 -#, tcl-format -msgid "Couldn't read merge head: %s" -msgstr "Impossível ler merge head: %s" - -#: gitk:3600 -#, tcl-format -msgid "Error reading index: %s" -msgstr "Erro ao ler o índice: %s" - -#: gitk:3625 -#, tcl-format -msgid "Couldn't start git blame: %s" -msgstr "Não foi possível inciar o 'git blame': %s" - -#: gitk:3628 gitk:6419 -msgid "Searching" -msgstr "Procurando" - -#: gitk:3660 -#, tcl-format -msgid "Error running git blame: %s" -msgstr "Erro ao executar 'git blame': %s" - -#: gitk:3688 -#, tcl-format -msgid "That line comes from commit %s, which is not in this view" -msgstr "Esta linha vem da revisão %s, que não está nesta vista" - -#: gitk:3702 -msgid "External diff viewer failed:" -msgstr "Erro do visualizador de alterações externo:" - -#: gitk:3820 -msgid "Gitk view definition" -msgstr "Definir vista" - -#: gitk:3824 -msgid "Remember this view" -msgstr "Lembrar esta vista" - -#: gitk:3825 -msgid "References (space separated list):" -msgstr "Referências (separar a lista com um espaço):" - -#: gitk:3826 -msgid "Branches & tags:" -msgstr "Ramos & etiquetas:" - -#: gitk:3827 -msgid "All refs" -msgstr "Todas as referências" - -#: gitk:3828 -msgid "All (local) branches" -msgstr "Todos os ramos locais" - -#: gitk:3829 -msgid "All tags" -msgstr "Todas as etiquetas" - -#: gitk:3830 -msgid "All remote-tracking branches" -msgstr "Todos os ramos de rastreio" - -#: gitk:3831 -msgid "Commit Info (regular expressions):" -msgstr "Informações da revisão (expressões regulares):" - -#: gitk:3832 -msgid "Author:" -msgstr "Autor:" - -#: gitk:3833 -msgid "Committer:" -msgstr "Revisor:" - -#: gitk:3834 -msgid "Commit Message:" -msgstr "Descrição da revisão:" - -#: gitk:3835 -msgid "Matches all Commit Info criteria" -msgstr "Coincidir todos os critérios de informações da revisão" - -#: gitk:3836 -msgid "Changes to Files:" -msgstr "Mudanças para os arquivos:" - -#: gitk:3837 -msgid "Fixed String" -msgstr "Texto fixo" - -#: gitk:3838 -msgid "Regular Expression" -msgstr "Expressão regular" - -#: gitk:3839 -msgid "Search string:" -msgstr "Texto de busca" - -#: gitk:3840 -msgid "" -"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" -msgstr "" -"Datas de revisão (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" - -#: gitk:3841 -msgid "Since:" -msgstr "Desde:" - -#: gitk:3842 -msgid "Until:" -msgstr "Até:" - -#: gitk:3843 -msgid "Limit and/or skip a number of revisions (positive integer):" -msgstr "Limitar e/ou ignorar um número de revisões (inteiro positivo):" - -#: gitk:3844 -msgid "Number to show:" -msgstr "Número para mostrar:" - -#: gitk:3845 -msgid "Number to skip:" -msgstr "Número para ignorar:" - -#: gitk:3846 -msgid "Miscellaneous options:" -msgstr "Opções diversas:" - -#: gitk:3847 -msgid "Strictly sort by date" -msgstr "Ordenar estritamente pela data" - -#: gitk:3848 -msgid "Mark branch sides" -msgstr "Marcar os dois lados do ramo" - -#: gitk:3849 -msgid "Limit to first parent" -msgstr "Limitar ao primeiro antecessor" - -#: gitk:3850 -msgid "Simple history" -msgstr "Histórico simplificado" - -#: gitk:3851 -msgid "Additional arguments to git log:" -msgstr "Argumentos adicionais para o 'git log':" - -#: gitk:3852 -msgid "Enter files and directories to include, one per line:" -msgstr "Arquivos e diretórios para incluir, um por linha" - -#: gitk:3853 -msgid "Command to generate more commits to include:" -msgstr "Comando para gerar mais revisões para incluir:" - -#: gitk:3977 -msgid "Gitk: edit view" -msgstr "Gitk: editar vista" - -#: gitk:3985 -msgid "-- criteria for selecting revisions" -msgstr "-- critérios para selecionar revisões" - -#: gitk:3990 -msgid "View Name" -msgstr "Nome da vista" - -#: gitk:4065 -msgid "Apply (F5)" -msgstr "Aplicar (F5)" - -#: gitk:4103 -msgid "Error in commit selection arguments:" -msgstr "Erro nos argumentos de seleção de revisões:" - -#: gitk:4156 gitk:4208 gitk:4656 gitk:4670 gitk:5931 gitk:11551 gitk:11552 -msgid "None" -msgstr "Nenhum" - -#: gitk:4604 gitk:6451 gitk:8309 gitk:8324 -msgid "Date" -msgstr "Data" - -#: gitk:4604 gitk:6451 -msgid "CDate" -msgstr "DataR" - -#: gitk:4753 gitk:4758 -msgid "Descendant" -msgstr "Descendente de" - -#: gitk:4754 -msgid "Not descendant" -msgstr "Não descendente de" - -#: gitk:4761 gitk:4766 -msgid "Ancestor" -msgstr "Antecessor de" - -#: gitk:4762 -msgid "Not ancestor" -msgstr "Não antecessor de" - -#: gitk:5052 -msgid "Local changes checked in to index but not committed" -msgstr "Mudanças locais marcadas, porém não salvas" - -#: gitk:5088 -msgid "Local uncommitted changes, not checked in to index" -msgstr "Mudanças locais não marcadas" - -#: gitk:6769 -msgid "many" -msgstr "muitas" - -#: gitk:6952 -msgid "Tags:" -msgstr "Etiquetas:" - -#: gitk:6969 gitk:6975 gitk:8302 -msgid "Parent" -msgstr "Antecessor" - -#: gitk:6980 -msgid "Child" -msgstr "Descendente" - -#: gitk:6989 -msgid "Branch" -msgstr "Ramo" - -#: gitk:6992 -msgid "Follows" -msgstr "Segue" - -#: gitk:6995 -msgid "Precedes" -msgstr "Precede" - -#: gitk:7532 -#, tcl-format -msgid "Error getting diffs: %s" -msgstr "Erro ao obter diferenças: %s" - -#: gitk:8130 -msgid "Goto:" -msgstr "Ir para:" - -#: gitk:8151 -#, tcl-format -msgid "Short SHA1 id %s is ambiguous" -msgstr "O id SHA1 %s é ambíguo" - -#: gitk:8158 -#, tcl-format -msgid "Revision %s is not known" -msgstr "Revisão %s desconhecida" - -#: gitk:8168 -#, tcl-format -msgid "SHA1 id %s is not known" -msgstr "Id SHA1 %s desconhecido" - -#: gitk:8170 -#, tcl-format -msgid "Revision %s is not in the current view" -msgstr "A revisão %s não está na vista atual" - -#: gitk:8312 -msgid "Children" -msgstr "Descendentes" - -#: gitk:8370 -#, tcl-format -msgid "Reset %s branch to here" -msgstr "Redefinir ramo %s para este ponto" - -#: gitk:8372 -msgid "Detached head: can't reset" -msgstr "Detached head: impossível redefinir" - -#: gitk:8481 gitk:8487 -msgid "Skipping merge commit " -msgstr "Saltando revisão de mesclagem" - -#: gitk:8496 gitk:8501 -msgid "Error getting patch ID for " -msgstr "Erro ao obter patch ID para" - -#: gitk:8497 gitk:8502 -msgid " - stopping\n" -msgstr "- parando\n" - -#: gitk:8507 gitk:8510 gitk:8518 gitk:8532 gitk:8541 -msgid "Commit " -msgstr "Revisão" - -#: gitk:8511 -msgid "" -" is the same patch as\n" -" " -msgstr "" -"é o mesmo patch que\n" -" " - -#: gitk:8519 -msgid "" -" differs from\n" -" " -msgstr "difere de" - -#: gitk:8521 -msgid "" -"Diff of commits:\n" -"\n" -msgstr "" -"Diferença de revisões:\n" -"\n" - -#: gitk:8533 gitk:8542 -#, tcl-format -msgid " has %s children - stopping\n" -msgstr "possui %s descendentes - parando\n" - -#: gitk:8561 -#, tcl-format -msgid "Error writing commit to file: %s" -msgstr "Erro ao salvar revisão para o arquivo: %s" - -#: gitk:8567 -#, tcl-format -msgid "Error diffing commits: %s" -msgstr "Erro ao comparar revisões: %s" - -#: gitk:8598 -msgid "Top" -msgstr "Início" - -#: gitk:8599 -msgid "From" -msgstr "De" - -#: gitk:8604 -msgid "To" -msgstr "Para" - -#: gitk:8628 -msgid "Generate patch" -msgstr "Gerar patch" - -#: gitk:8630 -msgid "From:" -msgstr "De:" - -#: gitk:8639 -msgid "To:" -msgstr "Para:" - -#: gitk:8648 -msgid "Reverse" -msgstr "Inverter" - -#: gitk:8650 gitk:8845 -msgid "Output file:" -msgstr "Arquivo de saída:" - -#: gitk:8656 -msgid "Generate" -msgstr "Gerar" - -#: gitk:8694 -msgid "Error creating patch:" -msgstr "Erro ao criar patch:" - -#: gitk:8717 gitk:8833 gitk:8890 -msgid "ID:" -msgstr "ID:" - -#: gitk:8726 -msgid "Tag name:" -msgstr "Nome da etiqueta:" - -#: gitk:8729 -msgid "Tag message is optional" -msgstr "A descrição da etiqueta é opcional" - -#: gitk:8731 -msgid "Tag message:" -msgstr "Descrição da etiqueta" - -#: gitk:8735 gitk:8899 -msgid "Create" -msgstr "Criar" - -#: gitk:8753 -msgid "No tag name specified" -msgstr "Nome da etiqueta não indicado" - -#: gitk:8757 -#, tcl-format -msgid "Tag \"%s\" already exists" -msgstr "Etiqueta \"%s\" já existe" - -#: gitk:8767 -msgid "Error creating tag:" -msgstr "Erro ao criar etiqueta:" - -#: gitk:8842 -msgid "Command:" -msgstr "Comando:" - -#: gitk:8850 -msgid "Write" -msgstr "Exportar" - -#: gitk:8868 -msgid "Error writing commit:" -msgstr "Erro ao exportar revisão" - -#: gitk:8895 -msgid "Name:" -msgstr "Nome:" - -#: gitk:8918 -msgid "Please specify a name for the new branch" -msgstr "Indique um nome para o novo ramo" - -#: gitk:8923 -#, tcl-format -msgid "Branch '%s' already exists. Overwrite?" -msgstr "O ramo \"%s\" já existe. Sobrescrever?" - -#: gitk:8989 -#, tcl-format -msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?" - -#: gitk:8994 -msgid "Cherry-picking" -msgstr "Cherry-picking" - -#: gitk:9003 -#, tcl-format -msgid "" -"Cherry-pick failed because of local changes to file '%s'.\n" -"Please commit, reset or stash your changes and try again." -msgstr "" -"O cherry-pick falhou porque o arquivo \"%s\" possui mudanças locais.\n" -"Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente " -"novamente." - -#: gitk:9009 -msgid "" -"Cherry-pick failed because of merge conflict.\n" -"Do you wish to run git citool to resolve it?" -msgstr "" -"O cherry-pick falhou porque houve um conflito na mesclagem.\n" -"Executar o 'git citool' para resolvê-lo?" - -#: gitk:9025 -msgid "No changes committed" -msgstr "Nenhuma revisão foi salva" - -#: gitk:9051 -msgid "Confirm reset" -msgstr "Confirmar redefinição" - -#: gitk:9053 -#, tcl-format -msgid "Reset branch %s to %s?" -msgstr "Você realmente deseja redefinir o ramo %s para %s?" - -#: gitk:9055 -msgid "Reset type:" -msgstr "Tipo de redefinição" - -#: gitk:9058 -msgid "Soft: Leave working tree and index untouched" -msgstr "Soft: deixa a árvore de trabalho e o índice intocados" - -#: gitk:9061 -msgid "Mixed: Leave working tree untouched, reset index" -msgstr "Misto: Deixa a árvore de trabalho intocada, redefine o índice" - -#: gitk:9064 -msgid "" -"Hard: Reset working tree and index\n" -"(discard ALL local changes)" -msgstr "" -"Hard: Redefine a árvore de trabalho e o índice\n" -"(descarta TODAS as mudanças locais)" - -#: gitk:9081 -msgid "Resetting" -msgstr "Redefinindo" - -#: gitk:9141 -msgid "Checking out" -msgstr "Abrindo" - -#: gitk:9194 -msgid "Cannot delete the currently checked-out branch" -msgstr "Impossível excluir o ramo atualmente aberto" - -#: gitk:9200 -#, tcl-format -msgid "" -"The commits on branch %s aren't on any other branch.\n" -"Really delete branch %s?" -msgstr "" -"As revisões do ramo \"%s\" não existem em nenhum outro ramo.\n" -"Você realmente deseja excluir ramo \"%s\"?" - -#: gitk:9231 -#, tcl-format -msgid "Tags and heads: %s" -msgstr "Referências: %s" - -#: gitk:9246 -msgid "Filter" -msgstr "Filtro" - -#: gitk:9541 -msgid "" -"Error reading commit topology information; branch and preceding/following " -"tag information will be incomplete." -msgstr "" -"Erro ao ler a topologia das revisões; as informações dos ramos e etiquetas " -"antecessoras/sucessoras estarão incompletas" - -#: gitk:10527 -msgid "Tag" -msgstr "Etiqueta" - -#: gitk:10527 -msgid "Id" -msgstr "Id" - -#: gitk:10576 -msgid "Gitk font chooser" -msgstr "Selecionar fontes do Gitk" - -#: gitk:10593 -msgid "B" -msgstr "B" - -#: gitk:10596 -msgid "I" -msgstr "I" - -#: gitk:10714 -msgid "Gitk preferences" -msgstr "Preferências do Gitk" - -#: gitk:10716 -msgid "Commit list display options" -msgstr "Opções da lista de revisões" - -#: gitk:10719 -msgid "Maximum graph width (lines)" -msgstr "Largura máxima do grafo (linhas)" - -#: gitk:10722 -#, tcl-format -msgid "Maximum graph width (% of pane)" -msgstr "Largura máxima do grafo (% do painel)" - -#: gitk:10725 -msgid "Show local changes" -msgstr "Exibir mudanças locais" - -#: gitk:10728 -msgid "Auto-select SHA1" -msgstr "Selecionar o SHA1 automaticamente" - -#: gitk:10731 -msgid "Hide remote refs" -msgstr "Ocultar referências remotas" - -#: gitk:10735 -msgid "Diff display options" -msgstr "Opções de exibição das alterações" - -#: gitk:10737 -msgid "Tab spacing" -msgstr "Espaços por tabulação" - -#: gitk:10740 -msgid "Display nearby tags" -msgstr "Exibir etiquetas próximas" - -#: gitk:10743 -msgid "Limit diffs to listed paths" -msgstr "Limitar diferenças aos caminhos listados" - -#: gitk:10746 -msgid "Support per-file encodings" -msgstr "Usar codificações distintas por arquivo" - -#: gitk:10752 gitk:10832 -msgid "External diff tool" -msgstr "Ferramenta 'diff' externa" - -#: gitk:10753 -msgid "Choose..." -msgstr "Selecionar..." - -#: gitk:10758 -msgid "General options" -msgstr "Opções gerais" - -#: gitk:10761 -msgid "Use themed widgets" -msgstr "Usar temas para as janelas" - -#: gitk:10763 -msgid "(change requires restart)" -msgstr "(exige reinicialização)" - -#: gitk:10765 -msgid "(currently unavailable)" -msgstr "(atualmente indisponível)" - -#: gitk:10769 -msgid "Colors: press to choose" -msgstr "Cores: clique para escolher" - -#: gitk:10772 -msgid "Interface" -msgstr "Interface" - -#: gitk:10773 -msgid "interface" -msgstr "interface" - -#: gitk:10776 -msgid "Background" -msgstr "Segundo plano" - -#: gitk:10777 gitk:10807 -msgid "background" -msgstr "segundo plano" - -#: gitk:10780 -msgid "Foreground" -msgstr "Primeiro plano" - -#: gitk:10781 -msgid "foreground" -msgstr "primeiro plano" - -#: gitk:10784 -msgid "Diff: old lines" -msgstr "Diff: linhas excluídas" - -#: gitk:10785 -msgid "diff old lines" -msgstr "linhas excluídas" - -#: gitk:10789 -msgid "Diff: new lines" -msgstr "Diff: linhas adicionadas" - -#: gitk:10790 -msgid "diff new lines" -msgstr "linhas adicionadas" - -#: gitk:10794 -msgid "Diff: hunk header" -msgstr "Diff: cabeçalho do bloco" - -#: gitk:10796 -msgid "diff hunk header" -msgstr "cabeçalho do bloco" - -#: gitk:10800 -msgid "Marked line bg" -msgstr "2º plano da linha marcada" - -#: gitk:10802 -msgid "marked line background" -msgstr "segundo plano da linha marcada" - -#: gitk:10806 -msgid "Select bg" -msgstr "2º plano da seleção" - -#: gitk:10810 -msgid "Fonts: press to choose" -msgstr "Fontes: clique para escolher" - -#: gitk:10812 -msgid "Main font" -msgstr "Fonte principal" - -#: gitk:10813 -msgid "Diff display font" -msgstr "Fonte da lista de mudanças" - -#: gitk:10814 -msgid "User interface font" -msgstr "Fonte da interface" - -#: gitk:10842 -#, tcl-format -msgid "Gitk: choose color for %s" -msgstr "Gitk: selecionar cor para %s" - -#: gitk:11445 -msgid "Cannot find a git repository here." -msgstr "Não há nenhum repositório git aqui." - -#: gitk:11449 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Impossível encontrar o diretório git \"%s\"." - -#: gitk:11496 -#, tcl-format -msgid "Ambiguous argument '%s': both revision and filename" -msgstr "" -"O argumento \"%s\" é ambíguo (especifica tanto uma revisão e um nome de " -"arquivo)" - -#: gitk:11508 -msgid "Bad arguments to gitk:" -msgstr "Argumentos incorretos para o gitk:" - -#: gitk:11604 -msgid "Command line" -msgstr "Linha de comando" diff --git a/po/ru.po b/po/ru.po deleted file mode 100644 index 5987303..0000000 --- a/po/ru.po +++ /dev/null @@ -1,1085 +0,0 @@ -# -# Translation of gitk to Russian. -# -msgid "" -msgstr "" -"Project-Id-Version: gitk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-24 16:00+0200\n" -"PO-Revision-Date: 2009-04-24 16:00+0200\n" -"Last-Translator: Alex Riesen <raa.lkml@gmail.com>\n" -"Language-Team: Russian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: gitk:113 -msgid "Couldn't get list of unmerged files:" -msgstr "" -"Невозможно получить список файлов незавершённой операции слияния:" - -#: gitk:268 -msgid "Error parsing revisions:" -msgstr "Ошибка в идентификаторе версии:" - -#: gitk:323 -msgid "Error executing --argscmd command:" -msgstr "Ошибка выполнения команды заданной --argscmd:" - -#: gitk:336 -msgid "No files selected: --merge specified but no files are unmerged." -msgstr "" -"Файлы не выбраны: указан --merge, но не было найдено ни одного файла " -"где эта операция должна быть завершена." - -#: gitk:339 -msgid "" -"No files selected: --merge specified but no unmerged files are within file " -"limit." -msgstr "" -"Файлы не выбраны: указан --merge, но в рамках указанного " -"ограничения на имена файлов нет ни одного " -"где эта операция должна быть завершена." - -#: gitk:361 gitk:508 -msgid "Error executing git log:" -msgstr "Ошибка запуска git log:" - -#: gitk:379 -msgid "Reading" -msgstr "Чтение" - -#: gitk:439 gitk:4021 -msgid "Reading commits..." -msgstr "Чтение версий..." - -#: gitk:442 gitk:1560 gitk:4024 -msgid "No commits selected" -msgstr "Ничего не выбрано" - -#: gitk:1436 -msgid "Can't parse git log output:" -msgstr "Ошибка обработки вывода команды git log:" - -#: gitk:1656 -msgid "No commit information available" -msgstr "Нет информации о состоянии" - -#: gitk:1791 gitk:1815 gitk:3814 gitk:8478 gitk:10014 gitk:10186 -msgid "OK" -msgstr "Ok" - -#: gitk:1817 gitk:3816 gitk:8078 gitk:8152 gitk:8259 gitk:8308 gitk:8480 -#: gitk:10015 gitk:10187 -msgid "Cancel" -msgstr "Отмена" - -#: gitk:1915 -msgid "Update" -msgstr "Обновить" - -#: gitk:1916 -msgid "Reload" -msgstr "Перечитать" - -#: gitk:1917 -msgid "Reread references" -msgstr "Обновить список ссылок" - -#: gitk:1918 -msgid "List references" -msgstr "Список ссылок" - -#: gitk:1920 -msgid "Start git gui" -msgstr "Запустить git gui" - -#: gitk:1922 -msgid "Quit" -msgstr "Завершить" - -#: gitk:1914 -msgid "File" -msgstr "Файл" - -#: gitk:1925 -msgid "Preferences" -msgstr "Настройки" - -#: gitk:1924 -msgid "Edit" -msgstr "Редактировать" - -#: gitk:1928 -msgid "New view..." -msgstr "Новое представление..." - -#: gitk:1929 -msgid "Edit view..." -msgstr "Редактировать представление..." - -#: gitk:1930 -msgid "Delete view" -msgstr "Удалить представление" - -#: gitk:1932 -msgid "All files" -msgstr "Все файлы" - -#: gitk:1927 gitk:3626 -msgid "View" -msgstr "Представление" - -#: gitk:1935 gitk:2609 -msgid "About gitk" -msgstr "О gitk" - -#: gitk:1936 -msgid "Key bindings" -msgstr "Назначения клавиатуры" - -#: gitk:1934 -msgid "Help" -msgstr "Подсказка" - -#: gitk:1994 -msgid "SHA1 ID: " -msgstr "SHA1:" - -#: gitk:2025 -msgid "Row" -msgstr "Строка" - -#: gitk:2056 -msgid "Find" -msgstr "Поиск" - -#: gitk:2057 -msgid "next" -msgstr "След." - -#: gitk:2058 -msgid "prev" -msgstr "Пред." - -#: gitk:2059 -msgid "commit" -msgstr "состояние" - -#: gitk:2062 gitk:2064 gitk:4179 gitk:4202 gitk:4226 gitk:6164 gitk:6236 -#: gitk:6320 -msgid "containing:" -msgstr "содержащее:" - -#: gitk:2065 gitk:3117 gitk:3122 gitk:4254 -msgid "touching paths:" -msgstr "касательно файлов:" - -#: gitk:2066 gitk:4259 -msgid "adding/removing string:" -msgstr "добавив/удалив строку:" - -#: gitk:2075 gitk:2077 -msgid "Exact" -msgstr "Точно" - -#: gitk:2077 gitk:4334 gitk:6132 -msgid "IgnCase" -msgstr "Игнорировать большие/маленькие" - -#: gitk:2077 gitk:4228 gitk:4332 gitk:6128 -msgid "Regexp" -msgstr "Регулярные выражения" - -#: gitk:2079 gitk:2080 gitk:4353 gitk:4383 gitk:4390 gitk:6256 gitk:6324 -msgid "All fields" -msgstr "Во всех полях" - -#: gitk:2080 gitk:4351 gitk:4383 gitk:6195 -msgid "Headline" -msgstr "Заголовок" - -#: gitk:2081 gitk:4351 gitk:6195 gitk:6324 gitk:6737 -msgid "Comments" -msgstr "Комментарии" - -#: gitk:2081 gitk:4351 gitk:4355 gitk:4390 gitk:6195 gitk:6672 gitk:7923 -#: gitk:7938 -msgid "Author" -msgstr "Автор" - -#: gitk:2081 gitk:4351 gitk:6195 gitk:6674 -msgid "Committer" -msgstr "Сохранивший состояние" - -#: gitk:2110 -msgid "Search" -msgstr "Найти" - -#: gitk:2117 -msgid "Diff" -msgstr "Сравнить" - -#: gitk:2119 -msgid "Old version" -msgstr "Старая версия" - -#: gitk:2121 -msgid "New version" -msgstr "Новая версия" - -#: gitk:2123 -msgid "Lines of context" -msgstr "Строк контекста" - -#: gitk:2133 -msgid "Ignore space change" -msgstr "Игнорировать пробелы" - -#: gitk:2191 -msgid "Patch" -msgstr "Патч" - -#: gitk:2193 -msgid "Tree" -msgstr "Файлы" - -#: gitk:2326 gitk:2339 -msgid "Diff this -> selected" -msgstr "Сравнить это состояние с выделенным" - -#: gitk:2327 gitk:2340 -msgid "Diff selected -> this" -msgstr "Сравнить выделенное с этим состоянием" - -#: gitk:2328 gitk:2341 -msgid "Make patch" -msgstr "Создать патч" - -#: gitk:2329 gitk:8136 -msgid "Create tag" -msgstr "Создать метку" - -#: gitk:2330 gitk:8239 -msgid "Write commit to file" -msgstr "Сохранить изменения в файл" - -#: gitk:2331 gitk:8296 -msgid "Create new branch" -msgstr "Создать ветвь" - -#: gitk:2332 -msgid "Cherry-pick this commit" -msgstr "Скопировать это состояние" - -#: gitk:2333 -msgid "Reset HEAD branch to here" -msgstr "Установить HEAD на это состояние" - -#: gitk:2347 -msgid "Check out this branch" -msgstr "Перейти на эту ветвь" - -#: gitk:2348 -msgid "Remove this branch" -msgstr "Удалить эту ветвь" - -#: gitk:2355 -msgid "Highlight this too" -msgstr "Подсветить этот тоже" - -#: gitk:2356 -msgid "Highlight this only" -msgstr "Подсветить только этот" - -#: gitk:2357 -msgid "External diff" -msgstr "Программа сравнения" - -#: gitk:2358 -msgid "Blame parent commit" -msgstr "Аннотировать родительское состояние" - -#: gitk:2365 -msgid "Show origin of this line" -msgstr "Показать источник этой строки" - -#: gitk:2366 -msgid "Run git gui blame on this line" -msgstr "Запустить git gui blame для этой строки" - -#: gitk:2611 -msgid "" -"\n" -"Gitk - a commit viewer for git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Use and redistribute under the terms of the GNU General Public License" -msgstr "" -"\n" -"Gitk - программа просмотра истории репозиториев Git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Использование и распространение согласно условиям GNU General Public License" - -#: gitk:2619 gitk:2681 gitk:8661 -msgid "Close" -msgstr "Закрыть" - -#: gitk:2638 -msgid "Gitk key bindings" -msgstr "Назначения клавиатуры в Gitk" - -#: gitk:2641 -msgid "Gitk key bindings:" -msgstr "Назначения клавиатуры в Gitk:" - -#: gitk:2643 -#, tcl-format -msgid "<%s-Q>\t\tQuit" -msgstr "<%s-Q>\t\tЗавершить" - -#: gitk:2644 -msgid "<Home>\t\tMove to first commit" -msgstr "<Home>\t\tПерейти к первому состоянию" - -#: gitk:2645 -msgid "<End>\t\tMove to last commit" -msgstr "<End>\t\tПерейти к последнему состоянию" - -#: gitk:2646 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Up>, p, i\tПерейти к следующему состоянию" - -#: gitk:2647 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Down>, n, k\tПерейти к предыдущему состоянию" - -#: gitk:2648 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Left>, z, j\tПоказать ранее посещённое состояние" - -#: gitk:2649 -msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Right>, x, l\tПоказать следующее посещённое состояние" - -#: gitk:2650 -msgid "<PageUp>\tMove up one page in commit list" -msgstr "<PageUp>\tПерейти на страницу выше в списке состояний" - -#: gitk:2651 -msgid "<PageDown>\tMove down one page in commit list" -msgstr "<PageDown>\tПерейти на страницу ниже в списке состояний" - -#: gitk:2652 -#, tcl-format -msgid "<%s-Home>\tScroll to top of commit list" -msgstr "<%s-Home>\tПоказать начало списка состояний" - -#: gitk:2653 -#, tcl-format -msgid "<%s-End>\tScroll to bottom of commit list" -msgstr "<%s-End>\tПоказать конец списка состояний" - -#: gitk:2654 -#, tcl-format -msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Up>\tПровернуть список состояний вверх" - -#: gitk:2655 -#, tcl-format -msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Down>\tПровернуть список состояний вниз" - -#: gitk:2656 -#, tcl-format -msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PageUp>\tПровернуть список состояний на страницу вверх" - -#: gitk:2657 -#, tcl-format -msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PageDown>\tПровернуть список состояний на страницу вниз" - -#: gitk:2658 -msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "" -"<Shift-Up>\tПоиск в обратном порядке (вверх, среди новых состояний)" - -#: gitk:2659 -msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Shift-Down>\tПоиск (вниз, среди старых состояний)" - -#: gitk:2660 -msgid "<Delete>, b\tScroll diff view up one page" -msgstr "<Delete>, b\tПрокрутить список изменений на страницу выше" - -#: gitk:2661 -msgid "<Backspace>\tScroll diff view up one page" -msgstr "<Backspace>\tПрокрутить список изменений на страницу выше" - -#: gitk:2662 -msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Leertaste>\t\tПрокрутить список изменений на страницу ниже" - -#: gitk:2663 -msgid "u\t\tScroll diff view up 18 lines" -msgstr "u\t\tПрокрутить список изменений на 18 строк вверх" - -#: gitk:2664 -msgid "d\t\tScroll diff view down 18 lines" -msgstr "d\t\tПрокрутить список изменений на 18 строк вниз" - -#: gitk:2665 -#, tcl-format -msgid "<%s-F>\t\tFind" -msgstr "<%s-F>\t\tПоиск" - -#: gitk:2666 -#, tcl-format -msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\tПерейти к следующему найденному состоянию" - -#: gitk:2667 -msgid "<Return>\tMove to next find hit" -msgstr "<Return>\tПерейти к следующему найденному состоянию" - -#: gitk:2668 -msgid "/\t\tFocus the search box" -msgstr "/\t\tПерейти к полю поиска" - -#: gitk:2669 -msgid "?\t\tMove to previous find hit" -msgstr "?\t\tПерейти к предыдущему найденному состоянию" - -#: gitk:2670 -msgid "f\t\tScroll diff view to next file" -msgstr "f\t\tПрокрутить список изменений к следующему файлу" - -#: gitk:2671 -#, tcl-format -msgid "<%s-S>\t\tSearch for next hit in diff view" -msgstr "<%s-S>\t\tПродолжить поиск в списке изменений" - -#: gitk:2672 -#, tcl-format -msgid "<%s-R>\t\tSearch for previous hit in diff view" -msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений" - -#: gitk:2673 -#, tcl-format -msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-KP+>\tУвеличить размер шрифта" - -#: gitk:2674 -#, tcl-format -msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-plus>\tУвеличить размер шрифта" - -#: gitk:2675 -#, tcl-format -msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-KP->\tУменьшить размер шрифта" - -#: gitk:2676 -#, tcl-format -msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-minus>\tУменьшить размер шрифта" - -#: gitk:2677 -msgid "<F5>\t\tUpdate" -msgstr "<F5>\t\tОбновить" - -#: gitk:3132 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Ошибка получения \"%s\" из %s:" - -#: gitk:3189 gitk:3198 -#, tcl-format -msgid "Error creating temporary directory %s:" -msgstr "Ошибка создания временного каталога %s:" - -#: gitk:3211 -msgid "command failed:" -msgstr "ошибка выполнения команды:" - -#: gitk:3357 -msgid "No such commit" -msgstr "Состояние не найдено" - -#: gitk:3371 -msgid "git gui blame: command failed:" -msgstr "git gui blame: ошибка выполнения команды:" - -#: gitk:3402 -#, tcl-format -msgid "Couldn't read merge head: %s" -msgstr "Ошибка чтения MERGE_HEAD: %s" - -#: gitk:3410 -#, tcl-format -msgid "Error reading index: %s" -msgstr "Ошибка чтения индекса: %s" - -#: gitk:3435 -#, tcl-format -msgid "Couldn't start git blame: %s" -msgstr "Ошибка запуска git blame: %s" - -#: gitk:3438 gitk:6163 -msgid "Searching" -msgstr "Поиск" - -#: gitk:3470 -#, tcl-format -msgid "Error running git blame: %s" -msgstr "Ошибка выполнения git blame: %s" - -#: gitk:3498 -#, tcl-format -msgid "That line comes from commit %s, which is not in this view" -msgstr "" -"Эта строка принадлежит состоянию %s, которое не показано в этом " -"представлении" - -#: gitk:3512 -msgid "External diff viewer failed:" -msgstr "Ошибка выполнения программы сравнения:" - -#: gitk:3630 -msgid "Gitk view definition" -msgstr "Gitk определение представлений" - -#: gitk:3634 -msgid "Remember this view" -msgstr "Запомнить представление" - -#: gitk:3635 -msgid "Commits to include (arguments to git log):" -msgstr "Включить состояния (аргументы для git-log):" - -#: gitk:3636 -msgid "Use all refs" -msgstr "Использовать все ветви" - -#: gitk:3637 -msgid "Strictly sort by date" -msgstr "Строгая сортировка по дате" - -#: gitk:3638 -msgid "Mark branch sides" -msgstr "Отметить стороны ветвей" - -#: gitk:3639 -msgid "Since date:" -msgstr "С даты:" - -#: gitk:3640 -msgid "Until date:" -msgstr "По дату:" - -#: gitk:3641 -msgid "Max count:" -msgstr "Макс. количество:" - -#: gitk:3642 -msgid "Skip:" -msgstr "Пропустить:" - -#: gitk:3643 -msgid "Limit to first parent" -msgstr "Ограничить первым предком" - -#: gitk:3644 -msgid "Command to generate more commits to include:" -msgstr "Дополнительная команда для списка состояний:" - -#: gitk:3753 -msgid "Name" -msgstr "Имя" - -#: gitk:3801 -msgid "Enter files and directories to include, one per line:" -msgstr "Файлы и каталоги для ограничения истории, по одному на строку:" - -#: gitk:3815 -msgid "Apply (F5)" -msgstr "Применить (F5)" - -#: gitk:3853 -msgid "Error in commit selection arguments:" -msgstr "Ошибка в параметрах выбора состояний:" - -#: gitk:3906 gitk:3958 gitk:4403 gitk:4417 gitk:5675 gitk:10867 gitk:10868 -msgid "None" -msgstr "Ни одного" - -#: gitk:4351 gitk:6195 gitk:7925 gitk:7940 -msgid "Date" -msgstr "Дата" - -#: gitk:4351 gitk:6195 -msgid "CDate" -msgstr "Дата ввода" - -#: gitk:4500 gitk:4505 -msgid "Descendant" -msgstr "Порождённое" - -#: gitk:4501 -msgid "Not descendant" -msgstr "Не порождённое" - -#: gitk:4508 gitk:4513 -msgid "Ancestor" -msgstr "Предок" - -#: gitk:4509 -msgid "Not ancestor" -msgstr "Не предок" - -#: gitk:4799 -msgid "Local changes checked in to index but not committed" -msgstr "Изменения зарегистрированные в индексе, но не сохранённые" - -#: gitk:4835 -msgid "Local uncommitted changes, not checked in to index" -msgstr "Изменения в рабочем каталоге, не зарегистрированные в индексе" - -#: gitk:6676 -msgid "Tags:" -msgstr "Таги:" - -#: gitk:6693 gitk:6699 gitk:7918 -msgid "Parent" -msgstr "Предок" - -#: gitk:6704 -msgid "Child" -msgstr "Потомок" - -#: gitk:6713 -msgid "Branch" -msgstr "Ветвь" - -#: gitk:6716 -msgid "Follows" -msgstr "Следует за" - -#: gitk:6719 -msgid "Precedes" -msgstr "Предшествует" - -#: gitk:7212 -#, tcl-format -msgid "Error getting diffs: %s" -msgstr "Ошибка получения изменений: %s" - -#: gitk:7751 -msgid "Goto:" -msgstr "Перейти к:" - -#: gitk:7753 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7772 -#, tcl-format -msgid "Short SHA1 id %s is ambiguous" -msgstr "Сокращённый SHA1 идентификатор %s неоднозначен" - -#: gitk:7784 -#, tcl-format -msgid "SHA1 id %s is not known" -msgstr "SHA1 идентификатор %s не найден" - -#: gitk:7786 -#, tcl-format -msgid "Tag/Head %s is not known" -msgstr "Метка или ветвь %s не найдена" - -#: gitk:7928 -msgid "Children" -msgstr "Потомки" - -#: gitk:7985 -#, tcl-format -msgid "Reset %s branch to here" -msgstr "Установить ветвь %s на это состояние" - -#: gitk:7987 -msgid "Detached head: can't reset" -msgstr "Состояние не принадлежит ни одной ветви, переход невозможен" - -#: gitk:8019 -msgid "Top" -msgstr "Верх" - -#: gitk:8020 -msgid "From" -msgstr "От" - -#: gitk:8025 -msgid "To" -msgstr "До" - -#: gitk:8049 -msgid "Generate patch" -msgstr "Создать патч" - -#: gitk:8051 -msgid "From:" -msgstr "От:" - -#: gitk:8060 -msgid "To:" -msgstr "До:" - -#: gitk:8069 -msgid "Reverse" -msgstr "В обратном порядке" - -#: gitk:8071 gitk:8253 -msgid "Output file:" -msgstr "Файл для сохранения:" - -#: gitk:8077 -msgid "Generate" -msgstr "Создать" - -#: gitk:8115 -msgid "Error creating patch:" -msgstr "Ошибка создания патча:" - -#: gitk:8138 gitk:8241 gitk:8298 -msgid "ID:" -msgstr "ID:" - -#: gitk:8147 -msgid "Tag name:" -msgstr "Имя метки:" - -#: gitk:8151 gitk:8307 -msgid "Create" -msgstr "Создать" - -#: gitk:8168 -msgid "No tag name specified" -msgstr "Не задано имя метки" - -#: gitk:8172 -#, tcl-format -msgid "Tag \"%s\" already exists" -msgstr "Метка \"%s\" уже существует" - -#: gitk:8178 -msgid "Error creating tag:" -msgstr "Ошибка создания метки:" - -#: gitk:8250 -msgid "Command:" -msgstr "Команда:" - -#: gitk:8258 -msgid "Write" -msgstr "Запись" - -#: gitk:8276 -msgid "Error writing commit:" -msgstr "Ошибка сохранения состояния:" - -#: gitk:8303 -msgid "Name:" -msgstr "Имя:" - -#: gitk:8326 -msgid "Please specify a name for the new branch" -msgstr "Укажите имя для новой ветви" - -#: gitk:8331 -#, tcl-format -msgid "Branch '%s' already exists. Overwrite?" -msgstr "Ветвь '%s' уже существует. Переписать?" - -#: gitk:8397 -#, tcl-format -msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "" -"Состояние %s уже принадлежит ветви %s. Продолжить операцию?" - -#: gitk:8402 -msgid "Cherry-picking" -msgstr "Копирование изменений" - -#: gitk:8411 -#, tcl-format -msgid "" -"Cherry-pick failed because of local changes to file '%s'.\n" -"Please commit, reset or stash your changes and try again." -msgstr "" -"Копирование невозможно из-за изменений в файле '%s'.\n" -"Сохраните или отмените изменения и повторите операцию." - -#: gitk:8417 -msgid "" -"Cherry-pick failed because of merge conflict.\n" -"Do you wish to run git citool to resolve it?" -msgstr "" -"Копирование изменений невозможно из-за незавершённой операции " -"слияния.\nЗапустить git citool для завершения этой операции?" - -#: gitk:8433 -msgid "No changes committed" -msgstr "Изменения не сохранены" - -#: gitk:8459 -msgid "Confirm reset" -msgstr "Подтвердите операцию перехода" - -#: gitk:8461 -#, tcl-format -msgid "Reset branch %s to %s?" -msgstr "Установить ветвь %s на состояние %s?" - -#: gitk:8465 -msgid "Reset type:" -msgstr "Тип операции перехода:" - -#: gitk:8469 -msgid "Soft: Leave working tree and index untouched" -msgstr "Лёгкий: оставить рабочий каталог и индекс неизменными" - -#: gitk:8472 -msgid "Mixed: Leave working tree untouched, reset index" -msgstr "" -"Смешанный: оставить рабочий каталог неизменным, установить индекс" - -#: gitk:8475 -msgid "" -"Hard: Reset working tree and index\n" -"(discard ALL local changes)" -msgstr "" -"Жесткий: переписать индекс и рабочий каталог\n" -"(все изменения в рабочем каталоги будут потеряны)" - -#: gitk:8492 -msgid "Resetting" -msgstr "Установка" - -#: gitk:8549 -msgid "Checking out" -msgstr "Переход" - -#: gitk:8602 -msgid "Cannot delete the currently checked-out branch" -msgstr "Активная ветвь не может быть удалена" - -#: gitk:8608 -#, tcl-format -msgid "" -"The commits on branch %s aren't on any other branch.\n" -"Really delete branch %s?" -msgstr "" -"Состояния ветви %s больше не принадлежат никакой другой ветви.\n" -"Действительно удалить ветвь %s?" - -#: gitk:8639 -#, tcl-format -msgid "Tags and heads: %s" -msgstr "Метки и ветви: %s" - -#: gitk:8654 -msgid "Filter" -msgstr "Фильтровать" - -#: gitk:8949 -msgid "" -"Error reading commit topology information; branch and preceding/following " -"tag information will be incomplete." -msgstr "" -"Ошибка чтения истории проекта; информация о ветвях и состояниях " -"вокруг меток (до/после) может быть неполной." - -#: gitk:9935 -msgid "Tag" -msgstr "Метка" - -#: gitk:9935 -msgid "Id" -msgstr "Id" - -#: gitk:9983 -msgid "Gitk font chooser" -msgstr "Шрифт Gitk" - -#: gitk:10000 -msgid "B" -msgstr "Ж" - -#: gitk:10003 -msgid "I" -msgstr "К" - -#: gitk:10098 -msgid "Gitk preferences" -msgstr "Настройки Gitk" - -#: gitk:10100 -msgid "Commit list display options" -msgstr "Параметры показа списка состояний" - -#: gitk:10103 -msgid "Maximum graph width (lines)" -msgstr "Макс. ширина графа (строк)" - -#: gitk:10107 -#, tcl-format -msgid "Maximum graph width (% of pane)" -msgstr "Макс. ширина графа (% ширины панели)" - -#: gitk:10111 -msgid "Show local changes" -msgstr "Показывать изменения в рабочем каталоге" - -#: gitk:10114 -msgid "Auto-select SHA1" -msgstr "Выделить SHA1" - -#: gitk:10118 -msgid "Diff display options" -msgstr "Параметры показа изменений" - -#: gitk:10120 -msgid "Tab spacing" -msgstr "Ширина табуляции" - -#: gitk:10123 -msgid "Display nearby tags" -msgstr "Показывать близкие метки" - -#: gitk:10126 -msgid "Limit diffs to listed paths" -msgstr "Ограничить показ изменений выбранными файлами" - -#: gitk:10129 -msgid "Support per-file encodings" -msgstr "Поддержка кодировок в отдельных файлах" - -#: gitk:10135 -msgid "External diff tool" -msgstr "Программа для показа изменений" - -#: gitk:10137 -msgid "Choose..." -msgstr "Выберите..." - -#: gitk:10142 -msgid "Colors: press to choose" -msgstr "Цвета: нажмите для выбора" - -#: gitk:10145 -msgid "Background" -msgstr "Фон" - -#: gitk:10146 gitk:10176 -msgid "background" -msgstr "фон" - -#: gitk:10149 -msgid "Foreground" -msgstr "Передний план" - -#: gitk:10150 -msgid "foreground" -msgstr "передний план" - -#: gitk:10153 -msgid "Diff: old lines" -msgstr "Изменения: старый текст" - -#: gitk:10154 -msgid "diff old lines" -msgstr "старый текст изменения" - -#: gitk:10158 -msgid "Diff: new lines" -msgstr "Изменения: новый текст" - -#: gitk:10159 -msgid "diff new lines" -msgstr "новый текст изменения" - -#: gitk:10163 -msgid "Diff: hunk header" -msgstr "Изменения: заголовок блока" - -#: gitk:10165 -msgid "diff hunk header" -msgstr "заголовок блока изменений" - -#: gitk:10169 -msgid "Marked line bg" -msgstr "Фон выбранной строки" - -#: gitk:10171 -msgid "marked line background" -msgstr "фон выбранной строки" - -#: gitk:10175 -msgid "Select bg" -msgstr "Выберите фон" - -#: gitk:10179 -msgid "Fonts: press to choose" -msgstr "Шрифт: нажмите для выбора" - -#: gitk:10181 -msgid "Main font" -msgstr "Основной шрифт" - -#: gitk:10182 -msgid "Diff display font" -msgstr "Шрифт показа изменений" - -#: gitk:10183 -msgid "User interface font" -msgstr "Шрифт интерфейса" - -#: gitk:10210 -#, tcl-format -msgid "Gitk: choose color for %s" -msgstr "Gitk: выберите цвет для %s" - -#: gitk:10656 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"К сожалению gitk не может работать с этой версий Tcl/Tk.\n" -"Требуется как минимум Tcl/Tk 8.4." - -#: gitk:10773 -msgid "Cannot find a git repository here." -msgstr "Git-репозитарий не найден в текущем каталоге." - -#: gitk:10777 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Git-репозитарий \"%s\" не найден." - -#: gitk:10824 -#, tcl-format -msgid "Ambiguous argument '%s': both revision and filename" -msgstr "Неоднозначный аргумент '%s': существует как версия и имя файла" - -#: gitk:10836 -msgid "Bad arguments to gitk:" -msgstr "Неправильные аргументы для gitk:" - -#: gitk:10896 -msgid "Command line" -msgstr "Командная строка" - @@ -1,1302 +1,3865 @@ -# Swedish translation for gitk -# Copyright (C) 2005-2010 Paul Mackerras -# This file is distributed under the same license as the gitk 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>, 2008-2010. -# 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:14+0100\n" -"PO-Revision-Date: 2010-09-12 21:16+0100\n" +"Project-Id-Version: git 1.7.10\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-03-26 07:00+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:34 +#, 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: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 "" +"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\"." + +#: commit.c:47 +#, c-format +msgid "could not parse %s" +msgstr "kunde inte tolka %s" + +#: commit.c:49 +#, 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" + +#: 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:1336 +msgid " 0 files changed\n" +msgstr " 0 filer ändrade\n" + +#: diff.c:1340 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] " %d fil ändrad" +msgstr[1] " %d filer ändrade" + +#: diff.c:1357 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] ", %d tillägg(+)" +msgstr[1] ", %d tillägg(+)" + +#: diff.c:1368 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] ", %d borttagning(-)" +msgstr[1] ", %d borttagningar(-)" + +#: diff.c:3424 +#, 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" + +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "gpg misslyckades signera data" + +#: grep.c:1280 +#, c-format +msgid "'%s': unable to read %s" +msgstr "\"%s\" kunde inte läsa %s" + +#: grep.c:1297 +#, c-format +msgid "'%s': %s" +msgstr "\"%s\": %s" + +#: grep.c:1308 +#, c-format +msgid "'%s': short read %s" +msgstr "\"%s\": kort läsning %s" + +#: 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 "" +"\"%s\" verkar vara ett git-kommando, men vi kan inte\n" +"köra det. Kanske git-%s är trasigt?" + +#: 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] "Din gren ligger före \"%s\" med %d incheckning.\n" +msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\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] "" +"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: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] "" +"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: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 "Kunde inte öppna \"%s\" för skrivning" + +#: 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 "Kunde inte skriva till \"%s\"" + +#: sequencer.c:143 +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>\"" -#: gitk:115 -msgid "Couldn't get list of unmerged files:" -msgstr "Kunde inte hämta lista över ej sammanslagna filer:" +#: 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 "" +"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:159 sequencer.c:685 sequencer.c:768 +#, c-format +msgid "Could not write to %s" +msgstr "Kunde inte skriva till %s" + +#: sequencer.c:162 +#, c-format +msgid "Error wrapping up %s" +msgstr "Fel vid ombrytning av %s" + +#: sequencer.c:177 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"." + +#: sequencer.c:179 +msgid "Your local changes would be overwritten by revert." +msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"." + +#: sequencer.c:182 +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:232 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Kunde inte skriva ny indexfil" + +#: sequencer.c:298 +msgid "Your index file is unmerged." +msgstr "Din indexfil har inte slagits ihop." + +#: sequencer.c:301 +msgid "You do not have a valid HEAD" +msgstr "Du har ingen giltig HEAD" + +#: sequencer.c:316 +#, 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:324 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "Incheckning %s har inte förälder %d" + +#: sequencer.c:328 +#, 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:339 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: kan inte tolka föräldraincheckningen %s" + +#: sequencer.c:343 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Kan inte hämta incheckningsmeddelande för %s" + +#: sequencer.c:427 +#, c-format +msgid "could not revert %s... %s" +msgstr "kunde inte ångra %s... %s" + +#: sequencer.c:428 +#, c-format +msgid "could not apply %s... %s" +msgstr "kunde inte applicera %s... %s" + +#: 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 "misslyckades skapa revisionstraversering" + +#: sequencer.c:453 +msgid "empty commit set passed" +msgstr "den angivna uppsättningen incheckningar är tom" + +#: sequencer.c:461 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: misslyckades läsa indexet" + +#: sequencer.c:466 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: misslyckades uppdatera indexet" + +#: sequencer.c:551 +#, c-format +msgid "Cannot %s during a %s" +msgstr "kan inte %s under en %s" + +#: sequencer.c:573 +#, c-format +msgid "Could not parse line %d." +msgstr "Kan inte tolka rad %d." + +#: sequencer.c:578 +msgid "No commits parsed." +msgstr "Inga incheckningar lästes." + +#: sequencer.c:591 +#, c-format +msgid "Could not open %s" +msgstr "Kunde inte öppna %s" + +#: sequencer.c:595 +#, c-format +msgid "Could not read %s." +msgstr "kunde inte läsa %s." + +#: sequencer.c:602 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "Oanvändbart manus: %s" + +#: sequencer.c:630 +#, c-format +msgid "Invalid key: %s" +msgstr "Felaktig nyckel: %s" + +#: sequencer.c:633 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Felaktigt värde för %s: %s" + +#: sequencer.c:645 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "Trasigt manus: %s" + +#: sequencer.c:666 +msgid "a cherry-pick or revert is already in progress" +msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" + +#: sequencer.c:667 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" + +#: sequencer.c:671 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" + +#: sequencer.c:687 sequencer.c:772 +#, c-format +msgid "Error wrapping up %s." +msgstr "Fel vid ombrytning av %s." + +#: sequencer.c:706 sequencer.c:840 +msgid "no cherry-pick or revert in progress" +msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" + +#: sequencer.c:708 +msgid "cannot resolve HEAD" +msgstr "kan inte bestämma HEAD" + +#: sequencer.c:710 +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:732 +#, c-format +msgid "cannot open %s: %s" +msgstr "kan inte öppna %s: %s" + +#: sequencer.c:735 +#, c-format +msgid "cannot read %s: %s" +msgstr "kan inte läsa %s: %s" + +#: sequencer.c:736 +msgid "unexpected end of file" +msgstr "oväntat filslut" + +#: sequencer.c:742 +#, 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:765 +#, c-format +msgid "Could not format %s." +msgstr "Kunde inte formatera %s." + +#: sequencer.c:927 +msgid "Can't revert as initial commit" +msgstr "Kan inte ångra som första incheckning" + +#: sequencer.c:928 +msgid "Can't cherry-pick into empty head" +msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" + +#: wt-status.c:134 +msgid "Unmerged paths:" +msgstr "Ej sammanslagna sökvägar:" + +#: wt-status.c:140 wt-status.c:157 +#, 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:142 wt-status.c:159 +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:143 +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:151 +msgid "Changes to be committed:" +msgstr "Ändringar att checka in:" + +#: wt-status.c:169 +msgid "Changes not staged for commit:" +msgstr "Ändringar ej i incheckningskön:" + +#: wt-status.c:173 +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)" -#: gitk:274 -msgid "Error parsing revisions:" -msgstr "Fel vid tolkning av revisioner:" +#: wt-status.c:175 +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)" -#: gitk:330 -msgid "Error executing --argscmd command:" -msgstr "Fel vid körning av --argscmd-kommando:" +#: wt-status.c:176 +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)" -#: gitk:343 -msgid "No files selected: --merge specified but no files are unmerged." +#: wt-status.c:178 +msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -"Inga filer valdes: --merge angavs men det finns inga filer som inte har " -"slagits samman." +" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" + +# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e. +#: wt-status.c:187 +#, c-format +msgid "%s files:" +msgstr "%se filer:" -#: gitk:346 +#: wt-status.c:190 +#, 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 vad som skall checkas in)" + +#: wt-status.c:207 +msgid "bug" +msgstr "programfel" + +#: wt-status.c:212 +msgid "both deleted:" +msgstr "borttaget av bägge:" + +#: wt-status.c:213 +msgid "added by us:" +msgstr "tillagt av oss:" + +#: wt-status.c:214 +msgid "deleted by them:" +msgstr "borttaget av dem:" + +#: wt-status.c:215 +msgid "added by them:" +msgstr "tillagt av dem:" + +#: wt-status.c:216 +msgid "deleted by us:" +msgstr "borttaget av oss:" + +#: wt-status.c:217 +msgid "both added:" +msgstr "tillagt av bägge:" + +#: wt-status.c:218 +msgid "both modified:" +msgstr "ändrat av bägge:" + +#: wt-status.c:248 +msgid "new commits, " +msgstr "nya incheckningar, " + +#: wt-status.c:250 +msgid "modified content, " +msgstr "ändrat innehåll, " + +#: wt-status.c:252 +msgid "untracked content, " +msgstr "ospårat innehåll, " + +#: wt-status.c:266 +#, c-format +msgid "new file: %s" +msgstr "ny fil: %s" + +#: wt-status.c:269 +#, c-format +msgid "copied: %s -> %s" +msgstr "kopierad: %s -> %s" + +#: wt-status.c:272 +#, c-format +msgid "deleted: %s" +msgstr "borttagen: %s" + +#: wt-status.c:275 +#, c-format +msgid "modified: %s" +msgstr "ändrad: %s" + +#: wt-status.c:278 +#, c-format +msgid "renamed: %s -> %s" +msgstr "namnbyte: %s -> %s" + +#: wt-status.c:281 +#, c-format +msgid "typechange: %s" +msgstr "typbyte: %s" + +#: wt-status.c:284 +#, c-format +msgid "unknown: %s" +msgstr "okänd: %s" + +#: wt-status.c:287 +#, c-format +msgid "unmerged: %s" +msgstr "osammansl.: %s" + +#: wt-status.c:290 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "programfel: diff-status %c ej hanterad" + +#: wt-status.c:713 +msgid "On branch " +msgstr "På grenen " + +#: wt-status.c:720 +msgid "Not currently on any branch." +msgstr "Inte på någon gren för närvarande." + +#: wt-status.c:731 +msgid "Initial commit" +msgstr "Första incheckning" + +#: wt-status.c:745 +msgid "Untracked" +msgstr "Ospårad" + +#: wt-status.c:747 +msgid "Ignored" +msgstr "Ignorerad" + +# %s är nästa sträng eller tom. +#: wt-status.c:749 +#, c-format +msgid "Untracked files not listed%s" +msgstr "Ospårade filer visas ej%s" + +#: wt-status.c:751 +msgid " (use -u option to show untracked files)" +msgstr " (använd flaggan -u för att visa ospårade filer)" + +#: wt-status.c:757 +msgid "No changes" +msgstr "Inga ändringar" + +#: wt-status.c:761 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "inga ändringar att checka in%s\n" + +#: wt-status.c:763 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr " (använd \"git add\" och/eller \"git commit -a\")" + +#: wt-status.c:765 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "inget köat för incheckning, men ospårade filer finns%s\n" + +#: wt-status.c:767 +msgid " (use \"git add\" to track)" +msgstr " (använd \"git add\" för att spåra)" + +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 +#, c-format +msgid "nothing to commit%s\n" +msgstr "inget att checka in%s\n" + +#: wt-status.c:770 +msgid " (create/copy files and use \"git add\" to track)" +msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)" + +#: wt-status.c:773 +msgid " (use -u to show untracked files)" +msgstr " (använd -u för att visa ospårade filer)" + +#: wt-status.c:776 +msgid " (working directory clean)" +msgstr " (arbetskatalogen ren)" + +#: wt-status.c:884 +msgid "HEAD (no branch)" +msgstr "HEAD (ingen gren)" + +#: wt-status.c:890 +msgid "Initial commit on " +msgstr "Första incheckning på " + +#: wt-status.c:905 +msgid "behind " +msgstr "efter " + +#: wt-status.c:908 wt-status.c:911 +msgid "ahead " +msgstr "före " + +#: wt-status.c:913 +msgid ", behind " +msgstr ", efter " + +#: 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:298 +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:456 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 applicera \"%s\"" + +#: builtin/add.c:312 +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:352 +#, 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:353 +msgid "no files added" +msgstr "inga filer har lagts till" + +#: builtin/add.c:359 +msgid "adding files failed" +msgstr "misslyckades lägga till filer" + +#: builtin/add.c:391 +msgid "-A and -u are mutually incompatible" +msgstr "-A och -u är ömsesidigt inkompatibla" + +#: builtin/add.c:393 +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:413 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Inget angivet, inget tillagt.\n" + +#: builtin/add.c:414 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Kanske menade du att skriva \"git add .\"?\n" + +#: 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 "indexfilen trasig" + +#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "Kunde inte skriva ny indexfil" + +#: 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/branch.c:137 +#, c-format msgid "" -"No files selected: --merge specified but no unmerged files are within file " -"limit." +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." msgstr "" -"Inga filer valdes: --merge angavs men det finns inga filer inom " -"filbegränsningen." +"tar bort grenen \"%s\" som har slagits ihop med\n" +" \"%s\", men ännu inte slagits ihop med HEAD." -#: gitk:368 gitk:516 -msgid "Error executing git log:" -msgstr "Fel vid körning av git log:" +#: 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 "" +"tar inte bort grenen \"%s\" som inte har slagits ihop med\n" +" \"%s\", trots att den har slagits ihop med HEAD." + +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" +#: builtin/branch.c:163 +msgid "remote " +msgstr "fjärr" + +#: builtin/branch.c:171 +msgid "cannot use -a with -d" +msgstr "kan inte ange -a med -d" + +#: builtin/branch.c:177 +msgid "Couldn't look up commit object for HEAD" +msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" + +#: builtin/branch.c:182 +#, 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:192 +#, c-format +msgid "%sbranch '%s' not found." +msgstr "%sgrenen \"%s\" hittades inte." + +#: builtin/branch.c:200 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" + +#: 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 "" +"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:214 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "Fel vid borttagning av %sgrenen \"%s\"" + +#: builtin/branch.c:219 +#, c-format +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "Tog bort %sgrenen %s (var %s).\n" + +#: builtin/branch.c:224 +msgid "Update of config-file failed" +msgstr "Misslyckades uppdatera konfigurationsfil" + +#: builtin/branch.c:322 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "grenen \"%s\" pekar inte på en incheckning" + +#: builtin/branch.c:394 +#, c-format +msgid "behind %d] " +msgstr "bakom %d] " + +#: builtin/branch.c:396 +#, c-format +msgid "ahead %d] " +msgstr "före %d] " + +#: builtin/branch.c:398 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "före %d, bakom %d] " + +#: builtin/branch.c:501 +msgid "(no branch)" +msgstr "(ingen gren)" + +#: builtin/branch.c:566 +msgid "some refs could not be read" +msgstr "vissa referenser kunde inte läsas" + +#: builtin/branch.c:579 +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:589 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Felaktigt namn på gren: \"%s\"" + +#: builtin/branch.c:604 +msgid "Branch rename failed" +msgstr "Misslyckades byta namn på gren" + +#: builtin/branch.c:608 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" + +#: builtin/branch.c:612 +#, 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:619 +msgid "Branch is renamed, but update of config-file failed" +msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" + +#: builtin/branch.c:634 +#, c-format +msgid "malformed object name %s" +msgstr "felformat objektnamn %s" + +#: builtin/branch.c:658 +#, c-format +msgid "could not write branch description template: %s\n" +msgstr "kunde inte skriva grenbeskrivningsmall: %s\n" + +#: builtin/branch.c:746 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Misslyckades slå upp HEAD som giltig referens" + +#: builtin/branch.c:751 builtin/clone.c:558 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD hittades inte under refs/heads!" + +#: builtin/branch.c:809 +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" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s är okej\n" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." + +#: builtin/checkout.c:113 builtin/checkout.c:146 +#, c-format +msgid "path '%s' does not have our version" +msgstr "sökvägen \"%s\" har inte vår version" + +#: builtin/checkout.c:115 builtin/checkout.c:148 +#, c-format +msgid "path '%s' does not have their version" +msgstr "sökvägen \"%s\" har inte deras version" + +#: builtin/checkout.c:131 +#, 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:175 +#, 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:192 +#, c-format +msgid "path '%s': cannot merge" +msgstr "sökväg \"%s\": kan inte slå ihop" + +#: builtin/checkout.c:209 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" + +#: builtin/checkout.c:212 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/checkout.c:234 builtin/checkout.c:392 +msgid "corrupt index file" +msgstr "indexfilen är trasig" + +#: builtin/checkout.c:264 builtin/checkout.c:271 +#, c-format +msgid "path '%s' is unmerged" +msgstr "sökvägen \"%s\" har inte slagits ihop" + +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/merge.c:811 +msgid "unable to write new index file" +msgstr "kunde inte skriva ny indexfil" + +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 +msgid "diff_setup_done failed" +msgstr "diff_setup_done misslyckades" + +#: builtin/checkout.c:414 +msgid "you need to resolve your current index first" +msgstr "du måste lösa ditt befintliga index först" + +#: builtin/checkout.c:533 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "Kan inte skapa referenslog för \"%s\"\n" + +#: builtin/checkout.c:565 +msgid "HEAD is now at" +msgstr "HEAD är nu på" + +#: builtin/checkout.c:572 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Återställ gren \"%s\"\n" + +#: builtin/checkout.c:575 +#, c-format +msgid "Already on '%s'\n" +msgstr "Redan på \"%s\"\n" + +#: builtin/checkout.c:579 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Växlade till och nollställde grenen \"%s\"\n" + +#: builtin/checkout.c:581 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Växlade till en ny gren \"%s\"\n" + +#: builtin/checkout.c:583 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Växlade till grenen \"%s\"\n" + +#: builtin/checkout.c:639 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... och %d till.\n" + +#. 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] "" +"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" -#: gitk:386 gitk:532 -msgid "Reading" -msgstr "Läser" +#: 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 "" +"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" -#: gitk:446 gitk:4271 -msgid "Reading commits..." -msgstr "Läser incheckningar..." +#: builtin/checkout.c:692 +msgid "internal error in revision walk" +msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: gitk:449 gitk:1580 gitk:4274 -msgid "No commits selected" -msgstr "Inga incheckningar markerade" +#: builtin/checkout.c:696 +msgid "Previous HEAD position was" +msgstr "Tidigare position för HEAD var" -#: gitk:1456 -msgid "Can't parse git log output:" -msgstr "Kan inte tolka utdata från git log:" +#: builtin/checkout.c:722 +msgid "You are on a branch yet to be born" +msgstr "Du är på en gren som ännu inte är född" -#: gitk:1676 -msgid "No commit information available" -msgstr "Ingen incheckningsinformation är tillgänglig" +#. case (1) +#: builtin/checkout.c:853 +#, c-format +msgid "invalid reference: %s" +msgstr "felaktig referens: %s" -#: gitk:1818 -msgid "mc" -msgstr "mc" +#. case (1): want a tree +#: builtin/checkout.c:892 +#, c-format +msgid "reference is not a tree: %s" +msgstr "referensen är inte ett träd: %s" -#: gitk:1853 gitk:4064 gitk:9067 gitk:10607 gitk:10817 -msgid "OK" -msgstr "OK" +#: builtin/checkout.c:972 +msgid "-B cannot be used with -b" +msgstr "-B kan inte användas med -b" -#: gitk:1855 gitk:4066 gitk:8657 gitk:8736 gitk:8851 gitk:8900 gitk:9069 -#: gitk:10608 gitk:10818 -msgid "Cancel" -msgstr "Avbryt" +#: builtin/checkout.c:981 +msgid "--patch is incompatible with all other options" +msgstr "--patch är inkompatibel med alla andra flaggor" -#: gitk:1980 -msgid "Update" -msgstr "Uppdatera" +#: builtin/checkout.c:984 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "--detcah kan inte användas med -b/-B/--orphan" -#: gitk:1981 -msgid "Reload" -msgstr "Ladda om" +#: builtin/checkout.c:986 +msgid "--detach cannot be used with -t" +msgstr "--detach kan inte användas med -t" -#: gitk:1982 -msgid "Reread references" -msgstr "Läs om referenser" +#: builtin/checkout.c:992 +msgid "--track needs a branch name" +msgstr "--track behöver ett namn på en gren" -#: gitk:1983 -msgid "List references" -msgstr "Visa referenser" +#: builtin/checkout.c:999 +msgid "Missing branch name; try -b" +msgstr "Grennamn saknas; försök med -b" -#: gitk:1985 -msgid "Start git gui" -msgstr "Starta git gui" +#: builtin/checkout.c:1005 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "--orphan och -b|-B kan inte användas samtidigt" -#: gitk:1987 -msgid "Quit" -msgstr "Avsluta" +#: builtin/checkout.c:1007 +msgid "--orphan cannot be used with -t" +msgstr "--orphan kan inte användas med -t" -#: gitk:1979 -msgid "File" -msgstr "Arkiv" +#: builtin/checkout.c:1017 +msgid "git checkout: -f and -m are incompatible" +msgstr "git checkout: -f och -m är inkompatibla" -#: gitk:1991 -msgid "Preferences" -msgstr "Inställningar" +#: builtin/checkout.c:1051 +msgid "invalid path specification" +msgstr "felaktig sökvägsangivelse" -#: gitk:1990 -msgid "Edit" -msgstr "Redigera" +#: 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 "" +"git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n" +"Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?" -#: gitk:1995 -msgid "New view..." -msgstr "Ny vy..." +#: builtin/checkout.c:1061 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." -#: gitk:1996 -msgid "Edit view..." -msgstr "Ändra vy..." +#: builtin/checkout.c:1066 +msgid "git checkout: --detach does not take a path argument" +msgstr "git checkout: --detach tar inte en sökväg som argument" -#: gitk:1997 -msgid "Delete view" -msgstr "Ta bort vy" +#: builtin/checkout.c:1069 +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." -#: gitk:1999 -msgid "All files" -msgstr "Alla filer" +#: builtin/checkout.c:1088 +msgid "Cannot switch branch to a non-commit." +msgstr "Kan inte växla gren på en icke-incheckning." -#: gitk:1994 gitk:3817 -msgid "View" -msgstr "Visa" +#: builtin/checkout.c:1091 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "--ours/--theirs är inkompatibla med att byta gren." -#: gitk:2004 gitk:2014 gitk:2787 -msgid "About gitk" -msgstr "Om gitk" +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "-x och -X kan inte användas samtidigt" -#: gitk:2005 gitk:2019 -msgid "Key bindings" -msgstr "Tangentbordsbindningar" - -#: gitk:2003 gitk:2018 -msgid "Help" -msgstr "Hjälp" - -#: gitk:2096 gitk:8132 -msgid "SHA1 ID:" -msgstr "SHA1-id:" - -#: gitk:2127 -msgid "Row" -msgstr "Rad" - -#: gitk:2165 -msgid "Find" -msgstr "Sök" - -#: gitk:2166 -msgid "next" -msgstr "nästa" - -#: gitk:2167 -msgid "prev" -msgstr "föreg" - -#: gitk:2168 -msgid "commit" -msgstr "incheckning" - -#: gitk:2171 gitk:2173 gitk:4432 gitk:4455 gitk:4479 gitk:6420 gitk:6492 -#: gitk:6576 -msgid "containing:" -msgstr "som innehåller:" - -#: gitk:2174 gitk:3298 gitk:3303 gitk:4507 -msgid "touching paths:" -msgstr "som rör sökväg:" - -#: gitk:2175 gitk:4512 -msgid "adding/removing string:" -msgstr "som lägger/till tar bort sträng:" - -#: gitk:2184 gitk:2186 -msgid "Exact" -msgstr "Exakt" - -#: gitk:2186 gitk:4587 gitk:6388 -msgid "IgnCase" -msgstr "IgnVersaler" - -#: gitk:2186 gitk:4481 gitk:4585 gitk:6384 -msgid "Regexp" -msgstr "Reg.uttr." - -#: gitk:2188 gitk:2189 gitk:4606 gitk:4636 gitk:4643 gitk:6512 gitk:6580 -msgid "All fields" -msgstr "Alla fält" - -#: gitk:2189 gitk:4604 gitk:4636 gitk:6451 -msgid "Headline" -msgstr "Rubrik" - -#: gitk:2190 gitk:4604 gitk:6451 gitk:6580 gitk:7013 -msgid "Comments" -msgstr "Kommentarer" - -#: gitk:2190 gitk:4604 gitk:4608 gitk:4643 gitk:6451 gitk:6948 gitk:8307 -#: gitk:8322 -msgid "Author" -msgstr "Författare" +#: 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" -#: gitk:2190 gitk:4604 gitk:6451 gitk:6950 -msgid "Committer" -msgstr "Incheckare" +#: 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:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "referensarkivet \"%s\" är inte en lokal katalog." + +#: builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "misslyckades öppna \"%s\"" + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "misslyckades skapa katalogen \"%s\"" + +#: builtin/clone.c:308 builtin/diff.c:75 +#, 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:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "misslyckades ta bort länken \"%s\"" + +#: 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:440 +#, 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:549 +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:639 +msgid "Too many arguments." +msgstr "För många argument." + +#: builtin/clone.c:643 +msgid "You must specify a repository to clone." +msgstr "Du måste ange ett arkiv att klona." + +#: builtin/clone.c:654 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "flaggorna --bare och --origin %s är inkompatibla." + +#: builtin/clone.c:668 +#, c-format +msgid "repository '%s' does not exist" +msgstr "arkivet \"%s\" finns inte" + +#: builtin/clone.c:673 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" + +#: builtin/clone.c:683 +#, 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:693 +#, c-format +msgid "working tree '%s' already exists." +msgstr "arbetsträdet \"%s\" finns redan." + +#: builtin/clone.c:706 builtin/clone.c:720 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "kunde inte skapa inledande kataloger för \"%s\"" + +#: builtin/clone.c:709 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "kunde inte skapa arbetskatalogen \"%s\"" + +#: builtin/clone.c:728 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "Klonar till ett naket arkiv \"%s\"...\n" + +#: builtin/clone.c:730 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "Klonar till \"%s\"...\n" + +#: builtin/clone.c:786 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Vet inte hur man klonar %s" + +#: builtin/clone.c:835 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" + +#: builtin/clone.c:842 +msgid "You appear to have cloned an empty repository." +msgstr "Du verkar ha klonat ett tomt arkiv." + +#: 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 "" +"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" -#: gitk:2221 -msgid "Search" -msgstr "Sök" +#: 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 "" +"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" -#: gitk:2229 -msgid "Diff" -msgstr "Diff" +#: 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 "" +"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" +" git commit --allow-empty\n" +"\n" +"Annars använder du \"git reset\"\n" + +#: builtin/commit.c:205 builtin/reset.c:33 +msgid "merge" +msgstr "sammanslagning" + +#: builtin/commit.c:208 +msgid "cherry-pick" +msgstr "cherry-pick" + +#: builtin/commit.c:325 +msgid "failed to unpack HEAD tree object" +msgstr "misslyckades packa upp HEAD:s trädobjekt" + +#: builtin/commit.c:367 +msgid "unable to create temporary index" +msgstr "kunde inte skapa temporär indexfil" + +#: builtin/commit.c:373 +msgid "interactive add failed" +msgstr "interaktiv tilläggning misslyckades" + +#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 +msgid "unable to write new_index file" +msgstr "kunde inte skriva filen new_index" + +# %s är antingen "merge" eller "cherry-pick". +#: builtin/commit.c:457 +#, c-format +msgid "cannot do a partial commit during a %s." +msgstr "kan inte utföra en delvis incheckning under en %s" + +#: builtin/commit.c:466 +msgid "cannot read the index" +msgstr "kan inte läsa indexet" + +#: builtin/commit.c:486 +msgid "unable to write temporary index file" +msgstr "kunde inte skriva temporär indexfil" + +#: builtin/commit.c:550 builtin/commit.c:556 +#, c-format +msgid "invalid commit: %s" +msgstr "felaktig incheckning: %s" + +#: builtin/commit.c:579 +msgid "malformed --author parameter" +msgstr "felformad \"--author\"-flagga" + +#: builtin/commit.c:635 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "Felaktig indragningssträng: \"%s\"" + +#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 +#, c-format +msgid "could not lookup commit %s" +msgstr "kunde inte slå upp incheckningen %s" + +#: builtin/commit.c:682 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:684 +msgid "could not read log from standard input" +msgstr "kunde inte läsa logg från standard in" + +#: builtin/commit.c:688 +#, c-format +msgid "could not read log file '%s'" +msgstr "kunde inte läsa loggfilen \"%s\"" + +#: builtin/commit.c:694 +msgid "commit has empty message" +msgstr "incheckningen har ett tomt meddelande" + +#: builtin/commit.c:710 +msgid "could not read MERGE_MSG" +msgstr "kunde inte läsa MERGE_MSG" + +#: builtin/commit.c:714 +msgid "could not read SQUASH_MSG" +msgstr "kunde inte läsa SQUASH_MSG" + +#: builtin/commit.c:718 +#, c-format +msgid "could not read '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: builtin/commit.c:746 +#, c-format +msgid "could not open '%s'" +msgstr "kunde inte öppna \"%s\"" + +#: builtin/commit.c:770 +msgid "could not write commit template" +msgstr "kunde inte skriva incheckningsmall" + +# %s är "merge" eller "cherry-pick" +#: 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 "" +"\n" +"Det verkar som du checkar in en %s.\n" +"Om det inte stämmer tar du bort filen\n" +"\t%s\n" +"och försöker igen.\n" -#: gitk:2231 -msgid "Old version" -msgstr "Gammal version" +#: builtin/commit.c:796 +msgid "Please enter the commit message for your changes." +msgstr "Ange ett incheckningsmeddelande för dina ändringar." -#: gitk:2233 -msgid "New version" -msgstr "Ny version" +#: builtin/commit.c:799 +msgid "" +" Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +" Rader som inleds\n" +"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n" -#: gitk:2235 -msgid "Lines of context" -msgstr "Rader sammanhang" +#: 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 "" +" 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:816 +#, c-format +msgid "%sAuthor: %s" +msgstr "%sFörfattare: %s" + +#: builtin/commit.c:823 +#, c-format +msgid "%sCommitter: %s" +msgstr "%sIncheckare: %s" + +#: builtin/commit.c:843 +msgid "Cannot read index" +msgstr "Kan inte läsa indexet" + +#: builtin/commit.c:880 +msgid "Error building trees" +msgstr "Fel vid byggande av träd" + +#: builtin/commit.c:895 builtin/tag.c:357 +#, 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:975 +#, c-format +msgid "No existing author found with '%s'" +msgstr "Hittade ingen befintlig författare med \"%s\"" + +#: builtin/commit.c:990 builtin/commit.c:1182 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Ogiltigt läge för ospårade filer: \"%s\"" + +#: builtin/commit.c:1030 +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:1041 +msgid "You have nothing to amend." +msgstr "Du har inget att utöka." + +#: builtin/commit.c:1043 +#, c-format +msgid "You are in the middle of a %s -- cannot amend." +msgstr "Du är i mitten av en %s -- kan inte utöka." + +#: builtin/commit.c:1045 +msgid "Options --squash and --fixup cannot be used together" +msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" + +#: builtin/commit.c:1055 +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:1057 +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:1063 +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:1080 +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:1082 +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:1084 +msgid "Clever... amending the last one with dirty index." +msgstr "Smart... utöka den senaste med smutsigt index." + +#: builtin/commit.c:1086 +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:1096 builtin/tag.c:556 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Felaktigt städningsläge %s" + +#: builtin/commit.c:1101 +msgid "Paths with -a does not make sense." +msgstr "Kan inte ange sökvägar med -a." + +#: builtin/commit.c:1280 +msgid "couldn't look up newly created commit" +msgstr "kunde inte slå upp en precis skapad incheckning" + +#: builtin/commit.c:1282 +msgid "could not parse newly created commit" +msgstr "kunde inte tolka en precis skapad incheckning" + +#: builtin/commit.c:1323 +msgid "detached HEAD" +msgstr "frånkopplad HEAD" + +#: builtin/commit.c:1325 +msgid " (root-commit)" +msgstr " (rotincheckning)" + +#: builtin/commit.c:1415 +msgid "could not parse HEAD commit" +msgstr "kunde inte tolka HEAD:s incheckning" + +#: builtin/commit.c:1452 builtin/merge.c:509 +#, c-format +msgid "could not open '%s' for reading" +msgstr "kunde inte öppna \"%s\" för läsning" + +#: builtin/commit.c:1459 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Trasig MERGE_HEAD-fil (%s)" + +#: builtin/commit.c:1466 +msgid "could not read MERGE_MODE" +msgstr "kunde inte läsa MERGE_MODE" + +#: builtin/commit.c:1485 +#, c-format +msgid "could not read commit message: %s" +msgstr "kunde inte läsa incheckningsmeddelande: %s" + +#: builtin/commit.c:1499 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" + +#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968 +msgid "failed to write commit object" +msgstr "kunde inte skriva incheckningsobjekt" + +#: builtin/commit.c:1535 +msgid "cannot lock HEAD ref" +msgstr "kunde inte låsa HEAD-referens" + +#: builtin/commit.c:1539 +msgid "cannot update HEAD ref" +msgstr "kunde inte uppdatera HEAD-referens" + +#: 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 "" +"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." + +#: 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." -#: gitk:2245 -msgid "Ignore space change" -msgstr "Ignorera ändringar i blanksteg" +#: 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." -#: gitk:2304 -msgid "Patch" -msgstr "Patch" +#: builtin/describe.c:378 +#, c-format +msgid "traversed %lu commits\n" +msgstr "traverserade %lu incheckningar\n" -#: gitk:2306 -msgid "Tree" -msgstr "Träd" +#: builtin/describe.c:381 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" +"mer än %i taggar hittades; listar de %i senaste\n" +"gav upp sökningen vid %s\n" + +#: 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:77 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "\"%s\": inte en normal fil eller symbolisk länk" + +#: builtin/diff.c:220 +#, c-format +msgid "invalid option: %s" +msgstr "ogiltig flagga: %s" + +#: builtin/diff.c:297 +msgid "Not a git repository" +msgstr "Inte ett git-arkiv" + +#: builtin/diff.c:347 +#, c-format +msgid "invalid object '%s' given." +msgstr "objektet \"%s\" som angavs är felaktigt." + +#: builtin/diff.c:352 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "mer än %d träd angavs: \"%s\"" + +#: builtin/diff.c:362 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "mer än två blobbar angavs: \"%s\"" + +#: builtin/diff.c:370 +#, c-format +msgid "unhandled object '%s' given." +msgstr "ej hanterat objekt \"%s\" angavs." + +#: builtin/fetch.c:200 +msgid "Couldn't find remote ref HEAD" +msgstr "Kunde inte hitta fjärr-referensen HEAD" + +#: builtin/fetch.c:252 +#, c-format +msgid "object %s not found" +msgstr "objektet %s hittades inte" + +#: builtin/fetch.c:258 +msgid "[up to date]" +msgstr "[àjour]" + +#: builtin/fetch.c:272 +#, 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:273 builtin/fetch.c:351 +msgid "[rejected]" +msgstr "[refuserad]" + +#: builtin/fetch.c:284 +msgid "[tag update]" +msgstr "[uppdaterad tagg]" + +#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331 +msgid " (unable to update local ref)" +msgstr " (kunde inte uppdatera lokal ref)" + +#: builtin/fetch.c:298 +msgid "[new tag]" +msgstr "[ny tagg]" + +#: builtin/fetch.c:302 +msgid "[new branch]" +msgstr "[ny gren]" + +#: builtin/fetch.c:347 +msgid "unable to update local ref" +msgstr "kunde inte uppdatera lokal ref" + +#: builtin/fetch.c:347 +msgid "forced update" +msgstr "tvingad uppdatering" + +#: builtin/fetch.c:353 +msgid "(non-fast-forward)" +msgstr "(ej snabbspolad)" + +#: builtin/fetch.c:384 builtin/fetch.c:676 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "kan inte öppna %s: %s\n" + +#: builtin/fetch.c:393 +#, 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:479 +#, c-format +msgid "From %.*s\n" +msgstr "Från %.*s\n" + +#: 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 "" +"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:540 +#, c-format +msgid " (%s will become dangling)\n" +msgstr " (%s kommer bli dinglande)\n" + +#: builtin/fetch.c:541 +#, c-format +msgid " (%s has become dangling)\n" +msgstr " (%s har blivit dinglande)\n" + +#: builtin/fetch.c:548 +msgid "[deleted]" +msgstr "[borttagen]" + +#: builtin/fetch.c:549 +msgid "(none)" +msgstr "(ingen)" + +#: builtin/fetch.c:666 +#, 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:700 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "Vet inte hur man hämtar från %s" + +#: builtin/fetch.c:777 +#, 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:780 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "Flaggan \"%s\" ignoreras för %s\n" + +#: builtin/fetch.c:879 +#, c-format +msgid "Fetching %s\n" +msgstr "Hämtar %s\n" + +#: builtin/fetch.c:881 +#, c-format +msgid "Could not fetch %s" +msgstr "Kunde inte hämta %s" + +#: 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 "" +"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:918 +msgid "You need to specify a tag name." +msgstr "Du måste ange namnet på en tagg." + +#: builtin/fetch.c:970 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all tar inte namnet på ett arkiv som argument" + +#: builtin/fetch.c:972 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all kan inte anges med referensspecifikationer" + +#: builtin/fetch.c:983 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "Fjärren eller fjärrgruppen finns inte: %s" + +#: builtin/fetch.c:991 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "Kan inte hämta från grupp och ange referensspecifikationer" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "Felaktigt %s: \"%s\"" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "För många flaggor angavs" + +#: builtin/gc.c:103 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "tokigt lång objektkatalog %.*s" + +#: builtin/gc.c:223 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "Packar arkivet automatiskt för optimal prestanda.\n" + +#: 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 "" +"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" -#: gitk:2463 gitk:2480 -msgid "Diff this -> selected" -msgstr "Diff denna -> markerad" +#: builtin/gc.c:256 +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:216 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: misslyckades skapa tråd. %s" + +#: builtin/grep.c:402 +#, c-format +msgid "Failed to chdir: %s" +msgstr "Kunde inte byta katalog (chdir): %s" + +#: builtin/grep.c:478 builtin/grep.c:512 +#, c-format +msgid "unable to read tree (%s)" +msgstr "kunde inte läsa träd (%s)" + +#: builtin/grep.c:526 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "Kunde inte \"grep\" från objekt av typen %s" + +#: builtin/grep.c:584 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "flaggan \"%c\" antar ett numeriskt värde" + +#: builtin/grep.c:601 +#, c-format +msgid "cannot open '%s'" +msgstr "kan inte öppna \"%s\"" + +#: builtin/grep.c:888 +msgid "no pattern given." +msgstr "inget mönster angavs." + +#: builtin/grep.c:902 +#, c-format +msgid "bad object %s" +msgstr "felaktigt objekt %s" + +#: builtin/grep.c:943 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" + +#: builtin/grep.c:966 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached och --untracked kan inte användas med --no-index." + +#: builtin/grep.c:971 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "--no-index och --untracked kan inte användas med revisioner." + +#: builtin/grep.c:974 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." + +#: builtin/grep.c:982 +msgid "both --cached and trees are given." +msgstr "både --cached och träd angavs." + +#: 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:322 builtin/init-db.c:325 +#, c-format +msgid "%s already exists" +msgstr "%s finns redan" + +#: builtin/init-db.c:354 +#, c-format +msgid "unable to handle file type %d" +msgstr "kan inte hantera filtyp %d" + +#: builtin/init-db.c:357 +#, c-format +msgid "unable to move %s to %s" +msgstr "kan inte flytta %s till %s" + +#: builtin/init-db.c:362 +#, 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:419 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s Git-arkiv i %s%s\n" + +#: builtin/init-db.c:420 +msgid "Reinitialized existing" +msgstr "Ominitierade befintligt" + +#: builtin/init-db.c:420 +msgid "Initialized empty" +msgstr "Initierade tomt" + +#: builtin/init-db.c:421 +msgid " shared" +msgstr " delat" + +#: builtin/init-db.c:440 +msgid "cannot tell cwd" +msgstr "kan inte läsa aktuell katalog (cwd)" + +#: builtin/init-db.c:521 builtin/init-db.c:528 +#, c-format +msgid "cannot mkdir %s" +msgstr "kan inte skapa katalogen (mkdir) %s" + +#: builtin/init-db.c:532 +#, c-format +msgid "cannot chdir to %s" +msgstr "kan inte byta katalog (chdir) till %s" + +#: builtin/init-db.c:554 +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" +"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" +"dir=<katalog>)" + +#: builtin/init-db.c:578 +msgid "Cannot access current working directory" +msgstr "Kan inte komma åt aktuell arbetskatalog" + +#: builtin/init-db.c:585 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "Kan inte komma åt arbetskatalogen \"%s\"" + +#: builtin/log.c:187 +#, c-format +msgid "Final output: %d %s\n" +msgstr "Slututdata: %d %s\n" + +#: builtin/log.c:395 builtin/log.c:483 +#, c-format +msgid "Could not read object %s" +msgstr "Kunde inte läsa objektet %s" + +#: builtin/log.c:507 +#, c-format +msgid "Unknown type: %d" +msgstr "Okänd typ: %d" + +#: builtin/log.c:596 +msgid "format.headers without value" +msgstr "format.headers utan värde" + +#: builtin/log.c:669 +msgid "name of output directory is too long" +msgstr "namnet på utdatakatalogen är för långt" + +#: builtin/log.c:680 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Kan inte öppna patchfilen %s" + +#: builtin/log.c:694 +msgid "Need exactly one range." +msgstr "Behöver precis ett intervall." + +#: builtin/log.c:702 +msgid "Not a range." +msgstr "Inte ett intervall." + +#: builtin/log.c:739 +msgid "Could not extract email from committer identity." +msgstr "Kunde inte extrahera e-postadress från incheckarens identitet." + +#: builtin/log.c:785 +msgid "Cover letter needs email format" +msgstr "Omslagsbrevet behöver e-postformat" + +#: builtin/log.c:879 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "tokigt in-reply-to: %s" + +#: builtin/log.c:952 +msgid "Two output directories?" +msgstr "Två utdatakataloger?" + +#: builtin/log.c:1173 +#, c-format +msgid "bogus committer info %s" +msgstr "felaktig incheckarinformation %s" + +#: builtin/log.c:1218 +msgid "-n and -k are mutually exclusive." +msgstr "-n och -k kan inte användas samtidigt." + +#: builtin/log.c:1220 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix och -k kan inte användas samtidigt." + +#: builtin/log.c:1225 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "okänt argument: %s" + +#: builtin/log.c:1228 +msgid "--name-only does not make sense" +msgstr "kan inte använda --name-only" + +#: builtin/log.c:1230 +msgid "--name-status does not make sense" +msgstr "kan inte använda --name-status" + +#: builtin/log.c:1232 +msgid "--check does not make sense" +msgstr "kan inte använda --check" + +#: builtin/log.c:1255 +msgid "standard output, or directory, which one?" +msgstr "standard ut, eller katalog, vilken skall det vara?" + +#: builtin/log.c:1257 +#, c-format +msgid "Could not create directory '%s'" +msgstr "Kunde inte skapa katalogen \"%s\"" + +#: builtin/log.c:1410 +msgid "Failed to create output files" +msgstr "Misslyckades skapa utdatafiler" + +#: builtin/log.c:1514 +#, c-format +msgid "" +"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:1530 builtin/log.c:1532 builtin/log.c:1544 +#, c-format +msgid "Unknown commit %s" +msgstr "Okänd incheckning %s" + +#: builtin/merge.c:91 +msgid "switch `m' requires a value" +msgstr "flaggan \"m\" behöver ett värde" + +#: builtin/merge.c:128 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" + +#: builtin/merge.c:129 +#, c-format +msgid "Available strategies are:" +msgstr "Tillgängliga strategier är:" + +#: builtin/merge.c:134 +#, c-format +msgid "Available custom strategies are:" +msgstr "Tillgängliga skräddarsydda strategier är:" + +#: builtin/merge.c:241 +msgid "could not run stash." +msgstr "kunde köra stash." + +#: builtin/merge.c:246 +msgid "stash failed" +msgstr "stash misslyckades" + +#: builtin/merge.c:251 +#, c-format +msgid "not a valid object: %s" +msgstr "inte ett giltigt objekt: %s" + +#: builtin/merge.c:270 builtin/merge.c:287 +msgid "read-tree failed" +msgstr "read-tree misslyckades" + +#: builtin/merge.c:317 +msgid " (nothing to squash)" +msgstr " (inget att platta till)" + +#: builtin/merge.c:330 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" + +#: builtin/merge.c:362 +msgid "Writing SQUASH_MSG" +msgstr "Skriver SQUASH_MSG" + +#: builtin/merge.c:364 +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:437 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "\"%s\" verkar inte peka på en incheckning" + +#: builtin/merge.c:536 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" + +#: builtin/merge.c:629 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree misslyckades skriva ett träd" + +#: builtin/merge.c:679 +msgid "failed to read the cache" +msgstr "misslyckads läsa cachen" + +#: builtin/merge.c:696 +msgid "Unable to write index." +msgstr "Kunde inte skriva indexet." + +#: 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" -#: gitk:2464 gitk:2481 -msgid "Diff selected -> this" -msgstr "Diff markerad -> denna" +#: 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 "" +"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" +"Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n" +"avbryter incheckningen.\n" -#: gitk:2465 gitk:2482 -msgid "Make patch" -msgstr "Skapa patch" +#: builtin/merge.c:915 +msgid "Empty commit message." +msgstr "Tomt incheckningsmeddelande." -#: gitk:2466 gitk:8715 -msgid "Create tag" -msgstr "Skapa tagg" +#: builtin/merge.c:927 +#, c-format +msgid "Wonderful.\n" +msgstr "Underbart.\n" -#: gitk:2467 gitk:8831 -msgid "Write commit to file" -msgstr "Skriv incheckning till fil" +#: builtin/merge.c:1000 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" +"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: gitk:2468 gitk:8888 -msgid "Create new branch" -msgstr "Skapa ny gren" +#: builtin/merge.c:1016 +#, c-format +msgid "'%s' is not a commit" +msgstr "\"%s\" är inte en incheckning" -#: gitk:2469 -msgid "Cherry-pick this commit" -msgstr "Plocka denna incheckning" +#: builtin/merge.c:1057 +msgid "No current branch." +msgstr "Inte på någon gren." -#: gitk:2470 -msgid "Reset HEAD branch to here" -msgstr "Återställ HEAD-grenen hit" +#: builtin/merge.c:1059 +msgid "No remote for the current branch." +msgstr "Ingen fjärr för aktuell gren." -#: gitk:2471 -msgid "Mark this commit" -msgstr "Markera denna incheckning" +#: builtin/merge.c:1061 +msgid "No default upstream defined for the current branch." +msgstr "Ingen standarduppström angiven för aktuell gren." -#: gitk:2472 -msgid "Return to mark" -msgstr "Återgå till markering" +#: builtin/merge.c:1066 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "Ingen fjärrspårande gren för %s från %s" -#: gitk:2473 -msgid "Find descendant of this and mark" -msgstr "Hitta efterföljare till denna och markera" +#: builtin/merge.c:1188 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: gitk:2474 -msgid "Compare with marked commit" -msgstr "Jämför med markerad incheckning" +#: 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 "" +"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" +"Checka in dina ändringar innan du kan slå ihop." -#: gitk:2488 -msgid "Check out this branch" -msgstr "Checka ut denna gren" +#: builtin/merge.c:1207 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: gitk:2489 -msgid "Remove this branch" -msgstr "Ta bort denna gren" +#: 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 "" +"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" +"Checka in dina ändringar innan du kan slå ihop." + +#: builtin/merge.c:1214 +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:1223 +msgid "You cannot combine --squash with --no-ff." +msgstr "Du kan inte kombinera --squash med --no-ff." + +#: builtin/merge.c:1228 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "Du kan inte kombinera --no-ff med --ff-only." + +#: builtin/merge.c:1235 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." + +#: builtin/merge.c:1266 +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:1269 +msgid "Squash commit into empty head not supported yet" +msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" + +#: builtin/merge.c:1271 +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:1275 builtin/merge.c:1319 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - inte något vi kan slå ihop" + +#: builtin/merge.c:1385 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Uppdaterar %s..%s\n" + +#: builtin/merge.c:1423 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" + +#: builtin/merge.c:1430 +#, c-format +msgid "Nope.\n" +msgstr "Nej.\n" + +#: builtin/merge.c:1462 +msgid "Not possible to fast-forward, aborting." +msgstr "Kan inte snabbspola, avbryter." + +#: builtin/merge.c:1485 builtin/merge.c:1562 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "Återspolar trädet till orört...\n" + +#: builtin/merge.c:1489 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Försöker sammanslagninsstrategin %s...\n" + +#: builtin/merge.c:1553 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" + +#: builtin/merge.c:1555 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Sammanslaning med strategin %s misslyckades.\n" + +#: builtin/merge.c:1564 +#, 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:1575 +#, 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/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 +#, c-format +msgid "renaming '%s' failed" +msgstr "misslyckades byta namn på \"%s\"" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "kunde inte starta \"show\" för objektet \"%s\"" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" + +#: builtin/notes.c:155 +#, 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:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" + +#: builtin/notes.c:175 builtin/tag.c:343 +#, c-format +msgid "could not create file '%s'" +msgstr "kunde inte skapa filen \"%s\"" + +#: builtin/notes.c:189 +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:210 builtin/notes.c:973 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Tar bort anteckning för objektet %s\n" + +#: builtin/notes.c:215 +msgid "unable to write note object" +msgstr "kunde inte skriva anteckningsobjekt" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "Anteckningens innehåll har lämnats kvar i %s" + +#: builtin/notes.c:251 builtin/tag.c:521 +#, c-format +msgid "cannot read '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: builtin/notes.c:253 builtin/tag.c:524 +#, c-format +msgid "could not open or read '%s'" +msgstr "kunde inte öppna eller läsa \"%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:537 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Kunde inte slå upp \"%s\" som en giltig referens." + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "Kunde inte läsa objektet \"%s\"." + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Felaktigt värde för notes.rewriteMode: '%s'" + +#: builtin/notes.c:350 +#, 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:377 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Felaktigt värde på %s: \"%s\"" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Felaktig indatarad: \"%s\"." + +#: builtin/notes.c:456 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%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 "för många parametrar" + +#: builtin/notes.c:513 builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "Inga anteckningar hittades för objektet %s." + +#: builtin/notes.c:580 +#, 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" -#: gitk:2496 -msgid "Highlight this too" -msgstr "Markera även detta" +#: builtin/notes.c:585 builtin/notes.c:662 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: gitk:2497 -msgid "Highlight this only" -msgstr "Markera bara detta" +#: builtin/notes.c:635 +msgid "too few parameters" +msgstr "för få parametrar" -#: gitk:2498 -msgid "External diff" -msgstr "Extern diff" +#: builtin/notes.c:656 +#, 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" -#: gitk:2499 -msgid "Blame parent commit" -msgstr "Klandra föräldraincheckning" +#: builtin/notes.c:668 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: gitk:2506 -msgid "Show origin of this line" -msgstr "Visa ursprunget för den här raden" +#: 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 "" +"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" + +#: builtin/notes.c:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "Objektet %s har ingen anteckning\n" + +#: builtin/notes.c:1103 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Okänt underkommando: %s" + +#: builtin/pack-objects.c:2310 +#, c-format +msgid "unsupported index version %s" +msgstr "indexversionen %s stöds ej" + +#: builtin/pack-objects.c:2314 +#, c-format +msgid "bad index version '%s'" +msgstr "felaktig indexversion \"%s\"" + +#: builtin/pack-objects.c:2322 +#, c-format +msgid "option %s does not accept negative form" +msgstr "flaggan %s godtar inte negativ form" + +#: builtin/pack-objects.c:2326 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" + +#: builtin/push.c:44 +msgid "tag shorthand without <tag>" +msgstr "taggförkortning utan <tagg>" + +#: builtin/push.c:63 +msgid "--delete only accepts plain target ref names" +msgstr "--delete godtar endast enkla målreferensnamn" + +#: 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 "" +"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" -#: gitk:2507 -msgid "Run git gui blame on this line" -msgstr "Kör git gui blame på den här raden" +#: 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 "" +"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" -#: gitk:2789 +#: builtin/push.c:88 +#, 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." + +#: builtin/push.c:111 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Du angav inga referensspecifikationer att sända, och push.default är " +"\"nothing\"." + +#: builtin/push.c:131 +#, c-format +msgid "Pushing to %s\n" +msgstr "Sänder till %s\n" + +#: builtin/push.c:135 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "misslyckades sända vissa referenser till \"%s\"" + +#: 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 "" +"För att förhindra att du tappar historik har icke snabbspolande " +"uppdateringar\n" +"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du sänder " +"igen.\n" +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för " +"detaljer.\n" + +#: builtin/push.c:160 +#, c-format +msgid "bad repository '%s'" +msgstr "felaktigt arkiv \"%s\"" + +#: 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" -"Gitk - a commit viewer for git\n" +" git remote add <name> <url>\n" "\n" -"Copyright ©9 2005-2010 Paul Mackerras\n" +"and then push using the remote name\n" "\n" -"Use and redistribute under the terms of the GNU General Public License" +" git push <name>\n" msgstr "" +"Ingen destination har angivits.\n" +"Ange antingen URL:en på kommandoraden eller ställ in ett uppströmsarkiv med\n" "\n" -"Gitk - en incheckningsvisare för git\n" +" git remote add <namn> <url>\n" "\n" -"Copyright ©9 2005-2010 Paul Mackerras\n" +"och sänd sedan med hjälp av fjärrnamnet\n" "\n" -"Använd och vidareförmedla enligt villkoren i GNU General Public License" - -#: gitk:2797 gitk:2862 gitk:9253 -msgid "Close" -msgstr "Stäng" - -#: gitk:2818 -msgid "Gitk key bindings" -msgstr "Tangentbordsbindningar för Gitk" - -#: gitk:2821 -msgid "Gitk key bindings:" -msgstr "Tangentbordsbindningar för Gitk:" - -#: gitk:2823 -#, tcl-format -msgid "<%s-Q>\t\tQuit" -msgstr "<%s-Q>\t\tAvsluta" - -#: gitk:2824 -#, tcl-format -msgid "<%s-W>\t\tClose window" -msgstr "<%s-W>\t\tStäng fönster" - -#: gitk:2825 -msgid "<Home>\t\tMove to first commit" -msgstr "<Home>\t\tGå till första incheckning" - -#: gitk:2826 -msgid "<End>\t\tMove to last commit" -msgstr "<End>\t\tGå till sista incheckning" - -#: gitk:2827 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Upp>, p, i\tGå en incheckning upp" - -#: gitk:2828 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Ned>, n, k\tGå en incheckning ned" - -#: gitk:2829 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Vänster>, z, j\tGå bakåt i historiken" - -#: gitk:2830 -msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Höger>, x, l\tGå framåt i historiken" - -#: gitk:2831 -msgid "<PageUp>\tMove up one page in commit list" -msgstr "<PageUp>\tGå upp en sida i incheckningslistan" - -#: gitk:2832 -msgid "<PageDown>\tMove down one page in commit list" -msgstr "<PageDown>\tGå ned en sida i incheckningslistan" - -#: gitk:2833 -#, tcl-format -msgid "<%s-Home>\tScroll to top of commit list" -msgstr "<%s-Home>\tRulla till början av incheckningslistan" - -#: gitk:2834 -#, tcl-format -msgid "<%s-End>\tScroll to bottom of commit list" -msgstr "<%s-End>\tRulla till slutet av incheckningslistan" - -#: gitk:2835 -#, tcl-format -msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" - -#: gitk:2836 -#, tcl-format -msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" - -#: gitk:2837 -#, tcl-format -msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" - -#: gitk:2838 -#, tcl-format -msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" - -#: gitk:2839 -msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)" - -#: gitk:2840 -msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)" - -#: gitk:2841 -msgid "<Delete>, b\tScroll diff view up one page" -msgstr "<Delete>, b\tRulla diffvisningen upp en sida" - -#: gitk:2842 -msgid "<Backspace>\tScroll diff view up one page" -msgstr "<Baksteg>\tRulla diffvisningen upp en sida" - -#: gitk:2843 -msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Blanksteg>\tRulla diffvisningen ned en sida" - -#: gitk:2844 -msgid "u\t\tScroll diff view up 18 lines" -msgstr "u\t\tRulla diffvisningen upp 18 rader" - -#: gitk:2845 -msgid "d\t\tScroll diff view down 18 lines" -msgstr "d\t\tRulla diffvisningen ned 18 rader" - -#: gitk:2846 -#, tcl-format -msgid "<%s-F>\t\tFind" -msgstr "<%s-F>\t\tSök" - -#: gitk:2847 -#, tcl-format -msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\tGå till nästa sökträff" - -#: gitk:2848 -msgid "<Return>\tMove to next find hit" -msgstr "<Return>\t\tGå till nästa sökträff" - -#: gitk:2849 -msgid "/\t\tFocus the search box" -msgstr "/\t\tFokusera sökrutan" - -#: gitk:2850 -msgid "?\t\tMove to previous find hit" -msgstr "?\t\tGå till föregående sökträff" - -#: gitk:2851 -msgid "f\t\tScroll diff view to next file" -msgstr "f\t\tRulla diffvisningen till nästa fil" - -#: gitk:2852 -#, tcl-format -msgid "<%s-S>\t\tSearch for next hit in diff view" -msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen" - -#: gitk:2853 -#, tcl-format -msgid "<%s-R>\t\tSearch for previous hit in diff view" -msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen" - -#: gitk:2854 -#, tcl-format -msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-Num+>\tÖka teckenstorlek" - -#: gitk:2855 -#, tcl-format -msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-plus>\tÖka teckenstorlek" - -#: gitk:2856 -#, tcl-format -msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-Num->\tMinska teckenstorlek" - -#: gitk:2857 -#, tcl-format -msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-minus>\tMinska teckenstorlek" - -#: gitk:2858 -msgid "<F5>\t\tUpdate" -msgstr "<F5>\t\tUppdatera" - -#: gitk:3313 gitk:3322 -#, tcl-format -msgid "Error creating temporary directory %s:" -msgstr "Fel vid skapande av temporär katalog %s:" - -#: gitk:3335 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Fel vid hämtning av \"%s\" från %s:" - -#: gitk:3398 -msgid "command failed:" -msgstr "kommando misslyckades:" - -#: gitk:3547 -msgid "No such commit" -msgstr "Incheckning saknas" - -#: gitk:3561 -msgid "git gui blame: command failed:" -msgstr "git gui blame: kommando misslyckades:" - -#: gitk:3592 -#, tcl-format -msgid "Couldn't read merge head: %s" -msgstr "Kunde inte läsa sammanslagningshuvud: %s" - -#: gitk:3600 -#, tcl-format -msgid "Error reading index: %s" -msgstr "Fel vid läsning av index: %s" - -#: gitk:3625 -#, tcl-format -msgid "Couldn't start git blame: %s" -msgstr "Kunde inte starta git blame: %s" - -#: gitk:3628 gitk:6419 -msgid "Searching" -msgstr "Söker" - -#: gitk:3660 -#, tcl-format -msgid "Error running git blame: %s" -msgstr "Fel vid körning av git blame: %s" - -#: gitk:3688 -#, tcl-format -msgid "That line comes from commit %s, which is not in this view" -msgstr "Raden kommer från incheckningen %s, som inte finns i denna vy" - -#: gitk:3702 -msgid "External diff viewer failed:" -msgstr "Externt diff-verktyg misslyckades:" - -#: gitk:3820 -msgid "Gitk view definition" -msgstr "Definition av Gitk-vy" - -#: gitk:3824 -msgid "Remember this view" -msgstr "Spara denna vy" - -#: gitk:3825 -msgid "References (space separated list):" -msgstr "Referenser (blankstegsavdelad lista):" - -#: gitk:3826 -msgid "Branches & tags:" -msgstr "Grenar & taggar:" - -#: gitk:3827 -msgid "All refs" -msgstr "Alla referenser" - -#: gitk:3828 -msgid "All (local) branches" -msgstr "Alla (lokala) grenar" - -#: gitk:3829 -msgid "All tags" -msgstr "Alla taggar" - -#: gitk:3830 -msgid "All remote-tracking branches" -msgstr "Alla fjärrspårande grenar" - -#: gitk:3831 -msgid "Commit Info (regular expressions):" -msgstr "Incheckningsinfo (reguljära uttryck):" - -#: gitk:3832 -msgid "Author:" -msgstr "Författare:" - -#: gitk:3833 -msgid "Committer:" -msgstr "Incheckare:" - -#: gitk:3834 -msgid "Commit Message:" -msgstr "Incheckningsmeddelande:" - -#: gitk:3835 -msgid "Matches all Commit Info criteria" -msgstr "Motsvarar alla kriterier för incheckningsinfo" - -#: gitk:3836 -msgid "Changes to Files:" -msgstr "Ändringar av filer:" - -#: gitk:3837 -msgid "Fixed String" -msgstr "Fast sträng" - -#: gitk:3838 -msgid "Regular Expression" -msgstr "Reguljärt uttryck" - -#: gitk:3839 -msgid "Search string:" -msgstr "Söksträng:" - -#: gitk:3840 +" git push <namn>\n" + +#: builtin/push.c:176 +msgid "--all and --tags are incompatible" +msgstr "--all och --tags är inkompatibla" + +#: builtin/push.c:177 +msgid "--all can't be combined with refspecs" +msgstr "--all kan inte kombineras med referensspecifikationer" + +#: builtin/push.c:182 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror och --tags är inkompatibla" + +#: builtin/push.c:183 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror kan inte kombineras med referensspecifikationer" + +#: builtin/push.c:188 +msgid "--all and --mirror are incompatible" +msgstr "--all och --mirror är inkompatibla" + +#: builtin/push.c:274 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete är imkompatibel med --all, --mirror och --tags" + +#: builtin/push.c:276 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete kan inte användas utan referenser" + +#: 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 "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:297 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Kan inte tolka objektet \"%s\"" + +#: builtin/reset.c:302 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch är inkompatibel med --{hard,mixed,soft}" + +#: builtin/reset.c:311 +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:313 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "Kan inte göra %s återställning med sökvägar." + +#: builtin/reset.c:325 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "%s återställning tillåts inte i ett naket arkiv" + +#: builtin/reset.c:341 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." + +#: builtin/revert.c:70 builtin/revert.c:91 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s kan inte användas med %s" + +#: builtin/revert.c:126 +msgid "program error" +msgstr "programfel" + +#: builtin/revert.c:209 +msgid "revert failed" +msgstr "\"revert\" misslyckades" + +#: builtin/revert.c:224 +msgid "cherry-pick failed" +msgstr "\"cherry-pick\" misslyckades" + +#: builtin/rm.c:109 +#, c-format msgid "" -"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" msgstr "" -"Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" - -#: gitk:3841 -msgid "Since:" -msgstr "Från:" - -#: gitk:3842 -msgid "Until:" -msgstr "Till:" - -#: gitk:3843 -msgid "Limit and/or skip a number of revisions (positive integer):" -msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):" - -#: gitk:3844 -msgid "Number to show:" -msgstr "Antal att visa:" - -#: gitk:3845 -msgid "Number to skip:" -msgstr "Antal att hoppa över:" - -#: gitk:3846 -msgid "Miscellaneous options:" -msgstr "Diverse alternativ:" - -#: gitk:3847 -msgid "Strictly sort by date" -msgstr "Strikt datumsortering" - -#: gitk:3848 -msgid "Mark branch sides" -msgstr "Markera sidogrenar" - -#: gitk:3849 -msgid "Limit to first parent" -msgstr "Begränsa till första förälder" - -#: gitk:3850 -msgid "Simple history" -msgstr "Enkel historik" - -#: gitk:3851 -msgid "Additional arguments to git log:" -msgstr "Ytterligare argument till git log:" - -#: gitk:3852 -msgid "Enter files and directories to include, one per line:" -msgstr "Ange filer och kataloger att ta med, en per rad:" - -#: gitk:3853 -msgid "Command to generate more commits to include:" -msgstr "Kommando för att generera fler incheckningar att ta med:" +"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n" +"(använd -f för att tvinga borttagning)" -#: gitk:3977 -msgid "Gitk: edit view" -msgstr "Gitk: redigera vy" - -#: gitk:3985 -msgid "-- criteria for selecting revisions" -msgstr " - kriterier för val av revisioner" - -#: gitk:3990 -msgid "View Name" -msgstr "Namn på vy" - -#: gitk:4065 -msgid "Apply (F5)" -msgstr "Använd (F5)" - -#: gitk:4103 -msgid "Error in commit selection arguments:" -msgstr "Fel i argument för val av incheckningar:" - -#: gitk:4156 gitk:4208 gitk:4656 gitk:4670 gitk:5931 gitk:11551 gitk:11552 -msgid "None" -msgstr "Inget" - -#: gitk:4604 gitk:6451 gitk:8309 gitk:8324 -msgid "Date" -msgstr "Datum" - -#: gitk:4604 gitk:6451 -msgid "CDate" -msgstr "Skapat datum" - -#: gitk:4753 gitk:4758 -msgid "Descendant" -msgstr "Avkomling" - -#: gitk:4754 -msgid "Not descendant" -msgstr "Inte avkomling" - -#: gitk:4761 gitk:4766 -msgid "Ancestor" -msgstr "Förfader" - -#: gitk:4762 -msgid "Not ancestor" -msgstr "Inte förfader" - -#: gitk:5052 -msgid "Local changes checked in to index but not committed" -msgstr "Lokala ändringar sparade i indexet men inte incheckade" - -#: gitk:5088 -msgid "Local uncommitted changes, not checked in to index" -msgstr "Lokala ändringar, ej sparade i indexet" - -#: gitk:6769 -msgid "many" -msgstr "många" - -#: gitk:6952 -msgid "Tags:" -msgstr "Taggar:" - -#: gitk:6969 gitk:6975 gitk:8302 -msgid "Parent" -msgstr "Förälder" - -#: gitk:6980 -msgid "Child" -msgstr "Barn" - -#: gitk:6989 -msgid "Branch" -msgstr "Gren" - -#: gitk:6992 -msgid "Follows" -msgstr "Följer" - -#: gitk:6995 -msgid "Precedes" -msgstr "Föregår" - -#: gitk:7532 -#, tcl-format -msgid "Error getting diffs: %s" -msgstr "Fel vid hämtning av diff: %s" - -#: gitk:8130 -msgid "Goto:" -msgstr "Gå till:" - -#: gitk:8151 -#, tcl-format -msgid "Short SHA1 id %s is ambiguous" -msgstr "Förkortat SHA1-id %s är tvetydigt" - -#: gitk:8158 -#, tcl-format -msgid "Revision %s is not known" -msgstr "Revisionen %s är inte känd" - -#: gitk:8168 -#, tcl-format -msgid "SHA1 id %s is not known" -msgstr "SHA-id:t %s är inte känt" - -#: gitk:8170 -#, tcl-format -msgid "Revision %s is not in the current view" -msgstr "Revisionen %s finns inte i den nuvarande vyn" - -#: gitk:8312 -msgid "Children" -msgstr "Barn" - -#: gitk:8370 -#, tcl-format -msgid "Reset %s branch to here" -msgstr "Återställ grenen %s hit" - -#: gitk:8372 -msgid "Detached head: can't reset" -msgstr "Frånkopplad head: kan inte återställa" - -#: gitk:8481 gitk:8487 -msgid "Skipping merge commit " -msgstr "Hoppar över sammanslagningsincheckning " - -#: gitk:8496 gitk:8501 -msgid "Error getting patch ID for " -msgstr "Fel vid hämtning av patch-id för " - -#: gitk:8497 gitk:8502 -msgid " - stopping\n" -msgstr " - stannar\n" - -#: gitk:8507 gitk:8510 gitk:8518 gitk:8532 gitk:8541 -msgid "Commit " -msgstr "Incheckning " - -#: gitk:8511 +#: builtin/rm.c:115 +#, c-format msgid "" -" is the same patch as\n" -" " +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" msgstr "" -" är samma patch som\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)" -#: gitk:8519 +#: builtin/rm.c:119 +#, c-format msgid "" -" differs from\n" -" " +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" msgstr "" -" skiljer sig från\n" -" " - -#: gitk:8521 +"\"%s\" har lokala ändringar\n" +"(använd --cached för att behålla filen eller -f för att tvinga borttagning)" + +#: 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:157 +#, c-format +msgid "Missing author: %s" +msgstr "Författare saknas: %s" + +#: builtin/tag.c:58 +#, c-format +msgid "malformed object at '%s'" +msgstr "felformat objekt vid \"%s\"" + +#: builtin/tag.c:205 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "taggnamnet för långt: %.*s..." + +#: builtin/tag.c:210 +#, c-format +msgid "tag '%s' not found." +msgstr "taggen \"%s\" hittades inte." + +#: builtin/tag.c:225 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Tog bort tagg \"%s\" (var %s)\n" + +#: builtin/tag.c:237 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "kunde inte bekräfta taggen \"%s\"" + +#: builtin/tag.c:247 msgid "" -"Diff of commits:\n" "\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" msgstr "" -"Skillnad mellan incheckningar:\n" "\n" +"#\n" +"# Skriv ett taggmeddelande\n" +"# Rader som inleds med \"#\" ignoreras.\n" +"#\n" -#: gitk:8533 gitk:8542 -#, tcl-format -msgid " has %s children - stopping\n" -msgstr " har %s barn - stannar\n" - -#: gitk:8561 -#, tcl-format -msgid "Error writing commit to file: %s" -msgstr "Fel vid skrivning av incheckning till fil: %s" - -#: gitk:8567 -#, tcl-format -msgid "Error diffing commits: %s" -msgstr "Fel vid jämförelse av incheckningar: %s" - -#: gitk:8598 -msgid "Top" -msgstr "Topp" - -#: gitk:8599 -msgid "From" -msgstr "Från" - -#: gitk:8604 -msgid "To" -msgstr "Till" - -#: gitk:8628 -msgid "Generate patch" -msgstr "Generera patch" - -#: gitk:8630 -msgid "From:" -msgstr "Från:" - -#: gitk:8639 -msgid "To:" -msgstr "Till:" - -#: gitk:8648 -msgid "Reverse" -msgstr "Vänd" - -#: gitk:8650 gitk:8845 -msgid "Output file:" -msgstr "Utdatafil:" - -#: gitk:8656 -msgid "Generate" -msgstr "Generera" - -#: gitk:8694 -msgid "Error creating patch:" -msgstr "Fel vid generering av patch:" - -#: gitk:8717 gitk:8833 gitk:8890 -msgid "ID:" -msgstr "Id:" - -#: gitk:8726 -msgid "Tag name:" -msgstr "Taggnamn:" - -#: gitk:8729 -msgid "Tag message is optional" -msgstr "Taggmeddelandet är valfritt" - -#: gitk:8731 -msgid "Tag message:" -msgstr "Taggmeddelande:" +#: 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 "" +"\n" +"#\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:294 +msgid "unable to sign the tag" +msgstr "kunde inte signera taggen" + +#: builtin/tag.c:296 +msgid "unable to write tag file" +msgstr "kunde inte skriva tagg-filen" + +#: builtin/tag.c:321 +msgid "bad object type." +msgstr "felaktig objekttyp" + +#: builtin/tag.c:334 +msgid "tag header too big." +msgstr "tagghuvud för stort." + +#: builtin/tag.c:366 +msgid "no tag message?" +msgstr "inget taggmeddelande?" + +#: builtin/tag.c:372 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "Taggmeddelandet har lämnats i %s\n" + +#: builtin/tag.c:421 +msgid "switch 'points-at' requires an object" +msgstr "flaggan \"points-at\" behöver ett object" + +#: builtin/tag.c:423 +#, c-format +msgid "malformed object name '%s'" +msgstr "felformat objektnamn \"%s\"" + +#: builtin/tag.c:502 +msgid "-n option is only allowed with -l." +msgstr "Flaggan -n är endast tillåten tillsammans med -l." + +#: builtin/tag.c:504 +msgid "--contains option is only allowed with -l." +msgstr "Flaggan --contains är endast tillåten tillsammans med -l" + +#: builtin/tag.c:506 +msgid "--points-at option is only allowed with -l." +msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." + +#: builtin/tag.c:514 +msgid "only one -F or -m option is allowed." +msgstr "endast en av flaggorna -F eller -m tillåts." + +#: builtin/tag.c:534 +msgid "too many params" +msgstr "för många parametrar" + +#: builtin/tag.c:540 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "\"%s\" är inte ett giltigt taggnamn." + +#: builtin/tag.c:545 +#, c-format +msgid "tag '%s' already exists" +msgstr "taggen \"%s\" finns redan" + +#: builtin/tag.c:563 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s: kan inte låsa referensen" + +#: builtin/tag.c:565 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s: kan inte uppdatera referensen" + +#: builtin/tag.c:567 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Uppdaterad tagg \"%s\" (var %s)\n" + +#: git-am.sh:49 +msgid "You need to set your committer info first" +msgstr "Du måste ställa in din incheckarinformation först" + +#: git-am.sh:136 +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." -#: gitk:8735 gitk:8899 -msgid "Create" -msgstr "Skapa" +#: git-am.sh:147 +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 appliceras på blobbar som antecknats i dess index." -#: gitk:8753 -msgid "No tag name specified" -msgstr "Inget taggnamn angavs" +#: git-am.sh:156 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" +"Faller tillbaka på att pacha grundversionen och trevägssammanslagning..." -#: gitk:8757 -#, tcl-format -msgid "Tag \"%s\" already exists" -msgstr "Taggen \"%s\" finns redan" +#: git-am.sh:268 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Endast en StGIT-patchserie kan appliceras åt gången" -#: gitk:8767 -msgid "Error creating tag:" -msgstr "Fel vid skapande av tagg:" +#: git-am.sh:355 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "Patchformatet $patch_format stöds inte." -#: gitk:8842 -msgid "Command:" -msgstr "Kommando:" +#: git-am.sh:357 +msgid "Patch format detection failed." +msgstr "Misslyckades detektera patchformat." -#: gitk:8850 -msgid "Write" -msgstr "Skriv" +#: git-am.sh:411 +msgid "-d option is no longer supported. Do not use." +msgstr "Flaggan -d stöds inte lägre. Använd inte." -#: gitk:8868 -msgid "Error writing commit:" -msgstr "Fel vid skrivning av incheckning:" +#: git-am.sh:474 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs." -#: gitk:8895 -msgid "Name:" -msgstr "Namn:" +#: git-am.sh:479 +msgid "Please make up your mind. --skip or --abort?" +msgstr "Bestäm dig. --skip eller --abort?" -#: gitk:8918 -msgid "Please specify a name for the new branch" -msgstr "Ange ett namn för den nya grenen" +#: git-am.sh:506 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: gitk:8923 -#, tcl-format -msgid "Branch '%s' already exists. Overwrite?" -msgstr "Grenen \"%s\" finns redan. Skriva över?" +#: git-am.sh:572 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "Smutsigt index: kan inte applicera patchar (smutsiga: $files)" -#: gitk:8989 -#, tcl-format -msgid "Commit %s is already included in branch %s -- really re-apply it?" +#: git-am.sh:748 +msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -"Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras " -"på nytt?" - -#: gitk:8994 -msgid "Cherry-picking" -msgstr "Plockar" - -#: gitk:9003 -#, tcl-format +"kan inte vara interaktiv om standard in inte är ansluten till en terminal." + +#. 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 "Applicera? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla " + +#: git-am.sh:795 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "Applicerar: $FIRSTLINE" + +#: git-am.sh:840 +msgid "No changes -- Patch already applied." +msgstr "Inga ändringar -- Patchen har redan applicerats." + +#: git-am.sh:866 +msgid "applying to an empty history" +msgstr "applicerar på en tom historik" + +#. 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 "" -"Cherry-pick failed because of local changes to file '%s'.\n" -"Please commit, reset or stash your changes and try again." +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." msgstr "" -"Cherry-pick misslyckades på grund av lokala ändringar i filen \"%s\".\n" -"Checka in, återställ eller spara undan (stash) dina ändringar och försök " -"igen." - -#: gitk:9009 +"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." + +#. 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:354 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "\"$invalid\" är inte en giltig incheckning" + +#: git-bisect.sh:363 +#, sh-format msgid "" -"Cherry-pick failed because of merge conflict.\n" -"Do you wish to run git citool to resolve it?" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." msgstr "" -"Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n" -"Vill du köra git citool för att lösa den?" - -#: gitk:9025 -msgid "No changes committed" -msgstr "Inga ändringar incheckade" - -#: gitk:9051 -msgid "Confirm reset" -msgstr "Bekräfta återställning" +"Kunde inte checka ut original-HEAD \"$branch\".\n" +"Försök \"git bisect reset <incheckning>\"." -#: gitk:9053 -#, tcl-format -msgid "Reset branch %s to %s?" -msgstr "Återställa grenen %s till %s?" +#: git-bisect.sh:390 +msgid "No logfile given" +msgstr "Ingen loggfil angiven" -#: gitk:9055 -msgid "Reset type:" -msgstr "Typ av återställning:" +#: git-bisect.sh:391 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "kan inte läsa $file för uppspelning" -#: gitk:9058 -msgid "Soft: Leave working tree and index untouched" -msgstr "Mjuk: Rör inte utcheckning och index" +#: git-bisect.sh:408 +msgid "?? what are you talking about?" +msgstr "?? vad menar du?" -#: gitk:9061 -msgid "Mixed: Leave working tree untouched, reset index" -msgstr "Blandad: Rör inte utcheckning, återställ index" +#: git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "Vi utför ingen bisect för tillfället." -#: gitk:9064 +#: git-pull.sh:21 msgid "" -"Hard: Reset working tree and index\n" -"(discard ALL local changes)" +"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 "" -"Hård: Återställ utcheckning och index\n" -"(förkastar ALLA lokala ändringar)" - -#: gitk:9081 -msgid "Resetting" -msgstr "Återställer" - -#: gitk:9141 -msgid "Checking out" -msgstr "Checkar ut" +"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" + +#: git-pull.sh:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." + +#: git-pull.sh:257 +msgid "Cannot rebase onto multiple branches" +msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar" + +#: 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" + +#: 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 applicera 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:491 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "Kastade ${REV} ($s)" + +#: git-stash.sh:492 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}: Kunde inte kasta \"stash\"-post" + +#: git-stash.sh:499 +msgid "No branch name specified" +msgstr "Inget grennamn angavs" + +#: git-stash.sh:570 +msgid "(To restore them type \"git stash apply\")" +msgstr "(För att återställa dem, skriv \"git stash apply\")" + +#: git-submodule.sh:56 +#, 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:108 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$path\"" + +#: git-submodule.sh:149 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$path\"" + +#: git-submodule.sh:159 +#, 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:247 +#, 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:264 +#, sh-format +msgid "'$path' already exists in the index" +msgstr "\"$path\" finns redan i indexet" + +#: git-submodule.sh:281 +#, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "\"$path\" finns redan och är inte ett giltigt git-arkiv" + +#: git-submodule.sh:295 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "Kan inte checka ut undermodul \"$path\"" + +#: git-submodule.sh:300 +#, sh-format +msgid "Failed to add submodule '$path'" +msgstr "Misslyckades lägga till underkatalog \"$path\"" + +#: git-submodule.sh:305 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "Misslyckades registrera undermodul \"$path\"" + +#: git-submodule.sh:347 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "Går in i \"$prefix$path\"" + +#: git-submodule.sh:359 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "Stoppar på \"$path\"; skriptet returnerade en status skild från noll." + +#: git-submodule.sh:401 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "Hittade ingen url för undermodulsökvägen \"$path\" i .gitmodules" + +#: git-submodule.sh:410 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "Misslyckades registrera url för underkatalogsökväg \"$path\"" + +#: git-submodule.sh:418 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "" +"Misslyckades registrera uppdateringsläge för undermodulsökväg \"$path\"" -#: gitk:9194 -msgid "Cannot delete the currently checked-out branch" -msgstr "Kan inte ta bort den just nu utcheckade grenen" +#: git-submodule.sh:420 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$path\"" -#: gitk:9200 -#, tcl-format +#: git-submodule.sh:519 +#, sh-format msgid "" -"The commits on branch %s aren't on any other branch.\n" -"Really delete branch %s?" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" msgstr "" -"Incheckningarna på grenen %s existerar inte på någon annan gren.\n" -"Vill du verkligen ta bort grenen %s?" +"Undermodulen \"$path\" har inte initierats\n" +"Kanske du vill köra \"update --init\"?" + +#: git-submodule.sh:532 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$path\"" + +#: git-submodule.sh:551 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "Kan inte hämta i undermodulsökväg \"$path\"" -#: gitk:9231 -#, tcl-format -msgid "Tags and heads: %s" -msgstr "Taggar och huvuden: %s" +#: git-submodule.sh:565 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "Kan inte göra \"rebase\" av \"$sha1\" i undermodulsökväg \"$path\"" -#: gitk:9246 -msgid "Filter" -msgstr "Filter" +#: git-submodule.sh:566 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "Undermodulsökvägen \"$path\": \"rebase\":ad in i \"$sha1\"" -#: gitk:9541 -msgid "" -"Error reading commit topology information; branch and preceding/following " -"tag information will be incomplete." -msgstr "" -"Fel vid läsning av information om incheckningstopologi; information om " -"grenar och föregående/senare taggar kommer inte vara komplett." +#: git-submodule.sh:571 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$path\"" -#: gitk:10527 -msgid "Tag" -msgstr "Tagg" +#: git-submodule.sh:572 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "Undermodulsökvägen \"$path\": sammanslagen i \"$sha1\"" -#: gitk:10527 -msgid "Id" -msgstr "Id" +#: git-submodule.sh:577 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$path\"" -#: gitk:10576 -msgid "Gitk font chooser" -msgstr "Teckensnittsväljare för Gitk" +#: git-submodule.sh:578 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "Undermodulsökvägen \"$path\": checkade ut \"$sha1\"" -#: gitk:10593 -msgid "B" -msgstr "F" +#: git-submodule.sh:600 git-submodule.sh:923 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "Misslyckades rekursera in i undermodulsökvägen \"$path\"" -#: gitk:10596 -msgid "I" -msgstr "K" +#: git-submodule.sh:708 +msgid "--" +msgstr "--" -#: gitk:10714 -msgid "Gitk preferences" -msgstr "Inställningar för Gitk" +#: git-submodule.sh:766 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr " Varning: $name innehåller inte incheckning $sha1_src" -#: gitk:10716 -msgid "Commit list display options" -msgstr "Alternativ för incheckningslistvy" +#: git-submodule.sh:769 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr " Varning: $name innehåller inte incheckning $sha1_dst" -#: gitk:10719 -msgid "Maximum graph width (lines)" -msgstr "Maximal grafbredd (rader)" +#: git-submodule.sh:772 +#, 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" -#: gitk:10722 -#, tcl-format -msgid "Maximum graph width (% of pane)" -msgstr "Maximal grafbredd (% av ruta)" +#: git-submodule.sh:797 +msgid "blob" +msgstr "blob" -#: gitk:10725 -msgid "Show local changes" -msgstr "Visa lokala ändringar" +#: git-submodule.sh:798 +msgid "submodule" +msgstr "undermodul" -#: gitk:10728 -msgid "Auto-select SHA1" -msgstr "Välj SHA1 automatiskt" +#: git-submodule.sh:969 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "Synkroniserar undermodul-url för \"$name\"" -#: gitk:10731 -msgid "Hide remote refs" -msgstr "Dölj fjärr-referenser" +#~ msgid "# Changed but not updated:" +#~ msgstr "# Ändrade men inte uppdaterade:" -#: gitk:10735 -msgid "Diff display options" -msgstr "Alternativ för diffvy" +#~ msgid "A branch named '%s' already exists." +#~ msgstr "Det finns redan en gren som heter \"%s\"" -#: gitk:10737 -msgid "Tab spacing" -msgstr "Blanksteg för tabulatortecken" +#~ msgid "path '%s' does not have all 3 versions" +#~ msgstr "sökvägen \"%s\" har inte alla 3 versionerna" -#: gitk:10740 -msgid "Display nearby tags" -msgstr "Visa närliggande taggar" +#~ 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." -#: gitk:10743 -msgid "Limit diffs to listed paths" -msgstr "Begränsa diff till listade sökvägar" +#~ msgid "git checkout: branch %s already exists" +#~ msgstr "git checkout: grenen %s finns redan" -#: gitk:10746 -msgid "Support per-file encodings" -msgstr "Stöd för filspecifika teckenkodningar" +#~ msgid "Paths with --interactive does not make sense." +#~ msgstr "Kan inte ange sökvägar med --interactive." -#: gitk:10752 gitk:10832 -msgid "External diff tool" -msgstr "Externt diff-verktyg" +#~ msgid "No HEAD commit to compare with (yet)" +#~ msgstr "Ingen HEAD-incheckning att jämföra med (ännu)" -#: gitk:10753 -msgid "Choose..." -msgstr "Välj..." +#~ msgid "cannot mix --fixed-strings and regexp" +#~ msgstr "kan inte blanda --fixed-strings och reguljära uttryck" -#: gitk:10758 -msgid "General options" -msgstr "Allmänna inställningar" +#~ msgid "invalid --decorate option: %s" +#~ msgstr "felaktigt värde till --decorate: %s" -#: gitk:10761 -msgid "Use themed widgets" -msgstr "Använd tema på fönsterelement" +#~ msgid "%s; will overwrite!" +#~ msgstr "%s; kommer skriva över!" -#: gitk:10763 -msgid "(change requires restart)" -msgstr "(ändringen kräver omstart)" +#~ msgid "Failed to write current notes tree to database" +#~ msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen" -#: gitk:10765 -msgid "(currently unavailable)" -msgstr "(för närvarande inte tillgängligt)" +#~ msgid "Failed to commit notes tree to database" +#~ msgstr "Kunde inte checka in anteckningsträd i databasen" -#: gitk:10769 -msgid "Colors: press to choose" -msgstr "Färger: tryck för att välja" +# FIXME: Untranslatable! +# +#~ msgid "Refusing to %s notes in %s (outside of refs/notes/)" +#~ msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)" -#: gitk:10772 -msgid "Interface" -msgstr "Gränssnitt" - -#: gitk:10773 -msgid "interface" -msgstr "gränssnitt" - -#: gitk:10776 -msgid "Background" -msgstr "Bakgrund" +#~ msgid "list" +#~ msgstr "list" -#: gitk:10777 gitk:10807 -msgid "background" -msgstr "bakgrund" +#~ msgid "add" +#~ msgstr "add" -#: gitk:10780 -msgid "Foreground" -msgstr "Förgrund" +#~ msgid "copy" +#~ msgstr "copy" -#: gitk:10781 -msgid "foreground" -msgstr "förgrund" +#~ msgid "show" +#~ msgstr "show" -#: gitk:10784 -msgid "Diff: old lines" -msgstr "Diff: gamla rader" +#~ msgid "remove" +#~ msgstr "remove" -#: gitk:10785 -msgid "diff old lines" -msgstr "diff gamla rader" +#~ msgid "prune" +#~ msgstr "prune" -#: gitk:10789 -msgid "Diff: new lines" -msgstr "Diff: nya rader" +#~ msgid "The current branch %s is not tracking anything." +#~ msgstr "Den aktuella grenen %s spårar ingenting." -#: gitk:10790 -msgid "diff new lines" -msgstr "diff nya rader" +#~ msgid "No destination configured to push to." +#~ msgstr "Har inte ställt in någon destination att sända till." -#: gitk:10794 -msgid "Diff: hunk header" -msgstr "Diff: delhuvud" +#~ msgid "Reflog action message too long: %.*s..." +#~ msgstr "Reflog-händelsemeddelande för långt: %.*s..." -#: gitk:10796 -msgid "diff hunk header" -msgstr "diff delhuvud" +#~ msgid "Could not read commit message of %s" +#~ msgstr "Kunde inte läsa incheckningsmeddelandet för %s" -#: gitk:10800 -msgid "Marked line bg" -msgstr "Markerad rad bakgrund" +#~ msgid "Could not extract author email from %s" +#~ msgstr "Kunde inte hämta författarens e-postadress från %s" -#: gitk:10802 -msgid "marked line background" -msgstr "markerad rad bakgrund" +#~ msgid "Could not extract author time from %s" +#~ msgstr "Kunde inte hämta författartid från %s" -#: gitk:10806 -msgid "Select bg" -msgstr "Markerad bakgrund" +#~ msgid "No author information found in %s" +#~ msgstr "Hittade ingen författarinformation i %s" -#: gitk:10810 -msgid "Fonts: press to choose" -msgstr "Teckensnitt: tryck för att välja" +#~ msgid "cherry-pick --ff cannot be used with --signoff" +#~ msgstr "cherry-pick --ff kan inte användas med --signoff" -#: gitk:10812 -msgid "Main font" -msgstr "Huvudteckensnitt" +#~ msgid "cherry-pick --ff cannot be used with --no-commit" +#~ msgstr "cherry-pick --ff kan inte användas med --no-commit" -#: gitk:10813 -msgid "Diff display font" -msgstr "Teckensnitt för diffvisning" +#~ msgid "cherry-pick --ff cannot be used with -x" +#~ msgstr "cherry-pick --ff kan inte användas med -x" -#: gitk:10814 -msgid "User interface font" -msgstr "Teckensnitt för användargränssnitt" +#~ msgid "cherry-pick --ff cannot be used with --edit" +#~ msgstr "cherry-pick --ff kan inte användas med --edit" -#: gitk:10842 -#, tcl-format -msgid "Gitk: choose color for %s" -msgstr "Gitk: välj färg för %s" +#~ msgid "committer info too long." +#~ msgstr "incheckarinformation för lång." -#: gitk:11445 -msgid "Cannot find a git repository here." -msgstr "Hittar inget git-arkiv här." +#~ msgid "" +#~ "\n" +#~ "#\n" +#~ "# Write a tag message\n" +#~ "#\n" +#~ msgstr "" +#~ "\n" +#~ "#\n" +#~ "# Skriv ett taggmeddelande\n" +#~ "#\n" -#: gitk:11449 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Hittar inte git-katalogen \"%s\"." +#~ msgid "signing key value too long (%.10s...)" +#~ msgstr "signeringsnyckelvärdet för långt (%.10s...)" -#: gitk:11496 -#, tcl-format -msgid "Ambiguous argument '%s': both revision and filename" -msgstr "Tvetydigt argument \"%s\": både revision och filnamn" +#~ 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 "" +#~ "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\"." -#: gitk:11508 -msgid "Bad arguments to gitk:" -msgstr "Felaktiga argument till gitk:" +#~ 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\"." -#: gitk:11604 -msgid "Command line" -msgstr "Kommandorad" +#~ msgid "Patch does not have a valid e-mail address." +#~ msgstr "Patchen har inte någon giltig e-postadress." -#~ msgid "SHA1 ID: " -#~ msgstr "SHA1-id: " +#~ msgid "Commit Body is:" +#~ msgstr "Incheckningskroppen är:" -#~ msgid "- stopping\n" -#~ msgstr "- stannar\n" +#~ 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." #~ msgid "" -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" -#~ " Gitk requires at least Tcl/Tk 8.4." +#~ "You still have unmerged paths in your index\n" +#~ "did you forget to use 'git add'?" #~ msgstr "" -#~ "Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n" -#~ " Gitk kräver åtminstone Tcl/Tk 8.4." +#~ "Du har fortfarande sökvägar som inte slagits samman i ditt index\n" +#~ "glömde du använda \"git add\"?" + +#~ msgid "Patch failed at $msgnum $FIRSTLINE" +#~ msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" + +#, fuzzy +#~ msgid "You need to start by \"git bisect start\"" +#~ msgstr "Du måste ställa in din incheckarinformation först" -#~ msgid "Tag/Head %s is not known" -#~ msgstr "Tagg/huvud %s är okänt" +#, fuzzy +#~ msgid "Index was not unstashed." +#~ msgstr "kunde köra stash." -#~ msgid "/\t\tMove to next find hit, or redo find" -#~ msgstr "/\t\tGå till nästa sökträff, eller sök på nytt" +#, fuzzy +#~ msgid "# Submodules changed but not updated:" +#~ msgstr "# Ändrade men inte uppdaterade:" -#~ msgid "Name" -#~ msgstr "Namn" +#, fuzzy +#~ msgid "# Submodule changes to be committed:" +#~ msgstr "# Ändringar att checka in:" diff --git a/po/zh_CN.po b/po/zh_CN.po new file mode 100644 index 0000000..6474739 --- /dev/null +++ b/po/zh_CN.po @@ -0,0 +1,3690 @@ +# 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-03-16 20:18+0800\n" +"PO-Revision-Date: 2012-01-30 00:00+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=1; plural=0;\n" + +#: advice.c:34 +#, 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: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 "" +"请先在工作区改正文件，然后酌情使用\n" +"'git add/rm <file>' 标记解决方案，\n" +"或使用 'git commit -a'。" + +#: commit.c:47 +#, c-format +msgid "could not parse %s" +msgstr "不能解析 %s" + +#: commit.c:49 +#, 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" + +# 译者：注意保持前导空格 +#: 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:1336 +msgid " 0 files changed\n" +msgstr " 0 个文件被修改\n" + +#: diff.c:1340 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] " %d 个文件被修改" + +#: diff.c:1357 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] "，插入 %d 行(+)" + +#: diff.c:1368 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] "，删除 %d 行(-)" + +#: diff.c:3424 +#, 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:1280 +#, c-format +msgid "'%s': unable to read %s" +msgstr "'%s'：无法读取 %s" + +#: grep.c:1297 +#, c-format +msgid "'%s': %s" +msgstr "'%s'：%s" + +#: grep.c:1308 +#, c-format +msgid "'%s': short read %s" +msgstr "'%s'：读取不完整 %s" + +#: 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 "" +"'%s' 像是一个 git 命令，但却无法运行。\n" +"可能是 git-%s 受损？" + +#: 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] "您的分支领先 '%s' 共 %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] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" + +#: 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] "" +"您的分支和 '%s' 出现了偏离，\n" +"并且各自分别有 %d 和 %d 处不同的提交。\n" + +#: 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 "不能为写入打开 '%s'" + +#: 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 "不能写入 '%s'" + +#: sequencer.c:143 +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: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 "" +"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" +"对修正后的文件做标记，然后用 'git commit' 提交" + +#: sequencer.c:159 sequencer.c:685 sequencer.c:768 +#, c-format +msgid "Could not write to %s" +msgstr "不能写入 %s" + +#: sequencer.c:162 +#, c-format +msgid "Error wrapping up %s" +msgstr "错误收尾 %s" + +#: 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 "%s：无法写入新索引文件" + +#: sequencer.c:298 +msgid "Your index file is unmerged." +msgstr "您的索引文件未完成合并。" + +#: sequencer.c:301 +msgid "You do not have a valid HEAD" +msgstr "您没有一个有效的 HEAD" + +#: sequencer.c:316 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" + +#: sequencer.c:324 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "提交 %s 没有父提交 %d" + +#: sequencer.c:328 +#, 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:339 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s：不能解析父提交 %s" + +#: sequencer.c:343 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "不能得到 %s 的提交说明" + +#: sequencer.c:427 +#, c-format +msgid "could not revert %s... %s" +msgstr "不能还原 %s... %s" + +#: sequencer.c:428 +#, c-format +msgid "could not apply %s... %s" +msgstr "不能应用 %s... %s" + +#: 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 "git %s：无法读取索引" + +#: sequencer.c:466 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s：无法刷新索引" + +#: sequencer.c:551 +#, c-format +msgid "Cannot %s during a %s" +msgstr "无法 %s 在一个 %s 过程中" + +#: sequencer.c:573 +#, c-format +msgid "Could not parse line %d." +msgstr "不能解析第 %d 行。" + +#: sequencer.c:578 +msgid "No commits parsed." +msgstr "没有提交被解析。" + +#: sequencer.c:591 +#, c-format +msgid "Could not open %s" +msgstr "不能打开 %s" + +#: sequencer.c:595 +#, c-format +msgid "Could not read %s." +msgstr "不能读取 %s。" + +#: sequencer.c:602 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "无用的指令表单：%s" + +#: sequencer.c:630 +#, c-format +msgid "Invalid key: %s" +msgstr "无效键名：%s" + +#: sequencer.c:633 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "无效的 %s 值：%s" + +#: sequencer.c:645 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "非法的选项表单：%s" + +#: 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 "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" + +#: sequencer.c:671 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "不能创建序列目录 %s" + +#: sequencer.c:687 sequencer.c:772 +#, c-format +msgid "Error wrapping up %s." +msgstr "错误收尾 %s。" + +#: sequencer.c:706 sequencer.c:840 +msgid "no cherry-pick or revert in progress" +msgstr "没有拣选或还原操作在进行" + +#: sequencer.c:708 +msgid "cannot resolve HEAD" +msgstr "不能解析 HEAD" + +#: 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 "不能打开 %s：%s" + +#: sequencer.c:735 +#, c-format +msgid "cannot read %s: %s" +msgstr "不能读取 %s：%s" + +#: 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 "保存拣选提交前的 HEAD 文件 '%s' 损坏" + +#: sequencer.c:765 +#, c-format +msgid "Could not format %s." +msgstr "不能格式化 %s。" + +#: 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 " （使用 \"git reset %s <file>...\" 撤出暂存区）" + +# 译者：注意保持前导空格 +#: wt-status.c:142 wt-status.c:159 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）" + +# 译者：注意保持前导空格 +#: wt-status.c:143 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）" + +#: 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 " （使用 \"git add <file>...\" 更新要提交的内容）" + +# 译者：注意保持前导空格 +#: wt-status.c:175 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）" + +# 译者：注意保持前导空格 +#: wt-status.c:176 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）" + +# 译者：注意保持前导空格 +#: 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 "%s文件：" + +# 译者：注意保持前导空格 +#: wt-status.c:190 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）" + +#: wt-status.c:207 +msgid "bug" +msgstr "bug" + +#: 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 "新文件： %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: wt-status.c:269 +#, c-format +msgid "copied: %s -> %s" +msgstr "拷贝： %s -> %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: wt-status.c:272 +#, c-format +msgid "deleted: %s" +msgstr "删除： %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: wt-status.c:275 +#, c-format +msgid "modified: %s" +msgstr "修改： %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: wt-status.c:278 +#, c-format +msgid "renamed: %s -> %s" +msgstr "重命名： %s -> %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: wt-status.c:281 +#, c-format +msgid "typechange: %s" +msgstr "类型变更： %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: wt-status.c:284 +#, c-format +msgid "unknown: %s" +msgstr "未知： %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: wt-status.c:287 +#, c-format +msgid "unmerged: %s" +msgstr "未合并： %s" + +#: wt-status.c:290 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "bug：未处理的差异状态 %c" + +#: 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 "未跟踪的文件没有列出%s" + +# 译者：中文字符串拼接，可删除前导空格 +#: wt-status.c:751 +msgid " (use -u option to show untracked files)" +msgstr "（使用 -u 参数显示未跟踪的文件）" + +#: wt-status.c:757 +msgid "No changes" +msgstr "没有修改" + +#: wt-status.c:761 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "修改尚未加入提交%s\n" + +# 译者：中文字符串拼接，可删除前导空格 +#: wt-status.c:763 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）" + +#: wt-status.c:765 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "空提交但存在未跟踪文件%s\n" + +# 译者：中文字符串拼接，可删除前导空格 +#: wt-status.c:767 +msgid " (use \"git add\" to track)" +msgstr "（使用 \"git add\" 建立跟踪）" + +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 +#, c-format +msgid "nothing to commit%s\n" +msgstr "无须提交%s\n" + +# 译者：中文字符串拼接，可删除前导空格 +#: wt-status.c:770 +msgid " (create/copy files and use \"git add\" to track)" +msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）" + +# 译者：中文字符串拼接，可删除前导空格 +#: wt-status.c:773 +msgid " (use -u to show untracked files)" +msgstr "（使用 -u 显示未跟踪文件）" + +# 译者：中文字符串拼接，可删除前导空格 +#: wt-status.c:776 +msgid " (working directory clean)" +msgstr "（干净的工作区）" + +#: wt-status.c:884 +msgid "HEAD (no branch)" +msgstr "HEAD（非分支）" + +# 译者：注意保持句尾空格 +#: 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 "意外的差异状态 %c" + +#: builtin/add.c:67 builtin/commit.c:298 +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:456 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:312 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n" + +#: builtin/add.c:352 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "使用 -f 参数如果您确实要添加它们。\n" + +#: 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 "-A 和 -u 选项互斥" + +#: builtin/add.c:393 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "选项 --ignore-missing 只能和 --dry-run 共用" + +#: builtin/add.c:413 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "没有指定文件，也没有文件被添加。\n" + +#: builtin/add.c:414 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "也许您想要执行 'git add .'？\n" + +#: 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 "不能创建归档文件 '%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：预期一个刷新" + +# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 +#: builtin/branch.c:137 +#, 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:141 +#, 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' 。" + +# 译者：汉字之间无空格，故删除尾部空格 +#. 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 "不能将 -a 和 -d 共用" + +#: builtin/branch.c:177 +msgid "Couldn't look up commit object for HEAD" +msgstr "无法查询 HEAD 指向的提交对象" + +#: builtin/branch.c:182 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "无法删除您当前所在的分支 '%s'。" + +#: builtin/branch.c:192 +#, c-format +msgid "%sbranch '%s' not found." +msgstr "%s分支 '%s' 未发现。" + +#: builtin/branch.c:200 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "无法查询 '%s' 指向的提交对象" + +#: 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 "" +"分支 '%s' 没有完全合并。\n" +"如果您确认要删除它，执行 'git branch -D %s'。" + +#: builtin/branch.c:214 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "删除 %s分支 '%s' 时出错" + +#: builtin/branch.c:219 +#, c-format +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "已删除 %s分支 %s（曾为 %s）。\n" + +#: builtin/branch.c:224 +msgid "Update of config-file failed" +msgstr "无法更新 config 文件" + +#: builtin/branch.c:322 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "分支 '%s' 未指向一个提交" + +# 译者：注意保持句尾空格 +#: builtin/branch.c:394 +#, c-format +msgid "behind %d] " +msgstr "落后 %d] " + +# 译者：注意保持句尾空格 +#: builtin/branch.c:396 +#, c-format +msgid "ahead %d] " +msgstr "领先 %d] " + +# 译者：注意保持句尾空格 +#: builtin/branch.c:398 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "领先 %d，落后 %d] " + +#: 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 "无效的分支名：'%s'" + +#: builtin/branch.c:604 +msgid "Branch rename failed" +msgstr "分支重命名失败" + +#: builtin/branch.c:608 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "重命名掉一个错误命名的旧分支 '%s'" + +#: builtin/branch.c:612 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "分支重命名为 %s，但 HEAD 没有更新！" + +#: builtin/branch.c:619 +msgid "Branch is renamed, but update of config-file failed" +msgstr "分支被重命名，但更新 config 文件失败" + +#: builtin/branch.c:634 +#, c-format +msgid "malformed object name %s" +msgstr "非法的对象名 %s" + +#: builtin/branch.c:658 +#, c-format +msgid "could not write branch description template: %s\n" +msgstr "不能写分支描述模版：%s\n" + +#: builtin/branch.c:746 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "无法将 HEAD 解析为有效引用。" + +#: builtin/branch.c:751 builtin/clone.c:558 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD 没有位于 /refs/heads 之下！" + +#: builtin/branch.c:809 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" + +#: 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/checkout.c:113 builtin/checkout.c:146 +#, c-format +msgid "path '%s' does not have our version" +msgstr "路径 '%s' 没有我们的版本" + +#: builtin/checkout.c:115 builtin/checkout.c:148 +#, c-format +msgid "path '%s' does not have their version" +msgstr "路径 '%s' 没有他们的版本" + +#: builtin/checkout.c:131 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "路径 '%s' 没有全部必须的版本" + +#: builtin/checkout.c:175 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "路径 '%s' 没有必须的版本" + +#: builtin/checkout.c:192 +#, c-format +msgid "path '%s': cannot merge" +msgstr "path '%s'：无法合并" + +#: builtin/checkout.c:209 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "无法为 '%s' 添加合并结果" + +#: builtin/checkout.c:212 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "对路径 '%s' 的 make_cache_entry 操作失败" + +#: 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 "路径 '%s' 未合并" + +#: 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 "diff_setup_done 失败" + +#: 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 "不能对 '%s' 执行 reflog 操作\n" + +#: builtin/checkout.c:565 +msgid "HEAD is now at" +msgstr "HEAD 目前位于" + +#: builtin/checkout.c:572 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "重置分支 '%s'\n" + +#: builtin/checkout.c:575 +#, c-format +msgid "Already on '%s'\n" +msgstr "已经位于 '%s'\n" + +#: builtin/checkout.c:579 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "切换并重置分支 '%s'\n" + +#: builtin/checkout.c:581 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "切换到一个新分支 '%s'\n" + +#: builtin/checkout.c:583 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "切换到分支 '%s'\n" + +# 译者：注意保持前导空格 +#: builtin/checkout.c:639 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... 及其它 %d 个。\n" + +#. 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] "" +"警告：您正丢下 %d 个提交，未和任何分支关联：\n" +"\n" +"%s\n" + +#: 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 "" +"如果您想要通过创建新分支保存他们，这可能是一个好时候。\n" +"如下操作：\n" +"\n" +" git branch new_branch_name %s\n" +"\n" + +#: builtin/checkout.c:692 +msgid "internal error in revision walk" +msgstr "在版本遍历时遇到内部错误" + +#: builtin/checkout.c:696 +msgid "Previous HEAD position was" +msgstr "之前的 HEAD 位置是" + +#: 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 "无效引用：%s" + +#. case (1): want a tree +#: builtin/checkout.c:892 +#, c-format +msgid "reference is not a tree: %s" +msgstr "引用不是一个树：%s" + +#: builtin/checkout.c:972 +msgid "-B cannot be used with -b" +msgstr "-B 不能和 -b 共用" + +#: builtin/checkout.c:981 +msgid "--patch is incompatible with all other options" +msgstr "--patch 选项和其他选项不兼容" + +#: builtin/checkout.c:984 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "--detach 不能和 -b/-B/--orphan 共用" + +#: builtin/checkout.c:986 +msgid "--detach cannot be used with -t" +msgstr "--detach 不能和 -t 共用" + +#: builtin/checkout.c:992 +msgid "--track needs a branch name" +msgstr "--track 需要一个分支名" + +#: builtin/checkout.c:999 +msgid "Missing branch name; try -b" +msgstr "缺少分支名；尝试 -b" + +#: builtin/checkout.c:1005 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "--orphan 和 -b|-B 互斥" + +#: builtin/checkout.c:1007 +msgid "--orphan cannot be used with -t" +msgstr "--orphan 不能和 -t 共用" + +#: builtin/checkout.c:1017 +msgid "git checkout: -f and -m are incompatible" +msgstr "git checkout：-f 和 -m 不兼容" + +#: 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 "" +"git checkout：更新路径和切换分支不兼容。\n" +"您是想要检出 '%s' 但未能将其解析为提交么？" + +#: builtin/checkout.c:1061 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "git checkout：更新路径和切换分支不兼容。" + +#: builtin/checkout.c:1066 +msgid "git checkout: --detach does not take a path argument" +msgstr "git checkout：--detach 不跟路径参数" + +#: builtin/checkout.c:1069 +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/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 "--ours/--theirs 和切换分支不兼容。" + +#: 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:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "引用版本库 '%s' 不是一个本地目录。" + +#: builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "无法打开 '%s'" + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "无法创建目录 '%s'" + +#: builtin/clone.c:308 builtin/diff.c:75 +#, 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:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "无法删除 '%s'" + +#: 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:440 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "不能发现要克隆的远程分支 %s。" + +#: builtin/clone.c:549 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" + +#: 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 "--bare 和 --origin %s 选项不兼容。" + +#: builtin/clone.c:668 +#, c-format +msgid "repository '%s' does not exist" +msgstr "版本库 '%s' 不存在" + +#: builtin/clone.c:673 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" + +#: builtin/clone.c:683 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" + +#: builtin/clone.c:693 +#, c-format +msgid "working tree '%s' already exists." +msgstr "工作区 '%s' 已经存在。" + +#: builtin/clone.c:706 builtin/clone.c:720 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "不能为 '%s' 创建先导目录" + +#: builtin/clone.c:709 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "不能为 '%s' 创建工作区目录。" + +#: builtin/clone.c:728 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "克隆到裸版本库 '%s'...\n" + +#: builtin/clone.c:730 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "正克隆到 '%s'...\n" + +#: builtin/clone.c:786 +#, c-format +msgid "Don't know how to clone %s" +msgstr "不知道如何克隆 %s" + +#: builtin/clone.c:835 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "远程分支 %s 在上游 %s 未发现" + +#: 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 "" +"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\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: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 "" +"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" +"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" + +#: 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 "" +"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n" +"也要提交，使用命令：\n" +"\n" +" git commit --allow-empty\n" +"\n" +"否则，请使用命令 'git reset'\n" + +#: 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 "无法解包 HEAD 树对象" + +#: 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 "无法写 new_index 文件" + +# 译者：%s若翻为中文，前后不需要空格 +#: builtin/commit.c:457 +#, c-format +msgid "cannot do a partial commit during a %s." +msgstr "在%s过程中不能做部分提交。" + +#: 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 "无效的提交：%s" + +#: builtin/commit.c:579 +msgid "malformed --author parameter" +msgstr "非法的 --author 参数" + +#: builtin/commit.c:635 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "非法的身份字符串：'%s'" + +#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 +#, c-format +msgid "could not lookup commit %s" +msgstr "不能查询提交 %s" + +#: builtin/commit.c:682 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "（正从标准输入中读取日志信息）\n" + +#: 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 "不能读取日志文件 '%s'" + +#: builtin/commit.c:694 +msgid "commit has empty message" +msgstr "提交说明为空" + +#: builtin/commit.c:710 +msgid "could not read MERGE_MSG" +msgstr "不能读取 MERGE_MSG" + +#: builtin/commit.c:714 +msgid "could not read SQUASH_MSG" +msgstr "不能读取 SQUASH_MSG" + +#: builtin/commit.c:718 +#, c-format +msgid "could not read '%s'" +msgstr "不能读取 '%s'" + +#: builtin/commit.c:746 +#, c-format +msgid "could not open '%s'" +msgstr "不能打开 '%s'" + +#: builtin/commit.c:770 +msgid "could not write commit template" +msgstr "不能写提交模版" + +# 译者：%s若翻为中文，前后不需要空格 +#: 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 "" +"\n" +"看起来您正在提交一个%s。\n" +"如果不是这样，请删除文件\n" +"\t%s\n" +"然后重试。\n" + +#: 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 "" +"以 '#' 开头\n" +"的行将被忽略，并且空的提交说明将会中止提交。\n" + +# 译者：中文字符串拼接，可删除前导空格 +#: 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 "" +"以 '#' 开头\n" +"的行将被保留，您可以删除它们如果您想这样做的话。空的提交说明将会\n" +"中止提交。\n" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: builtin/commit.c:816 +#, c-format +msgid "%sAuthor: %s" +msgstr "%s作者： %s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: builtin/commit.c:823 +#, c-format +msgid "%sCommitter: %s" +msgstr "%s提交者： %s" + +#: 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 "请使用 -m 或者 -F 选项提供提交说明。\n" + +#: builtin/commit.c:975 +#, c-format +msgid "No existing author found with '%s'" +msgstr "没有找到匹配 '%s' 的作者" + +#: builtin/commit.c:990 builtin/commit.c:1182 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "无效的未追踪文件参数 '%s'" + +#: builtin/commit.c:1030 +msgid "Using both --reset-author and --author does not make sense" +msgstr "同时使用 --reset-author 和 --author 没有意义" + +#: builtin/commit.c:1041 +msgid "You have nothing to amend." +msgstr "您没有可修补的提交。" + +# 译者：%s若翻为中文，前后不需要空格 +#: builtin/commit.c:1043 +#, c-format +msgid "You are in the middle of a %s -- cannot amend." +msgstr "您正处于一个%s的过程中 -- 无法修补提交。" + +#: builtin/commit.c:1045 +msgid "Options --squash and --fixup cannot be used together" +msgstr "选项 --squash 和 --fixup 不能共用" + +#: builtin/commit.c:1055 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "只能用一个 -c/-C/-F/--fixup 选项。" + +#: builtin/commit.c:1057 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。" + +#: builtin/commit.c:1063 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。" + +#: builtin/commit.c:1080 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" + +#: builtin/commit.c:1082 +msgid "No paths with --include/--only does not make sense." +msgstr "参数 --include/--only 不跟路径没有意义。" + +#: 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 "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." + +#: builtin/commit.c:1096 builtin/tag.c:556 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "无效的清理模式 %s" + +#: builtin/commit.c:1101 +msgid "Paths with -a does not make sense." +msgstr "路径和 -a 选项共用没有意义。" + +#: 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 "不能解析 HEAD 提交" + +#: builtin/commit.c:1452 builtin/merge.c:509 +#, c-format +msgid "could not open '%s' for reading" +msgstr "不能为读入打开 '%s'" + +#: builtin/commit.c:1459 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "损坏的 MERGE_HEAD 文件（%s）" + +#: builtin/commit.c:1466 +msgid "could not read MERGE_MODE" +msgstr "不能读取 MERGE_MODE" + +#: builtin/commit.c:1485 +#, c-format +msgid "could not read commit message: %s" +msgstr "不能读取提交说明：%s" + +#: builtin/commit.c:1499 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "终止提交因为提交说明为空。\n" + +#: 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 "无法锁定 HEAD 引用" + +#: builtin/commit.c:1539 +msgid "cannot update HEAD ref" +msgstr "无法更新 HEAD 引用" + +#: 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 "" +"版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n" +"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。" + +#: 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: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:77 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "'%s'：不是一个正规文件或符号链接" + +#: builtin/diff.c:220 +#, c-format +msgid "invalid option: %s" +msgstr "无效选项：%s" + +#: builtin/diff.c:297 +msgid "Not a git repository" +msgstr "不是一个 git 版本库" + +#: builtin/diff.c:347 +#, c-format +msgid "invalid object '%s' given." +msgstr "提供了无效对象 '%s'。" + +#: builtin/diff.c:352 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "提供了超过 %d 个树对象：'%s'" + +#: builtin/diff.c:362 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "提供了超过两个 blob 对象：'%s'" + +#: builtin/diff.c:370 +#, c-format +msgid "unhandled object '%s' given." +msgstr "提供了无法处理的对象 '%s'。" + +#: builtin/fetch.c:200 +msgid "Couldn't find remote ref HEAD" +msgstr "无法发现远程 HEAD 引用" + +#: builtin/fetch.c:252 +#, c-format +msgid "object %s not found" +msgstr "对象 %s 未发现" + +#: 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 "! %-*s %-*s -> %s （在当前分支下不能获取）" + +#: builtin/fetch.c:273 builtin/fetch.c:351 +msgid "[rejected]" +msgstr "[已拒绝]" + +#: builtin/fetch.c:284 +msgid "[tag update]" +msgstr "[tag更新]" + +# 译者：注意保持前导空格 +#: 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 "[新tag]" + +#: 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 "无法打开 %s：%s\n" + +#: builtin/fetch.c:393 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s 未发送所有必须的对象\n" + +#: builtin/fetch.c:479 +#, c-format +msgid "From %.*s\n" +msgstr "来自 %.*s\n" + +#: 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 "" +"一些本地引用不能被更新；尝试运行\n" +" 'git remote prune %s' 来删除旧的、有冲突的分支" + +# 译者：注意保持前导空格 +#: builtin/fetch.c:540 +#, c-format +msgid " (%s will become dangling)\n" +msgstr " （%s 将成为悬空状态）\n" + +# 译者：注意保持前导空格 +#: builtin/fetch.c:541 +#, c-format +msgid " (%s has become dangling)\n" +msgstr " （%s 已成为悬空状态）\n" + +#: 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 "拒绝获取到非裸版本库的当前分支 %s" + +#: builtin/fetch.c:700 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "不知道如何从 %s 获取" + +#: builtin/fetch.c:777 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" + +#: builtin/fetch.c:780 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "选项 \"%s\" 对于 %s 被忽略\n" + +#: builtin/fetch.c:879 +#, c-format +msgid "Fetching %s\n" +msgstr "正在获取 %s\n" + +#: builtin/fetch.c:881 +#, c-format +msgid "Could not fetch %s" +msgstr "不能获取 %s" + +#: 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 "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。" + +#: builtin/fetch.c:918 +msgid "You need to specify a tag name." +msgstr "您需要指定一个 tag 名称。" + +#: builtin/fetch.c:970 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all 不能带一个版本库参数" + +#: builtin/fetch.c:972 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all 带引用表达式没有任何意义" + +#: builtin/fetch.c:983 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "没有这样的远程或远程组：%s" + +#: 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 "无效的 %s：'%s'" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "指定了太多的选项" + +#: builtin/gc.c:103 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "不正常的长对象目录 %.*s" + +#: builtin/gc.c:223 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "自动打包版本库以求最佳性能。\n" + +#: 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 "" +"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" +"参见 \"git help gc\" 以获取更多信息。\n" + +#: builtin/gc.c:256 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" + +#: builtin/grep.c:216 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep：无法创建线程：%s" + +#: builtin/grep.c:402 +#, c-format +msgid "Failed to chdir: %s" +msgstr "无法切换目录：%s" + +#: builtin/grep.c:478 builtin/grep.c:512 +#, c-format +msgid "unable to read tree (%s)" +msgstr "无法读取树（%s）" + +#: builtin/grep.c:526 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "无法抓取来自于 %s 类型的对象" + +#: builtin/grep.c:584 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "开关 `%c' 期望一个数字值" + +#: builtin/grep.c:601 +#, c-format +msgid "cannot open '%s'" +msgstr "不能打开 '%s'" + +#: builtin/grep.c:888 +msgid "no pattern given." +msgstr "未提供模式匹配。" + +#: builtin/grep.c:902 +#, c-format +msgid "bad object %s" +msgstr "坏对象 %s" + +#: builtin/grep.c:943 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager 仅用于工作区" + +#: builtin/grep.c:966 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached 或 --untracked 不能与 --no-index 共用。" + +#: builtin/grep.c:971 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "--no-index 或 --untracked 不能和版本共用。" + +#: builtin/grep.c:974 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" + +#: builtin/grep.c:982 +msgid "both --cached and trees are given." +msgstr "同时给出了 --cached 和树对象。" + +#: 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 "未复制错误版本 %d 的模版自 '%s'" + +#: builtin/init-db.c:192 +#, c-format +msgid "insane git directory %s" +msgstr "不正常的 git 目录 %s" + +#: builtin/init-db.c:322 builtin/init-db.c:325 +#, c-format +msgid "%s already exists" +msgstr "%s 已经存在" + +#: builtin/init-db.c:354 +#, c-format +msgid "unable to handle file type %d" +msgstr "不能处理 %d 类型的文件" + +#: builtin/init-db.c:357 +#, c-format +msgid "unable to move %s to %s" +msgstr "不能移动 %s 至 %s" + +#: builtin/init-db.c:362 +#, 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:419 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s Git 版本库于 %s%s\n" + +#: 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 "不能创建目录 %s" + +#: builtin/init-db.c:532 +#, c-format +msgid "cannot chdir to %s" +msgstr "不能切换目录到 %s" + +#: builtin/init-db.c:554 +#, 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:578 +msgid "Cannot access current working directory" +msgstr "不能访问当前工作目录" + +#: builtin/init-db.c:585 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "不能访问工作区 '%s'" + +#: builtin/log.c:187 +#, c-format +msgid "Final output: %d %s\n" +msgstr "最终输出：%d %s\n" + +#: builtin/log.c:395 builtin/log.c:483 +#, c-format +msgid "Could not read object %s" +msgstr "不能读取对象 %s" + +#: builtin/log.c:507 +#, c-format +msgid "Unknown type: %d" +msgstr "未知类型：%d" + +#: builtin/log.c:596 +msgid "format.headers without value" +msgstr "format.headers 没有值" + +#: 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 "无法打开补丁文件 %s" + +#: 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 "不正常的 in-reply-to：%s" + +#: builtin/log.c:952 +msgid "Two output directories?" +msgstr "两个输出目录？" + +#: builtin/log.c:1173 +#, c-format +msgid "bogus committer info %s" +msgstr "虚假的提交者信息 %s" + +#: builtin/log.c:1218 +msgid "-n and -k are mutually exclusive." +msgstr "-n 和 -k 互斥。" + +#: builtin/log.c:1220 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix 和 -k 互斥。" + +#: builtin/log.c:1225 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "未识别的参数：%s" + +#: builtin/log.c:1228 +msgid "--name-only does not make sense" +msgstr "--name-only 无意义" + +#: builtin/log.c:1230 +msgid "--name-status does not make sense" +msgstr "--name-status 无意义" + +#: builtin/log.c:1232 +msgid "--check does not make sense" +msgstr "--check 无意义" + +#: 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 "不能创建目录 '%s'" + +#: 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 "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" + +#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544 +#, c-format +msgid "Unknown commit %s" +msgstr "未知提交 %s" + +#: builtin/merge.c:91 +msgid "switch `m' requires a value" +msgstr "开关 `m' 需要一个值" + +#: builtin/merge.c:128 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "不能找到合并策略 '%s'。\n" + +#: 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 "不是一个有效对象：%s" + +#: 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 "压缩提交 -- 未更新 HEAD\n" + +#: builtin/merge.c:362 +msgid "Writing SQUASH_MSG" +msgstr "写入 SQUASH_MSG" + +#: builtin/merge.c:364 +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:437 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "'%s' 没有指向一个提交" + +#: builtin/merge.c:536 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "坏的 branch.%s.mergeoptions 字符串：%s" + +#: builtin/merge.c:629 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree 无法写入一树对象" + +#: 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 "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:1000 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" + +#: builtin/merge.c:1016 +#, c-format +msgid "'%s' is not a commit" +msgstr "'%s' 不是一个提交" + +#: 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 "%s 没有来自 %s 的远程跟踪分支" + +#: builtin/merge.c:1188 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" + +#: 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 "" +"您尚未结束您的合并（存在 MERGE_HEAD）。\n" +"请在合并前先提交您的修改。" + +#: builtin/merge.c:1207 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" + +#: 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 "" +"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" +"请在合并前先提交您的修改。" + +#: builtin/merge.c:1214 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" + +#: builtin/merge.c:1223 +msgid "You cannot combine --squash with --no-ff." +msgstr "您不能将 --squash 与 --no-ff 共用。" + +#: builtin/merge.c:1228 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "您不能将 --no-ff 与 --ff-only 共用。" + +#: builtin/merge.c:1235 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" + +#: 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 "%s - 不能被合并" + +#: builtin/merge.c:1385 +#, c-format +msgid "Updating %s..%s\n" +msgstr "更新 %s..%s\n" + +#: builtin/merge.c:1423 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "尝试非常小的索引内合并...\n" + +#: builtin/merge.c:1430 +#, c-format +msgid "Nope.\n" +msgstr "无。\n" + +#: 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 "将树回滚至原始状态...\n" + +#: builtin/merge.c:1489 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "尝试合并策略 %s...\n" + +#: builtin/merge.c:1553 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "没有合并策略处理此合并。\n" + +#: builtin/merge.c:1555 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "使用策略 %s 合并失败。\n" + +#: builtin/merge.c:1564 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "使用 %s 以准备手工解决。\n" + +#: builtin/merge.c:1575 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "自动合并进展顺利，按要求在提交前停止\n" + +#: 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 +#, c-format +msgid "renaming '%s' failed" +msgstr "重命名 '%s' 失败" + +#: 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:343 +#, 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:521 +#, c-format +msgid "cannot read '%s'" +msgstr "不能读取 '%s'" + +#: builtin/notes.c:253 builtin/tag.c:524 +#, 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:537 +#, 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: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: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:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "对象 %s 没有注解\n" + +#: builtin/notes.c:1103 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "未知子命令：%s" + +#: builtin/pack-objects.c:2310 +#, c-format +msgid "unsupported index version %s" +msgstr "不支持的索引版本 %s" + +#: builtin/pack-objects.c:2314 +#, c-format +msgid "bad index version '%s'" +msgstr "坏的索引版本 '%s'" + +#: builtin/pack-objects.c:2322 +#, c-format +msgid "option %s does not accept negative form" +msgstr "选项 %s 不接受否定格式" + +#: builtin/pack-objects.c:2326 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "不能解析值 '%s' 针对于选项 %s" + +#: builtin/push.c:44 +msgid "tag shorthand without <tag>" +msgstr "tag 简写没有跟 <tag> 参数" + +#: builtin/push.c:63 +msgid "--delete only accepts plain target ref names" +msgstr "--delete 只接受简单的目标引用名" + +#: 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 "" +"您当前不在一个分支上。\n" +"现在为推送当前（分离头指针）的历史，使用\n" +"\n" +" git push %s HEAD:<name-of-remote-branch>\n" + +#: 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 "" +"当前分支 %s 没有对应的上游分支。\n" +"为推送当前分支并建立与远程上游的跟踪，使用\n" +"\n" +" git push --set-upstream %s %s\n" + +#: builtin/push.c:88 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "当前分支 %s 有多个上游分支，拒绝推送。" + +#: builtin/push.c:111 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。" + +#: builtin/push.c:131 +#, c-format +msgid "Pushing to %s\n" +msgstr "推送到 %s\n" + +#: builtin/push.c:135 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "无法推送一些引用到 '%s'" + +#: 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 "" +"为了防止您丢失提交历史，非快进式更新被拒绝。\n" +"再次推送前先与远程变更合并（如 'git pull'）。详见\n" +"'git push --help' 中的 'Note about fast-forwards' 小节。\n" + +#: builtin/push.c:160 +#, c-format +msgid "bad repository '%s'" +msgstr "坏的版本库 '%s'" + +#: 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 "" +"没有配置推送目标。\n" +"或者通过命令行指定URL，或者用下面命令配置一个远程版本库\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"然后使用该远程版本库名执行推送\n" +"\n" +" git push <name>\n" + +#: builtin/push.c:176 +msgid "--all and --tags are incompatible" +msgstr "--all 和 --tags 不兼容" + +#: builtin/push.c:177 +msgid "--all can't be combined with refspecs" +msgstr "--all 不能和引用表达式共用" + +#: builtin/push.c:182 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror 和 --tags 不兼容" + +#: builtin/push.c:183 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror 不能和引用表达式共用" + +#: builtin/push.c:188 +msgid "--all and --mirror are incompatible" +msgstr "--all 和 --mirror 不兼容" + +#: builtin/push.c:274 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" + +#: builtin/push.c:276 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete 未接任何引用没有意义" + +#: 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 "您没有一个有效的 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:297 +#, c-format +msgid "Could not parse object '%s'." +msgstr "不能解析对象 '%s'。" + +#: builtin/reset.c:302 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch 与 --{hard,mixed,soft} 不兼容" + +#: builtin/reset.c:311 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "--mixed 带路径已弃用，代之以 'git reset -- <paths>'。" + +# 译者：汉字之间无空格，故删除%s前后空格 +#: builtin/reset.c:313 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "不能带路径进行%s重置。" + +# 译者：汉字之间无空格，故删除%s前后空格 +#: builtin/reset.c:325 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "不能对裸版本库进行%s重置" + +#: builtin/reset.c:341 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "不能重置索引文件至版本 '%s'。" + +#: builtin/revert.c:70 builtin/revert.c:91 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s：%s 不能和 %s 共用" + +#: 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 "" +"'%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: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:157 +#, c-format +msgid "Missing author: %s" +msgstr "缺少作者：%s" + +#: builtin/tag.c:58 +#, c-format +msgid "malformed object at '%s'" +msgstr "非法的对象于 '%s'" + +#: builtin/tag.c:205 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "tag 名字太长：%.*s..." + +#: builtin/tag.c:210 +#, c-format +msgid "tag '%s' not found." +msgstr "tag '%s' 未发现。" + +#: builtin/tag.c:225 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "已删除 tag '%s'（曾为 %s）\n" + +#: builtin/tag.c:237 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "不能校验 tag '%s'" + +#: builtin/tag.c:247 +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: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 "" +"\n" +"#\n" +"# 输入一个 tag 说明\n" +"# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n" +"#\n" + +#: builtin/tag.c:294 +msgid "unable to sign the tag" +msgstr "无法签署 tag" + +#: builtin/tag.c:296 +msgid "unable to write tag file" +msgstr "无法写 tag 文件" + +#: builtin/tag.c:321 +msgid "bad object type." +msgstr "坏的对象类型。" + +#: builtin/tag.c:334 +msgid "tag header too big." +msgstr "tag 头信息太大。" + +#: builtin/tag.c:366 +msgid "no tag message?" +msgstr "无 tag 说明？" + +#: builtin/tag.c:372 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "tag 说明被保留在 %s\n" + +#: builtin/tag.c:421 +msgid "switch 'points-at' requires an object" +msgstr "开关 'points-at' 需要一个对象" + +#: builtin/tag.c:423 +#, c-format +msgid "malformed object name '%s'" +msgstr "非法的对象名 '%s'" + +#: builtin/tag.c:502 +msgid "-n option is only allowed with -l." +msgstr "-n 选项只允许和 -l 共用。" + +#: builtin/tag.c:504 +msgid "--contains option is only allowed with -l." +msgstr "--contains 选项只允许和 -l 共用。" + +#: builtin/tag.c:506 +msgid "--points-at option is only allowed with -l." +msgstr "--points-at 选项只允许和 -l 共用。" + +#: builtin/tag.c:514 +msgid "only one -F or -m option is allowed." +msgstr "只允许一个 -F 或 -m 选项。" + +#: builtin/tag.c:534 +msgid "too many params" +msgstr "太多参数" + +#: builtin/tag.c:540 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "'%s' 不是一个有效的tag名称。" + +#: builtin/tag.c:545 +#, c-format +msgid "tag '%s' already exists" +msgstr "tag '%s' 已存在" + +#: builtin/tag.c:563 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s：不能锁定引用" + +#: builtin/tag.c:565 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s：不能更新引用" + +#: builtin/tag.c:567 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "已更新tag '%s'（曾为 %s）\n" + +#: 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 "版本库缺乏必要的 blob 数据以进行三路合并。" + +#: git-am.sh:147 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"您是否曾手动编辑过您的补丁？\n" +"无法应用补丁到索引中的数据上。" + +#: 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 "一次只能有一个 StGIT 补丁队列被应用" + +#: git-am.sh:355 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "不支持 $patch_format 补丁格式。" + +#: 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 "不再支持 -d 选项。不要使用。" + +#: git-am.sh:474 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。" + +#: git-am.sh:479 +msgid "Please make up your mind. --skip or --abort?" +msgstr "请下决心。--skip 或是 --abort ？" + +#: 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 "脏的索引：不能应用补丁（脏文件：$files）" + +#: 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 "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " + +#: git-am.sh:795 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "正应用：$FIRSTLINE" + +#: 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 "您想让我为您这样做么[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' 只能带一个参数。" + +# 译者：注意保持句尾空格 +#. 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: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: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 "" +"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 "更新尚未诞生的分支，变更添加至索引" + +#: 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 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 "不能记录工作区状态" + +#: 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:491 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "丢弃了 ${REV} ($s)" + +#: git-stash.sh:492 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}：不能丢弃进度条目" + +#: git-stash.sh:499 +msgid "No branch name specified" +msgstr "未指定分支名" + +#: git-stash.sh:570 +msgid "(To restore them type \"git stash apply\")" +msgstr "（为恢复数据输入 \"git stash apply\"）" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "无法从 url '$remoteurl' 剥离一个组件" + +#: git-submodule.sh:108 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "未在 .gitmodules 中发现路径 '$path' 的子模组映射" + +#: git-submodule.sh:149 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "无法克隆 '$url' 到子模组路径 '$path'" + +#: git-submodule.sh:159 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反" + +#: git-submodule.sh:247 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始" + +#: git-submodule.sh:264 +#, sh-format +msgid "'$path' already exists in the index" +msgstr "'$path' 已经存在于索引中" + +#: git-submodule.sh:281 +#, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "'$path' 已存在且不是一个有效的 git 版本库" + +#: git-submodule.sh:295 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "不能检出子模组 '$path'" + +#: git-submodule.sh:300 +#, sh-format +msgid "Failed to add submodule '$path'" +msgstr "无法添加子模组 '$path'" + +#: git-submodule.sh:305 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "无法注册子模组 '$path'" + +#: git-submodule.sh:347 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "正在进入 '$prefix$path'" + +#: git-submodule.sh:359 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "停止于 '$path'，脚本返回非零值。" + +#: git-submodule.sh:401 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的 url" + +#: git-submodule.sh:410 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "无法为子模组路径 '$path' 注册 url" + +#: git-submodule.sh:418 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "无法为子模组路径 '$path' 注册更新模式" + +#: git-submodule.sh:420 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "子模组 '$name' ($url) 已为路径 '$path' 注册" + +#: git-submodule.sh:519 +#, sh-format +msgid "" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" +"子模组路径 '$path' 没有初始化\n" +"也许您想用 'update --init'？" + +#: git-submodule.sh:532 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "无法在子模组路径 '$path' 中找到当前版本" + +#: git-submodule.sh:551 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "无法在子模组路径 '$path' 中获取" + +#: git-submodule.sh:565 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "无法在子模组路径 '$path' 中变基 '$sha1'" + +#: git-submodule.sh:566 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "子模组路径 '$path'：变基至 '$sha1'" + +#: git-submodule.sh:571 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "无法合并 '$sha1' 到子模组路径 '$path' 中" + +#: git-submodule.sh:572 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "子模组路径 '$path'：已合并入 '$sha1'" + +#: git-submodule.sh:577 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "无法在子模组路径 '$path' 中检出 '$sha1'" + +#: git-submodule.sh:578 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "子模组路径 '$path'：检出 '$sha1'" + +#: git-submodule.sh:600 git-submodule.sh:923 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "无法递归进子模组路径 '$path'" + +#: git-submodule.sh:708 +msgid "--" +msgstr "--" + +# 译者：注意保持前导空格 +#: git-submodule.sh:766 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr " 警告：$name 未包含提交 $sha1_src" + +# 译者：注意保持前导空格 +#: git-submodule.sh:769 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr " 警告：$name 未包含提交 $sha1_dst" + +# 译者：注意保持前导空格 +#: git-submodule.sh:772 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst" + +#: git-submodule.sh:797 +msgid "blob" +msgstr "blob" + +#: git-submodule.sh:798 +msgid "submodule" +msgstr "子模组" + +#: git-submodule.sh:969 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "为 '$name' 同步子模组 url" |