diff options
Diffstat (limited to 'gitk-git/po')
| -rw-r--r-- | gitk-git/po/de.po | 920 | ||||
| -rw-r--r-- | gitk-git/po/es.po | 911 | ||||
| -rw-r--r-- | gitk-git/po/it.po | 500 | ||||
| -rw-r--r-- | gitk-git/po/ja.po | 1255 | ||||
| -rw-r--r-- | gitk-git/po/ru.po | 1085 | ||||
| -rw-r--r-- | gitk-git/po/sv.po | 1246 |
6 files changed, 5434 insertions, 483 deletions
diff --git a/gitk-git/po/de.po b/gitk-git/po/de.po index 5ee2fca8b2..53ef0d6359 100644 --- a/gitk-git/po/de.po +++ b/gitk-git/po/de.po @@ -1,528 +1,932 @@ # 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 # +# 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: 2008-01-09 22:20+0100\n" -"PO-Revision-Date: 2008-01-09 22:21+0100\n" +"POT-Creation-Date: 2009-05-12 21:55+0200\n" +"PO-Revision-Date: 2009-05-12 22:18+0200\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:101 -msgid "Error executing git rev-list:" -msgstr "Fehler beim Ausführen von git-rev-list:" +#: gitk:113 +msgid "Couldn't get list of unmerged files:" +msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:" + +#: gitk:268 +msgid "Error parsing revisions:" +msgstr "Fehler beim Laden der Versionen:" -#: gitk:114 +#: gitk:323 +msgid "Error executing --argscmd command:" +msgstr "Fehler beim Ausführen des --argscmd-Kommandos:" + +#: gitk:336 +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:339 +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:361 gitk:508 +msgid "Error executing git log:" +msgstr "Fehler beim Ausführen von »git log«:" + +#: gitk:379 gitk:524 msgid "Reading" msgstr "Lesen" -#: gitk:141 gitk:2143 +#: gitk:439 gitk:4061 msgid "Reading commits..." -msgstr "Versionen lesen..." +msgstr "Versionen werden gelesen ..." -#: gitk:264 -msgid "Can't parse git log output:" -msgstr "Git log Ausgabe kann nicht erkannt werden:" - -#: gitk:375 gitk:2147 +#: gitk:442 gitk:1560 gitk:4064 msgid "No commits selected" -msgstr "Keine Versionen ausgewählt." +msgstr "Keine Versionen ausgewählt" + +#: gitk:1436 +msgid "Can't parse git log output:" +msgstr "Ausgabe von »git log« kann nicht erkannt werden:" -#: gitk:486 +#: gitk:1656 msgid "No commit information available" msgstr "Keine Versionsinformation verfügbar" -#: gitk:585 gitk:607 gitk:1908 gitk:6366 gitk:7866 gitk:8020 +#: gitk:1791 gitk:1815 gitk:3854 gitk:8714 gitk:10250 gitk:10422 msgid "OK" msgstr "Ok" -#: gitk:609 gitk:1909 gitk:6046 gitk:6117 gitk:6218 gitk:6264 gitk:6368 -#: gitk:7867 gitk:8021 +#: gitk:1817 gitk:3856 gitk:8311 gitk:8385 gitk:8495 gitk:8544 gitk:8716 +#: gitk:10251 gitk:10423 msgid "Cancel" msgstr "Abbrechen" -#: gitk:646 -msgid "File" -msgstr "Datei" - -#: gitk:648 +#: gitk:1917 msgid "Update" msgstr "Aktualisieren" -#: gitk:649 +#: gitk:1918 +msgid "Reload" +msgstr "Neu laden" + +#: gitk:1919 msgid "Reread references" msgstr "Zweige neu laden" -#: gitk:650 +#: gitk:1920 msgid "List references" -msgstr "Zweige auflisten" +msgstr "Zweige/Markierungen auflisten" + +#: gitk:1922 +msgid "Start git gui" +msgstr "»git gui« starten" -#: gitk:651 +#: gitk:1924 msgid "Quit" msgstr "Beenden" -#: gitk:653 -msgid "Edit" -msgstr "Bearbeiten" +#: gitk:1916 +msgid "File" +msgstr "Datei" -#: gitk:654 +#: gitk:1928 msgid "Preferences" msgstr "Einstellungen" -#: gitk:657 -msgid "View" -msgstr "Ansicht" +#: gitk:1927 +msgid "Edit" +msgstr "Bearbeiten" -#: gitk:658 +#: gitk:1932 msgid "New view..." -msgstr "Neue Ansicht..." +msgstr "Neue Ansicht ..." -#: gitk:659 gitk:2085 gitk:8651 +#: gitk:1933 msgid "Edit view..." -msgstr "Ansicht bearbeiten..." +msgstr "Ansicht bearbeiten ..." -#: gitk:661 gitk:2086 gitk:8652 +#: gitk:1934 msgid "Delete view" -msgstr "Ansicht löschen" +msgstr "Ansicht entfernen" -#: gitk:663 +#: gitk:1936 msgid "All files" msgstr "Alle Dateien" -#: gitk:667 -msgid "Help" -msgstr "Hilfe" +#: gitk:1931 gitk:3666 +msgid "View" +msgstr "Ansicht" -#: gitk:668 gitk:1280 +#: gitk:1941 gitk:1951 gitk:2650 msgid "About gitk" msgstr "Über gitk" -#: gitk:669 +#: gitk:1942 gitk:1956 msgid "Key bindings" msgstr "Tastenkürzel" -#: gitk:726 +#: gitk:1940 gitk:1955 +msgid "Help" +msgstr "Hilfe" + +#: gitk:2016 msgid "SHA1 ID: " msgstr "SHA1:" -#: gitk:776 +#: gitk:2047 +msgid "Row" +msgstr "Zeile" + +#: gitk:2078 msgid "Find" msgstr "Suche" -#: gitk:777 +#: gitk:2079 msgid "next" msgstr "nächste" -#: gitk:778 +#: gitk:2080 msgid "prev" msgstr "vorige" -#: gitk:779 +#: gitk:2081 msgid "commit" -msgstr "Version" +msgstr "Version nach" -#: gitk:782 gitk:784 gitk:2308 gitk:2331 gitk:2355 gitk:4257 gitk:4320 +#: gitk:2084 gitk:2086 gitk:4222 gitk:4245 gitk:4269 gitk:6210 gitk:6282 +#: gitk:6366 msgid "containing:" -msgstr "enthaltend:" +msgstr "Beschreibung:" -#: gitk:785 gitk:1741 gitk:1746 gitk:2383 +#: gitk:2087 gitk:3158 gitk:3163 gitk:4297 msgid "touching paths:" -msgstr "Pfad betreffend:" +msgstr "Dateien:" -#: gitk:786 gitk:2388 +#: gitk:2088 gitk:4302 msgid "adding/removing string:" -msgstr "String dazu/löschen:" +msgstr "Änderungen:" -#: gitk:795 gitk:797 +#: gitk:2097 gitk:2099 msgid "Exact" msgstr "Exakt" -#: gitk:797 gitk:2466 gitk:4225 +#: gitk:2099 gitk:4377 gitk:6178 msgid "IgnCase" msgstr "Kein Groß/Klein" -#: gitk:797 gitk:2357 gitk:2464 gitk:4221 +#: gitk:2099 gitk:4271 gitk:4375 gitk:6174 msgid "Regexp" msgstr "Regexp" -#: gitk:799 gitk:800 gitk:2485 gitk:2515 gitk:2522 gitk:4331 gitk:4387 +#: gitk:2101 gitk:2102 gitk:4396 gitk:4426 gitk:4433 gitk:6302 gitk:6370 msgid "All fields" msgstr "Alle Felder" -#: gitk:800 gitk:2483 gitk:2515 gitk:4287 +#: gitk:2102 gitk:4394 gitk:4426 gitk:6241 msgid "Headline" msgstr "Überschrift" -#: gitk:801 gitk:2483 gitk:4287 gitk:4387 gitk:4775 +#: gitk:2103 gitk:4394 gitk:6241 gitk:6370 gitk:6804 msgid "Comments" msgstr "Beschreibung" -#: gitk:801 gitk:2483 gitk:2487 gitk:2522 gitk:4287 gitk:4711 gitk:5895 -#: gitk:5910 +#: gitk:2103 gitk:4394 gitk:4398 gitk:4433 gitk:6241 gitk:6739 gitk:7991 +#: gitk:8006 msgid "Author" msgstr "Autor" -#: gitk:801 gitk:2483 gitk:4287 gitk:4713 +#: gitk:2103 gitk:4394 gitk:6241 gitk:6741 msgid "Committer" msgstr "Eintragender" -#: gitk:829 +#: gitk:2132 msgid "Search" -msgstr "Suche" +msgstr "Suchen" -#: gitk:836 +#: gitk:2139 msgid "Diff" msgstr "Vergleich" -#: gitk:838 +#: gitk:2141 msgid "Old version" msgstr "Alte Version" -#: gitk:840 +#: gitk:2143 msgid "New version" msgstr "Neue Version" -#: gitk:842 +#: gitk:2145 msgid "Lines of context" msgstr "Kontextzeilen" -#: gitk:900 +#: gitk:2155 +msgid "Ignore space change" +msgstr "Leerzeichenänderungen ignorieren" + +#: gitk:2213 msgid "Patch" msgstr "Patch" -#: gitk:902 +#: gitk:2215 msgid "Tree" msgstr "Baum" -#: gitk:1018 gitk:1033 gitk:5961 +#: gitk:2359 gitk:2376 msgid "Diff this -> selected" -msgstr "Vergleich diese -> gewählte" +msgstr "Vergleich: diese -> gewählte" -#: gitk:1020 gitk:1035 gitk:5962 +#: gitk:2360 gitk:2377 msgid "Diff selected -> this" -msgstr "Vergleich gewählte -> diese" +msgstr "Vergleich: gewählte -> diese" -#: gitk:1022 gitk:1037 gitk:5963 +#: gitk:2361 gitk:2378 msgid "Make patch" msgstr "Patch erstellen" -#: gitk:1023 gitk:6101 +#: gitk:2362 gitk:8369 msgid "Create tag" msgstr "Markierung erstellen" -#: gitk:1024 gitk:6198 +#: gitk:2363 gitk:8475 msgid "Write commit to file" msgstr "Version in Datei schreiben" -#: gitk:1025 gitk:6252 +#: gitk:2364 gitk:8532 msgid "Create new branch" msgstr "Neuen Zweig erstellen" -#: gitk:1026 +#: gitk:2365 msgid "Cherry-pick this commit" msgstr "Diese Version pflücken" -#: gitk:1028 +#: gitk:2366 msgid "Reset HEAD branch to here" msgstr "HEAD-Zweig auf diese Version zurücksetzen" -#: gitk:1044 +#: gitk:2367 +msgid "Mark this commit" +msgstr "Lesezeichen setzen" + +#: gitk:2368 +msgid "Return to mark" +msgstr "Zum Lesezeichen" + +#: gitk:2369 +msgid "Find descendant of this and mark" +msgstr "Abkömmling von Lesezeichen und dieser Version finden" + +#: gitk:2370 +msgid "Compare with marked commit" +msgstr "Mit Lesezeichen vergleichen" + +#: gitk:2384 msgid "Check out this branch" msgstr "Auf diesen Zweig umstellen" -#: gitk:1046 +#: gitk:2385 msgid "Remove this branch" msgstr "Zweig löschen" -#: gitk:1052 +#: gitk:2392 msgid "Highlight this too" msgstr "Diesen auch hervorheben" -#: gitk:1054 +#: gitk:2393 msgid "Highlight this only" msgstr "Nur diesen hervorheben" -#: gitk:1281 +#: gitk:2394 +msgid "External diff" +msgstr "Externes Diff-Programm" + +#: gitk:2395 +msgid "Blame parent commit" +msgstr "Annotieren der Elternversion" + +#: gitk:2402 +msgid "Show origin of this line" +msgstr "Herkunft dieser Zeile anzeigen" + +#: gitk:2403 +msgid "Run git gui blame on this line" +msgstr "Diese Zeile annotieren (»git gui blame«)" + +#: gitk:2652 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2006 Paul Mackerras\n" +"Copyright © 2005-2008 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" +"Gitk - eine Visualisierung der Git-Historie\n" "\n" -"Copyright © 2005-2006 Paul Mackerras\n" +"Copyright © 2005-2008 Paul Mackerras\n" "\n" "Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public " -"License\n" -" " +"License" -#: gitk:1289 gitk:1350 gitk:6524 +#: gitk:2660 gitk:2722 gitk:8897 msgid "Close" msgstr "Schließen" -#: gitk:1308 +#: gitk:2679 msgid "Gitk key bindings" -msgstr "Gitk Tastaturbelegung" +msgstr "Gitk-Tastaturbelegung" -#: gitk:1858 -msgid "Gitk view definition" -msgstr "Gitk Ansichten" +#: gitk:2682 +msgid "Gitk key bindings:" +msgstr "Gitk-Tastaturbelegung:" -#: gitk:1882 -msgid "Name" -msgstr "Name" +#: gitk:2684 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tBeenden" + +#: gitk:2685 +msgid "<Home>\t\tMove to first commit" +msgstr "<Pos1>\t\tZur neuesten Version springen" + +#: gitk:2686 +msgid "<End>\t\tMove to last commit" +msgstr "<Ende>\t\tZur ältesten Version springen" + +#: gitk:2687 +msgid "<Up>, p, i\tMove up one commit" +msgstr "<Hoch>, p, i\tNächste neuere Version" + +#: gitk:2688 +msgid "<Down>, n, k\tMove down one commit" +msgstr "<Runter>, n, k\tNächste ältere Version" + +#: gitk:2689 +msgid "<Left>, z, j\tGo back in history list" +msgstr "<Links>, z, j\tEine Version zurückgehen" + +#: gitk:2690 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Rechts>, x, l\tEine Version weitergehen" + +#: gitk:2691 +msgid "<PageUp>\tMove up one page in commit list" +msgstr "<BildHoch>\tEine Seite nach oben blättern" + +#: gitk:2692 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<BildRunter>\tEine Seite nach unten blättern" + +#: gitk:2693 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern" + +#: gitk:2694 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern" + +#: gitk:2695 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern" + +#: gitk:2696 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern" + +#: gitk:2697 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern" + +#: gitk:2698 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern" + +#: gitk:2699 +msgid "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)" + +#: gitk:2700 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)" + +#: gitk:2701 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern" + +#: gitk:2702 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern" + +#: gitk:2703 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern" + +#: gitk:2704 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern" + +#: gitk:2705 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern" + +#: gitk:2706 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tSuchen" + +#: gitk:2707 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tWeitersuchen" + +#: gitk:2708 +msgid "<Return>\tMove to next find hit" +msgstr "<Eingabetaste>\tWeitersuchen" + +#: gitk:2709 +msgid "/\t\tFocus the search box" +msgstr "/\t\tTastaturfokus ins Suchfeld" + +#: gitk:2710 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tRückwärts weitersuchen" + +#: gitk:2711 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tVergleich zur nächsten Datei blättern" + +#: gitk:2712 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tWeitersuchen im Vergleich" + +#: gitk:2713 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich" + +#: gitk:2714 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern" + +#: gitk:2715 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-Plus>\tSchrift vergrößern" + +#: gitk:2716 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-Nummernblock-Minus> Schrift verkleinern" -#: gitk:1885 +#: gitk:2717 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-Minus>\tSchrift verkleinern" + +#: gitk:2718 +msgid "<F5>\t\tUpdate" +msgstr "<F5>\t\tAktualisieren" + +#: gitk:3173 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fehler beim Holen von »%s« von »%s«:" + +#: gitk:3230 gitk:3239 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:" + +#: gitk:3251 +msgid "command failed:" +msgstr "Kommando fehlgeschlagen:" + +#: gitk:3397 +msgid "No such commit" +msgstr "Version nicht gefunden" + +#: gitk:3411 +msgid "git gui blame: command failed:" +msgstr "git gui blame: Kommando fehlgeschlagen:" + +#: gitk:3442 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s" + +#: gitk:3450 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s" + +#: gitk:3475 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "»git blame« konnte nicht gestartet werden: %s" + +#: gitk:3478 gitk:6209 +msgid "Searching" +msgstr "Suchen" + +#: gitk:3510 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Fehler beim Ausführen von »git blame«: %s" + +#: gitk:3538 +#, 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:3552 +msgid "External diff viewer failed:" +msgstr "Externes Diff-Programm fehlgeschlagen:" + +#: gitk:3670 +msgid "Gitk view definition" +msgstr "Gitk-Ansichten" + +#: gitk:3674 msgid "Remember this view" msgstr "Diese Ansicht speichern" -#: gitk:1889 -msgid "Commits to include (arguments to git rev-list):" -msgstr "Versionen anzeigen (Argumente von git-rev-list):" +#: gitk:3675 +msgid "Commits to include (arguments to git log):" +msgstr "Versionen anzeigen (Argumente von git log):" + +#: gitk:3676 +msgid "Use all refs" +msgstr "Alle Zweige verwenden" + +#: gitk:3677 +msgid "Strictly sort by date" +msgstr "Streng nach Datum sortieren" + +#: gitk:3678 +msgid "Mark branch sides" +msgstr "Zweig-Seiten markieren" + +#: gitk:3679 +msgid "Since date:" +msgstr "Von Datum:" + +#: gitk:3680 +msgid "Until date:" +msgstr "Bis Datum:" + +#: gitk:3681 +msgid "Max count:" +msgstr "Max. Anzahl:" + +#: gitk:3682 +msgid "Skip:" +msgstr "Überspringen:" + +#: gitk:3683 +msgid "Limit to first parent" +msgstr "Auf erste Elternversion beschränken" + +#: gitk:3684 +msgid "Command to generate more commits to include:" +msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:" + +#: gitk:3780 +msgid "Gitk: edit view" +msgstr "Gitk: Ansicht bearbeiten" -#: gitk:1895 +#: gitk:3793 +msgid "Name" +msgstr "Name" + +#: gitk:3841 msgid "Enter files and directories to include, one per line:" msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" -#: gitk:1942 +#: gitk:3855 +msgid "Apply (F5)" +msgstr "Anwenden (F5)" + +#: gitk:3893 msgid "Error in commit selection arguments:" msgstr "Fehler in den ausgewählten Versionen:" -#: gitk:1993 gitk:2079 gitk:2535 gitk:2549 gitk:3732 gitk:8620 gitk:8621 +#: gitk:3946 gitk:3998 gitk:4446 gitk:4460 gitk:5721 gitk:11114 gitk:11115 msgid "None" msgstr "Keine" -#: gitk:2483 gitk:4287 gitk:5897 gitk:5912 +#: gitk:4394 gitk:6241 gitk:7993 gitk:8008 msgid "Date" msgstr "Datum" -#: gitk:2483 gitk:4287 +#: gitk:4394 gitk:6241 msgid "CDate" msgstr "Eintragedatum" -#: gitk:2632 gitk:2637 +#: gitk:4543 gitk:4548 msgid "Descendant" msgstr "Abkömmling" -#: gitk:2633 +#: gitk:4544 msgid "Not descendant" -msgstr "Nicht Abkömmling" +msgstr "Kein Abkömmling" -#: gitk:2640 gitk:2645 +#: gitk:4551 gitk:4556 msgid "Ancestor" msgstr "Vorgänger" -#: gitk:2641 +#: gitk:4552 msgid "Not ancestor" -msgstr "Nicht Vorgänger" +msgstr "Kein Vorgänger" -#: gitk:2875 +#: gitk:4842 msgid "Local changes checked in to index but not committed" msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen" -#: gitk:2905 +#: gitk:4878 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokale Änderungen, nicht bereitgestellt" -#: gitk:4256 -msgid "Searching" -msgstr "Suchen" +#: gitk:6559 +msgid "many" +msgstr "viele" -#: gitk:4715 +#: gitk:6743 msgid "Tags:" msgstr "Markierungen:" -#: gitk:4732 gitk:4738 gitk:5890 +#: gitk:6760 gitk:6766 gitk:7986 msgid "Parent" msgstr "Eltern" -#: gitk:4743 +#: gitk:6771 msgid "Child" msgstr "Kind" -#: gitk:4752 +#: gitk:6780 msgid "Branch" msgstr "Zweig" -#: gitk:4755 +#: gitk:6783 msgid "Follows" msgstr "Folgt auf" -#: gitk:4758 +#: gitk:6786 msgid "Precedes" msgstr "Vorgänger von" -#: gitk:5040 -msgid "Error getting merge diffs:" -msgstr "Fehler beim Laden des Vergleichs:" +#: gitk:7279 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Fehler beim Laden des Vergleichs: %s" -#: gitk:5717 +#: gitk:7819 msgid "Goto:" msgstr "Gehe zu:" -#: gitk:5719 +#: gitk:7821 msgid "SHA1 ID:" -msgstr "SHA1 Kennung:" +msgstr "SHA1-Hashwert:" -#: gitk:5744 +#: gitk:7840 #, tcl-format msgid "Short SHA1 id %s is ambiguous" -msgstr "Kurze SHA1-Kennung »%s« ist mehrdeutig" +msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig" -#: gitk:5756 +#: gitk:7852 #, tcl-format msgid "SHA1 id %s is not known" -msgstr "SHA1-Kennung »%s« unbekannt" +msgstr "SHA1-Hashwert »%s« ist unbekannt" -#: gitk:5758 +#: gitk:7854 #, tcl-format msgid "Tag/Head %s is not known" msgstr "Markierung/Zweig »%s« ist unbekannt" -#: gitk:5900 +#: gitk:7996 msgid "Children" msgstr "Kinder" -#: gitk:5957 +#: gitk:8053 #, tcl-format msgid "Reset %s branch to here" msgstr "Zweig »%s« hierher zurücksetzen" -#: gitk:5988 +#: gitk:8055 +msgid "Detached head: can't reset" +msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich" + +#: gitk:8164 gitk:8170 +msgid "Skipping merge commit " +msgstr "Überspringe Zusammenführungs-Version " + +#: gitk:8179 gitk:8184 +msgid "Error getting patch ID for " +msgstr "Fehler beim Holen der Patch-ID für " + +#: gitk:8180 gitk:8185 +msgid " - stopping\n" +msgstr " - Abbruch.\n" + +#: gitk:8190 gitk:8193 gitk:8201 gitk:8211 gitk:8220 +msgid "Commit " +msgstr "Version " + +#: gitk:8194 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" ist das gleiche Patch wie\n" +" " + +#: gitk:8202 +msgid "" +" differs from\n" +" " +msgstr "" +" ist unterschiedlich von\n" +" " + +#: gitk:8204 +msgid "- stopping\n" +msgstr "- Abbruch.\n" + +#: gitk:8212 gitk:8221 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " hat %s Kinder. Abbruch\n" + +#: gitk:8252 msgid "Top" msgstr "Oben" -#: gitk:5989 +#: gitk:8253 msgid "From" msgstr "Von" -#: gitk:5994 +#: gitk:8258 msgid "To" msgstr "bis" -#: gitk:6017 +#: gitk:8282 msgid "Generate patch" msgstr "Patch erstellen" -#: gitk:6019 +#: gitk:8284 msgid "From:" msgstr "Von:" -#: gitk:6028 +#: gitk:8293 msgid "To:" msgstr "bis:" -#: gitk:6037 +#: gitk:8302 msgid "Reverse" msgstr "Umgekehrt" -#: gitk:6039 gitk:6212 +#: gitk:8304 gitk:8489 msgid "Output file:" msgstr "Ausgabedatei:" -#: gitk:6045 +#: gitk:8310 msgid "Generate" msgstr "Erzeugen" -#: gitk:6081 +#: gitk:8348 msgid "Error creating patch:" -msgstr "Fehler beim Patch erzeugen:" +msgstr "Fehler beim Erzeugen des Patches:" -#: gitk:6103 gitk:6200 gitk:6254 +#: gitk:8371 gitk:8477 gitk:8534 msgid "ID:" msgstr "ID:" -#: gitk:6112 +#: gitk:8380 msgid "Tag name:" msgstr "Markierungsname:" -#: gitk:6116 gitk:6263 +#: gitk:8384 gitk:8543 msgid "Create" msgstr "Erstellen" -#: gitk:6131 +#: gitk:8401 msgid "No tag name specified" msgstr "Kein Markierungsname angegeben" -#: gitk:6135 +#: gitk:8405 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Markierung »%s« existiert bereits." -#: gitk:6145 +#: gitk:8411 msgid "Error creating tag:" -msgstr "Fehler bei Markierung erstellen:" +msgstr "Fehler beim Erstellen der Markierung:" -#: gitk:6209 +#: gitk:8486 msgid "Command:" msgstr "Kommando:" -#: gitk:6217 +#: gitk:8494 msgid "Write" msgstr "Schreiben" -#: gitk:6233 +#: gitk:8512 msgid "Error writing commit:" -msgstr "Fehler beim Version eintragen:" +msgstr "Fehler beim Schreiben der Version:" -#: gitk:6259 +#: gitk:8539 msgid "Name:" msgstr "Name:" -#: gitk:6278 +#: gitk:8562 msgid "Please specify a name for the new branch" msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." -#: gitk:6307 +#: gitk:8567 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?" + +#: gitk:8633 #, 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:6312 +#: gitk:8638 msgid "Cherry-picking" msgstr "Version pflücken" -#: gitk:6324 +#: gitk:8647 +#, 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:8653 +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:8669 msgid "No changes committed" msgstr "Keine Änderungen eingetragen" -#: gitk:6347 +#: gitk:8695 msgid "Confirm reset" msgstr "Zurücksetzen bestätigen" -#: gitk:6349 +#: gitk:8697 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Zweig »%s« auf »%s« zurücksetzen?" -#: gitk:6353 +#: gitk:8701 msgid "Reset type:" msgstr "Art des Zurücksetzens:" -#: gitk:6357 +#: gitk:8705 msgid "Soft: Leave working tree and index untouched" msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert" -#: gitk:6360 +#: gitk:8708 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Gemischt: Arbeitskopie unverändert,\n" "Bereitstellung zurückgesetzt" -#: gitk:6363 +#: gitk:8711 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -530,21 +934,21 @@ msgstr "" "Hart: Arbeitskopie und Bereitstellung\n" "(Alle lokalen Änderungen werden gelöscht)" -#: gitk:6379 +#: gitk:8728 msgid "Resetting" msgstr "Zurücksetzen" -#: gitk:6436 +#: gitk:8785 msgid "Checking out" msgstr "Umstellen" -#: gitk:6466 +#: gitk:8838 msgid "Cannot delete the currently checked-out branch" msgstr "" "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht " "gelöscht werden." -#: gitk:6472 +#: gitk:8844 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -553,130 +957,174 @@ msgstr "" "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n" "Zweig »%s« trotzdem löschen?" -#: gitk:6503 +#: gitk:8875 #, tcl-format msgid "Tags and heads: %s" msgstr "Markierungen und Zweige: %s" -#: gitk:6517 +#: gitk:8890 msgid "Filter" msgstr "Filtern" -#: gitk:6811 +#: gitk:9185 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." msgstr "" -"Fehler beim Lesen der Strukturinformationen; Zweige und Vorgänger/Nachfolger " -"Informationen werden unvollständig sein." +"Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu " +"Vorgänger/Nachfolger werden unvollständig sein." -#: gitk:7795 +#: gitk:10171 msgid "Tag" msgstr "Markierung" -#: gitk:7795 +#: gitk:10171 msgid "Id" msgstr "Id" -#: gitk:7835 +#: gitk:10219 msgid "Gitk font chooser" -msgstr "Gitk Schriften wählen" +msgstr "Gitk-Schriften wählen" -#: gitk:7852 +#: gitk:10236 msgid "B" msgstr "F" -#: gitk:7855 +#: gitk:10239 msgid "I" msgstr "K" -#: gitk:7948 +#: gitk:10334 msgid "Gitk preferences" -msgstr "Gitk Einstellungen" +msgstr "Gitk-Einstellungen" -#: gitk:7949 +#: gitk:10336 msgid "Commit list display options" -msgstr "Anzeige Versionsliste" +msgstr "Anzeige der Versionsliste" -#: gitk:7952 +#: gitk:10339 msgid "Maximum graph width (lines)" msgstr "Maximale Graphenbreite (Zeilen)" -#: gitk:7956 +#: gitk:10343 #, tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximale Graphenbreite (% des Fensters)" -#: gitk:7961 +#: gitk:10347 msgid "Show local changes" msgstr "Lokale Änderungen anzeigen" -#: gitk:7966 +#: gitk:10350 +msgid "Auto-select SHA1" +msgstr "SHA1-Hashwert automatisch auswählen" + +#: gitk:10354 msgid "Diff display options" -msgstr "Anzeige Vergleich" +msgstr "Anzeige des Vergleichs" -#: gitk:7968 +#: gitk:10356 msgid "Tab spacing" msgstr "Tabulatorbreite" -#: gitk:7972 +#: gitk:10359 msgid "Display nearby tags" -msgstr "Naheliegende Überschriften anzeigen" +msgstr "Naheliegende Markierungen anzeigen" -#: gitk:7977 +#: gitk:10362 msgid "Limit diffs to listed paths" msgstr "Vergleich nur für angezeigte Pfade" -#: gitk:7982 +#: gitk:10365 +msgid "Support per-file encodings" +msgstr "Zeichenkodierung pro Datei ermitteln" + +#: gitk:10371 gitk:10436 +msgid "External diff tool" +msgstr "Externes Diff-Programm" + +#: gitk:10373 +msgid "Choose..." +msgstr "Wählen ..." + +#: gitk:10378 msgid "Colors: press to choose" msgstr "Farben: Klicken zum Wählen" -#: gitk:7985 +#: gitk:10381 msgid "Background" -msgstr "Vordergrund" +msgstr "Hintergrund" -#: gitk:7989 -msgid "Foreground" +#: gitk:10382 gitk:10412 +msgid "background" msgstr "Hintergrund" -#: gitk:7993 +#: gitk:10385 +msgid "Foreground" +msgstr "Vordergrund" + +#: gitk:10386 +msgid "foreground" +msgstr "Vordergrund" + +#: gitk:10389 msgid "Diff: old lines" msgstr "Vergleich: Alte Zeilen" -#: gitk:7998 +#: gitk:10390 +msgid "diff old lines" +msgstr "Vergleich - Alte Zeilen" + +#: gitk:10394 msgid "Diff: new lines" msgstr "Vergleich: Neue Zeilen" -#: gitk:8003 +#: gitk:10395 +msgid "diff new lines" +msgstr "Vergleich - Neue Zeilen" + +#: gitk:10399 msgid "Diff: hunk header" msgstr "Vergleich: Änderungstitel" -#: gitk:8009 +#: gitk:10401 +msgid "diff hunk header" +msgstr "Vergleich - Änderungstitel" + +#: gitk:10405 +msgid "Marked line bg" +msgstr "Hintergrund für markierte Zeile" + +#: gitk:10407 +msgid "marked line background" +msgstr "Hintergrund für markierte Zeile" + +#: gitk:10411 msgid "Select bg" -msgstr "Hintergrundfarbe Auswählen" +msgstr "Hintergrundfarbe auswählen" -#: gitk:8013 +#: gitk:10415 msgid "Fonts: press to choose" msgstr "Schriftart: Klicken zum Wählen" -#: gitk:8015 +#: gitk:10417 msgid "Main font" msgstr "Programmschriftart" -#: gitk:8016 +#: gitk:10418 msgid "Diff display font" -msgstr "Vergleich" +msgstr "Schriftart für Vergleich" -#: gitk:8017 +#: gitk:10419 msgid "User interface font" msgstr "Beschriftungen" -#: gitk:8033 +#: gitk:10446 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: Farbe wählen für %s" -#: gitk:8414 +#: gitk:10893 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -684,42 +1132,24 @@ msgstr "" "Gitk läuft nicht mit dieser Version von Tcl/Tk.\n" "Gitk benötigt mindestens Tcl/Tk 8.4." -#: gitk:8501 +#: gitk:11020 msgid "Cannot find a git repository here." msgstr "Kein Git-Projektarchiv gefunden." -#: gitk:8505 +#: gitk:11024 #, tcl-format msgid "Cannot find the git directory \"%s\"." msgstr "Git-Verzeichnis »%s« wurde nicht gefunden." -#: gitk:8544 +#: gitk:11071 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert." -#: gitk:8556 +#: gitk:11083 msgid "Bad arguments to gitk:" msgstr "Falsche Kommandozeilen-Parameter für gitk:" -#: gitk:8568 -msgid "Couldn't get list of unmerged files:" -msgstr "Liste der nicht-zusammengeführten Dateien nicht gefunden:" - -#: gitk:8584 -msgid "No files selected: --merge specified but no files are unmerged." -msgstr "" -"Keine Dateien ausgewähle: --merge angegeben, es existieren aber keine nicht-" -"zusammengeführten Dateien." - -#: gitk:8587 -msgid "" -"No files selected: --merge specified but no unmerged files are within file " -"limit." -msgstr "" -"Keine Dateien ausgewähle: --merge angegeben, aber keine nicht-" -"zusammengeführten Dateien sind in der Dateiauswahl." - -#: gitk:8646 +#: gitk:11167 msgid "Command line" msgstr "Kommandozeile" diff --git a/gitk-git/po/es.po b/gitk-git/po/es.po new file mode 100644 index 0000000000..0e19b5eae2 --- /dev/null +++ b/gitk-git/po/es.po @@ -0,0 +1,911 @@ +# 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 © 2005-2008 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 © 2005-2008 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/gitk-git/po/it.po b/gitk-git/po/it.po index d0f4c2e19a..e89c95702c 100644 --- a/gitk-git/po/it.po +++ b/gitk-git/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-13 17:29+0100\n" +"POT-Creation-Date: 2008-10-18 22:03+1100\n" "PO-Revision-Date: 2008-03-13 17:34+0100\n" "Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n" "Language-Team: Italian\n" @@ -16,676 +16,706 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:111 -msgid "Error executing git rev-list:" -msgstr "Errore nell'esecuzione di git rev-list:" +#: gitk:113 +msgid "Couldn't get list of unmerged files:" +msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:" + +#: gitk:340 +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:343 +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:124 +#: gitk:365 gitk:503 +msgid "Error executing git log:" +msgstr "Errore nell'esecuzione di git log:" + +#: gitk:378 msgid "Reading" msgstr "Lettura in corso" -#: gitk:151 gitk:2191 +#: gitk:438 gitk:3462 msgid "Reading commits..." msgstr "Lettura delle revisioni in corso..." -#: gitk:275 -msgid "Can't parse git log output:" -msgstr "Impossibile elaborare i dati di git log:" - -#: gitk:386 gitk:2195 +#: gitk:441 gitk:1528 gitk:3465 msgid "No commits selected" msgstr "Nessuna revisione selezionata" -#: gitk:500 +#: gitk:1399 +msgid "Can't parse git log output:" +msgstr "Impossibile elaborare i dati di git log:" + +#: gitk:1605 msgid "No commit information available" msgstr "Nessuna informazione disponibile sulle revisioni" -#: gitk:599 gitk:621 gitk:1955 gitk:6423 gitk:7923 gitk:8082 +#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466 msgid "OK" msgstr "OK" -#: gitk:623 gitk:1956 gitk:6107 gitk:6178 gitk:6275 gitk:6321 gitk:6425 -#: gitk:7924 gitk:8083 +#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766 +#: gitk:9294 gitk:9467 msgid "Cancel" msgstr "Annulla" -#: gitk:661 -msgid "File" -msgstr "File" - -#: gitk:663 +#: gitk:1811 msgid "Update" msgstr "Aggiorna" -#: gitk:664 +#: gitk:1813 msgid "Reread references" msgstr "Rileggi riferimenti" -#: gitk:665 +#: gitk:1814 msgid "List references" msgstr "Elenca riferimenti" -#: gitk:666 +#: gitk:1815 msgid "Quit" msgstr "Esci" -#: gitk:668 -msgid "Edit" -msgstr "Modifica" +#: gitk:1810 +msgid "File" +msgstr "File" -#: gitk:669 +#: gitk:1818 msgid "Preferences" msgstr "Preferenze" -#: gitk:672 gitk:1892 -msgid "View" -msgstr "Vista" +#: gitk:1817 +msgid "Edit" +msgstr "Modifica" -#: gitk:673 +#: gitk:1821 msgid "New view..." msgstr "Nuova vista..." -#: gitk:674 gitk:2133 gitk:8722 +#: gitk:1822 msgid "Edit view..." msgstr "Modifica vista..." -#: gitk:676 gitk:2134 gitk:8723 +#: gitk:1823 msgid "Delete view" msgstr "Elimina vista" -#: gitk:678 +#: gitk:1825 msgid "All files" msgstr "Tutti i file" -#: gitk:682 -msgid "Help" -msgstr "Aiuto" +#: gitk:1820 gitk:3196 +msgid "View" +msgstr "Vista" -#: gitk:683 gitk:1317 +#: gitk:1828 gitk:2487 msgid "About gitk" msgstr "Informazioni su gitk" -#: gitk:684 +#: gitk:1829 msgid "Key bindings" msgstr "Scorciatoie da tastiera" -#: gitk:741 +#: gitk:1827 +msgid "Help" +msgstr "Aiuto" + +#: gitk:1887 msgid "SHA1 ID: " msgstr "SHA1 ID: " -#: gitk:791 +#: gitk:1918 +msgid "Row" +msgstr "" + +#: gitk:1949 msgid "Find" msgstr "Trova" -#: gitk:792 +#: gitk:1950 msgid "next" msgstr "succ" -#: gitk:793 +#: gitk:1951 msgid "prev" msgstr "prec" -#: gitk:794 +#: gitk:1952 msgid "commit" msgstr "revisione" -#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369 +#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621 msgid "containing:" msgstr "contenente:" -#: gitk:800 gitk:1778 gitk:1783 gitk:2431 +#: gitk:1958 gitk:2954 gitk:2959 gitk:3692 msgid "touching paths:" msgstr "che riguarda i percorsi:" -#: gitk:801 gitk:2436 +#: gitk:1959 gitk:3697 msgid "adding/removing string:" msgstr "che aggiunge/rimuove la stringa:" -#: gitk:810 gitk:812 +#: gitk:1968 gitk:1970 msgid "Exact" msgstr "Esatto" -#: gitk:812 gitk:2514 gitk:4274 +#: gitk:1970 gitk:3773 gitk:5518 msgid "IgnCase" msgstr "" -#: gitk:812 gitk:2405 gitk:2512 gitk:4270 +#: gitk:1970 gitk:3666 gitk:3771 gitk:5514 msgid "Regexp" msgstr "" -#: gitk:814 gitk:815 gitk:2533 gitk:2563 gitk:2570 gitk:4380 gitk:4436 +#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708 msgid "All fields" msgstr "Tutti i campi" -#: gitk:815 gitk:2531 gitk:2563 gitk:4336 +#: gitk:1973 gitk:3790 gitk:3822 gitk:5580 msgid "Headline" msgstr "Titolo" -#: gitk:816 gitk:2531 gitk:4336 gitk:4436 gitk:4827 +#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109 msgid "Comments" msgstr "Commenti" -#: gitk:816 gitk:2531 gitk:2535 gitk:2570 gitk:4336 gitk:4763 gitk:5956 -#: gitk:5971 +#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285 +#: gitk:7300 msgid "Author" msgstr "Autore" -#: gitk:816 gitk:2531 gitk:4336 gitk:4765 +#: gitk:1974 gitk:3790 gitk:5580 gitk:6047 msgid "Committer" msgstr "Revisione creata da" -#: gitk:845 +#: gitk:2003 msgid "Search" msgstr "Cerca" -#: gitk:852 +#: gitk:2010 msgid "Diff" msgstr "" -#: gitk:854 +#: gitk:2012 msgid "Old version" msgstr "Vecchia versione" -#: gitk:856 +#: gitk:2014 msgid "New version" msgstr "Nuova versione" -#: gitk:858 +#: gitk:2016 msgid "Lines of context" msgstr "Linee di contesto" -#: gitk:868 +#: gitk:2026 msgid "Ignore space change" msgstr "Ignora modifiche agli spazi" -#: gitk:926 +#: gitk:2084 msgid "Patch" msgstr "Modifiche" -#: gitk:928 +#: gitk:2086 msgid "Tree" msgstr "Directory" -#: gitk:1053 gitk:1068 gitk:6022 +#: gitk:2213 gitk:2226 msgid "Diff this -> selected" msgstr "Diff questo -> selezionato" -#: gitk:1055 gitk:1070 gitk:6023 +#: gitk:2214 gitk:2227 msgid "Diff selected -> this" msgstr "Diff selezionato -> questo" -#: gitk:1057 gitk:1072 gitk:6024 +#: gitk:2215 gitk:2228 msgid "Make patch" msgstr "Crea patch" -#: gitk:1058 gitk:6162 +#: gitk:2216 gitk:7494 msgid "Create tag" msgstr "Crea etichetta" -#: gitk:1059 gitk:6255 +#: gitk:2217 gitk:7593 msgid "Write commit to file" msgstr "Scrivi revisione in un file" -#: gitk:1060 gitk:6309 +#: gitk:2218 gitk:7647 msgid "Create new branch" msgstr "Crea un nuovo ramo" -#: gitk:1061 +#: gitk:2219 msgid "Cherry-pick this commit" msgstr "Porta questa revisione in cima al ramo attuale" -#: gitk:1063 +#: gitk:2220 msgid "Reset HEAD branch to here" msgstr "Aggiorna il ramo HEAD a questa revisione" -#: gitk:1079 +#: gitk:2234 msgid "Check out this branch" msgstr "Attiva questo ramo" -#: gitk:1081 +#: gitk:2235 msgid "Remove this branch" msgstr "Elimina questo ramo" -#: gitk:1087 +#: gitk:2242 msgid "Highlight this too" msgstr "Evidenzia anche questo" -#: gitk:1089 +#: gitk:2243 msgid "Highlight this only" msgstr "Evidenzia solo questo" -#: gitk:1318 +#: gitk:2245 +msgid "Blame parent commit" +msgstr "" + +#: gitk:2488 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2006 Paul Mackerras\n" +"Copyright © 2005-2008 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 © 2005-2006 Paul Mackerras\n" +"Copyright © 2005-2008 Paul Mackerras\n" "\n" "Utilizzo e redistribuzione permessi sotto i termini della GNU General Public " "License" -#: gitk:1326 gitk:1387 gitk:6581 +#: gitk:2496 gitk:2557 gitk:7943 msgid "Close" msgstr "Chiudi" -#: gitk:1345 +#: gitk:2515 msgid "Gitk key bindings" msgstr "Scorciatoie da tastiera di Gitk" -#: gitk:1347 +#: gitk:2517 msgid "Gitk key bindings:" msgstr "Scorciatoie da tastiera di Gitk:" -#: gitk:1349 +#: gitk:2519 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tEsci" -#: gitk:1350 +#: gitk:2520 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tVai alla prima revisione" -#: gitk:1351 +#: gitk:2521 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tVai all'ultima revisione" -#: gitk:1352 +#: gitk:2522 msgid "<Up>, p, i\tMove up one commit" msgstr "<Up>, p, i\tVai più in alto di una revisione" -#: gitk:1353 +#: gitk:2523 msgid "<Down>, n, k\tMove down one commit" msgstr "<Down>, n, k\tVai più in basso di una revisione" -#: gitk:1354 +#: gitk:2524 msgid "<Left>, z, j\tGo back in history list" msgstr "<Left>, z, j\tTorna indietro nella cronologia" -#: gitk:1355 +#: gitk:2525 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tVai avanti nella cronologia" -#: gitk:1356 +#: gitk:2526 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tVai più in alto di una pagina nella lista delle revisioni" -#: gitk:1357 +#: gitk:2527 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tVai più in basso di una pagina nella lista delle revisioni" -#: gitk:1358 +#: gitk:2528 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni" -#: gitk:1359 +#: gitk:2529 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tScorri alla fine della lista delle revisioni" -#: gitk:1360 +#: gitk:2530 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tScorri la lista delle revisioni in alto di una riga" -#: gitk:1361 +#: gitk:2531 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tScorri la lista delle revisioni in basso di una riga" -#: gitk:1362 +#: gitk:2532 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tScorri la lista delle revisioni in alto di una pagina" -#: gitk:1363 +#: gitk:2533 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tScorri la lista delle revisioni in basso di una pagina" -#: gitk:1364 +#: gitk:2534 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\tTrova all'indietro (verso l'alto, revisioni successive)" -#: gitk:1365 +#: gitk:2535 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Down>\tTrova in avanti (verso il basso, revisioni precedenti)" -#: gitk:1366 +#: gitk:2536 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tScorri la vista delle differenze in alto di una pagina" -#: gitk:1367 +#: gitk:2537 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tScorri la vista delle differenze in alto di una pagina" -#: gitk:1368 +#: gitk:2538 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tScorri la vista delle differenze in basso di una pagina" -#: gitk:1369 +#: gitk:2539 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee" -#: gitk:1370 +#: gitk:2540 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee" -#: gitk:1371 +#: gitk:2541 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tTrova" -#: gitk:1372 +#: gitk:2542 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tTrova in avanti" -#: gitk:1373 +#: gitk:2543 msgid "<Return>\tMove to next find hit" msgstr "<Return>\tTrova in avanti" -#: gitk:1374 +#: gitk:2544 msgid "/\t\tMove to next find hit, or redo find" msgstr "/\t\tTrova in avanti, o cerca di nuovo" -#: gitk:1375 +#: gitk:2545 msgid "?\t\tMove to previous find hit" msgstr "?\t\tTrova all'indietro" -#: gitk:1376 +#: gitk:2546 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tScorri la vista delle differenze al file successivo" -#: gitk:1377 +#: gitk:2547 #, 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:1378 +#: gitk:2548 #, 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:1379 +#: gitk:2549 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumenta grandezza carattere" -#: gitk:1380 +#: gitk:2550 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAumenta grandezza carattere" -#: gitk:1381 +#: gitk:2551 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDiminuisci grandezza carattere" -#: gitk:1382 +#: gitk:2552 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tDiminuisci grandezza carattere" -#: gitk:1383 +#: gitk:2553 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tAggiorna" -#: gitk:1896 +#: gitk:3200 msgid "Gitk view definition" msgstr "Scelta vista Gitk" -#: gitk:1921 +#: gitk:3225 msgid "Name" msgstr "Nome" -#: gitk:1924 +#: gitk:3228 msgid "Remember this view" msgstr "Ricorda questa vista" -#: gitk:1928 -msgid "Commits to include (arguments to git rev-list):" -msgstr "Revisioni da includere (argomenti di git rev-list):" +#: gitk:3232 +msgid "Commits to include (arguments to git log):" +msgstr "Revisioni da includere (argomenti di git log):" -#: gitk:1935 +#: gitk:3239 msgid "Command to generate more commits to include:" msgstr "Comando che genera altre revisioni da visualizzare:" -#: gitk:1942 +#: gitk:3246 msgid "Enter files and directories to include, one per line:" msgstr "Inserire file e directory da includere, uno per riga:" -#: gitk:1989 +#: gitk:3293 msgid "Error in commit selection arguments:" msgstr "Errore negli argomenti di selezione delle revisioni:" -#: gitk:2043 gitk:2127 gitk:2583 gitk:2597 gitk:3781 gitk:8688 gitk:8689 +#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142 msgid "None" msgstr "Nessuno" -#: gitk:2531 gitk:4336 gitk:5958 gitk:5973 +#: gitk:3790 gitk:5580 gitk:7287 gitk:7302 msgid "Date" msgstr "Data" -#: gitk:2531 gitk:4336 +#: gitk:3790 gitk:5580 msgid "CDate" msgstr "" -#: gitk:2680 gitk:2685 +#: gitk:3939 gitk:3944 msgid "Descendant" msgstr "Discendente" -#: gitk:2681 +#: gitk:3940 msgid "Not descendant" msgstr "Non discendente" -#: gitk:2688 gitk:2693 +#: gitk:3947 gitk:3952 msgid "Ancestor" msgstr "Ascendente" -#: gitk:2689 +#: gitk:3948 msgid "Not ancestor" msgstr "Non ascendente" -#: gitk:2924 +#: gitk:4187 msgid "Local changes checked in to index but not committed" msgstr "Modifiche locali presenti nell'indice ma non nell'archivio" -#: gitk:2954 +#: gitk:4220 msgid "Local uncommitted changes, not checked in to index" msgstr "Modifiche locali non presenti né nell'archivio né nell'indice" -#: gitk:4305 +#: gitk:5549 msgid "Searching" msgstr "Ricerca in corso" -#: gitk:4767 +#: gitk:6049 msgid "Tags:" msgstr "Etichette:" -#: gitk:4784 gitk:4790 gitk:5951 +#: gitk:6066 gitk:6072 gitk:7280 msgid "Parent" msgstr "Genitore" -#: gitk:4795 +#: gitk:6077 msgid "Child" msgstr "Figlio" -#: gitk:4804 +#: gitk:6086 msgid "Branch" msgstr "Ramo" -#: gitk:4807 +#: gitk:6089 msgid "Follows" msgstr "Segue" -#: gitk:4810 +#: gitk:6092 msgid "Precedes" msgstr "Precede" -#: gitk:5093 +#: gitk:6378 msgid "Error getting merge diffs:" msgstr "Errore nella lettura delle differenze di fusione:" -#: gitk:5778 +#: gitk:7113 msgid "Goto:" msgstr "Vai a:" -#: gitk:5780 +#: gitk:7115 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:5805 +#: gitk:7134 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La SHA1 id abbreviata %s è ambigua" -#: gitk:5817 +#: gitk:7146 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La SHA1 id %s è sconosciuta" -#: gitk:5819 +#: gitk:7148 #, tcl-format msgid "Tag/Head %s is not known" msgstr "L'etichetta/ramo %s è sconosciuto" -#: gitk:5961 +#: gitk:7290 msgid "Children" msgstr "Figli" -#: gitk:6018 +#: gitk:7347 #, tcl-format msgid "Reset %s branch to here" msgstr "Aggiorna il ramo %s a questa revisione" -#: gitk:6049 +#: gitk:7349 +msgid "Detached head: can't reset" +msgstr "" + +#: gitk:7381 msgid "Top" msgstr "Inizio" -#: gitk:6050 +#: gitk:7382 msgid "From" msgstr "Da" -#: gitk:6055 +#: gitk:7387 msgid "To" msgstr "A" -#: gitk:6078 +#: gitk:7410 msgid "Generate patch" msgstr "Genera patch" -#: gitk:6080 +#: gitk:7412 msgid "From:" msgstr "Da:" -#: gitk:6089 +#: gitk:7421 msgid "To:" msgstr "A:" -#: gitk:6098 +#: gitk:7430 msgid "Reverse" msgstr "Inverti" -#: gitk:6100 gitk:6269 +#: gitk:7432 gitk:7607 msgid "Output file:" msgstr "Scrivi sul file:" -#: gitk:6106 +#: gitk:7438 msgid "Generate" msgstr "Genera" -#: gitk:6142 +#: gitk:7474 msgid "Error creating patch:" msgstr "Errore nella creazione della patch:" -#: gitk:6164 gitk:6257 gitk:6311 +#: gitk:7496 gitk:7595 gitk:7649 msgid "ID:" msgstr "ID:" -#: gitk:6173 +#: gitk:7505 msgid "Tag name:" msgstr "Nome etichetta:" -#: gitk:6177 gitk:6320 +#: gitk:7509 gitk:7659 msgid "Create" msgstr "Crea" -#: gitk:6192 +#: gitk:7524 msgid "No tag name specified" msgstr "Nessuna etichetta specificata" -#: gitk:6196 +#: gitk:7528 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "L'etichetta \"%s\" esiste già" -#: gitk:6202 +#: gitk:7534 msgid "Error creating tag:" msgstr "Errore nella creazione dell'etichetta:" -#: gitk:6266 +#: gitk:7604 msgid "Command:" msgstr "Comando:" -#: gitk:6274 +#: gitk:7612 msgid "Write" msgstr "Scrivi" -#: gitk:6290 +#: gitk:7628 msgid "Error writing commit:" msgstr "Errore nella scrittura della revisione:" -#: gitk:6316 +#: gitk:7654 msgid "Name:" msgstr "Nome:" -#: gitk:6335 +#: gitk:7674 msgid "Please specify a name for the new branch" msgstr "Specificare un nome per il nuovo ramo" -#: gitk:6364 +#: gitk:7703 #, 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:6369 +#: gitk:7708 msgid "Cherry-picking" msgstr "" -#: gitk:6381 +#: gitk:7720 msgid "No changes committed" msgstr "Nessuna modifica archiviata" -#: gitk:6404 +#: gitk:7745 msgid "Confirm reset" msgstr "Conferma git reset" -#: gitk:6406 +#: gitk:7747 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Aggiornare il ramo %s a %s?" -#: gitk:6410 +#: gitk:7751 msgid "Reset type:" msgstr "Tipo di aggiornamento:" -#: gitk:6414 +#: gitk:7755 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono" -#: gitk:6417 +#: gitk:7758 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice" -#: gitk:6420 +#: gitk:7761 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -693,19 +723,19 @@ msgstr "" "Hard: Aggiorna la directory di lavoro e l'indice\n" "(abbandona TUTTE le modifiche locali)" -#: gitk:6436 +#: gitk:7777 msgid "Resetting" msgstr "git reset in corso" -#: gitk:6493 +#: gitk:7834 msgid "Checking out" msgstr "Attivazione in corso" -#: gitk:6523 +#: gitk:7885 msgid "Cannot delete the currently checked-out branch" msgstr "Impossibile cancellare il ramo attualmente attivo" -#: gitk:6529 +#: gitk:7891 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -714,16 +744,16 @@ msgstr "" "Le revisioni nel ramo %s non sono presenti su altri rami.\n" "Cancellare il ramo %s?" -#: gitk:6560 +#: gitk:7922 #, tcl-format msgid "Tags and heads: %s" msgstr "Etichette e rami: %s" -#: gitk:6574 +#: gitk:7936 msgid "Filter" msgstr "Filtro" -#: gitk:6868 +#: gitk:8230 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -731,117 +761,129 @@ msgstr "" "Errore nella lettura della topologia delle revisioni: le informazioni sul " "ramo e le etichette precedenti e seguenti saranno incomplete." -#: gitk:7852 +#: gitk:9216 msgid "Tag" msgstr "Etichetta" -#: gitk:7852 +#: gitk:9216 msgid "Id" msgstr "Id" -#: gitk:7892 +#: gitk:9262 msgid "Gitk font chooser" msgstr "Scelta caratteri gitk" -#: gitk:7909 +#: gitk:9279 msgid "B" msgstr "B" -#: gitk:7912 +#: gitk:9282 msgid "I" msgstr "I" -#: gitk:8005 +#: gitk:9375 msgid "Gitk preferences" msgstr "Preferenze gitk" -#: gitk:8006 +#: gitk:9376 msgid "Commit list display options" msgstr "Opzioni visualizzazione dell'elenco revisioni" -#: gitk:8009 +#: gitk:9379 msgid "Maximum graph width (lines)" msgstr "Larghezza massima del grafico (in linee)" -#: gitk:8013 +#: gitk:9383 #, tcl-format msgid "Maximum graph width (% of pane)" msgstr "Larghezza massima del grafico (% del pannello)" -#: gitk:8018 +#: gitk:9388 msgid "Show local changes" msgstr "Mostra modifiche locali" -#: gitk:8023 +#: gitk:9393 msgid "Auto-select SHA1" msgstr "Seleziona automaticamente SHA1 hash" -#: gitk:8028 +#: gitk:9398 msgid "Diff display options" msgstr "Opzioni di visualizzazione delle differenze" -#: gitk:8030 +#: gitk:9400 msgid "Tab spacing" msgstr "Spaziatura tabulazioni" -#: gitk:8034 +#: gitk:9404 msgid "Display nearby tags" msgstr "Mostra etichette vicine" -#: gitk:8039 +#: gitk:9409 msgid "Limit diffs to listed paths" msgstr "Limita le differenze ai percorsi elencati" -#: gitk:8044 +#: 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 "Colori: premere per scegliere" -#: gitk:8047 +#: gitk:9431 msgid "Background" msgstr "Sfondo" -#: gitk:8051 +#: gitk:9435 msgid "Foreground" msgstr "Primo piano" -#: gitk:8055 +#: gitk:9439 msgid "Diff: old lines" msgstr "Diff: vecchie linee" -#: gitk:8060 +#: gitk:9444 msgid "Diff: new lines" msgstr "Diff: nuove linee" -#: gitk:8065 +#: gitk:9449 msgid "Diff: hunk header" msgstr "Diff: intestazione della sezione" -#: gitk:8071 +#: gitk:9455 msgid "Select bg" msgstr "Sfondo selezione" -#: gitk:8075 +#: gitk:9459 msgid "Fonts: press to choose" msgstr "Carattere: premere per scegliere" -#: gitk:8077 +#: gitk:9461 msgid "Main font" msgstr "Carattere principale" -#: gitk:8078 +#: gitk:9462 msgid "Diff display font" msgstr "Carattere per differenze" -#: gitk:8079 +#: gitk:9463 msgid "User interface font" msgstr "Carattere per interfaccia utente" -#: gitk:8095 +#: gitk:9488 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: scegliere un colore per %s" -#: gitk:8476 +#: gitk:9934 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -849,42 +891,24 @@ msgstr "" "Questa versione di Tcl/Tk non può avviare gitk.\n" " Gitk richiede Tcl/Tk versione 8.4 o superiore." -#: gitk:8565 +#: gitk:10047 msgid "Cannot find a git repository here." msgstr "Archivio git non trovato." -#: gitk:8569 +#: gitk:10051 #, tcl-format msgid "Cannot find the git directory \"%s\"." msgstr "Directory git \"%s\" non trovata." -#: gitk:8612 +#: gitk:10098 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file" -#: gitk:8624 +#: gitk:10110 msgid "Bad arguments to gitk:" msgstr "Gitk: argomenti errati:" -#: gitk:8636 -msgid "Couldn't get list of unmerged files:" -msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:" - -#: gitk:8652 -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:8655 -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:8716 +#: gitk:10170 msgid "Command line" msgstr "Linea di comando" diff --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po new file mode 100644 index 0000000000..c0c92addb4 --- /dev/null +++ b/gitk-git/po/ja.po @@ -0,0 +1,1255 @@ +# 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 © 2005-2008 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - gitコミットビューア\n" +"\n" +"Copyright © 2005-2008 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/gitk-git/po/ru.po b/gitk-git/po/ru.po new file mode 100644 index 0000000000..704eba8f9d --- /dev/null +++ b/gitk-git/po/ru.po @@ -0,0 +1,1085 @@ +# +# 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 © 2005-2008 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - программа просмотра истории репозиториев Git\n" +"\n" +"Copyright (c) 2005-2008 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 "Командная строка" + diff --git a/gitk-git/po/sv.po b/gitk-git/po/sv.po new file mode 100644 index 0000000000..624eb2281e --- /dev/null +++ b/gitk-git/po/sv.po @@ -0,0 +1,1246 @@ +# Swedish translation for gitk +# Copyright (C) 2005-2009 Paul Mackerras +# This file is distributed under the same license as the gitk package. +# +# Peter Krefting <peter@softwolves.pp.se>, 2008-2009. +# Mikael Magnusson <mikachu@gmail.com>, 2008. +msgid "" +msgstr "" +"Project-Id-Version: sv\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-08-13 13:38+0100\n" +"PO-Revision-Date: 2009-08-13 13:40+0100\n" +"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" +"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit" + +#: gitk:113 +msgid "Couldn't get list of unmerged files:" +msgstr "Kunde inte hämta lista över ej sammanslagna filer:" + +#: gitk:269 +msgid "Error parsing revisions:" +msgstr "Fel vid tolkning av revisioner:" + +#: gitk:324 +msgid "Error executing --argscmd command:" +msgstr "Fel vid körning av --argscmd-kommando:" + +#: gitk:337 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Inga filer valdes: --merge angavs men det finns inga filer som inte har " +"slagits samman." + +#: gitk:340 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Inga filer valdes: --merge angavs men det finns inga filer inom " +"filbegränsningen." + +#: gitk:362 gitk:509 +msgid "Error executing git log:" +msgstr "Fel vid körning av git log:" + +#: gitk:380 gitk:525 +msgid "Reading" +msgstr "Läser" + +#: gitk:440 gitk:4123 +msgid "Reading commits..." +msgstr "Läser incheckningar..." + +#: gitk:443 gitk:1561 gitk:4126 +msgid "No commits selected" +msgstr "Inga incheckningar markerade" + +#: gitk:1437 +msgid "Can't parse git log output:" +msgstr "Kan inte tolka utdata från git log:" + +#: gitk:1657 +msgid "No commit information available" +msgstr "Ingen incheckningsinformation är tillgänglig" + +#: 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 "Avbryt" + +#: gitk:1919 +msgid "Update" +msgstr "Uppdatera" + +#: gitk:1920 +msgid "Reload" +msgstr "Ladda om" + +#: gitk:1921 +msgid "Reread references" +msgstr "Läs om referenser" + +#: gitk:1922 +msgid "List references" +msgstr "Visa referenser" + +#: gitk:1924 +msgid "Start git gui" +msgstr "Starta git gui" + +#: gitk:1926 +msgid "Quit" +msgstr "Avsluta" + +#: gitk:1918 +msgid "File" +msgstr "Arkiv" + +#: gitk:1930 +msgid "Preferences" +msgstr "Inställningar" + +#: gitk:1929 +msgid "Edit" +msgstr "Redigera" + +#: gitk:1934 +msgid "New view..." +msgstr "Ny vy..." + +#: gitk:1935 +msgid "Edit view..." +msgstr "Ändra vy..." + +#: gitk:1936 +msgid "Delete view" +msgstr "Ta bort vy" + +#: gitk:1938 +msgid "All files" +msgstr "Alla filer" + +#: gitk:1933 gitk:3670 +msgid "View" +msgstr "Visa" + +#: gitk:1943 gitk:1953 gitk:2654 +msgid "About gitk" +msgstr "Om gitk" + +#: gitk:1944 gitk:1958 +msgid "Key bindings" +msgstr "Tangentbordsbindningar" + +#: gitk:1942 gitk:1957 +msgid "Help" +msgstr "Hjälp" + +#: gitk:2018 +msgid "SHA1 ID: " +msgstr "SHA1-id: " + +#: gitk:2049 +msgid "Row" +msgstr "Rad" + +#: gitk:2080 +msgid "Find" +msgstr "Sök" + +#: gitk:2081 +msgid "next" +msgstr "nästa" + +#: gitk:2082 +msgid "prev" +msgstr "föreg" + +#: gitk:2083 +msgid "commit" +msgstr "incheckning" + +#: gitk:2086 gitk:2088 gitk:4284 gitk:4307 gitk:4331 gitk:6272 gitk:6344 +#: gitk:6428 +msgid "containing:" +msgstr "som innehåller:" + +#: gitk:2089 gitk:3162 gitk:3167 gitk:4359 +msgid "touching paths:" +msgstr "som rör sökväg:" + +#: gitk:2090 gitk:4364 +msgid "adding/removing string:" +msgstr "som lägger/till tar bort sträng:" + +#: gitk:2099 gitk:2101 +msgid "Exact" +msgstr "Exakt" + +#: gitk:2101 gitk:4439 gitk:6240 +msgid "IgnCase" +msgstr "IgnVersaler" + +#: gitk:2101 gitk:4333 gitk:4437 gitk:6236 +msgid "Regexp" +msgstr "Reg.uttr." + +#: gitk:2103 gitk:2104 gitk:4458 gitk:4488 gitk:4495 gitk:6364 gitk:6432 +msgid "All fields" +msgstr "Alla fält" + +#: gitk:2104 gitk:4456 gitk:4488 gitk:6303 +msgid "Headline" +msgstr "Rubrik" + +#: gitk:2105 gitk:4456 gitk:6303 gitk:6432 gitk:6866 +msgid "Comments" +msgstr "Kommentarer" + +#: gitk:2105 gitk:4456 gitk:4460 gitk:4495 gitk:6303 gitk:6801 gitk:8063 +#: gitk:8078 +msgid "Author" +msgstr "Författare" + +#: gitk:2105 gitk:4456 gitk:6303 gitk:6803 +msgid "Committer" +msgstr "Incheckare" + +#: gitk:2134 +msgid "Search" +msgstr "Sök" + +#: gitk:2141 +msgid "Diff" +msgstr "Diff" + +#: gitk:2143 +msgid "Old version" +msgstr "Gammal version" + +#: gitk:2145 +msgid "New version" +msgstr "Ny version" + +#: gitk:2147 +msgid "Lines of context" +msgstr "Rader sammanhang" + +#: gitk:2157 +msgid "Ignore space change" +msgstr "Ignorera ändringar i blanksteg" + +#: gitk:2215 +msgid "Patch" +msgstr "Patch" + +#: gitk:2217 +msgid "Tree" +msgstr "Träd" + +#: gitk:2361 gitk:2378 +msgid "Diff this -> selected" +msgstr "Diff denna -> markerad" + +#: gitk:2362 gitk:2379 +msgid "Diff selected -> this" +msgstr "Diff markerad -> denna" + +#: gitk:2363 gitk:2380 +msgid "Make patch" +msgstr "Skapa patch" + +#: gitk:2364 gitk:8441 +msgid "Create tag" +msgstr "Skapa tagg" + +#: gitk:2365 gitk:8547 +msgid "Write commit to file" +msgstr "Skriv incheckning till fil" + +#: gitk:2366 gitk:8604 +msgid "Create new branch" +msgstr "Skapa ny gren" + +#: gitk:2367 +msgid "Cherry-pick this commit" +msgstr "Plocka denna incheckning" + +#: gitk:2368 +msgid "Reset HEAD branch to here" +msgstr "Återställ HEAD-grenen hit" + +#: gitk:2369 +msgid "Mark this commit" +msgstr "Markera denna incheckning" + +#: gitk:2370 +msgid "Return to mark" +msgstr "Återgå till markering" + +#: gitk:2371 +msgid "Find descendant of this and mark" +msgstr "Hitta efterföljare till denna och markera" + +#: gitk:2372 +msgid "Compare with marked commit" +msgstr "Jämför med markerad incheckning" + +#: gitk:2386 +msgid "Check out this branch" +msgstr "Checka ut denna gren" + +#: gitk:2387 +msgid "Remove this branch" +msgstr "Ta bort denna gren" + +#: gitk:2394 +msgid "Highlight this too" +msgstr "Markera även detta" + +#: gitk:2395 +msgid "Highlight this only" +msgstr "Markera bara detta" + +#: gitk:2396 +msgid "External diff" +msgstr "Extern diff" + +#: gitk:2397 +msgid "Blame parent commit" +msgstr "Klandra föräldraincheckning" + +#: gitk:2404 +msgid "Show origin of this line" +msgstr "Visa ursprunget för den här raden" + +#: gitk:2405 +msgid "Run git gui blame on this line" +msgstr "Kör git gui blame på den här raden" + +#: gitk:2656 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" +"Copyright © 2005-2008 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - en incheckningsvisare för git\n" +"\n" +"Copyright © 2005-2008 Paul Mackerras\n" +"\n" +"Använd och vidareförmedla enligt villkoren i GNU General Public License" + +#: gitk:2664 gitk:2726 gitk:8969 +msgid "Close" +msgstr "Stäng" + +#: gitk:2683 +msgid "Gitk key bindings" +msgstr "Tangentbordsbindningar för Gitk" + +#: gitk:2686 +msgid "Gitk key bindings:" +msgstr "Tangentbordsbindningar för Gitk:" + +#: gitk:2688 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tAvsluta" + +#: gitk:2689 +msgid "<Home>\t\tMove to first commit" +msgstr "<Home>\t\tGå till första incheckning" + +#: gitk:2690 +msgid "<End>\t\tMove to last commit" +msgstr "<End>\t\tGå till sista incheckning" + +#: gitk:2691 +msgid "<Up>, p, i\tMove up one commit" +msgstr "<Upp>, p, i\tGå en incheckning upp" + +#: gitk:2692 +msgid "<Down>, n, k\tMove down one commit" +msgstr "<Ned>, n, k\tGå en incheckning ned" + +#: gitk:2693 +msgid "<Left>, z, j\tGo back in history list" +msgstr "<Vänster>, z, j\tGå bakåt i historiken" + +#: gitk:2694 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Höger>, x, l\tGå framåt i historiken" + +#: gitk:2695 +msgid "<PageUp>\tMove up one page in commit list" +msgstr "<PageUp>\tGå upp en sida i incheckningslistan" + +#: gitk:2696 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<PageDown>\tGå ned en sida i incheckningslistan" + +#: gitk:2697 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tRulla till början av incheckningslistan" + +#: gitk:2698 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tRulla till slutet av incheckningslistan" + +#: gitk:2699 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" + +#: gitk:2700 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" + +#: gitk:2701 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" + +#: gitk:2702 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" + +#: gitk:2703 +msgid "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)" + +#: gitk:2704 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)" + +#: gitk:2705 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Delete>, b\tRulla diffvisningen upp en sida" + +#: gitk:2706 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Baksteg>\tRulla diffvisningen upp en sida" + +#: gitk:2707 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Blanksteg>\tRulla diffvisningen ned en sida" + +#: gitk:2708 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tRulla diffvisningen upp 18 rader" + +#: gitk:2709 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tRulla diffvisningen ned 18 rader" + +#: gitk:2710 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tSök" + +#: gitk:2711 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tGå till nästa sökträff" + +#: gitk:2712 +msgid "<Return>\tMove to next find hit" +msgstr "<Return>\t\tGå till nästa sökträff" + +#: gitk:2713 +msgid "/\t\tFocus the search box" +msgstr "/\t\tFokusera sökrutan" + +#: gitk:2714 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tGå till föregående sökträff" + +#: gitk:2715 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tRulla diffvisningen till nästa fil" + +#: gitk:2716 +#, 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:2717 +#, 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:2718 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-Num+>\tÖka teckenstorlek" + +#: gitk:2719 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tÖka teckenstorlek" + +#: gitk:2720 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-Num->\tMinska teckenstorlek" + +#: gitk:2721 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tMinska teckenstorlek" + +#: gitk:2722 +msgid "<F5>\t\tUpdate" +msgstr "<F5>\t\tUppdatera" + +#: gitk:3177 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fel vid hämtning av \"%s\" från %s:" + +#: gitk:3234 gitk:3243 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Fel vid skapande av temporär katalog %s:" + +#: gitk:3255 +msgid "command failed:" +msgstr "kommando misslyckades:" + +#: gitk:3401 +msgid "No such commit" +msgstr "Incheckning saknas" + +#: gitk:3415 +msgid "git gui blame: command failed:" +msgstr "git gui blame: kommando misslyckades:" + +#: gitk:3446 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Kunde inte läsa sammanslagningshuvud: %s" + +#: gitk:3454 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Fel vid läsning av index: %s" + +#: gitk:3479 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Kunde inte starta git blame: %s" + +#: gitk:3482 gitk:6271 +msgid "Searching" +msgstr "Söker" + +#: gitk:3514 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Fel vid körning av git blame: %s" + +#: gitk:3542 +#, 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:3556 +msgid "External diff viewer failed:" +msgstr "Externt diff-verktyg misslyckades:" + +#: gitk:3674 +msgid "Gitk view definition" +msgstr "Definition av Gitk-vy" + +#: gitk:3678 +msgid "Remember this view" +msgstr "Spara denna vy" + +#: gitk:3679 +msgid "References (space separated list):" +msgstr "Referenser (blankstegsavdelad lista):" + +#: gitk:3680 +msgid "Branches & tags:" +msgstr "Grenar & taggar:" + +#: gitk:3681 +msgid "All refs" +msgstr "Alla referenser" + +#: gitk:3682 +msgid "All (local) branches" +msgstr "Alla (lokala) grenar" + +#: gitk:3683 +msgid "All tags" +msgstr "Alla taggar" + +#: gitk:3684 +msgid "All remote-tracking branches" +msgstr "Alla fjärrspårande grenar" + +#: gitk:3685 +msgid "Commit Info (regular expressions):" +msgstr "Incheckningsinfo (reguljära uttryck):" + +#: gitk:3686 +msgid "Author:" +msgstr "Författare:" + +#: gitk:3687 +msgid "Committer:" +msgstr "Incheckare:" + +#: gitk:3688 +msgid "Commit Message:" +msgstr "Incheckningsmeddelande:" + +#: gitk:3689 +msgid "Matches all Commit Info criteria" +msgstr "Motsvarar alla kriterier för incheckningsinfo" + +#: gitk:3690 +msgid "Changes to Files:" +msgstr "Ändringar av filer:" + +#: gitk:3691 +msgid "Fixed String" +msgstr "Fast sträng" + +#: gitk:3692 +msgid "Regular Expression" +msgstr "Reguljärt uttryck" + +#: gitk:3693 +msgid "Search string:" +msgstr "Söksträng:" + +#: gitk:3694 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" + +#: gitk:3695 +msgid "Since:" +msgstr "Från:" + +#: gitk:3696 +msgid "Until:" +msgstr "Till:" + +#: gitk:3697 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):" + +#: gitk:3698 +msgid "Number to show:" +msgstr "Antal att visa:" + +#: gitk:3699 +msgid "Number to skip:" +msgstr "Antal att hoppa över:" + +#: gitk:3700 +msgid "Miscellaneous options:" +msgstr "Diverse alternativ:" + +#: gitk:3701 +msgid "Strictly sort by date" +msgstr "Strikt datumsortering" + +#: gitk:3702 +msgid "Mark branch sides" +msgstr "Markera sidogrenar" + +#: gitk:3703 +msgid "Limit to first parent" +msgstr "Begränsa till första förälder" + +#: gitk:3704 +msgid "Simple history" +msgstr "Enkel historik" + +#: gitk:3705 +msgid "Additional arguments to git log:" +msgstr "Ytterligare argument till git log:" + +#: gitk:3706 +msgid "Enter files and directories to include, one per line:" +msgstr "Ange filer och kataloger att ta med, en per rad:" + +#: gitk:3707 +msgid "Command to generate more commits to include:" +msgstr "Kommando för att generera fler incheckningar att ta med:" + +#: gitk:3829 +msgid "Gitk: edit view" +msgstr "Gitk: redigera vy" + +#: gitk:3837 +msgid "-- criteria for selecting revisions" +msgstr " - kriterier för val av revisioner" + +#: gitk:3842 +msgid "View Name:" +msgstr "Namn på vy:" + +#: gitk:3917 +msgid "Apply (F5)" +msgstr "Använd (F5)" + +#: gitk:3955 +msgid "Error in commit selection arguments:" +msgstr "Fel i argument för val av incheckningar:" + +#: gitk:4008 gitk:4060 gitk:4508 gitk:4522 gitk:5783 gitk:11196 gitk:11197 +msgid "None" +msgstr "Inget" + +#: gitk:4456 gitk:6303 gitk:8065 gitk:8080 +msgid "Date" +msgstr "Datum" + +#: gitk:4456 gitk:6303 +msgid "CDate" +msgstr "Skapat datum" + +#: gitk:4605 gitk:4610 +msgid "Descendant" +msgstr "Avkomling" + +#: gitk:4606 +msgid "Not descendant" +msgstr "Inte avkomling" + +#: gitk:4613 gitk:4618 +msgid "Ancestor" +msgstr "Förfader" + +#: gitk:4614 +msgid "Not ancestor" +msgstr "Inte förfader" + +#: gitk:4904 +msgid "Local changes checked in to index but not committed" +msgstr "Lokala ändringar sparade i indexet men inte incheckade" + +#: gitk:4940 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Lokala ändringar, ej sparade i indexet" + +#: gitk:6621 +msgid "many" +msgstr "många" + +#: gitk:6805 +msgid "Tags:" +msgstr "Taggar:" + +#: gitk:6822 gitk:6828 gitk:8058 +msgid "Parent" +msgstr "Förälder" + +#: gitk:6833 +msgid "Child" +msgstr "Barn" + +#: gitk:6842 +msgid "Branch" +msgstr "Gren" + +#: gitk:6845 +msgid "Follows" +msgstr "Följer" + +#: gitk:6848 +msgid "Precedes" +msgstr "Föregår" + +#: gitk:7346 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Fel vid hämtning av diff: %s" + +#: gitk:7886 +msgid "Goto:" +msgstr "Gå till:" + +#: gitk:7888 +msgid "SHA1 ID:" +msgstr "SHA1-id:" + +#: gitk:7907 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Förkortat SHA1-id %s är tvetydigt" + +#: gitk:7914 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Revisionen %s är inte känd" + +#: gitk:7924 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "SHA-id:t %s är inte känt" + +#: gitk:7926 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "Revisionen %s finns inte i den nuvarande vyn" + +#: gitk:8068 +msgid "Children" +msgstr "Barn" + +#: gitk:8125 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Återställ grenen %s hit" + +#: gitk:8127 +msgid "Detached head: can't reset" +msgstr "Frånkopplad head: kan inte återställa" + +#: gitk:8236 gitk:8242 +msgid "Skipping merge commit " +msgstr "Hoppar över sammanslagningsincheckning " + +#: gitk:8251 gitk:8256 +msgid "Error getting patch ID for " +msgstr "Fel vid hämtning av patch-id för " + +#: gitk:8252 gitk:8257 +msgid " - stopping\n" +msgstr " - stannar\n" + +#: gitk:8262 gitk:8265 gitk:8273 gitk:8283 gitk:8292 +msgid "Commit " +msgstr "Incheckning " + +#: gitk:8266 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" är samma patch som\n" +" " + +#: gitk:8274 +msgid "" +" differs from\n" +" " +msgstr "" +" skiljer sig från\n" +" " + +#: gitk:8276 +msgid "- stopping\n" +msgstr "- stannar\n" + +#: gitk:8284 gitk:8293 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " har %s barn - stannar\n" + +#: gitk:8324 +msgid "Top" +msgstr "Topp" + +#: gitk:8325 +msgid "From" +msgstr "Från" + +#: gitk:8330 +msgid "To" +msgstr "Till" + +#: gitk:8354 +msgid "Generate patch" +msgstr "Generera patch" + +#: gitk:8356 +msgid "From:" +msgstr "Från:" + +#: gitk:8365 +msgid "To:" +msgstr "Till:" + +#: gitk:8374 +msgid "Reverse" +msgstr "Vänd" + +#: gitk:8376 gitk:8561 +msgid "Output file:" +msgstr "Utdatafil:" + +#: gitk:8382 +msgid "Generate" +msgstr "Generera" + +#: gitk:8420 +msgid "Error creating patch:" +msgstr "Fel vid generering av patch:" + +#: gitk:8443 gitk:8549 gitk:8606 +msgid "ID:" +msgstr "Id:" + +#: gitk:8452 +msgid "Tag name:" +msgstr "Taggnamn:" + +#: gitk:8456 gitk:8615 +msgid "Create" +msgstr "Skapa" + +#: gitk:8473 +msgid "No tag name specified" +msgstr "Inget taggnamn angavs" + +#: gitk:8477 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Taggen \"%s\" finns redan" + +#: gitk:8483 +msgid "Error creating tag:" +msgstr "Fel vid skapande av tagg:" + +#: gitk:8558 +msgid "Command:" +msgstr "Kommando:" + +#: gitk:8566 +msgid "Write" +msgstr "Skriv" + +#: gitk:8584 +msgid "Error writing commit:" +msgstr "Fel vid skrivning av incheckning:" + +#: gitk:8611 +msgid "Name:" +msgstr "Namn:" + +#: gitk:8634 +msgid "Please specify a name for the new branch" +msgstr "Ange ett namn för den nya grenen" + +#: gitk:8639 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Grenen \"%s\" finns redan. Skriva över?" + +#: gitk:8705 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras " +"på nytt?" + +#: gitk:8710 +msgid "Cherry-picking" +msgstr "Plockar" + +#: 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 "" +"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:8725 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n" +"Vill du köra git citool för att lösa den?" + +#: gitk:8741 +msgid "No changes committed" +msgstr "Inga ändringar incheckade" + +#: gitk:8767 +msgid "Confirm reset" +msgstr "Bekräfta återställning" + +#: gitk:8769 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Återställa grenen %s till %s?" + +#: gitk:8773 +msgid "Reset type:" +msgstr "Typ av återställning:" + +#: gitk:8777 +msgid "Soft: Leave working tree and index untouched" +msgstr "Mjuk: Rör inte utcheckning och index" + +#: gitk:8780 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Blandad: Rör inte utcheckning, återställ index" + +#: gitk:8783 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Hård: Återställ utcheckning och index\n" +"(förkastar ALLA lokala ändringar)" + +#: gitk:8800 +msgid "Resetting" +msgstr "Återställer" + +#: gitk:8857 +msgid "Checking out" +msgstr "Checkar ut" + +#: gitk:8910 +msgid "Cannot delete the currently checked-out branch" +msgstr "Kan inte ta bort den just nu utcheckade grenen" + +#: gitk:8916 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"Incheckningarna på grenen %s existerar inte på någon annan gren.\n" +"Vill du verkligen ta bort grenen %s?" + +#: gitk:8947 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Taggar och huvuden: %s" + +#: gitk:8962 +msgid "Filter" +msgstr "Filter" + +#: gitk:9257 +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." + +#: gitk:10243 +msgid "Tag" +msgstr "Tagg" + +#: gitk:10243 +msgid "Id" +msgstr "Id" + +#: gitk:10291 +msgid "Gitk font chooser" +msgstr "Teckensnittsväljare för Gitk" + +#: gitk:10308 +msgid "B" +msgstr "F" + +#: gitk:10311 +msgid "I" +msgstr "K" + +#: gitk:10407 +msgid "Gitk preferences" +msgstr "Inställningar för Gitk" + +#: gitk:10409 +msgid "Commit list display options" +msgstr "Alternativ för incheckningslistvy" + +#: gitk:10412 +msgid "Maximum graph width (lines)" +msgstr "Maximal grafbredd (rader)" + +#: gitk:10416 +#, tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Maximal grafbredd (% av ruta)" + +#: gitk:10420 +msgid "Show local changes" +msgstr "Visa lokala ändringar" + +#: gitk:10423 +msgid "Auto-select SHA1" +msgstr "Välj SHA1 automatiskt" + +#: gitk:10427 +msgid "Diff display options" +msgstr "Alternativ för diffvy" + +#: gitk:10429 +msgid "Tab spacing" +msgstr "Blanksteg för tabulatortecken" + +#: gitk:10432 +msgid "Display nearby tags" +msgstr "Visa närliggande taggar" + +#: gitk:10435 +msgid "Hide remote refs" +msgstr "Dölj fjärr-referenser" + +#: gitk:10438 +msgid "Limit diffs to listed paths" +msgstr "Begränsa diff till listade sökvägar" + +#: gitk:10441 +msgid "Support per-file encodings" +msgstr "Stöd för filspecifika teckenkodningar" + +#: gitk:10447 gitk:10512 +msgid "External diff tool" +msgstr "Externt diff-verktyg" + +#: gitk:10449 +msgid "Choose..." +msgstr "Välj..." + +#: gitk:10454 +msgid "Colors: press to choose" +msgstr "Färger: tryck för att välja" + +#: gitk:10457 +msgid "Background" +msgstr "Bakgrund" + +#: gitk:10458 gitk:10488 +msgid "background" +msgstr "bakgrund" + +#: gitk:10461 +msgid "Foreground" +msgstr "Förgrund" + +#: gitk:10462 +msgid "foreground" +msgstr "förgrund" + +#: gitk:10465 +msgid "Diff: old lines" +msgstr "Diff: gamla rader" + +#: gitk:10466 +msgid "diff old lines" +msgstr "diff gamla rader" + +#: gitk:10470 +msgid "Diff: new lines" +msgstr "Diff: nya rader" + +#: gitk:10471 +msgid "diff new lines" +msgstr "diff nya rader" + +#: gitk:10475 +msgid "Diff: hunk header" +msgstr "Diff: delhuvud" + +#: gitk:10477 +msgid "diff hunk header" +msgstr "diff delhuvud" + +#: gitk:10481 +msgid "Marked line bg" +msgstr "Markerad rad bakgrund" + +#: gitk:10483 +msgid "marked line background" +msgstr "markerad rad bakgrund" + +#: gitk:10487 +msgid "Select bg" +msgstr "Markerad bakgrund" + +#: gitk:10491 +msgid "Fonts: press to choose" +msgstr "Teckensnitt: tryck för att välja" + +#: gitk:10493 +msgid "Main font" +msgstr "Huvudteckensnitt" + +#: gitk:10494 +msgid "Diff display font" +msgstr "Teckensnitt för diffvisning" + +#: gitk:10495 +msgid "User interface font" +msgstr "Teckensnitt för användargränssnitt" + +#: gitk:10522 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: välj färg för %s" + +#: gitk:10973 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n" +" Gitk kräver åtminstone Tcl/Tk 8.4." + +#: gitk:11101 +msgid "Cannot find a git repository here." +msgstr "Hittar inget gitk-arkiv här." + +#: gitk:11105 +#, tcl-format +msgid "Cannot find the git directory \"%s\"." +msgstr "Hittar inte git-katalogen \"%s\"." + +#: gitk:11152 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Tvetydigt argument \"%s\": både revision och filnamn" + +#: gitk:11164 +msgid "Bad arguments to gitk:" +msgstr "Felaktiga argument till gitk:" + +#: gitk:11249 +msgid "Command line" +msgstr "Kommandorad" + +#~ msgid "Tag/Head %s is not known" +#~ msgstr "Tagg/huvud %s är okänt" + +#~ msgid "/\t\tMove to next find hit, or redo find" +#~ msgstr "/\t\tGå till nästa sökträff, eller sök på nytt" + +#~ msgid "Name" +#~ msgstr "Namn" |