diff options
Diffstat (limited to 'gitk-git')
| -rw-r--r-- | gitk-git/gitk | 23 | ||||
| -rw-r--r-- | gitk-git/po/de.po | 741 | ||||
| -rw-r--r-- | gitk-git/po/fr.po | 1254 | ||||
| -rw-r--r-- | gitk-git/po/hu.po | 1295 | ||||
| -rw-r--r-- | gitk-git/po/it.po | 892 | ||||
| -rw-r--r-- | gitk-git/po/sv.po | 673 |
6 files changed, 3989 insertions, 889 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk index 364c7a84cb..48cfce3a0e 100644 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -130,7 +130,7 @@ proc unmerged_files {files} { } proc parseviewargs {n arglist} { - global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs + global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env set vdatemode($n) 0 set vmergeonly($n) 0 @@ -210,6 +210,9 @@ proc parseviewargs {n arglist} { # git rev-parse doesn't understand --merge lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD } + "--no-replace-objects" { + set env(GIT_NO_REPLACE_OBJECTS) "1" + } "-*" { # Other flag arguments including -<n> if {[string is digit -strict [string range $arg 1 end]]} { @@ -2085,7 +2088,7 @@ proc makewindow {} { set sha1entry .tf.bar.sha1 set entries $sha1entry set sha1but .tf.bar.sha1label - button $sha1but -text [mc "SHA1 ID: "] -state disabled -relief flat \ + button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \ -command gotocommit -width 8 $sha1but conf -disabledforeground [$sha1but cget -foreground] pack .tf.bar.sha1label -side left @@ -7686,8 +7689,10 @@ proc getblobdiffline {bdf ids} { makediffhdr $fname $ids $ctext insert end "\n$line\n" filesep } elseif {![string compare -length 3 " >" $line]} { + set line [encoding convertfrom $diffencoding $line] $ctext insert end "$line\n" dresult } elseif {![string compare -length 3 " <" $line]} { + set line [encoding convertfrom $diffencoding $line] $ctext insert end "$line\n" d0 } elseif {$diffinhdr} { if {![string compare -length 12 "rename from " $line]} { @@ -8698,6 +8703,11 @@ proc mktag {} { ${NS}::label $top.tlab -text [mc "Tag name:"] ${NS}::entry $top.tag -width 60 grid $top.tlab $top.tag -sticky w + ${NS}::label $top.op -text [mc "Tag message is optional"] + grid $top.op -columnspan 2 -sticky we + ${NS}::label $top.mlab -text [mc "Tag message:"] + ${NS}::entry $top.msg -width 60 + grid $top.mlab $top.msg -sticky w ${NS}::frame $top.buts ${NS}::button $top.buts.gen -text [mc "Create"] -command mktaggo ${NS}::button $top.buts.can -text [mc "Cancel"] -command mktagcan @@ -8715,6 +8725,7 @@ proc domktag {} { set id [$mktagtop.sha1 get] set tag [$mktagtop.tag get] + set msg [$mktagtop.msg get] if {$tag == {}} { error_popup [mc "No tag name specified"] $mktagtop return 0 @@ -8724,7 +8735,11 @@ proc domktag {} { return 0 } if {[catch { - exec git tag $tag $id + if {$msg != {}} { + exec git tag -a -m $msg $tag $id + } else { + exec git tag $tag $id + } } err]} { error_popup "[mc "Error creating tag:"] $err" $mktagtop return 0 @@ -10480,7 +10495,7 @@ proc showtag {tag isnew} { set linknum 0 if {![info exists tagcontents($tag)]} { catch { - set tagcontents($tag) [exec git cat-file tag $tagobjid($tag)] + set tagcontents($tag) [exec git cat-file tag $tag] } } if {[info exists tagcontents($tag)]} { diff --git a/gitk-git/po/de.po b/gitk-git/po/de.po index 53ef0d6359..c79aa9cbc8 100644 --- a/gitk-git/po/de.po +++ b/gitk-git/po/de.po @@ -8,33 +8,33 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-12 21:55+0200\n" -"PO-Revision-Date: 2009-05-12 22:18+0200\n" +"POT-Creation-Date: 2010-01-27 20:21+0100\n" +"PO-Revision-Date: 2010-01-27 20:27+0100\n" "Last-Translator: Christian Stimming <stimming@tuhh.de>\n" "Language-Team: German\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:113 +#: gitk:115 msgid "Couldn't get list of unmerged files:" msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:" -#: gitk:268 +#: gitk:274 msgid "Error parsing revisions:" msgstr "Fehler beim Laden der Versionen:" -#: gitk:323 +#: gitk:329 msgid "Error executing --argscmd command:" msgstr "Fehler beim Ausführen des --argscmd-Kommandos:" -#: gitk:336 +#: gitk:342 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren " "keine nicht zusammengeführten Dateien." -#: gitk:339 +#: gitk:345 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -42,719 +42,801 @@ msgstr "" "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine " "nicht zusammengeführten Dateien in der Dateiauswahl." -#: gitk:361 gitk:508 +#: gitk:367 gitk:514 msgid "Error executing git log:" msgstr "Fehler beim Ausführen von »git log«:" -#: gitk:379 gitk:524 +#: gitk:385 gitk:530 msgid "Reading" msgstr "Lesen" -#: gitk:439 gitk:4061 +#: gitk:445 gitk:4261 msgid "Reading commits..." msgstr "Versionen werden gelesen ..." -#: gitk:442 gitk:1560 gitk:4064 +#: gitk:448 gitk:1578 gitk:4264 msgid "No commits selected" msgstr "Keine Versionen ausgewählt" -#: gitk:1436 +#: gitk:1454 msgid "Can't parse git log output:" msgstr "Ausgabe von »git log« kann nicht erkannt werden:" -#: gitk:1656 +#: gitk:1674 msgid "No commit information available" msgstr "Keine Versionsinformation verfügbar" -#: gitk:1791 gitk:1815 gitk:3854 gitk:8714 gitk:10250 gitk:10422 +#: gitk:1816 +msgid "mc" +msgstr "mc" + +#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804 msgid "OK" msgstr "Ok" -#: gitk:1817 gitk:3856 gitk:8311 gitk:8385 gitk:8495 gitk:8544 gitk:8716 -#: gitk:10251 gitk:10423 +#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046 +#: gitk:10586 gitk:10805 msgid "Cancel" msgstr "Abbrechen" -#: gitk:1917 +#: gitk:1975 msgid "Update" msgstr "Aktualisieren" -#: gitk:1918 +#: gitk:1976 msgid "Reload" msgstr "Neu laden" -#: gitk:1919 +#: gitk:1977 msgid "Reread references" msgstr "Zweige neu laden" -#: gitk:1920 +#: gitk:1978 msgid "List references" msgstr "Zweige/Markierungen auflisten" -#: gitk:1922 +#: gitk:1980 msgid "Start git gui" msgstr "»git gui« starten" -#: gitk:1924 +#: gitk:1982 msgid "Quit" msgstr "Beenden" -#: gitk:1916 +#: gitk:1974 msgid "File" msgstr "Datei" -#: gitk:1928 +#: gitk:1986 msgid "Preferences" msgstr "Einstellungen" -#: gitk:1927 +#: gitk:1985 msgid "Edit" msgstr "Bearbeiten" -#: gitk:1932 +#: gitk:1990 msgid "New view..." msgstr "Neue Ansicht ..." -#: gitk:1933 +#: gitk:1991 msgid "Edit view..." msgstr "Ansicht bearbeiten ..." -#: gitk:1934 +#: gitk:1992 msgid "Delete view" msgstr "Ansicht entfernen" -#: gitk:1936 +#: gitk:1994 msgid "All files" msgstr "Alle Dateien" -#: gitk:1931 gitk:3666 +#: gitk:1989 gitk:3808 msgid "View" msgstr "Ansicht" -#: gitk:1941 gitk:1951 gitk:2650 +#: gitk:1999 gitk:2009 gitk:2780 msgid "About gitk" msgstr "Über gitk" -#: gitk:1942 gitk:1956 +#: gitk:2000 gitk:2014 msgid "Key bindings" msgstr "Tastenkürzel" -#: gitk:1940 gitk:1955 +#: gitk:1998 gitk:2013 msgid "Help" msgstr "Hilfe" -#: gitk:2016 -msgid "SHA1 ID: " -msgstr "SHA1:" +#: gitk:2091 gitk:8110 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:2047 +#: gitk:2122 msgid "Row" msgstr "Zeile" -#: gitk:2078 +#: gitk:2160 msgid "Find" msgstr "Suche" -#: gitk:2079 +#: gitk:2161 msgid "next" msgstr "nächste" -#: gitk:2080 +#: gitk:2162 msgid "prev" msgstr "vorige" -#: gitk:2081 +#: gitk:2163 msgid "commit" msgstr "Version nach" -#: gitk:2084 gitk:2086 gitk:4222 gitk:4245 gitk:4269 gitk:6210 gitk:6282 -#: gitk:6366 +#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482 +#: gitk:6566 msgid "containing:" msgstr "Beschreibung:" -#: gitk:2087 gitk:3158 gitk:3163 gitk:4297 +#: gitk:2169 gitk:3290 gitk:3295 gitk:4497 msgid "touching paths:" msgstr "Dateien:" -#: gitk:2088 gitk:4302 +#: gitk:2170 gitk:4502 msgid "adding/removing string:" msgstr "Änderungen:" -#: gitk:2097 gitk:2099 +#: gitk:2179 gitk:2181 msgid "Exact" msgstr "Exakt" -#: gitk:2099 gitk:4377 gitk:6178 +#: gitk:2181 gitk:4577 gitk:6378 msgid "IgnCase" msgstr "Kein Groß/Klein" -#: gitk:2099 gitk:4271 gitk:4375 gitk:6174 +#: gitk:2181 gitk:4471 gitk:4575 gitk:6374 msgid "Regexp" msgstr "Regexp" -#: gitk:2101 gitk:2102 gitk:4396 gitk:4426 gitk:4433 gitk:6302 gitk:6370 +#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570 msgid "All fields" msgstr "Alle Felder" -#: gitk:2102 gitk:4394 gitk:4426 gitk:6241 +#: gitk:2184 gitk:4594 gitk:4626 gitk:6441 msgid "Headline" msgstr "Überschrift" -#: gitk:2103 gitk:4394 gitk:6241 gitk:6370 gitk:6804 +#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003 msgid "Comments" msgstr "Beschreibung" -#: gitk:2103 gitk:4394 gitk:4398 gitk:4433 gitk:6241 gitk:6739 gitk:7991 -#: gitk:8006 +#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285 +#: gitk:8300 msgid "Author" msgstr "Autor" -#: gitk:2103 gitk:4394 gitk:6241 gitk:6741 +#: gitk:2185 gitk:4594 gitk:6441 gitk:6940 msgid "Committer" msgstr "Eintragender" -#: gitk:2132 +#: gitk:2216 msgid "Search" msgstr "Suchen" -#: gitk:2139 +#: gitk:2224 msgid "Diff" msgstr "Vergleich" -#: gitk:2141 +#: gitk:2226 msgid "Old version" msgstr "Alte Version" -#: gitk:2143 +#: gitk:2228 msgid "New version" msgstr "Neue Version" -#: gitk:2145 +#: gitk:2230 msgid "Lines of context" msgstr "Kontextzeilen" -#: gitk:2155 +#: gitk:2240 msgid "Ignore space change" msgstr "Leerzeichenänderungen ignorieren" -#: gitk:2213 +#: gitk:2299 msgid "Patch" msgstr "Patch" -#: gitk:2215 +#: gitk:2301 msgid "Tree" msgstr "Baum" -#: gitk:2359 gitk:2376 +#: gitk:2456 gitk:2473 msgid "Diff this -> selected" msgstr "Vergleich: diese -> gewählte" -#: gitk:2360 gitk:2377 +#: gitk:2457 gitk:2474 msgid "Diff selected -> this" msgstr "Vergleich: gewählte -> diese" -#: gitk:2361 gitk:2378 +#: gitk:2458 gitk:2475 msgid "Make patch" msgstr "Patch erstellen" -#: gitk:2362 gitk:8369 +#: gitk:2459 gitk:8692 msgid "Create tag" msgstr "Markierung erstellen" -#: gitk:2363 gitk:8475 +#: gitk:2460 gitk:8808 msgid "Write commit to file" msgstr "Version in Datei schreiben" -#: gitk:2364 gitk:8532 +#: gitk:2461 gitk:8865 msgid "Create new branch" msgstr "Neuen Zweig erstellen" -#: gitk:2365 +#: gitk:2462 msgid "Cherry-pick this commit" msgstr "Diese Version pflücken" -#: gitk:2366 +#: gitk:2463 msgid "Reset HEAD branch to here" msgstr "HEAD-Zweig auf diese Version zurücksetzen" -#: gitk:2367 +#: gitk:2464 msgid "Mark this commit" msgstr "Lesezeichen setzen" -#: gitk:2368 +#: gitk:2465 msgid "Return to mark" msgstr "Zum Lesezeichen" -#: gitk:2369 +#: gitk:2466 msgid "Find descendant of this and mark" msgstr "Abkömmling von Lesezeichen und dieser Version finden" -#: gitk:2370 +#: gitk:2467 msgid "Compare with marked commit" msgstr "Mit Lesezeichen vergleichen" -#: gitk:2384 +#: gitk:2481 msgid "Check out this branch" msgstr "Auf diesen Zweig umstellen" -#: gitk:2385 +#: gitk:2482 msgid "Remove this branch" msgstr "Zweig löschen" -#: gitk:2392 +#: gitk:2489 msgid "Highlight this too" msgstr "Diesen auch hervorheben" -#: gitk:2393 +#: gitk:2490 msgid "Highlight this only" msgstr "Nur diesen hervorheben" -#: gitk:2394 +#: gitk:2491 msgid "External diff" msgstr "Externes Diff-Programm" -#: gitk:2395 +#: gitk:2492 msgid "Blame parent commit" msgstr "Annotieren der Elternversion" -#: gitk:2402 +#: gitk:2499 msgid "Show origin of this line" msgstr "Herkunft dieser Zeile anzeigen" -#: gitk:2403 +#: gitk:2500 msgid "Run git gui blame on this line" msgstr "Diese Zeile annotieren (»git gui blame«)" -#: gitk:2652 +#: gitk:2782 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2008 Paul Mackerras\n" +"Copyright ©9 2005-2009 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" "\n" "Gitk - eine Visualisierung der Git-Historie\n" "\n" -"Copyright © 2005-2008 Paul Mackerras\n" +"Copyright © 2005-2009 Paul Mackerras\n" "\n" -"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public " -"License" +"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public License" -#: gitk:2660 gitk:2722 gitk:8897 +#: gitk:2790 gitk:2854 gitk:9230 msgid "Close" msgstr "Schließen" -#: gitk:2679 +#: gitk:2811 msgid "Gitk key bindings" msgstr "Gitk-Tastaturbelegung" -#: gitk:2682 +#: gitk:2814 msgid "Gitk key bindings:" msgstr "Gitk-Tastaturbelegung:" -#: gitk:2684 +#: gitk:2816 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tBeenden" -#: gitk:2685 +#: gitk:2817 msgid "<Home>\t\tMove to first commit" msgstr "<Pos1>\t\tZur neuesten Version springen" -#: gitk:2686 +#: gitk:2818 msgid "<End>\t\tMove to last commit" msgstr "<Ende>\t\tZur ältesten Version springen" -#: gitk:2687 +#: gitk:2819 msgid "<Up>, p, i\tMove up one commit" msgstr "<Hoch>, p, i\tNächste neuere Version" -#: gitk:2688 +#: gitk:2820 msgid "<Down>, n, k\tMove down one commit" msgstr "<Runter>, n, k\tNächste ältere Version" -#: gitk:2689 +#: gitk:2821 msgid "<Left>, z, j\tGo back in history list" msgstr "<Links>, z, j\tEine Version zurückgehen" -#: gitk:2690 +#: gitk:2822 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Rechts>, x, l\tEine Version weitergehen" -#: gitk:2691 +#: gitk:2823 msgid "<PageUp>\tMove up one page in commit list" msgstr "<BildHoch>\tEine Seite nach oben blättern" -#: gitk:2692 +#: gitk:2824 msgid "<PageDown>\tMove down one page in commit list" msgstr "<BildRunter>\tEine Seite nach unten blättern" -#: gitk:2693 +#: gitk:2825 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern" -#: gitk:2694 +#: gitk:2826 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern" -#: gitk:2695 +#: gitk:2827 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern" -#: gitk:2696 +#: gitk:2828 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern" -#: gitk:2697 +#: gitk:2829 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern" -#: gitk:2698 +#: gitk:2830 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern" -#: gitk:2699 +#: gitk:2831 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)" -#: gitk:2700 +#: gitk:2832 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)" -#: gitk:2701 +#: gitk:2833 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern" -#: gitk:2702 +#: gitk:2834 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern" -#: gitk:2703 +#: gitk:2835 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern" -#: gitk:2704 +#: gitk:2836 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern" -#: gitk:2705 +#: gitk:2837 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern" -#: gitk:2706 +#: gitk:2838 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSuchen" -#: gitk:2707 +#: gitk:2839 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tWeitersuchen" -#: gitk:2708 +#: gitk:2840 msgid "<Return>\tMove to next find hit" msgstr "<Eingabetaste>\tWeitersuchen" -#: gitk:2709 +#: gitk:2841 msgid "/\t\tFocus the search box" msgstr "/\t\tTastaturfokus ins Suchfeld" -#: gitk:2710 +#: gitk:2842 msgid "?\t\tMove to previous find hit" msgstr "?\t\tRückwärts weitersuchen" -#: gitk:2711 +#: gitk:2843 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tVergleich zur nächsten Datei blättern" -#: gitk:2712 +#: gitk:2844 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tWeitersuchen im Vergleich" -#: gitk:2713 +#: gitk:2845 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich" -#: gitk:2714 +#: gitk:2846 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern" -#: gitk:2715 +#: gitk:2847 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-Plus>\tSchrift vergrößern" -#: gitk:2716 +#: gitk:2848 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Nummernblock-Minus> Schrift verkleinern" -#: gitk:2717 +#: gitk:2849 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-Minus>\tSchrift verkleinern" -#: gitk:2718 +#: gitk:2850 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 +#: gitk:3305 gitk:3314 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:" -#: gitk:3251 +#: gitk:3327 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fehler beim Holen von »%s« von »%s«:" + +#: gitk:3390 msgid "command failed:" msgstr "Kommando fehlgeschlagen:" -#: gitk:3397 +#: gitk:3539 msgid "No such commit" msgstr "Version nicht gefunden" -#: gitk:3411 +#: gitk:3553 msgid "git gui blame: command failed:" msgstr "git gui blame: Kommando fehlgeschlagen:" -#: gitk:3442 +#: gitk:3584 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s" -#: gitk:3450 +#: gitk:3592 #, tcl-format msgid "Error reading index: %s" msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s" -#: gitk:3475 +#: gitk:3617 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "»git blame« konnte nicht gestartet werden: %s" -#: gitk:3478 gitk:6209 +#: gitk:3620 gitk:6409 msgid "Searching" msgstr "Suchen" -#: gitk:3510 +#: gitk:3652 #, tcl-format msgid "Error running git blame: %s" msgstr "Fehler beim Ausführen von »git blame«: %s" -#: gitk:3538 +#: gitk:3680 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" "Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird" -#: gitk:3552 +#: gitk:3694 msgid "External diff viewer failed:" msgstr "Externes Diff-Programm fehlgeschlagen:" -#: gitk:3670 +#: gitk:3812 msgid "Gitk view definition" msgstr "Gitk-Ansichten" -#: gitk:3674 +#: gitk:3816 msgid "Remember this view" msgstr "Diese Ansicht speichern" -#: gitk:3675 -msgid "Commits to include (arguments to git log):" -msgstr "Versionen anzeigen (Argumente von git log):" +#: gitk:3817 +msgid "References (space separated list):" +msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):" -#: gitk:3676 -msgid "Use all refs" -msgstr "Alle Zweige verwenden" +#: gitk:3818 +msgid "Branches & tags:" +msgstr "Zweige/Markierungen:" -#: gitk:3677 -msgid "Strictly sort by date" -msgstr "Streng nach Datum sortieren" +#: gitk:3819 +msgid "All refs" +msgstr "Alle Markierungen und Zweige" -#: gitk:3678 -msgid "Mark branch sides" -msgstr "Zweig-Seiten markieren" +#: gitk:3820 +msgid "All (local) branches" +msgstr "Alle (lokalen) Zweige" -#: gitk:3679 -msgid "Since date:" -msgstr "Von Datum:" +#: gitk:3821 +msgid "All tags" +msgstr "Alle Markierungen" -#: gitk:3680 -msgid "Until date:" -msgstr "Bis Datum:" +#: gitk:3822 +msgid "All remote-tracking branches" +msgstr "Alle Übernahmezweige" + +#: gitk:3823 +msgid "Commit Info (regular expressions):" +msgstr "Versionsinformationen (reguläre Ausdrücke):" + +#: gitk:3824 +msgid "Author:" +msgstr "Autor:" + +#: gitk:3825 +msgid "Committer:" +msgstr "Eintragender:" + +#: gitk:3826 +msgid "Commit Message:" +msgstr "Versionsbeschreibung:" -#: gitk:3681 -msgid "Max count:" -msgstr "Max. Anzahl:" +#: gitk:3827 +msgid "Matches all Commit Info criteria" +msgstr "Alle Versionsinformationen-Kriterien erfüllen" -#: gitk:3682 -msgid "Skip:" +#: gitk:3828 +msgid "Changes to Files:" +msgstr "Dateien:" + +#: gitk:3829 +msgid "Fixed String" +msgstr "Zeichenkette" + +#: gitk:3830 +msgid "Regular Expression" +msgstr "Regulärer Ausdruck" + +#: gitk:3831 +msgid "Search string:" +msgstr "Suchausdruck:" + +#: gitk:3832 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)" + +#: gitk:3833 +msgid "Since:" +msgstr "Von:" + +#: gitk:3834 +msgid "Until:" +msgstr "Bis:" + +#: gitk:3835 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):" + +#: gitk:3836 +msgid "Number to show:" +msgstr "Anzeigen:" + +#: gitk:3837 +msgid "Number to skip:" msgstr "Überspringen:" -#: gitk:3683 +#: gitk:3838 +msgid "Miscellaneous options:" +msgstr "Sonstiges:" + +#: gitk:3839 +msgid "Strictly sort by date" +msgstr "Streng nach Datum sortieren" + +#: gitk:3840 +msgid "Mark branch sides" +msgstr "Zweig-Seiten markieren" + +#: gitk:3841 msgid "Limit to first parent" msgstr "Auf erste Elternversion beschränken" -#: gitk:3684 +#: gitk:3842 +msgid "Simple history" +msgstr "Einfache Historie" + +#: gitk:3843 +msgid "Additional arguments to git log:" +msgstr "Zusätzliche Argumente für »git log«:" + +#: gitk:3844 +msgid "Enter files and directories to include, one per line:" +msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" + +#: gitk:3845 msgid "Command to generate more commits to include:" msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:" -#: gitk:3780 +#: gitk:3967 msgid "Gitk: edit view" msgstr "Gitk: Ansicht bearbeiten" -#: gitk:3793 -msgid "Name" -msgstr "Name" +#: gitk:3975 +msgid "-- criteria for selecting revisions" +msgstr "-- Auswahl der angezeigten Versionen" -#: gitk:3841 -msgid "Enter files and directories to include, one per line:" -msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" +#: gitk:3980 +msgid "View Name" +msgstr "Ansichtsname" -#: gitk:3855 +#: gitk:4055 msgid "Apply (F5)" msgstr "Anwenden (F5)" -#: gitk:3893 +#: gitk:4093 msgid "Error in commit selection arguments:" msgstr "Fehler in den ausgewählten Versionen:" -#: gitk:3946 gitk:3998 gitk:4446 gitk:4460 gitk:5721 gitk:11114 gitk:11115 +#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535 msgid "None" msgstr "Keine" -#: gitk:4394 gitk:6241 gitk:7993 gitk:8008 +#: gitk:4594 gitk:6441 gitk:8287 gitk:8302 msgid "Date" msgstr "Datum" -#: gitk:4394 gitk:6241 +#: gitk:4594 gitk:6441 msgid "CDate" msgstr "Eintragedatum" -#: gitk:4543 gitk:4548 +#: gitk:4743 gitk:4748 msgid "Descendant" msgstr "Abkömmling" -#: gitk:4544 +#: gitk:4744 msgid "Not descendant" msgstr "Kein Abkömmling" -#: gitk:4551 gitk:4556 +#: gitk:4751 gitk:4756 msgid "Ancestor" msgstr "Vorgänger" -#: gitk:4552 +#: gitk:4752 msgid "Not ancestor" msgstr "Kein Vorgänger" -#: gitk:4842 +#: gitk:5042 msgid "Local changes checked in to index but not committed" msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen" -#: gitk:4878 +#: gitk:5078 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokale Änderungen, nicht bereitgestellt" -#: gitk:6559 +#: gitk:6759 msgid "many" msgstr "viele" -#: gitk:6743 +#: gitk:6942 msgid "Tags:" msgstr "Markierungen:" -#: gitk:6760 gitk:6766 gitk:7986 +#: gitk:6959 gitk:6965 gitk:8280 msgid "Parent" msgstr "Eltern" -#: gitk:6771 +#: gitk:6970 msgid "Child" msgstr "Kind" -#: gitk:6780 +#: gitk:6979 msgid "Branch" msgstr "Zweig" -#: gitk:6783 +#: gitk:6982 msgid "Follows" msgstr "Folgt auf" -#: gitk:6786 +#: gitk:6985 msgid "Precedes" msgstr "Vorgänger von" -#: gitk:7279 +#: gitk:7522 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fehler beim Laden des Vergleichs: %s" -#: gitk:7819 +#: gitk:8108 msgid "Goto:" msgstr "Gehe zu:" -#: gitk:7821 -msgid "SHA1 ID:" -msgstr "SHA1-Hashwert:" - -#: gitk:7840 +#: gitk:8129 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig" -#: gitk:7852 +#: gitk:8136 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Version »%s« ist unbekannt" + +#: gitk:8146 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1-Hashwert »%s« ist unbekannt" -#: gitk:7854 +#: gitk:8148 #, tcl-format -msgid "Tag/Head %s is not known" -msgstr "Markierung/Zweig »%s« ist unbekannt" +msgid "Revision %s is not in the current view" +msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt" -#: gitk:7996 +#: gitk:8290 msgid "Children" msgstr "Kinder" -#: gitk:8053 +#: gitk:8348 #, tcl-format msgid "Reset %s branch to here" msgstr "Zweig »%s« hierher zurücksetzen" -#: gitk:8055 +#: gitk:8350 msgid "Detached head: can't reset" msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich" -#: gitk:8164 gitk:8170 +#: gitk:8459 gitk:8465 msgid "Skipping merge commit " msgstr "Überspringe Zusammenführungs-Version " -#: gitk:8179 gitk:8184 +#: gitk:8474 gitk:8479 msgid "Error getting patch ID for " msgstr "Fehler beim Holen der Patch-ID für " -#: gitk:8180 gitk:8185 +#: gitk:8475 gitk:8480 msgid " - stopping\n" msgstr " - Abbruch.\n" -#: gitk:8190 gitk:8193 gitk:8201 gitk:8211 gitk:8220 +#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519 msgid "Commit " msgstr "Version " -#: gitk:8194 +#: gitk:8489 msgid "" " is the same patch as\n" " " @@ -762,7 +844,7 @@ msgstr "" " ist das gleiche Patch wie\n" " " -#: gitk:8202 +#: gitk:8497 msgid "" " differs from\n" " " @@ -770,117 +852,138 @@ msgstr "" " ist unterschiedlich von\n" " " -#: gitk:8204 -msgid "- stopping\n" -msgstr "- Abbruch.\n" +#: gitk:8499 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Vergleich der Versionen:\n" +"\n" -#: gitk:8212 gitk:8221 +#: gitk:8511 gitk:8520 #, tcl-format msgid " has %s children - stopping\n" msgstr " hat %s Kinder. Abbruch\n" -#: gitk:8252 +#: gitk:8539 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Fehler beim Schreiben der Version in Datei: %s" + +#: gitk:8545 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Fehler beim Vergleichen der Versionen: %s" + +#: gitk:8575 msgid "Top" msgstr "Oben" -#: gitk:8253 +#: gitk:8576 msgid "From" msgstr "Von" -#: gitk:8258 +#: gitk:8581 msgid "To" msgstr "bis" -#: gitk:8282 +#: gitk:8605 msgid "Generate patch" msgstr "Patch erstellen" -#: gitk:8284 +#: gitk:8607 msgid "From:" msgstr "Von:" -#: gitk:8293 +#: gitk:8616 msgid "To:" msgstr "bis:" -#: gitk:8302 +#: gitk:8625 msgid "Reverse" msgstr "Umgekehrt" -#: gitk:8304 gitk:8489 +#: gitk:8627 gitk:8822 msgid "Output file:" msgstr "Ausgabedatei:" -#: gitk:8310 +#: gitk:8633 msgid "Generate" msgstr "Erzeugen" -#: gitk:8348 +#: gitk:8671 msgid "Error creating patch:" msgstr "Fehler beim Erzeugen des Patches:" -#: gitk:8371 gitk:8477 gitk:8534 +#: gitk:8694 gitk:8810 gitk:8867 msgid "ID:" msgstr "ID:" -#: gitk:8380 +#: gitk:8703 msgid "Tag name:" msgstr "Markierungsname:" -#: gitk:8384 gitk:8543 +#: gitk:8706 +msgid "Tag message is optional" +msgstr "Eine Markierungsbeschreibung ist optional" + +#: gitk:8708 +msgid "Tag message:" +msgstr "Markierungsbeschreibung:" + +#: gitk:8712 gitk:8876 msgid "Create" msgstr "Erstellen" -#: gitk:8401 +#: gitk:8730 msgid "No tag name specified" msgstr "Kein Markierungsname angegeben" -#: gitk:8405 +#: gitk:8734 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Markierung »%s« existiert bereits." -#: gitk:8411 +#: gitk:8744 msgid "Error creating tag:" msgstr "Fehler beim Erstellen der Markierung:" -#: gitk:8486 +#: gitk:8819 msgid "Command:" msgstr "Kommando:" -#: gitk:8494 +#: gitk:8827 msgid "Write" msgstr "Schreiben" -#: gitk:8512 +#: gitk:8845 msgid "Error writing commit:" msgstr "Fehler beim Schreiben der Version:" -#: gitk:8539 +#: gitk:8872 msgid "Name:" msgstr "Name:" -#: gitk:8562 +#: gitk:8895 msgid "Please specify a name for the new branch" msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." -#: gitk:8567 +#: gitk:8900 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?" -#: gitk:8633 +#: gitk:8966 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" -"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut " -"eintragen?" +"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut eintragen?" -#: gitk:8638 +#: gitk:8971 msgid "Cherry-picking" msgstr "Version pflücken" -#: gitk:8647 +#: gitk:8980 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -890,7 +993,7 @@ msgstr "" "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" "zwischenspeichern (»git stash«) und dann erneut versuchen." -#: gitk:8653 +#: gitk:8986 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -899,34 +1002,34 @@ msgstr "" "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" "werden, um diesen Konflikt aufzulösen?" -#: gitk:8669 +#: gitk:9002 msgid "No changes committed" msgstr "Keine Änderungen eingetragen" -#: gitk:8695 +#: gitk:9028 msgid "Confirm reset" msgstr "Zurücksetzen bestätigen" -#: gitk:8697 +#: gitk:9030 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Zweig »%s« auf »%s« zurücksetzen?" -#: gitk:8701 +#: gitk:9032 msgid "Reset type:" msgstr "Art des Zurücksetzens:" -#: gitk:8705 +#: gitk:9035 msgid "Soft: Leave working tree and index untouched" msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert" -#: gitk:8708 +#: gitk:9038 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Gemischt: Arbeitskopie unverändert,\n" "Bereitstellung zurückgesetzt" -#: gitk:8711 +#: gitk:9041 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -934,21 +1037,21 @@ msgstr "" "Hart: Arbeitskopie und Bereitstellung\n" "(Alle lokalen Änderungen werden gelöscht)" -#: gitk:8728 +#: gitk:9058 msgid "Resetting" msgstr "Zurücksetzen" -#: gitk:8785 +#: gitk:9118 msgid "Checking out" msgstr "Umstellen" -#: gitk:8838 +#: gitk:9171 msgid "Cannot delete the currently checked-out branch" msgstr "" "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht " "gelöscht werden." -#: gitk:8844 +#: gitk:9177 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -957,16 +1060,16 @@ msgstr "" "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n" "Zweig »%s« trotzdem löschen?" -#: gitk:8875 +#: gitk:9208 #, tcl-format msgid "Tags and heads: %s" msgstr "Markierungen und Zweige: %s" -#: gitk:8890 +#: gitk:9223 msgid "Filter" msgstr "Filtern" -#: gitk:9185 +#: gitk:9518 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -974,182 +1077,202 @@ msgstr "" "Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu " "Vorgänger/Nachfolger werden unvollständig sein." -#: gitk:10171 +#: gitk:10504 msgid "Tag" msgstr "Markierung" -#: gitk:10171 +#: gitk:10504 msgid "Id" msgstr "Id" -#: gitk:10219 +#: gitk:10554 msgid "Gitk font chooser" msgstr "Gitk-Schriften wählen" -#: gitk:10236 +#: gitk:10571 msgid "B" msgstr "F" -#: gitk:10239 +#: gitk:10574 msgid "I" msgstr "K" -#: gitk:10334 +#: gitk:10692 msgid "Gitk preferences" msgstr "Gitk-Einstellungen" -#: gitk:10336 +#: gitk:10694 msgid "Commit list display options" msgstr "Anzeige der Versionsliste" -#: gitk:10339 +#: gitk:10697 msgid "Maximum graph width (lines)" msgstr "Maximale Graphenbreite (Zeilen)" -#: gitk:10343 +#: gitk:10700 #, tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximale Graphenbreite (% des Fensters)" -#: gitk:10347 +#: gitk:10703 msgid "Show local changes" msgstr "Lokale Änderungen anzeigen" -#: gitk:10350 +#: gitk:10706 msgid "Auto-select SHA1" msgstr "SHA1-Hashwert automatisch auswählen" -#: gitk:10354 +#: gitk:10709 +msgid "Hide remote refs" +msgstr "Entfernte Zweige/Markierungen ausblenden" + +#: gitk:10713 msgid "Diff display options" msgstr "Anzeige des Vergleichs" -#: gitk:10356 +#: gitk:10715 msgid "Tab spacing" msgstr "Tabulatorbreite" -#: gitk:10359 +#: gitk:10718 msgid "Display nearby tags" msgstr "Naheliegende Markierungen anzeigen" -#: gitk:10362 +#: gitk:10721 msgid "Limit diffs to listed paths" msgstr "Vergleich nur für angezeigte Pfade" -#: gitk:10365 +#: gitk:10724 msgid "Support per-file encodings" msgstr "Zeichenkodierung pro Datei ermitteln" -#: gitk:10371 gitk:10436 +#: gitk:10730 gitk:10819 msgid "External diff tool" msgstr "Externes Diff-Programm" -#: gitk:10373 +#: gitk:10731 msgid "Choose..." msgstr "Wählen ..." -#: gitk:10378 +#: gitk:10736 +msgid "General options" +msgstr "Allgemeine Optionen" + +#: gitk:10739 +msgid "Use themed widgets" +msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen" + +#: gitk:10741 +msgid "(change requires restart)" +msgstr "(Änderungen werden erst nach Neustart wirksam)" + +#: gitk:10743 +msgid "(currently unavailable)" +msgstr "(Momentan nicht verfügbar)" + +#: gitk:10747 msgid "Colors: press to choose" msgstr "Farben: Klicken zum Wählen" -#: gitk:10381 +#: gitk:10750 +msgid "Interface" +msgstr "Benutzeroberfläche" + +#: gitk:10751 +msgid "interface" +msgstr "Benutzeroberfläche" + +#: gitk:10754 msgid "Background" msgstr "Hintergrund" -#: gitk:10382 gitk:10412 +#: gitk:10755 gitk:10785 msgid "background" msgstr "Hintergrund" -#: gitk:10385 +#: gitk:10758 msgid "Foreground" msgstr "Vordergrund" -#: gitk:10386 +#: gitk:10759 msgid "foreground" msgstr "Vordergrund" -#: gitk:10389 +#: gitk:10762 msgid "Diff: old lines" msgstr "Vergleich: Alte Zeilen" -#: gitk:10390 +#: gitk:10763 msgid "diff old lines" msgstr "Vergleich - Alte Zeilen" -#: gitk:10394 +#: gitk:10767 msgid "Diff: new lines" msgstr "Vergleich: Neue Zeilen" -#: gitk:10395 +#: gitk:10768 msgid "diff new lines" msgstr "Vergleich - Neue Zeilen" -#: gitk:10399 +#: gitk:10772 msgid "Diff: hunk header" msgstr "Vergleich: Änderungstitel" -#: gitk:10401 +#: gitk:10774 msgid "diff hunk header" msgstr "Vergleich - Änderungstitel" -#: gitk:10405 +#: gitk:10778 msgid "Marked line bg" msgstr "Hintergrund für markierte Zeile" -#: gitk:10407 +#: gitk:10780 msgid "marked line background" msgstr "Hintergrund für markierte Zeile" -#: gitk:10411 +#: gitk:10784 msgid "Select bg" msgstr "Hintergrundfarbe auswählen" -#: gitk:10415 +#: gitk:10788 msgid "Fonts: press to choose" msgstr "Schriftart: Klicken zum Wählen" -#: gitk:10417 +#: gitk:10790 msgid "Main font" msgstr "Programmschriftart" -#: gitk:10418 +#: gitk:10791 msgid "Diff display font" msgstr "Schriftart für Vergleich" -#: gitk:10419 +#: gitk:10792 msgid "User interface font" msgstr "Beschriftungen" -#: gitk:10446 +#: gitk:10829 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: Farbe wählen für %s" -#: gitk:10893 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"Gitk läuft nicht mit dieser Version von Tcl/Tk.\n" -"Gitk benötigt mindestens Tcl/Tk 8.4." - -#: gitk:11020 +#: gitk:11433 msgid "Cannot find a git repository here." msgstr "Kein Git-Projektarchiv gefunden." -#: gitk:11024 +#: gitk:11437 #, tcl-format msgid "Cannot find the git directory \"%s\"." msgstr "Git-Verzeichnis »%s« wurde nicht gefunden." -#: gitk:11071 +#: gitk:11484 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert." -#: gitk:11083 +#: gitk:11496 msgid "Bad arguments to gitk:" msgstr "Falsche Kommandozeilen-Parameter für gitk:" -#: gitk:11167 +#: gitk:11587 msgid "Command line" msgstr "Kommandozeile" diff --git a/gitk-git/po/fr.po b/gitk-git/po/fr.po new file mode 100644 index 0000000000..cb0e1edc63 --- /dev/null +++ b/gitk-git/po/fr.po @@ -0,0 +1,1254 @@ +# French translation of the gitk package +# Copyright (C) 2005-2008 Paul Mackerras. All rights reserved. +# This file is distributed under the same license as the gitk package. +# Translators: +# Emmanuel Trillaud <etrillaud@gmail.com> +# +msgid "" +msgstr "" +"Project-Id-Version: gitk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-05 15:16+0200\n" +"PO-Revision-Date: 2009-11-19 22:13+0100\n" +"Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n" +"Language-Team: git@vger.kernel.org\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: French\n" +"X-Poedit-Country: FRANCE\n" + +#: gitk:113 +msgid "Couldn't get list of unmerged files:" +msgstr "Impossible de récupérer la liste des fichiers non fusionnés :" + +#: gitk:269 +msgid "Error parsing revisions:" +msgstr "Erreur lors du parcours des révisions :" + +#: gitk:324 +msgid "Error executing --argscmd command:" +msgstr "Erreur à l'exécution de la commande --argscmd :" + +#: gitk:337 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Aucun fichier sélectionné : --merge précisé, mais tous les fichiers sont " +"fusionnés." + +# FIXME : améliorer la traduction de 'file limite' +#: gitk:340 +#, fuzzy +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné " +"n'est dans la limite des fichiers." + +#: gitk:362 gitk:509 +msgid "Error executing git log:" +msgstr "Erreur à l'exécution de git log :" + +#: gitk:380 gitk:525 +msgid "Reading" +msgstr "Lecture en cours" + +#: gitk:440 gitk:4123 +msgid "Reading commits..." +msgstr "Lecture des commits..." + +#: gitk:443 gitk:1561 gitk:4126 +msgid "No commits selected" +msgstr "Aucun commit sélectionné" + +#: gitk:1437 +msgid "Can't parse git log output:" +msgstr "Impossible de lire la sortie de git log :" + +#: gitk:1657 +msgid "No commit information available" +msgstr "Aucune information disponible sur le commit" + +#: gitk:1793 gitk:1817 gitk:3916 gitk:8786 gitk:10322 gitk:10498 +msgid "OK" +msgstr "OK" + +#: gitk:1819 gitk:3918 gitk:8383 gitk:8457 gitk:8567 gitk:8616 gitk:8788 +#: gitk:10323 gitk:10499 +msgid "Cancel" +msgstr "Annuler" + +#: gitk:1919 +msgid "Update" +msgstr "Mise à jour" + +#: gitk:1920 +msgid "Reload" +msgstr "Recharger" + +#: gitk:1921 +msgid "Reread references" +msgstr "Relire les références" + +#: gitk:1922 +msgid "List references" +msgstr "Lister les références" + +#: gitk:1924 +msgid "Start git gui" +msgstr "Démarrer git gui" + +#: gitk:1926 +msgid "Quit" +msgstr "Quitter" + +#: gitk:1918 +msgid "File" +msgstr "Fichier" + +#: gitk:1930 +msgid "Preferences" +msgstr "Préférences" + +#: gitk:1929 +msgid "Edit" +msgstr "Éditer" + +#: gitk:1934 +msgid "New view..." +msgstr "Nouvelle vue..." + +#: gitk:1935 +msgid "Edit view..." +msgstr "Éditer la vue..." + +#: gitk:1936 +msgid "Delete view" +msgstr "Supprimer la vue" + +#: gitk:1938 +msgid "All files" +msgstr "Tous les fichiers" + +#: gitk:1933 gitk:3670 +msgid "View" +msgstr "Vue" + +#: gitk:1943 gitk:1953 gitk:2654 +msgid "About gitk" +msgstr "À propos de gitk" + +#: gitk:1944 gitk:1958 +msgid "Key bindings" +msgstr "Raccourcis clavier" + +#: gitk:1942 gitk:1957 +msgid "Help" +msgstr "Aide" + +#: gitk:2018 +msgid "SHA1 ID: " +msgstr "ID SHA1 :" + +#: gitk:2049 +msgid "Row" +msgstr "Colonne" + +#: gitk:2080 +msgid "Find" +msgstr "Recherche" + +#: gitk:2081 +msgid "next" +msgstr "suivant" + +#: gitk:2082 +msgid "prev" +msgstr "précédent" + +#: gitk:2083 +msgid "commit" +msgstr "commit" + +#: gitk:2086 gitk:2088 gitk:4284 gitk:4307 gitk:4331 gitk:6272 gitk:6344 +#: gitk:6428 +msgid "containing:" +msgstr "contient :" + +#: gitk:2089 gitk:3162 gitk:3167 gitk:4359 +msgid "touching paths:" +msgstr "chemins modifiés :" + +#: gitk:2090 gitk:4364 +msgid "adding/removing string:" +msgstr "ajoute/supprime la chaîne :" + +#: gitk:2099 gitk:2101 +msgid "Exact" +msgstr "Exact" + +#: gitk:2101 gitk:4439 gitk:6240 +msgid "IgnCase" +msgstr "Ignorer la casse" + +#: gitk:2101 gitk:4333 gitk:4437 gitk:6236 +msgid "Regexp" +msgstr "Expression régulière" + +#: gitk:2103 gitk:2104 gitk:4458 gitk:4488 gitk:4495 gitk:6364 gitk:6432 +msgid "All fields" +msgstr "Tous les champs" + +#: gitk:2104 gitk:4456 gitk:4488 gitk:6303 +msgid "Headline" +msgstr "Surligner" + +#: gitk:2105 gitk:4456 gitk:6303 gitk:6432 gitk:6866 +msgid "Comments" +msgstr "Commentaires" + +#: gitk:2105 gitk:4456 gitk:4460 gitk:4495 gitk:6303 gitk:6801 gitk:8063 +#: gitk:8078 +msgid "Author" +msgstr "Auteur" + +#: gitk:2105 gitk:4456 gitk:6303 gitk:6803 +msgid "Committer" +msgstr "Auteur du commit" + +#: gitk:2134 +msgid "Search" +msgstr "Rechercher" + +#: gitk:2141 +msgid "Diff" +msgstr "Diff" + +#: gitk:2143 +msgid "Old version" +msgstr "Ancienne version" + +#: gitk:2145 +msgid "New version" +msgstr "Nouvelle version" + +#: gitk:2147 +msgid "Lines of context" +msgstr "Lignes de contexte" + +#: gitk:2157 +msgid "Ignore space change" +msgstr "Ignorer les modifications d'espace" + +#: gitk:2215 +msgid "Patch" +msgstr "Patch" + +#: gitk:2217 +msgid "Tree" +msgstr "Arbre" + +#: gitk:2361 gitk:2378 +msgid "Diff this -> selected" +msgstr "Diff entre ceci et la sélection" + +#: gitk:2362 gitk:2379 +msgid "Diff selected -> this" +msgstr "Diff entre sélection et ceci" + +#: gitk:2363 gitk:2380 +msgid "Make patch" +msgstr "Créer patch" + +#: gitk:2364 gitk:8441 +msgid "Create tag" +msgstr "Créer tag" + +#: gitk:2365 gitk:8547 +msgid "Write commit to file" +msgstr "Écrire le commit dans un fichier" + +#: gitk:2366 gitk:8604 +msgid "Create new branch" +msgstr "Créer une nouvelle branche" + +#: gitk:2367 +msgid "Cherry-pick this commit" +msgstr "Cueillir (cherry-pick) ce commit" + +#: gitk:2368 +msgid "Reset HEAD branch to here" +msgstr "Réinitialiser la branche HEAD vers cet état" + +#: gitk:2369 +msgid "Mark this commit" +msgstr "Marquer ce commit" + +#: gitk:2370 +msgid "Return to mark" +msgstr "Retourner à la marque" + +#: gitk:2371 +msgid "Find descendant of this and mark" +msgstr "Chercher le descendant de ceci et le marquer" + +#: gitk:2372 +msgid "Compare with marked commit" +msgstr "Comparer avec le commit marqué" + +#: gitk:2386 +msgid "Check out this branch" +msgstr "Récupérer cette branche" + +#: gitk:2387 +msgid "Remove this branch" +msgstr "Supprimer cette branche" + +#: gitk:2394 +msgid "Highlight this too" +msgstr "Surligner également ceci" + +#: gitk:2395 +msgid "Highlight this only" +msgstr "Surligner seulement ceci" + +#: gitk:2396 +msgid "External diff" +msgstr "Diff externe" + +#: gitk:2397 +msgid "Blame parent commit" +msgstr "Blâmer le commit parent" + +#: gitk:2404 +msgid "Show origin of this line" +msgstr "Montrer l'origine de cette ligne" + +#: gitk:2405 +msgid "Run git gui blame on this line" +msgstr "Exécuter git gui blame sur cette ligne" + +#: gitk:2656 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" +"Copyright © 2005-2008 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - visualisateur de commit pour git\n" +"\n" +"Copyright © 2005-2008 Paul Mackerras\n" +"\n" +"Utilisation et redistribution soumises aux termes de la GNU General Public " +"License" + +#: gitk:2664 gitk:2726 gitk:8969 +msgid "Close" +msgstr "Fermer" + +#: gitk:2683 +msgid "Gitk key bindings" +msgstr "Raccourcis clavier de Gitk" + +#: gitk:2686 +msgid "Gitk key bindings:" +msgstr "Raccourcis clavier de Gitk :" + +#: gitk:2688 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tQuitter" + +#: gitk:2689 +msgid "<Home>\t\tMove to first commit" +msgstr "<Début>\t\tAller au premier commit" + +#: gitk:2690 +msgid "<End>\t\tMove to last commit" +msgstr "<Fin>\t\tAller au dernier commit" + +#: gitk:2691 +msgid "<Up>, p, i\tMove up one commit" +msgstr "<Haut>, p, i\t Aller au commit suivant" + +#: gitk:2692 +msgid "<Down>, n, k\tMove down one commit" +msgstr "<Bas>, n, k\t Aller au commit précédent" + +#: gitk:2693 +msgid "<Left>, z, j\tGo back in history list" +msgstr "<Gauche>, z, j\tReculer dans l'historique" + +#: gitk:2694 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Droite>, x, l\tAvancer dans l'historique" + +#: gitk:2695 +msgid "<PageUp>\tMove up one page in commit list" +msgstr "<PageUp>\tMonter d'une page dans la liste des commits" + +#: gitk:2696 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<PageDown>\tDescendre d'une page dans la liste des commits" + +#: gitk:2697 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Début>\tAller en haut de la liste des commits" + +#: gitk:2698 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tAller en bas de la liste des commits" + +#: gitk:2699 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits" + +#: gitk:2700 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits" + +#: gitk:2701 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits" + +#: gitk:2702 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits" + +#: gitk:2703 +msgid "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "" +"<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)" + +#: gitk:2704 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "" +"<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)" + +#: gitk:2705 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff" + +#: gitk:2706 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Backspace>\tMonter d'une page dans la vue des diff" + +#: gitk:2707 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff" + +#: gitk:2708 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tMonter de 18 lignes dans la vue des diff" + +#: gitk:2709 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tDescendre de 18 lignes dans la vue des diff" + +#: gitk:2710 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tRechercher" + +#: gitk:2711 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tAller au résultat de recherche suivant" + +#: gitk:2712 +msgid "<Return>\tMove to next find hit" +msgstr "<Return>\t\tAller au résultat de recherche suivant" + +#: gitk:2713 +msgid "/\t\tFocus the search box" +msgstr "/\t\tFocus sur la zone de recherche" + +#: gitk:2714 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tAller au résultat de recherche précédent" + +#: gitk:2715 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tAller au prochain fichier dans la vue des diff" + +#: gitk:2716 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff" + +#: gitk:2717 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff" + +#: gitk:2718 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tAugmenter la taille de la police" + +#: gitk:2719 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tAugmenter la taille de la police" + +#: gitk:2720 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tDiminuer la taille de la police" + +#: gitk:2721 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tDiminuer la taille de la police" + +#: gitk:2722 +msgid "<F5>\t\tUpdate" +msgstr "<F5>\t\tMise à jour" + +#: gitk:3177 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Erreur en obtenant \"%s\" de %s:" + +#: gitk:3234 gitk:3243 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Erreur lors de la création du répertoire temporaire %s :" + +#: gitk:3255 +msgid "command failed:" +msgstr "échec de la commande :" + +#: gitk:3401 +msgid "No such commit" +msgstr "Commit inexistant" + +#: gitk:3415 +msgid "git gui blame: command failed:" +msgstr "git gui blame : échec de la commande :" + +#: gitk:3446 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Impossible de lire le head de la fusion : %s" + +#: gitk:3454 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Erreur à la lecture de l'index : %s" + +#: gitk:3479 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Impossible de démarrer git blame : %s" + +#: gitk:3482 gitk:6271 +msgid "Searching" +msgstr "Recherche en cours" + +#: gitk:3514 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Erreur à l'exécution de git blame : %s" + +#: gitk:3542 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue" + +#: gitk:3556 +msgid "External diff viewer failed:" +msgstr "Échec de l'outil externe de visualisation des diff" + +#: gitk:3674 +msgid "Gitk view definition" +msgstr "Définition des vues de Gitk" + +#: gitk:3678 +msgid "Remember this view" +msgstr "Se souvenir de cette vue" + +#: gitk:3679 +msgid "References (space separated list):" +msgstr "Références (liste d'éléments séparés par des espaces) :" + +#: gitk:3680 +msgid "Branches & tags:" +msgstr "Branches & tags :" + +#: gitk:3681 +msgid "All refs" +msgstr "Toutes les références" + +#: gitk:3682 +msgid "All (local) branches" +msgstr "Toutes les branches (locales)" + +#: gitk:3683 +msgid "All tags" +msgstr "Tous les tags" + +#: gitk:3684 +msgid "All remote-tracking branches" +msgstr "Toutes les branches de suivi à distance" + +#: gitk:3685 +msgid "Commit Info (regular expressions):" +msgstr "Info sur les commits (expressions régulières) :" + +#: gitk:3686 +msgid "Author:" +msgstr "Auteur :" + +#: gitk:3687 +msgid "Committer:" +msgstr "Commiteur :" + +#: gitk:3688 +msgid "Commit Message:" +msgstr "Message de commit :" + +#: gitk:3689 +msgid "Matches all Commit Info criteria" +msgstr "Correspond à tous les critères d'Info sur les commits" + +#: gitk:3690 +msgid "Changes to Files:" +msgstr "Changements des fichiers :" + +#: gitk:3691 +msgid "Fixed String" +msgstr "Chaîne Figée" + +#: gitk:3692 +msgid "Regular Expression" +msgstr "Expression Régulière" + +#: gitk:3693 +msgid "Search string:" +msgstr "Recherche de la chaîne :" + +#: gitk:3694 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " +"2009 15:27:38\") :" + +#: gitk:3695 +msgid "Since:" +msgstr "De :" + +#: gitk:3696 +msgid "Until:" +msgstr "Jusqu'au :" + +#: gitk:3697 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :" + +#: gitk:3698 +msgid "Number to show:" +msgstr "Nombre à afficher :" + +#: gitk:3699 +msgid "Number to skip:" +msgstr "Nombre à sauter :" + +#: gitk:3700 +msgid "Miscellaneous options:" +msgstr "Options diverses :" + +#: gitk:3701 +msgid "Strictly sort by date" +msgstr "Trier par date" + +# FIXME : traduction de "branch sides" +#: gitk:3702 +#, fuzzy +msgid "Mark branch sides" +msgstr "Marquer les extrémités des branches" + +#: gitk:3703 +msgid "Limit to first parent" +msgstr "Limiter au premier ancêtre" + +#: gitk:3704 +msgid "Simple history" +msgstr "Historique simple" + +#: gitk:3705 +msgid "Additional arguments to git log:" +msgstr "Arguments supplémentaires de git log :" + +#: gitk:3706 +msgid "Enter files and directories to include, one per line:" +msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :" + +#: gitk:3707 +msgid "Command to generate more commits to include:" +msgstr "Commande pour générer plus de commits à inclure :" + +#: gitk:3829 +msgid "Gitk: edit view" +msgstr "Gitk : éditer la vue" + +#: gitk:3837 +msgid "-- criteria for selecting revisions" +msgstr "-- critère pour la sélection des révisions" + +#: gitk:3842 +msgid "View Name:" +msgstr "Nom de la vue :" + +#: gitk:3917 +msgid "Apply (F5)" +msgstr "Appliquer (F5)" + +#: gitk:3955 +msgid "Error in commit selection arguments:" +msgstr "Erreur dans les arguments de sélection des commits :" + +#: gitk:4008 gitk:4060 gitk:4508 gitk:4522 gitk:5783 gitk:11196 gitk:11197 +msgid "None" +msgstr "Aucun" + +#: gitk:4456 gitk:6303 gitk:8065 gitk:8080 +msgid "Date" +msgstr "Date" + +#: gitk:4456 gitk:6303 +msgid "CDate" +msgstr "CDate" + +#: gitk:4605 gitk:4610 +msgid "Descendant" +msgstr "Descendant" + +#: gitk:4606 +msgid "Not descendant" +msgstr "Pas un descendant" + +#: gitk:4613 gitk:4618 +msgid "Ancestor" +msgstr "Ancêtre" + +#: gitk:4614 +msgid "Not ancestor" +msgstr "Pas un ancêtre" + +#: gitk:4904 +msgid "Local changes checked in to index but not committed" +msgstr "Modifications locales enregistrées dans l'index mais non commitées" + +#: gitk:4940 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Modifications locales non enregistrées dans l'index et non commitées" + +#: gitk:6621 +msgid "many" +msgstr "nombreux" + +#: gitk:6805 +msgid "Tags:" +msgstr "Tags :" + +#: gitk:6822 gitk:6828 gitk:8058 +msgid "Parent" +msgstr "Parent" + +#: gitk:6833 +msgid "Child" +msgstr "Enfant" + +#: gitk:6842 +msgid "Branch" +msgstr "Branche" + +#: gitk:6845 +msgid "Follows" +msgstr "Suit" + +#: gitk:6848 +msgid "Precedes" +msgstr "Précède" + +#: gitk:7346 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Erreur lors de la récupération des diff : %s" + +#: gitk:7886 +msgid "Goto:" +msgstr "Aller à :" + +#: gitk:7888 +msgid "SHA1 ID:" +msgstr "Id SHA1 :" + +#: gitk:7907 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Id SHA1 court %s est ambigu" + +#: gitk:7914 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Id SHA1 %s est inconnu" + +#: gitk:7924 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "Id SHA1 %s est inconnu" + +#: gitk:7926 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "La révision %s n'est pas dans la vue courante" + +#: gitk:8068 +msgid "Children" +msgstr "Enfants" + +#: gitk:8125 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Réinitialiser la branche %s vers cet état" + +#: gitk:8127 +msgid "Detached head: can't reset" +msgstr "Head détaché : impossible de réinitialiser" + +#: gitk:8236 gitk:8242 +msgid "Skipping merge commit " +msgstr "Éviter le commit de la fusion " + +#: gitk:8251 gitk:8256 +msgid "Error getting patch ID for " +msgstr "Erreur à l'obtention de l'ID du patch pour " + +#: gitk:8252 gitk:8257 +msgid " - stopping\n" +msgstr " - arrêt en cours\n" + +#: gitk:8262 gitk:8265 gitk:8273 gitk:8283 gitk:8292 +msgid "Commit " +msgstr "Commit " + +#: gitk:8266 +msgid "" +" is the same patch as\n" +" " +msgstr "" +"est le même patch que \n" +" " + +#: gitk:8274 +msgid "" +" differs from\n" +" " +msgstr "" +" diffère de\n" +" " + +#: gitk:8276 +msgid "- stopping\n" +msgstr "- arrêt en cours\n" + +#: gitk:8284 gitk:8293 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr "a %s enfants - arrêt en cours\n" + +#: gitk:8324 +msgid "Top" +msgstr "Haut" + +#: gitk:8325 +msgid "From" +msgstr "De" + +#: gitk:8330 +msgid "To" +msgstr "À" + +#: gitk:8354 +msgid "Generate patch" +msgstr "Générer le patch" + +#: gitk:8356 +msgid "From:" +msgstr "De :" + +#: gitk:8365 +msgid "To:" +msgstr "À :" + +#: gitk:8374 +msgid "Reverse" +msgstr "Inverser" + +#: gitk:8376 gitk:8561 +msgid "Output file:" +msgstr "Fichier de sortie :" + +#: gitk:8382 +msgid "Generate" +msgstr "Générer" + +#: gitk:8420 +msgid "Error creating patch:" +msgstr "Erreur à la création du patch :" + +#: gitk:8443 gitk:8549 gitk:8606 +msgid "ID:" +msgstr "ID :" + +#: gitk:8452 +msgid "Tag name:" +msgstr "Nom du Tag :" + +#: gitk:8456 gitk:8615 +msgid "Create" +msgstr "Créer" + +#: gitk:8473 +msgid "No tag name specified" +msgstr "Aucun nom de tag spécifié" + +#: gitk:8477 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Le tag \"%s\" existe déjà" + +#: gitk:8483 +msgid "Error creating tag:" +msgstr "Erreur à la création du tag :" + +#: gitk:8558 +msgid "Command:" +msgstr "Commande :" + +#: gitk:8566 +msgid "Write" +msgstr "Écrire" + +#: gitk:8584 +msgid "Error writing commit:" +msgstr "Erreur à l'ecriture du commit :" + +#: gitk:8611 +msgid "Name:" +msgstr "Nom :" + +#: gitk:8634 +msgid "Please specify a name for the new branch" +msgstr "Veuillez spécifier un nom pour la nouvelle branche" + +#: gitk:8639 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "La branche '%s' existe déjà. Écraser?" + +#: gitk:8705 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré " +"tout?" + +#: gitk:8710 +msgid "Cherry-picking" +msgstr "Cueillir (Cherry-picking)" + +#: gitk:8719 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" +"La cueillette (cherry-pick) a échouée à cause de modifications locales du " +"fichier '%s'.\n" +"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de " +"nouveau." + +#: gitk:8725 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"La cueillette (cherry-pick) a échouée à cause d'un conflit lors d'une " +"fusion.\n" +"Souhaitez-vous exécuter git citool pour le résoudre ?" + +#: gitk:8741 +msgid "No changes committed" +msgstr "Aucun changement commité" + +#: gitk:8767 +msgid "Confirm reset" +msgstr "Confirmer la réinitialisation" + +#: gitk:8769 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Réinitialiser la branche %s à %s?" + +#: gitk:8773 +msgid "Reset type:" +msgstr "Type de réinitialisation :" + +#: gitk:8777 +msgid "Soft: Leave working tree and index untouched" +msgstr "Douce : Laisse le répertoire de travail et l'index intacts" + +#: gitk:8780 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "" +"Hybride : Laisse le répertoire de travail dans son état courant, " +"réinitialise l'index" + +#: gitk:8783 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Dure : Réinitialise le répertoire de travail et l'index\n" +"(abandonne TOUS les changements locaux)" + +#: gitk:8800 +msgid "Resetting" +msgstr "Réinitialisation" + +# Fixme: Récupération est-il vraiment une mauvaise traduction? +#: gitk:8857 +#, fuzzy +msgid "Checking out" +msgstr "Récupération" + +#: gitk:8910 +msgid "Cannot delete the currently checked-out branch" +msgstr "Impossible de supprimer la branche en cours" + +#: gitk:8916 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"Les commits de la branche %s ne sont dans aucune autre branche.\n" +"Voulez-vous vraiment supprimer cette branche %s ?" + +#: gitk:8947 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Tags et heads : %s" + +#: gitk:8962 +msgid "Filter" +msgstr "Filtrer" + +#: gitk:9257 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Erreur à la lecture des informations sur la topologie des commits, les " +"informations sur les branches et les tags précédents/suivants seront " +"incomplètes." + +#: gitk:10243 +msgid "Tag" +msgstr "Tag" + +#: gitk:10243 +msgid "Id" +msgstr "Id" + +#: gitk:10291 +msgid "Gitk font chooser" +msgstr "Sélecteur de police de Gitk" + +#: gitk:10308 +msgid "B" +msgstr "B" + +#: gitk:10311 +msgid "I" +msgstr "I" + +#: gitk:10407 +msgid "Gitk preferences" +msgstr "Préférences de Gitk" + +#: gitk:10409 +msgid "Commit list display options" +msgstr "Options d'affichage de la liste des commits" + +#: gitk:10412 +msgid "Maximum graph width (lines)" +msgstr "Longueur maximum du graphe (lignes)" + +# FIXME : Traduction standard de "pane"? +#: gitk:10416 +#, fuzzy, tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Longueur maximum du graphe (% du panneau)" + +#: gitk:10420 +msgid "Show local changes" +msgstr "Montrer les changements locaux" + +#: gitk:10423 +msgid "Auto-select SHA1" +msgstr "Sélection auto. du SHA1" + +#: gitk:10427 +msgid "Diff display options" +msgstr "Options d'affichage des diff" + +#: gitk:10429 +msgid "Tab spacing" +msgstr "Taille des tabulations" + +#: gitk:10432 +msgid "Display nearby tags" +msgstr "Afficher les tags les plus proches" + +#: gitk:10435 +msgid "Hide remote refs" +msgstr "Cacher les refs distantes" + +#: gitk:10438 +msgid "Limit diffs to listed paths" +msgstr "Limiter les différences aux chemins listés" + +#: gitk:10441 +msgid "Support per-file encodings" +msgstr "Support pour un encodage des caractères par fichier" + +#: gitk:10447 gitk:10512 +msgid "External diff tool" +msgstr "Outil diff externe" + +#: gitk:10449 +msgid "Choose..." +msgstr "Choisir..." + +#: gitk:10454 +msgid "Colors: press to choose" +msgstr "Couleurs : cliquer pour choisir" + +#: gitk:10457 +msgid "Background" +msgstr "Arrière-plan" + +#: gitk:10458 gitk:10488 +msgid "background" +msgstr "arrière-plan" + +#: gitk:10461 +msgid "Foreground" +msgstr "Premier plan" + +#: gitk:10462 +msgid "foreground" +msgstr "premier plan" + +#: gitk:10465 +msgid "Diff: old lines" +msgstr "Diff : anciennes lignes" + +#: gitk:10466 +msgid "diff old lines" +msgstr "diff anciennes lignes" + +#: gitk:10470 +msgid "Diff: new lines" +msgstr "Diff : nouvelles lignes" + +#: gitk:10471 +msgid "diff new lines" +msgstr "diff nouvelles lignes" + +#: gitk:10475 +msgid "Diff: hunk header" +msgstr "Diff : entête du hunk" + +#: gitk:10477 +msgid "diff hunk header" +msgstr "diff : entête du hunk" + +#: gitk:10481 +msgid "Marked line bg" +msgstr "Arrière-plan de la ligne marquée" + +#: gitk:10483 +msgid "marked line background" +msgstr "Arrière-plan de la ligne marquée" + +#: gitk:10487 +msgid "Select bg" +msgstr "Sélectionner l'arrière-plan" + +#: gitk:10491 +msgid "Fonts: press to choose" +msgstr "Polices : cliquer pour choisir" + +#: gitk:10493 +msgid "Main font" +msgstr "Police principale" + +#: gitk:10494 +msgid "Diff display font" +msgstr "Police d'affichage des diff" + +#: gitk:10495 +msgid "User interface font" +msgstr "Police de l'interface utilisateur" + +#: gitk:10522 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk : choisir la couleur de %s" + +#: gitk:10973 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n" +" Gitk requiert Tcl/Tk version 8.4 ou supérieur." + +#: gitk:11101 +msgid "Cannot find a git repository here." +msgstr "Impossible de trouver un dépôt git ici." + +#: gitk:11105 +#, tcl-format +msgid "Cannot find the git directory \"%s\"." +msgstr "Impossible de trouver le répertoire git \"%s\"." + +#: gitk:11152 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier" + +#: gitk:11164 +msgid "Bad arguments to gitk:" +msgstr "Arguments invalides pour gitk :" + +#: gitk:11249 +msgid "Command line" +msgstr "Ligne de commande" diff --git a/gitk-git/po/hu.po b/gitk-git/po/hu.po new file mode 100644 index 0000000000..1df212e881 --- /dev/null +++ b/gitk-git/po/hu.po @@ -0,0 +1,1295 @@ +# Translation of gitk to Hungarian. +# Copyright (C) 2007 Paul Mackerras. +# This file is distributed under the same license as the gitk package. +# +# Laszlo Papp <laszlo.papp@arhungary.hu>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: git-gui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-14 13:33+0100\n" +"PO-Revision-Date: 2009-12-14 14:04+0100\n" +"Last-Translator: Laszlo Papp <djszapi@archlinux.us>\n" +"Language-Team: Hungarian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: gitk:115 +msgid "Couldn't get list of unmerged files:" +msgstr "Nem sikerült letölteni az unmerged fájl listát:" + +#: gitk:271 +msgid "Error parsing revisions:" +msgstr "Hiba történt értelmezés közben:" + +#: gitk:326 +msgid "Error executing --argscmd command:" +msgstr "Hiba történt a végrehajtáskor --argscmd parancs:" + +#: gitk:339 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Nincsen fájl kiválasztva: --merge megadve, de egyetlen fájl sem unmerged." + +#: gitk:342 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Nincsen fájl kiválasztva: --merge megadva, de nincsenek unmerged fájlok a " +"fájlon belül limit." + +#: gitk:364 gitk:511 +msgid "Error executing git log:" +msgstr "Hiba történt a git log végrehajtása közben:" + +#: gitk:382 gitk:527 +msgid "Reading" +msgstr "Olvasás" + +#: gitk:442 gitk:4258 +msgid "Reading commits..." +msgstr "Commitok olvasása ..." + +#: gitk:445 gitk:1575 gitk:4261 +msgid "No commits selected" +msgstr "Nincsen commit kiválasztva" + +#: gitk:1451 +msgid "Can't parse git log output:" +msgstr "Nem lehet értelmezni a git log kimenetét:" + +#: gitk:1671 +msgid "No commit information available" +msgstr "Nincsen elérhető commit információ" + +#: gitk:1813 +msgid "mc" +msgstr "mc" + +#: gitk:1848 gitk:4051 gitk:9029 gitk:10570 gitk:10789 +msgid "OK" +msgstr "OK" + +#: gitk:1850 gitk:4053 gitk:8629 gitk:8703 gitk:8813 gitk:8862 gitk:9031 +#: gitk:10571 gitk:10790 +msgid "Cancel" +msgstr "Visszavonás" + +#: gitk:1972 +msgid "Update" +msgstr "Frissités" + +#: gitk:1973 +msgid "Reload" +msgstr "Újratöltés" + +#: gitk:1974 +msgid "Reread references" +msgstr "Referenciák újraolvasása" + +#: gitk:1975 +msgid "List references" +msgstr "Referenciák listázása" + +#: gitk:1977 +msgid "Start git gui" +msgstr "Git gui indítása" + +#: gitk:1979 +msgid "Quit" +msgstr "Kilépés" + +#: gitk:1971 +msgid "File" +msgstr "Fájl" + +#: gitk:1983 +msgid "Preferences" +msgstr "Beállítások" + +#: gitk:1982 +msgid "Edit" +msgstr "Szerkesztés" + +#: gitk:1987 +msgid "New view..." +msgstr "Új nézet ..." + +#: gitk:1988 +msgid "Edit view..." +msgstr "Nézet szerkesztése ..." + +#: gitk:1989 +msgid "Delete view" +msgstr "Nézet törlése" + +#: gitk:1991 +msgid "All files" +msgstr "Minden fájl" + +#: gitk:1986 gitk:3805 +msgid "View" +msgstr "Nézet" + +#: gitk:1996 gitk:2006 gitk:2777 +msgid "About gitk" +msgstr "Gitk névjegy" + +#: gitk:1997 gitk:2011 +msgid "Key bindings" +msgstr "Billentyűkombináció" + +#: gitk:1995 gitk:2010 +msgid "Help" +msgstr "Segítség" + +#: gitk:2088 +msgid "SHA1 ID: " +msgstr "SHA1 ID: " + +#: gitk:2119 +msgid "Row" +msgstr "Sor" + +#: gitk:2157 +msgid "Find" +msgstr "Keresés" + +#: gitk:2158 +msgid "next" +msgstr "következő" + +#: gitk:2159 +msgid "prev" +msgstr "előző" + +#: gitk:2160 +msgid "commit" +msgstr "commit" + +#: gitk:2163 gitk:2165 gitk:4419 gitk:4442 gitk:4466 gitk:6407 gitk:6479 +#: gitk:6563 +msgid "containing:" +msgstr "tartalmazás:" + +#: gitk:2166 gitk:3287 gitk:3292 gitk:4494 +msgid "touching paths:" +msgstr "érintendő útvonalak:" + +#: gitk:2167 gitk:4499 +msgid "adding/removing string:" +msgstr "string hozzáadása/törlése:" + +#: gitk:2176 gitk:2178 +msgid "Exact" +msgstr "Pontos" + +#: gitk:2178 gitk:4574 gitk:6375 +msgid "IgnCase" +msgstr "Kis/nagy betű nem számít" + +#: gitk:2178 gitk:4468 gitk:4572 gitk:6371 +msgid "Regexp" +msgstr "Regexp" + +#: gitk:2180 gitk:2181 gitk:4593 gitk:4623 gitk:4630 gitk:6499 gitk:6567 +msgid "All fields" +msgstr "Minden mező" + +#: gitk:2181 gitk:4591 gitk:4623 gitk:6438 +msgid "Headline" +msgstr "Főcím" + +#: gitk:2182 gitk:4591 gitk:6438 gitk:6567 gitk:7000 +msgid "Comments" +msgstr "Megjegyzések" + +#: gitk:2182 gitk:4591 gitk:4595 gitk:4630 gitk:6438 gitk:6935 gitk:8280 +#: gitk:8295 +msgid "Author" +msgstr "Szerző" + +#: gitk:2182 gitk:4591 gitk:6438 gitk:6937 +msgid "Committer" +msgstr "Commitoló" + +#: gitk:2213 +msgid "Search" +msgstr "Keresés" + +#: gitk:2221 +msgid "Diff" +msgstr "Diff" + +#: gitk:2223 +msgid "Old version" +msgstr "Régi verzió" + +#: gitk:2225 +msgid "New version" +msgstr "Új verzió" + +#: gitk:2227 +msgid "Lines of context" +msgstr "Tartalmi sorok" + +#: gitk:2237 +msgid "Ignore space change" +msgstr "Space váltás mellőzése" + +#: gitk:2296 +msgid "Patch" +msgstr "Patch" + +#: gitk:2298 +msgid "Tree" +msgstr "Tree" + +#: gitk:2453 gitk:2470 +msgid "Diff this -> selected" +msgstr "Diff ezeket -> kiválasztott" + +#: gitk:2454 gitk:2471 +msgid "Diff selected -> this" +msgstr "Diff kiválasztottakat -> ezt" + +#: gitk:2455 gitk:2472 +msgid "Make patch" +msgstr "Patch készítése" + +#: gitk:2456 gitk:8687 +msgid "Create tag" +msgstr "Tag készítése" + +#: gitk:2457 gitk:8793 +msgid "Write commit to file" +msgstr "Commit fáljba írása" + +#: gitk:2458 gitk:8850 +msgid "Create new branch" +msgstr "Új branch készítése" + +#: gitk:2459 +msgid "Cherry-pick this commit" +msgstr "Cherry-pick erre a commitra" + +#: gitk:2460 +msgid "Reset HEAD branch to here" +msgstr "HEAD branch újraindítása ide" + +#: gitk:2461 +msgid "Mark this commit" +msgstr "Ezen commit megjelölése" + +#: gitk:2462 +msgid "Return to mark" +msgstr "Visszatérés a megjelöléshez" + +#: gitk:2463 +msgid "Find descendant of this and mark" +msgstr "Találd meg ezen utódokat és jelöld meg" + +#: gitk:2464 +msgid "Compare with marked commit" +msgstr "Összehasonlítás a megjelölt commit-tal" + +#: gitk:2478 +msgid "Check out this branch" +msgstr "Check out ezt a branchot" + +#: gitk:2479 +msgid "Remove this branch" +msgstr "Töröld ezt a branch-ot" + +#: gitk:2486 +msgid "Highlight this too" +msgstr "Emeld ki ezt is" + +#: gitk:2487 +msgid "Highlight this only" +msgstr "Csak ezt emeld ki" + +#: gitk:2488 +msgid "External diff" +msgstr "Külső diff" + +#: gitk:2489 +msgid "Blame parent commit" +msgstr "Blame szülő kommitra" + +#: gitk:2496 +msgid "Show origin of this line" +msgstr "Mutasd meg ennek a sornak az eredetét" + +#: gitk:2497 +msgid "Run git gui blame on this line" +msgstr "Futtasd a git gui blame-t ezen a soron" + +#: gitk:2779 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" +"Copyright ©9 2005-2009 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - commit nézegető a githez\n" +"\n" +"Szerzői jog ©9 2005-2009 Paul Mackerras\n" +"\n" +"Használd és terjeszd a GNU General Public License feltételei mellett" + +#: gitk:2787 gitk:2851 gitk:9215 +msgid "Close" +msgstr "Bezárás" + +#: gitk:2808 +msgid "Gitk key bindings" +msgstr "Gitk-billentyű hozzárendelés" + +#: gitk:2811 +msgid "Gitk key bindings:" +msgstr "Gitk-billentyű hozzaárendelés:" + +#: gitk:2813 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tKilépés" + +#: gitk:2814 +msgid "<Home>\t\tMove to first commit" +msgstr "<Pos1>\t\tElső commithoz" + +#: gitk:2815 +msgid "<End>\t\tMove to last commit" +msgstr "<Ende>\t\tUtolsó commithoz" + +#: gitk:2816 +msgid "<Up>, p, i\tMove up one commit" +msgstr "<Hoch>, p, i\tEgy committal feljebb" + +#: gitk:2817 +msgid "<Down>, n, k\tMove down one commit" +msgstr "<Runter>, n, k\tEgy committal lejjebb" + +#: gitk:2818 +msgid "<Left>, z, j\tGo back in history list" +msgstr "<Links>, z, j\tVissza a history listába" + +#: gitk:2819 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Rechts>, x, l\tElőre a history listába" + +#: gitk:2820 +msgid "<PageUp>\tMove up one page in commit list" +msgstr "<BildHoch>\tEgy lappal feljebb a commit listába" + +#: gitk:2821 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<BildRunter>\tEgy lappal lejjebb a commit listába" + +#: gitk:2822 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Pos1>\tGörgetés a commit lista tetejéhez" + +#: gitk:2823 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-Ende>\tGörgetés a commit lista aljához" + +#: gitk:2824 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Hoch>\tEgy sorral feljebb görgetés a commit listában" + +#: gitk:2825 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Runter>\tEgy sorral lejjebb görgetés a commit listában" + +#: gitk:2826 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-BildHoch>\tEgy lappal feljebb görgetés a commit listában" + +#: gitk:2827 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-BildRunter>\tEgy sorral lejjebb görgetés a commit listában" + +#: gitk:2828 +msgid "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Umschalt-Hoch>\tKeresés visszafele (felfele, utolsó commitok)" + +#: gitk:2829 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "<Umschalt-Runter>\tKeresés előre (lefelé; korábbi commitok)" + +#: gitk:2830 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Entf>, b\t\tEgy lappal feljebb görgetés a diff nézetben" + +#: gitk:2831 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Löschtaste>\tEgy lappal feljebb görgetés a diff nézetben" + +#: gitk:2832 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Leertaste>\tEgy lappal lejjebb görgetés a diff nézetben" + +#: gitk:2833 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\t18 sorral felfelé görgetés diff nézetben" + +#: gitk:2834 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\t18 sorral lejjebb görgetés a diff nézetben" + +#: gitk:2835 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tKeresés" + +#: gitk:2836 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tKövetkező találathoz" + +#: gitk:2837 +msgid "<Return>\tMove to next find hit" +msgstr "<Eingabetaste>\tKövetkező találathoz" + +#: gitk:2838 +msgid "/\t\tFocus the search box" +msgstr "/\t\tLépj a keresési mezőre" + +#: gitk:2839 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tElőző találathoz" + +#: gitk:2840 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tKövetkező fájlra görgetés diff nézetben" + +#: gitk:2841 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tKövetkező találatra keresés diff nézetben" + +#: gitk:2842 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tElőző találatra keresés diff nézetben" + +#: gitk:2843 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-Nummerblock-Plus>\tBetűméret növelése" + +#: gitk:2844 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-Plus>\tBetűméret növelése" + +#: gitk:2845 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-Nummernblock-Minus> Betűméret csökkentése" + +#: gitk:2846 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-Minus>\tBetűméret csökkentése" + +#: gitk:2847 +msgid "<F5>\t\tUpdate" +msgstr "<F5>\t\tFrissítés" + +#: gitk:3302 gitk:3311 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Hiba történt az ideiglenes könyvtár létrehozása közben %s:" + +#: gitk:3324 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Hiba történt \"%s\" letöltése közben %s-ről:" + +#: gitk:3387 +msgid "command failed:" +msgstr "parancs hiba:" + +#: gitk:3536 +msgid "No such commit" +msgstr "Nincs ilyen commit" + +#: gitk:3550 +msgid "git gui blame: command failed:" +msgstr "git gui blame: parancs hiba:" + +#: gitk:3581 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Nem sikerült a Merge head olvasása: %s" + +#: gitk:3589 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Hiba történt az index olvasása közben: %s" + +#: gitk:3614 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Nem sikerült a git blame indítása: %s" + +#: gitk:3617 gitk:6406 +msgid "Searching" +msgstr "Keresés" + +#: gitk:3649 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Hiba történt a git blame futtatása közben: %s" + +#: gitk:3677 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "" +"A %s commitból származik az a sor, amelyik nem található ebben a nézetben" + +#: gitk:3691 +msgid "External diff viewer failed:" +msgstr "Külső diff nézegető hiba:" + +#: gitk:3809 +msgid "Gitk view definition" +msgstr "Gitk nézet meghatározása" + +#: gitk:3813 +msgid "Remember this view" +msgstr "Maradj ennél a nézetnél" + +#: gitk:3814 +msgid "References (space separated list):" +msgstr "Referenciák (szóközzel tagolt lista" + +#: gitk:3815 +msgid "Branches & tags:" +msgstr "Branch-ek & tagek:" + +#: gitk:3816 +msgid "All refs" +msgstr "Minden ref" + +#: gitk:3817 +msgid "All (local) branches" +msgstr "Minden (helyi) branch" + +#: gitk:3818 +msgid "All tags" +msgstr "Minden tag" + +#: gitk:3819 +msgid "All remote-tracking branches" +msgstr "Minden távoli követő branch" + +#: gitk:3820 +msgid "Commit Info (regular expressions):" +msgstr "Commit Infó (reguláris kifejezés):" + +#: gitk:3821 +msgid "Author:" +msgstr "Szerző:" + +#: gitk:3822 +msgid "Committer:" +msgstr "Commitoló:" + +#: gitk:3823 +msgid "Commit Message:" +msgstr "Commit üzenet:" + +#: gitk:3824 +msgid "Matches all Commit Info criteria" +msgstr "Egyezik minen Commit Infó feltétellel" + +#: gitk:3825 +msgid "Changes to Files:" +msgstr "Fájl változások:" + +#: gitk:3826 +msgid "Fixed String" +msgstr "Fix String" + +#: gitk:3827 +msgid "Regular Expression" +msgstr "Reguláris kifejezés" + +#: gitk:3828 +msgid "Search string:" +msgstr "Keresés szöveg:" + +#: gitk:3829 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Commit Dátumok (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" + +#: gitk:3830 +msgid "Since:" +msgstr "Ettől:" + +#: gitk:3831 +msgid "Until:" +msgstr "Eddig:" + +#: gitk:3832 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Limitálva és/vagy kihagyva egy adott számú revíziót (pozitív egész):" + +#: gitk:3833 +msgid "Number to show:" +msgstr "Mutatandó szám:" + +#: gitk:3834 +msgid "Number to skip:" +msgstr "Kihagyandó szám:" + +#: gitk:3835 +msgid "Miscellaneous options:" +msgstr "Különféle opciók:" + +#: gitk:3836 +msgid "Strictly sort by date" +msgstr "Szigorú rendezás dátum alapján" + +#: gitk:3837 +msgid "Mark branch sides" +msgstr "Jelölje meg az ágakat" + +#: gitk:3838 +msgid "Limit to first parent" +msgstr "Korlátozás az első szülőre" + +#: gitk:3839 +msgid "Simple history" +msgstr "Egyszerű history" + +#: gitk:3840 +msgid "Additional arguments to git log:" +msgstr "További argumentok a git log-hoz:" + +#: gitk:3841 +msgid "Enter files and directories to include, one per line:" +msgstr "Fájlok és könyvtárak bejegyzése amiket tartalmaz, soronként:" + +#: gitk:3842 +msgid "Command to generate more commits to include:" +msgstr "Parancs több tartalmazó commit generálására:" + +#: gitk:3964 +msgid "Gitk: edit view" +msgstr "Gitk: szerkesztés nézet" + +#: gitk:3972 +msgid "-- criteria for selecting revisions" +msgstr "-- kritériumok a revíziók kiválasztásához" + +#: gitk:3977 +msgid "View Name" +msgstr "Nézet neve" + +#: gitk:4052 +msgid "Apply (F5)" +msgstr "Alkalmaz (F5)" + +#: gitk:4090 +msgid "Error in commit selection arguments:" +msgstr "Hiba történt a commit argumentumok kiválasztása közben:" + +#: gitk:4143 gitk:4195 gitk:4643 gitk:4657 gitk:5918 gitk:11519 gitk:11520 +msgid "None" +msgstr "Keine" + +#: gitk:4591 gitk:6438 gitk:8282 gitk:8297 +msgid "Date" +msgstr "Dátum" + +#: gitk:4591 gitk:6438 +msgid "CDate" +msgstr "Dátum" + +#: gitk:4740 gitk:4745 +msgid "Descendant" +msgstr "Leszármazott" + +#: gitk:4741 +msgid "Not descendant" +msgstr "Nem leszármazott" + +#: gitk:4748 gitk:4753 +msgid "Ancestor" +msgstr "Előd" + +#: gitk:4749 +msgid "Not ancestor" +msgstr "Nem előd" + +#: gitk:5039 +msgid "Local changes checked in to index but not committed" +msgstr "" +"Lokális változtatások, melyek be vannak téve az indexbe, de még nincsenek " +"commitolva" + +#: gitk:5075 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Lokális nem commitolt változások, nincsenek betéve az indexbe" + +#: gitk:6756 +msgid "many" +msgstr "sok" + +#: gitk:6939 +msgid "Tags:" +msgstr "Tagek:" + +#: gitk:6956 gitk:6962 gitk:8275 +msgid "Parent" +msgstr "Eltern" + +#: gitk:6967 +msgid "Child" +msgstr "Gyerek" + +#: gitk:6976 +msgid "Branch" +msgstr "Ág" + +#: gitk:6979 +msgid "Follows" +msgstr "Következők" + +#: gitk:6982 +msgid "Precedes" +msgstr "Megelőzők" + +#: gitk:7519 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Hiba történt a diff-ek letöltése közben: %s" + +#: gitk:8103 +msgid "Goto:" +msgstr "Menj:" + +#: gitk:8105 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + +#: gitk:8124 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Rövid SHA1 id %s félreérthető" + +#: gitk:8131 +msgid "Revision %s is not known" +msgstr "A(z) %s revízió nem ismert" + +#: gitk:8141 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "SHA1 id %s nem ismert" + +#: gitk:8143 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "A(z) %s revízió nincs a jelenlegi nézetben" + +#: gitk:8285 +msgid "Children" +msgstr "Gyerekek" + +#: gitk:8343 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Állítsd vissza a %s branch-ot ide" + +#: gitk:8345 +msgid "Detached head: can't reset" +msgstr "Elkülönített head: nem lehet visszaállítani" + +#: gitk:8454 gitk:8460 +msgid "Skipping merge commit " +msgstr "Merge commit kihagyása " + +#: gitk:8469 gitk:8474 +msgid "Error getting patch ID for " +msgstr "Hiba történt a patch ID megszerzése közben a következőnél " + +#: gitk:8470 gitk:8475 +msgid " - stopping\n" +msgstr " - abbahagyás\n" + +#: gitk:8480 gitk:8483 gitk:8491 gitk:8505 gitk:8514 +msgid "Commit " +msgstr "Commit " + +#: gitk:8484 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" Ugyanaz a patch mint\n" +" " + +#: gitk:8492 +msgid "" +" differs from\n" +" " +msgstr "" +" különbözik innentől\n" +" " + +#: gitk:8494 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"A commitok diffje:\n" +"\n" + +#: gitk:8506 gitk:8515 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " %s gyereke van. abbahagyás\n" + +#: gitk:8534 +msgid "Error writing commit to file: %s" +msgstr "Hiba történt a commit fájlba írása közben: %s" + +#: gitk:8540 +msgid "Error diffing commits: %s" +msgstr "Hiba történt a commitok diffelése közben: %s" + +#: gitk:8570 +msgid "Top" +msgstr "Teteje" + +#: gitk:8571 +msgid "From" +msgstr "Innen" + +#: gitk:8576 +msgid "To" +msgstr "Ide" + +#: gitk:8600 +msgid "Generate patch" +msgstr "Patch generálása" + +#: gitk:8602 +msgid "From:" +msgstr "Innen:" + +#: gitk:8611 +msgid "To:" +msgstr "Ide:" + +#: gitk:8620 +msgid "Reverse" +msgstr "Visszafele" + +#: gitk:8622 gitk:8807 +msgid "Output file:" +msgstr "Kimeneti fájl:" + +#: gitk:8628 +msgid "Generate" +msgstr "Generálás" + +#: gitk:8666 +msgid "Error creating patch:" +msgstr "Hiba törtét a patch készítése közben:" + +#: gitk:8689 gitk:8795 gitk:8852 +msgid "ID:" +msgstr "ID:" + +#: gitk:8698 +msgid "Tag name:" +msgstr "Tag név:" + +#: gitk:8702 gitk:8861 +msgid "Create" +msgstr "Létrehozás" + +#: gitk:8719 +msgid "No tag name specified" +msgstr "A tag neve nincsen megadva" + +#: gitk:8723 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "%s Tag már létezik" + +#: gitk:8729 +msgid "Error creating tag:" +msgstr "Hiba történt a tag létrehozása közben:" + +#: gitk:8804 +msgid "Command:" +msgstr "Parancs:" + +#: gitk:8812 +msgid "Write" +msgstr "Írás" + +#: gitk:8830 +msgid "Error writing commit:" +msgstr "Hiba történt a commit írása közben:" + +#: gitk:8857 +msgid "Name:" +msgstr "Név:" + +#: gitk:8880 +msgid "Please specify a name for the new branch" +msgstr "Kérem adja meg a nevét az új branchhoz" + +#: gitk:8885 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "%s branch már létezik. Felülírja?" + +#: gitk:8951 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" +"eintragen?" + +#: gitk:8956 +msgid "Cherry-picking" +msgstr "Cherry-picking" + +#: gitk:8965 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" +"Cherry-pick hiba történt lokális váltotások miatt a '%s' fájlban.\n" +"Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja " +"újra." + +#: gitk:8971 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"Cherry-pick hiba történt merge konfliktus miatt.\n" +"Kívánja futtatni a git citool-t a probléma megoldásához?" + +#: gitk:8987 +msgid "No changes committed" +msgstr "Nincsen változás commitolva" + +#: gitk:9013 +msgid "Confirm reset" +msgstr "Újraindítás megerősítése" + +#: gitk:9015 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Újraindítja a %s branchot %s-ig?" + +#: gitk:9017 +msgid "Reset type:" +msgstr "Újraindítás típusa:" + +#: gitk:9020 +msgid "Soft: Leave working tree and index untouched" +msgstr "Soft: Hagyd a working tree-t és az indexet érintetlenül" + +#: gitk:9023 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Kevert: Hagyd a working tree-t érintetlenül, töröld az indexet" + +#: gitk:9026 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Hard: Indítsd újra a working tree-t és az indexet\n" +"(MINDEN lokális változás eldobása)" + +#: gitk:9043 +msgid "Resetting" +msgstr "Újraindítás" + +#: gitk:9103 +msgid "Checking out" +msgstr "Kivesz" + +#: gitk:9156 +msgid "Cannot delete the currently checked-out branch" +msgstr "Nem lehet a jelenleg kivett branch-ot törölni" + +#: gitk:9162 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"A %s branchon található commit nem található meg semelyik másik branchon.\n" +"Tényleg törli a %s branchot?" + +#: gitk:9193 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Tagek és headek: %s" + +#: gitk:9208 +msgid "Filter" +msgstr "Szűrő" + +#: gitk:9503 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Hiba történt a commit topológiai információ olvasása közben; branch ésa " +"megelőző/következő információ nem lesz teljes." + +#: gitk:10489 +msgid "Tag" +msgstr "Tag" + +#: gitk:10489 +msgid "Id" +msgstr "Id" + +#: gitk:10539 +msgid "Gitk font chooser" +msgstr "Gitk-betű kiválasztó" + +#: gitk:10556 +msgid "B" +msgstr "F" + +#: gitk:10559 +msgid "I" +msgstr "K" + +#: gitk:10677 +msgid "Gitk preferences" +msgstr "Gitk beállítások" + +#: gitk:10679 +msgid "Commit list display options" +msgstr "Commit lista kijelzési opciók" + +#: gitk:10682 +msgid "Maximum graph width (lines)" +msgstr "Maximális grafikon szélesség (sorok)" + +#: gitk:10685 +#, tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Maximális grafikon szélesség (táble %-je)" + +#: gitk:10688 +msgid "Show local changes" +msgstr "Mutasd a lokális változtatásokat" + +#: gitk:10691 +msgid "Auto-select SHA1" +msgstr "SHA1 Automatikus kiválasztása" + +#: gitk:10694 +msgid "Hide remote refs" +msgstr "A távoli refek elrejtése" + +#: gitk:10698 +msgid "Diff display options" +msgstr "Diff kijelző opciók" + +#: gitk:10700 +msgid "Tab spacing" +msgstr "Tab sorköz" + +#: gitk:10703 +msgid "Display nearby tags" +msgstr "Szomszédos tagek kijelzése" + +#: gitk:10706 +msgid "Limit diffs to listed paths" +msgstr "Korlátozott diffek a kilistázott útvonalakhoz" + +#: gitk:10709 +msgid "Support per-file encodings" +msgstr "Fájlonkénti kódolás támgatása" + +#: gitk:10715 gitk:10804 +msgid "External diff tool" +msgstr "Külső diff alkalmazás" + +#: gitk:10716 +msgid "Choose..." +msgstr "Válaszd ..." + +#: gitk:10721 +msgid "General options" +msgstr "Általános opciók" + +#: gitk:10724 +msgid "Use themed widgets" +msgstr "Témázott vezérlők használata" + +#: gitk:10726 +msgid "(change requires restart)" +msgstr "(a változás újraindítást igényel)" + +#: gitk:10728 +msgid "(currently unavailable)" +msgstr "(jelenleg nem elérhető)" + +#: gitk:10732 +msgid "Colors: press to choose" +msgstr "Színek: nyomja meg a kiválasztáshoz" + +#: gitk:10735 +msgid "Interface" +msgstr "Interfész" + +#: gitk:10736 +msgid "interface" +msgstr "interfész" + +#: gitk:10739 +msgid "Background" +msgstr "Háttér" + +#: gitk:10740 gitk:10770 +msgid "background" +msgstr "háttér" + +#: gitk:10743 +msgid "Foreground" +msgstr "Előtér" + +#: gitk:10744 +msgid "foreground" +msgstr "előtér" + +#: gitk:10747 +msgid "Diff: old lines" +msgstr "Diff: régi sorok" + +#: gitk:10748 +msgid "diff old lines" +msgstr "diff régi sorok" + +#: gitk:10752 +msgid "Diff: new lines" +msgstr "Diff: új sorok" + +#: gitk:10753 +msgid "diff new lines" +msgstr "diff - új sorok" + +#: gitk:10757 +msgid "Diff: hunk header" +msgstr "Diff: nagy headerök" + +#: gitk:10759 +msgid "diff hunk header" +msgstr "diff - nagy headerök" + +#: gitk:10763 +msgid "Marked line bg" +msgstr "Megjelölt sor háttér" + +#: gitk:10765 +msgid "marked line background" +msgstr "megjelölt sor háttér" + +#: gitk:10769 +msgid "Select bg" +msgstr "Válasszon hátteret" + +#: gitk:10773 +msgid "Fonts: press to choose" +msgstr "Betű: nyomja meg a kiválasztáshoz" + +#: gitk:10775 +msgid "Main font" +msgstr "Fő betű" + +#: gitk:10776 +msgid "Diff display font" +msgstr "Diff kijelző betű" + +#: gitk:10777 +msgid "User interface font" +msgstr "Felhasználói interfész betű" + +#: gitk:10814 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: válasszon színt a %s-ra" + +#: gitk:11418 +msgid "Cannot find a git repository here." +msgstr "Nem találhatü git repository itt." + +#: gitk:11422 +#, tcl-format +msgid "Cannot find the git directory \"%s\"." +msgstr "Nem található a \"%s\" könyvtár." + +#: gitk:11469 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Félreérthető argumentum '%s': revízió és fájlnév is" + +#: gitk:11481 +msgid "Bad arguments to gitk:" +msgstr "Rossz gitk argumentumok:" + +#: gitk:11572 +msgid "Command line" +msgstr "Parancs sor" + +#~ msgid "Use all refs" +#~ msgstr "Használd az összes referenciát" + +#~ msgid "Max count:" +#~ msgstr "Max. szám:" + +#~ msgid "Skip:" +#~ msgstr "Kihagy:" + +#~ msgid "Name" +#~ msgstr "Név" + +#~ msgid "Tag/Head %s is not known" +#~ msgstr "Tag/Head %s nem ismert" + +#~ msgid "- stopping\n" +#~ msgstr "- abbahagyás.\n" + +#~ msgid "" +#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" +#~ " Gitk requires at least Tcl/Tk 8.4." +#~ msgstr "" +#~ "Sajnáljuk, de a gitk nem futtatható ezzel a Tcl/Tk verzióval.\n" +#~ "Gitk futtatásához legalább Tcl/Tk 8.4 szükséges." diff --git a/gitk-git/po/it.po b/gitk-git/po/it.po index e89c95702c..4818652309 100644 --- a/gitk-git/po/it.po +++ b/gitk-git/po/it.po @@ -8,25 +8,33 @@ 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-13 17:34+0100\n" +"POT-Creation-Date: 2010-01-28 18:40+0100\n" +"PO-Revision-Date: 2010-01-28 18:41+0100\n" "Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n" "Language-Team: Italian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:113 +#: gitk:115 msgid "Couldn't get list of unmerged files:" msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:" -#: gitk:340 +#: gitk:274 +msgid "Error parsing revisions:" +msgstr "Errore nella lettura delle revisioni:" + +#: gitk:329 +msgid "Error executing --argscmd command:" +msgstr "Errore nell'esecuzione del comando specificato con --argscmd:" + +#: gitk:342 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nessun file selezionato: è stata specificata l'opzione --merge ma non ci " "sono file in attesa di fusione." -#: gitk:343 +#: gitk:345 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -34,688 +42,994 @@ msgstr "" "Nessun file selezionato: è stata specificata l'opzione --merge ma i file " "specificati non sono in attesa di fusione." -#: gitk:365 gitk:503 +#: gitk:367 gitk:514 msgid "Error executing git log:" msgstr "Errore nell'esecuzione di git log:" -#: gitk:378 +#: gitk:385 gitk:530 msgid "Reading" msgstr "Lettura in corso" -#: gitk:438 gitk:3462 +#: gitk:445 gitk:4261 msgid "Reading commits..." msgstr "Lettura delle revisioni in corso..." -#: gitk:441 gitk:1528 gitk:3465 +#: gitk:448 gitk:1578 gitk:4264 msgid "No commits selected" msgstr "Nessuna revisione selezionata" -#: gitk:1399 +#: gitk:1454 msgid "Can't parse git log output:" msgstr "Impossibile elaborare i dati di git log:" -#: gitk:1605 +#: gitk:1674 msgid "No commit information available" msgstr "Nessuna informazione disponibile sulle revisioni" -#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466 +#: gitk:1816 +msgid "mc" +msgstr "" + +#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804 msgid "OK" msgstr "OK" -#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766 -#: gitk:9294 gitk:9467 +#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046 +#: gitk:10586 gitk:10805 msgid "Cancel" msgstr "Annulla" -#: gitk:1811 +#: gitk:1975 msgid "Update" msgstr "Aggiorna" -#: gitk:1813 +#: gitk:1976 +msgid "Reload" +msgstr "Ricarica" + +#: gitk:1977 msgid "Reread references" msgstr "Rileggi riferimenti" -#: gitk:1814 +#: gitk:1978 msgid "List references" msgstr "Elenca riferimenti" -#: gitk:1815 +#: gitk:1980 +msgid "Start git gui" +msgstr "Avvia git gui" + +#: gitk:1982 msgid "Quit" msgstr "Esci" -#: gitk:1810 +#: gitk:1974 msgid "File" msgstr "File" -#: gitk:1818 +#: gitk:1986 msgid "Preferences" msgstr "Preferenze" -#: gitk:1817 +#: gitk:1985 msgid "Edit" msgstr "Modifica" -#: gitk:1821 +#: gitk:1990 msgid "New view..." msgstr "Nuova vista..." -#: gitk:1822 +#: gitk:1991 msgid "Edit view..." msgstr "Modifica vista..." -#: gitk:1823 +#: gitk:1992 msgid "Delete view" msgstr "Elimina vista" -#: gitk:1825 +#: gitk:1994 msgid "All files" msgstr "Tutti i file" -#: gitk:1820 gitk:3196 +#: gitk:1989 gitk:3808 msgid "View" msgstr "Vista" -#: gitk:1828 gitk:2487 +#: gitk:1999 gitk:2009 gitk:2780 msgid "About gitk" msgstr "Informazioni su gitk" -#: gitk:1829 +#: gitk:2000 gitk:2014 msgid "Key bindings" msgstr "Scorciatoie da tastiera" -#: gitk:1827 +#: gitk:1998 gitk:2013 msgid "Help" msgstr "Aiuto" -#: gitk:1887 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " +#: gitk:2091 gitk:8110 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:1918 +#: gitk:2122 msgid "Row" -msgstr "" +msgstr "Riga" -#: gitk:1949 +#: gitk:2160 msgid "Find" msgstr "Trova" -#: gitk:1950 +#: gitk:2161 msgid "next" msgstr "succ" -#: gitk:1951 +#: gitk:2162 msgid "prev" msgstr "prec" -#: gitk:1952 +#: gitk:2163 msgid "commit" msgstr "revisione" -#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621 +#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482 +#: gitk:6566 msgid "containing:" msgstr "contenente:" -#: gitk:1958 gitk:2954 gitk:2959 gitk:3692 +#: gitk:2169 gitk:3290 gitk:3295 gitk:4497 msgid "touching paths:" msgstr "che riguarda i percorsi:" -#: gitk:1959 gitk:3697 +#: gitk:2170 gitk:4502 msgid "adding/removing string:" msgstr "che aggiunge/rimuove la stringa:" -#: gitk:1968 gitk:1970 +#: gitk:2179 gitk:2181 msgid "Exact" msgstr "Esatto" -#: gitk:1970 gitk:3773 gitk:5518 +#: gitk:2181 gitk:4577 gitk:6378 msgid "IgnCase" msgstr "" -#: gitk:1970 gitk:3666 gitk:3771 gitk:5514 +#: gitk:2181 gitk:4471 gitk:4575 gitk:6374 msgid "Regexp" msgstr "" -#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708 +#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570 msgid "All fields" msgstr "Tutti i campi" -#: gitk:1973 gitk:3790 gitk:3822 gitk:5580 +#: gitk:2184 gitk:4594 gitk:4626 gitk:6441 msgid "Headline" msgstr "Titolo" -#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109 +#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003 msgid "Comments" msgstr "Commenti" -#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285 -#: gitk:7300 +#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285 +#: gitk:8300 msgid "Author" msgstr "Autore" -#: gitk:1974 gitk:3790 gitk:5580 gitk:6047 +#: gitk:2185 gitk:4594 gitk:6441 gitk:6940 msgid "Committer" msgstr "Revisione creata da" -#: gitk:2003 +#: gitk:2216 msgid "Search" msgstr "Cerca" -#: gitk:2010 +#: gitk:2224 msgid "Diff" msgstr "" -#: gitk:2012 +#: gitk:2226 msgid "Old version" msgstr "Vecchia versione" -#: gitk:2014 +#: gitk:2228 msgid "New version" msgstr "Nuova versione" -#: gitk:2016 +#: gitk:2230 msgid "Lines of context" msgstr "Linee di contesto" -#: gitk:2026 +#: gitk:2240 msgid "Ignore space change" msgstr "Ignora modifiche agli spazi" -#: gitk:2084 +#: gitk:2299 msgid "Patch" msgstr "Modifiche" -#: gitk:2086 +#: gitk:2301 msgid "Tree" msgstr "Directory" -#: gitk:2213 gitk:2226 +#: gitk:2456 gitk:2473 msgid "Diff this -> selected" msgstr "Diff questo -> selezionato" -#: gitk:2214 gitk:2227 +#: gitk:2457 gitk:2474 msgid "Diff selected -> this" msgstr "Diff selezionato -> questo" -#: gitk:2215 gitk:2228 +#: gitk:2458 gitk:2475 msgid "Make patch" msgstr "Crea patch" -#: gitk:2216 gitk:7494 +#: gitk:2459 gitk:8692 msgid "Create tag" msgstr "Crea etichetta" -#: gitk:2217 gitk:7593 +#: gitk:2460 gitk:8808 msgid "Write commit to file" msgstr "Scrivi revisione in un file" -#: gitk:2218 gitk:7647 +#: gitk:2461 gitk:8865 msgid "Create new branch" msgstr "Crea un nuovo ramo" -#: gitk:2219 +#: gitk:2462 msgid "Cherry-pick this commit" msgstr "Porta questa revisione in cima al ramo attuale" -#: gitk:2220 +#: gitk:2463 msgid "Reset HEAD branch to here" msgstr "Aggiorna il ramo HEAD a questa revisione" -#: gitk:2234 +#: gitk:2464 +msgid "Mark this commit" +msgstr "Segna questa revisione" + +#: gitk:2465 +msgid "Return to mark" +msgstr "Torna alla revisione segnata" + +#: gitk:2466 +msgid "Find descendant of this and mark" +msgstr "Trova il discendente di questa revisione e di quella segnata" + +#: gitk:2467 +msgid "Compare with marked commit" +msgstr "Confronta con la revisione segnata" + +#: gitk:2481 msgid "Check out this branch" msgstr "Attiva questo ramo" -#: gitk:2235 +#: gitk:2482 msgid "Remove this branch" msgstr "Elimina questo ramo" -#: gitk:2242 +#: gitk:2489 msgid "Highlight this too" msgstr "Evidenzia anche questo" -#: gitk:2243 +#: gitk:2490 msgid "Highlight this only" msgstr "Evidenzia solo questo" -#: gitk:2245 +#: gitk:2491 +msgid "External diff" +msgstr "Visualizza differenze in un altro programma" + +#: gitk:2492 msgid "Blame parent commit" -msgstr "" +msgstr "Annota la revisione precedente" + +#: gitk:2499 +msgid "Show origin of this line" +msgstr "Mostra la provenienza di questa riga" -#: gitk:2488 +#: gitk:2500 +msgid "Run git gui blame on this line" +msgstr "Esegui git gui blame su questa riga" + +#: gitk:2782 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2008 Paul Mackerras\n" +"Copyright © 2005-2009 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-2008 Paul Mackerras\n" +"Copyright © 2005-2009 Paul Mackerras\n" "\n" "Utilizzo e redistribuzione permessi sotto i termini della GNU General Public " "License" -#: gitk:2496 gitk:2557 gitk:7943 +#: gitk:2790 gitk:2854 gitk:9230 msgid "Close" msgstr "Chiudi" -#: gitk:2515 +#: gitk:2811 msgid "Gitk key bindings" msgstr "Scorciatoie da tastiera di Gitk" -#: gitk:2517 +#: gitk:2814 msgid "Gitk key bindings:" msgstr "Scorciatoie da tastiera di Gitk:" -#: gitk:2519 +#: gitk:2816 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tEsci" -#: gitk:2520 +#: gitk:2817 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tVai alla prima revisione" -#: gitk:2521 +#: gitk:2818 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tVai all'ultima revisione" -#: gitk:2522 +#: gitk:2819 msgid "<Up>, p, i\tMove up one commit" -msgstr "<Up>, p, i\tVai più in alto di una revisione" +msgstr "<Su>, p, i\tVai più in alto di una revisione" -#: gitk:2523 +#: gitk:2820 msgid "<Down>, n, k\tMove down one commit" -msgstr "<Down>, n, k\tVai più in basso di una revisione" +msgstr "<Giù>, n, k\tVai più in basso di una revisione" -#: gitk:2524 +#: gitk:2821 msgid "<Left>, z, j\tGo back in history list" -msgstr "<Left>, z, j\tTorna indietro nella cronologia" +msgstr "<Sinistra>, z, j\tTorna indietro nella cronologia" -#: gitk:2525 +#: gitk:2822 msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Right>, x, l\tVai avanti nella cronologia" +msgstr "<Destra>, x, l\tVai avanti nella cronologia" -#: gitk:2526 +#: gitk:2823 msgid "<PageUp>\tMove up one page in commit list" -msgstr "<PageUp>\tVai più in alto di una pagina nella lista delle revisioni" +msgstr "<PaginaSu>\tVai più in alto di una pagina nella lista delle revisioni" -#: gitk:2527 +#: gitk:2824 msgid "<PageDown>\tMove down one page in commit list" -msgstr "<PageDown>\tVai più in basso di una pagina nella lista delle revisioni" +msgstr "" +"<PaginaGiù>\tVai più in basso di una pagina nella lista delle revisioni" -#: gitk:2528 +#: gitk:2825 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni" -#: gitk:2529 +#: gitk:2826 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tScorri alla fine della lista delle revisioni" -#: gitk:2530 +#: gitk:2827 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Up>\tScorri la lista delle revisioni in alto di una riga" +msgstr "<%s-Su>\tScorri la lista delle revisioni in alto di una riga" -#: gitk:2531 +#: gitk:2828 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Down>\tScorri la lista delle revisioni in basso di una riga" +msgstr "<%s-Giù>\tScorri la lista delle revisioni in basso di una riga" -#: gitk:2532 +#: gitk:2829 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PageUp>\tScorri la lista delle revisioni in alto di una pagina" +msgstr "<%s-PaginaSu>\tScorri la lista delle revisioni in alto di una pagina" -#: gitk:2533 +#: gitk:2830 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PageDown>\tScorri la lista delle revisioni in basso di una pagina" +msgstr "<%s-PaginaGiù>\tScorri la lista delle revisioni in basso di una pagina" -#: gitk:2534 +#: gitk:2831 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "<Shift-Up>\tTrova all'indietro (verso l'alto, revisioni successive)" +msgstr "<Shift-Su>\tTrova all'indietro (verso l'alto, revisioni successive)" -#: gitk:2535 +#: gitk:2832 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Shift-Down>\tTrova in avanti (verso il basso, revisioni precedenti)" +msgstr "<Shift-Giù>\tTrova in avanti (verso il basso, revisioni precedenti)" -#: gitk:2536 +#: gitk:2833 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tScorri la vista delle differenze in alto di una pagina" -#: gitk:2537 +#: gitk:2834 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tScorri la vista delle differenze in alto di una pagina" -#: gitk:2538 +#: gitk:2835 msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Space>\t\tScorri la vista delle differenze in basso di una pagina" +msgstr "<Spazio>\t\tScorri la vista delle differenze in basso di una pagina" -#: gitk:2539 +#: gitk:2836 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee" -#: gitk:2540 +#: gitk:2837 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee" -#: gitk:2541 +#: gitk:2838 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tTrova" -#: gitk:2542 +#: gitk:2839 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tTrova in avanti" -#: gitk:2543 +#: gitk:2840 msgid "<Return>\tMove to next find hit" -msgstr "<Return>\tTrova in avanti" +msgstr "<Invio>\tTrova in avanti" -#: gitk:2544 -msgid "/\t\tMove to next find hit, or redo find" -msgstr "/\t\tTrova in avanti, o cerca di nuovo" +#: gitk:2841 +msgid "/\t\tFocus the search box" +msgstr "/\t\tCursore nel box di ricerca" -#: gitk:2545 +#: gitk:2842 msgid "?\t\tMove to previous find hit" msgstr "?\t\tTrova all'indietro" -#: gitk:2546 +#: gitk:2843 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tScorri la vista delle differenze al file successivo" -#: gitk:2547 +#: gitk:2844 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tCerca in avanti nella vista delle differenze" -#: gitk:2548 +#: gitk:2845 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tCerca all'indietro nella vista delle differenze" -#: gitk:2549 +#: gitk:2846 #, tcl-format msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-KP+>\tAumenta grandezza carattere" +msgstr "<%s-KP+>\tAumenta dimensione carattere" -#: gitk:2550 +#: gitk:2847 #, tcl-format msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-plus>\tAumenta grandezza carattere" +msgstr "<%s-più>\tAumenta dimensione carattere" -#: gitk:2551 +#: gitk:2848 #, tcl-format msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-KP->\tDiminuisci grandezza carattere" +msgstr "<%s-KP->\tDiminuisci dimensione carattere" -#: gitk:2552 +#: gitk:2849 #, tcl-format msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-minus>\tDiminuisci grandezza carattere" +msgstr "<%s-meno>\tDiminuisci dimensione carattere" -#: gitk:2553 +#: gitk:2850 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tAggiorna" -#: gitk:3200 +#: gitk:3305 gitk:3314 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Errore durante la creazione della directory temporanea %s:" + +#: gitk:3327 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Errore nella lettura di \"%s\" da %s:" + +#: gitk:3390 +msgid "command failed:" +msgstr "impossibile eseguire il comando:" + +#: gitk:3539 +msgid "No such commit" +msgstr "Revisione inesistente" + +#: gitk:3553 +msgid "git gui blame: command failed:" +msgstr "git gui blame: impossibile eseguire il comando:" + +#: gitk:3584 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Impossibile leggere merge head: %s" + +#: gitk:3592 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Errore nella lettura dell'indice: %s" + +#: gitk:3617 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Impossibile eseguire git blame: %s" + +#: gitk:3620 gitk:6409 +msgid "Searching" +msgstr "Ricerca in corso" + +#: gitk:3652 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Errore nell'esecuzione di git blame: %s" + +#: gitk:3680 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "Quella riga proviene dalla revisione %s, non presente in questa vista" + +#: gitk:3694 +msgid "External diff viewer failed:" +msgstr "Impossibile eseguire il visualizzatore di differenze:" + +#: gitk:3812 msgid "Gitk view definition" msgstr "Scelta vista Gitk" -#: gitk:3225 -msgid "Name" -msgstr "Nome" - -#: gitk:3228 +#: gitk:3816 msgid "Remember this view" msgstr "Ricorda questa vista" -#: gitk:3232 -msgid "Commits to include (arguments to git log):" -msgstr "Revisioni da includere (argomenti di git log):" +#: gitk:3817 +msgid "References (space separated list):" +msgstr "Riferimenti (lista di elementi separati da spazi)" -#: gitk:3239 -msgid "Command to generate more commits to include:" -msgstr "Comando che genera altre revisioni da visualizzare:" +#: gitk:3818 +msgid "Branches & tags:" +msgstr "Rami ed etichette" + +#: gitk:3819 +msgid "All refs" +msgstr "Tutti i riferimenti" + +#: gitk:3820 +msgid "All (local) branches" +msgstr "Tutti i rami (locali)" + +#: gitk:3821 +msgid "All tags" +msgstr "Tutte le etichette" + +#: gitk:3822 +msgid "All remote-tracking branches" +msgstr "Tutti i rami remoti" + +#: gitk:3823 +msgid "Commit Info (regular expressions):" +msgstr "Informazioni sulla revisione (espressioni regolari):" + +#: gitk:3824 +msgid "Author:" +msgstr "Autore:" + +#: gitk:3825 +msgid "Committer:" +msgstr "Revisione creata da:" + +#: gitk:3826 +msgid "Commit Message:" +msgstr "Messaggio di revisione:" + +#: gitk:3827 +msgid "Matches all Commit Info criteria" +msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" + +#: gitk:3828 +msgid "Changes to Files:" +msgstr "Modifiche ai file:" + +#: gitk:3829 +msgid "Fixed String" +msgstr "Stringa fissa" + +#: gitk:3830 +msgid "Regular Expression" +msgstr "Espressione regolare" + +#: gitk:3831 +msgid "Search string:" +msgstr "Cerca stringa:" + +#: gitk:3832 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Date di revisione (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " +"2009 15:27:38\"):" + +#: gitk:3833 +msgid "Since:" +msgstr "Da:" + +#: gitk:3834 +msgid "Until:" +msgstr "A:" + +#: gitk:3835 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Limita e/o salta N revisioni (intero positivo):" + +#: gitk:3836 +msgid "Number to show:" +msgstr "Numero di revisioni da mostrare:" + +#: gitk:3837 +msgid "Number to skip:" +msgstr "Numero di revisioni da saltare:" + +#: gitk:3838 +msgid "Miscellaneous options:" +msgstr "Altre opzioni:" + +#: gitk:3839 +msgid "Strictly sort by date" +msgstr "Ordina solo per data" + +#: gitk:3840 +msgid "Mark branch sides" +msgstr "Segna i lati del ramo" + +#: gitk:3841 +msgid "Limit to first parent" +msgstr "Limita al primo genitore" -#: gitk:3246 +#: gitk:3842 +msgid "Simple history" +msgstr "Cronologia semplificata" + +#: gitk:3843 +msgid "Additional arguments to git log:" +msgstr "Ulteriori argomenti da passare a git log:" + +#: gitk:3844 msgid "Enter files and directories to include, one per line:" msgstr "Inserire file e directory da includere, uno per riga:" -#: gitk:3293 +#: gitk:3845 +msgid "Command to generate more commits to include:" +msgstr "Comando che genera altre revisioni da visualizzare:" + +#: gitk:3967 +msgid "Gitk: edit view" +msgstr "Gitk: modifica vista" + +#: gitk:3975 +msgid "-- criteria for selecting revisions" +msgstr "-- criteri per la scelta delle revisioni" + +#: gitk:3980 +msgid "View Name" +msgstr "Nome vista" + +#: gitk:4055 +msgid "Apply (F5)" +msgstr "Applica (F5)" + +#: gitk:4093 msgid "Error in commit selection arguments:" msgstr "Errore negli argomenti di selezione delle revisioni:" -#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142 +#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535 msgid "None" msgstr "Nessuno" -#: gitk:3790 gitk:5580 gitk:7287 gitk:7302 +#: gitk:4594 gitk:6441 gitk:8287 gitk:8302 msgid "Date" msgstr "Data" -#: gitk:3790 gitk:5580 +#: gitk:4594 gitk:6441 msgid "CDate" msgstr "" -#: gitk:3939 gitk:3944 +#: gitk:4743 gitk:4748 msgid "Descendant" msgstr "Discendente" -#: gitk:3940 +#: gitk:4744 msgid "Not descendant" msgstr "Non discendente" -#: gitk:3947 gitk:3952 +#: gitk:4751 gitk:4756 msgid "Ancestor" msgstr "Ascendente" -#: gitk:3948 +#: gitk:4752 msgid "Not ancestor" msgstr "Non ascendente" -#: gitk:4187 +#: gitk:5042 msgid "Local changes checked in to index but not committed" msgstr "Modifiche locali presenti nell'indice ma non nell'archivio" -#: gitk:4220 +#: gitk:5078 msgid "Local uncommitted changes, not checked in to index" msgstr "Modifiche locali non presenti né nell'archivio né nell'indice" -#: gitk:5549 -msgid "Searching" -msgstr "Ricerca in corso" +#: gitk:6759 +msgid "many" +msgstr "molti" -#: gitk:6049 +#: gitk:6942 msgid "Tags:" msgstr "Etichette:" -#: gitk:6066 gitk:6072 gitk:7280 +#: gitk:6959 gitk:6965 gitk:8280 msgid "Parent" msgstr "Genitore" -#: gitk:6077 +#: gitk:6970 msgid "Child" msgstr "Figlio" -#: gitk:6086 +#: gitk:6979 msgid "Branch" msgstr "Ramo" -#: gitk:6089 +#: gitk:6982 msgid "Follows" msgstr "Segue" -#: gitk:6092 +#: gitk:6985 msgid "Precedes" msgstr "Precede" -#: gitk:6378 -msgid "Error getting merge diffs:" -msgstr "Errore nella lettura delle differenze di fusione:" +#: gitk:7522 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Errore nella lettura delle differenze:" -#: gitk:7113 +#: gitk:8108 msgid "Goto:" msgstr "Vai a:" -#: gitk:7115 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7134 +#: gitk:8129 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La SHA1 id abbreviata %s è ambigua" -#: gitk:7146 +#: gitk:8136 +#, tcl-format +msgid "Revision %s is not known" +msgstr "La revisione %s è sconosciuta" + +#: gitk:8146 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La SHA1 id %s è sconosciuta" -#: gitk:7148 +#: gitk:8148 #, tcl-format -msgid "Tag/Head %s is not known" -msgstr "L'etichetta/ramo %s è sconosciuto" +msgid "Revision %s is not in the current view" +msgstr "La revisione %s non è presente nella vista attuale" -#: gitk:7290 +#: gitk:8290 msgid "Children" msgstr "Figli" -#: gitk:7347 +#: gitk:8348 #, tcl-format msgid "Reset %s branch to here" msgstr "Aggiorna il ramo %s a questa revisione" -#: gitk:7349 +#: gitk:8350 msgid "Detached head: can't reset" +msgstr "Nessun ramo attivo: reset impossibile" + +#: gitk:8459 gitk:8465 +msgid "Skipping merge commit " +msgstr "Salto la revisione di fusione " + +#: gitk:8474 gitk:8479 +msgid "Error getting patch ID for " +msgstr "Errore nella identificazione della patch per " + +#: gitk:8475 gitk:8480 +msgid " - stopping\n" +msgstr " - fine\n" + +#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519 +msgid "Commit " +msgstr "La revisione " + +#: gitk:8489 +msgid "" +" is the same patch as\n" +" " msgstr "" +" ha le stesse differenze di\n" +" " + +#: gitk:8497 +msgid "" +" differs from\n" +" " +msgstr "" +" è diversa da\n" +" " + +#: gitk:8499 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Differenze tra le revisioni:\n" +"\n" + +#: gitk:8511 gitk:8520 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " ha %s figli - fine\n" + +#: gitk:8539 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Errore nella scrittura della revisione nel file: %s" -#: gitk:7381 +#: gitk:8545 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Errore nelle differenze tra le revisioni: %s" + +#: gitk:8575 msgid "Top" msgstr "Inizio" -#: gitk:7382 +#: gitk:8576 msgid "From" msgstr "Da" -#: gitk:7387 +#: gitk:8581 msgid "To" msgstr "A" -#: gitk:7410 +#: gitk:8605 msgid "Generate patch" msgstr "Genera patch" -#: gitk:7412 +#: gitk:8607 msgid "From:" msgstr "Da:" -#: gitk:7421 +#: gitk:8616 msgid "To:" msgstr "A:" -#: gitk:7430 +#: gitk:8625 msgid "Reverse" msgstr "Inverti" -#: gitk:7432 gitk:7607 +#: gitk:8627 gitk:8822 msgid "Output file:" msgstr "Scrivi sul file:" -#: gitk:7438 +#: gitk:8633 msgid "Generate" msgstr "Genera" -#: gitk:7474 +#: gitk:8671 msgid "Error creating patch:" msgstr "Errore nella creazione della patch:" -#: gitk:7496 gitk:7595 gitk:7649 +#: gitk:8694 gitk:8810 gitk:8867 msgid "ID:" msgstr "ID:" -#: gitk:7505 +#: gitk:8703 msgid "Tag name:" msgstr "Nome etichetta:" -#: gitk:7509 gitk:7659 +#: gitk:8706 +msgid "Tag message is optional" +msgstr "Il messaggio dell'etichetta è opzionale" + +#: gitk:8708 +msgid "Tag message:" +msgstr "Messaggio dell'etichetta:" + +#: gitk:8712 gitk:8876 msgid "Create" msgstr "Crea" -#: gitk:7524 +#: gitk:8730 msgid "No tag name specified" msgstr "Nessuna etichetta specificata" -#: gitk:7528 +#: gitk:8734 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "L'etichetta \"%s\" esiste già" -#: gitk:7534 +#: gitk:8744 msgid "Error creating tag:" msgstr "Errore nella creazione dell'etichetta:" -#: gitk:7604 +#: gitk:8819 msgid "Command:" msgstr "Comando:" -#: gitk:7612 +#: gitk:8827 msgid "Write" msgstr "Scrivi" -#: gitk:7628 +#: gitk:8845 msgid "Error writing commit:" msgstr "Errore nella scrittura della revisione:" -#: gitk:7654 +#: gitk:8872 msgid "Name:" msgstr "Nome:" -#: gitk:7674 +#: gitk:8895 msgid "Please specify a name for the new branch" msgstr "Specificare un nome per il nuovo ramo" -#: gitk:7703 +#: gitk:8900 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Il ramo '%s' esiste già. Sovrascrivere?" + +#: gitk:8966 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?" -#: gitk:7708 +#: gitk:8971 msgid "Cherry-picking" msgstr "" -#: gitk:7720 +#: gitk:8980 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" +"Impossibile eseguire cherry-pick perché il file '%s' è stato modificato " +"nella directory di lavoro.\n" +"Prima di riprovare, bisogna creare una nuova revisione, annullare le " +"modifiche o usare 'git stash'." + +#: gitk:8986 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n" +"Vuoi avviare git citool per risolverlo?" + +#: gitk:9002 msgid "No changes committed" msgstr "Nessuna modifica archiviata" -#: gitk:7745 +#: gitk:9028 msgid "Confirm reset" msgstr "Conferma git reset" -#: gitk:7747 +#: gitk:9030 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Aggiornare il ramo %s a %s?" -#: gitk:7751 +#: gitk:9032 msgid "Reset type:" msgstr "Tipo di aggiornamento:" -#: gitk:7755 +#: gitk:9035 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono" -#: gitk:7758 +#: gitk:9038 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice" -#: gitk:7761 +#: gitk:9041 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -723,19 +1037,19 @@ msgstr "" "Hard: Aggiorna la directory di lavoro e l'indice\n" "(abbandona TUTTE le modifiche locali)" -#: gitk:7777 +#: gitk:9058 msgid "Resetting" msgstr "git reset in corso" -#: gitk:7834 +#: gitk:9118 msgid "Checking out" msgstr "Attivazione in corso" -#: gitk:7885 +#: gitk:9171 msgid "Cannot delete the currently checked-out branch" msgstr "Impossibile cancellare il ramo attualmente attivo" -#: gitk:7891 +#: gitk:9177 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -744,16 +1058,16 @@ msgstr "" "Le revisioni nel ramo %s non sono presenti su altri rami.\n" "Cancellare il ramo %s?" -#: gitk:7922 +#: gitk:9208 #, tcl-format msgid "Tags and heads: %s" msgstr "Etichette e rami: %s" -#: gitk:7936 +#: gitk:9223 msgid "Filter" msgstr "Filtro" -#: gitk:8230 +#: gitk:9518 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -761,154 +1075,202 @@ msgstr "" "Errore nella lettura della topologia delle revisioni: le informazioni sul " "ramo e le etichette precedenti e seguenti saranno incomplete." -#: gitk:9216 +#: gitk:10504 msgid "Tag" msgstr "Etichetta" -#: gitk:9216 +#: gitk:10504 msgid "Id" msgstr "Id" -#: gitk:9262 +#: gitk:10554 msgid "Gitk font chooser" msgstr "Scelta caratteri gitk" -#: gitk:9279 +#: gitk:10571 msgid "B" msgstr "B" -#: gitk:9282 +#: gitk:10574 msgid "I" msgstr "I" -#: gitk:9375 +#: gitk:10692 msgid "Gitk preferences" msgstr "Preferenze gitk" -#: gitk:9376 +#: gitk:10694 msgid "Commit list display options" msgstr "Opzioni visualizzazione dell'elenco revisioni" -#: gitk:9379 +#: gitk:10697 msgid "Maximum graph width (lines)" msgstr "Larghezza massima del grafico (in linee)" -#: gitk:9383 +#: gitk:10700 #, tcl-format msgid "Maximum graph width (% of pane)" msgstr "Larghezza massima del grafico (% del pannello)" -#: gitk:9388 +#: gitk:10703 msgid "Show local changes" msgstr "Mostra modifiche locali" -#: gitk:9393 +#: gitk:10706 msgid "Auto-select SHA1" msgstr "Seleziona automaticamente SHA1 hash" -#: gitk:9398 +#: gitk:10709 +msgid "Hide remote refs" +msgstr "Nascondi i riferimenti remoti" + +#: gitk:10713 msgid "Diff display options" msgstr "Opzioni di visualizzazione delle differenze" -#: gitk:9400 +#: gitk:10715 msgid "Tab spacing" msgstr "Spaziatura tabulazioni" -#: gitk:9404 +#: gitk:10718 msgid "Display nearby tags" msgstr "Mostra etichette vicine" -#: gitk:9409 +#: gitk:10721 msgid "Limit diffs to listed paths" msgstr "Limita le differenze ai percorsi elencati" -#: gitk:9414 +#: gitk:10724 msgid "Support per-file encodings" -msgstr "" +msgstr "Attiva codifica file per file" -#: gitk:9421 +#: gitk:10730 gitk:10819 msgid "External diff tool" -msgstr "" +msgstr "Visualizzatore di differenze" -#: gitk:9423 +#: gitk:10731 msgid "Choose..." -msgstr "" +msgstr "Scegli..." -#: gitk:9428 +#: gitk:10736 +msgid "General options" +msgstr "Opzioni generali" + +#: gitk:10739 +msgid "Use themed widgets" +msgstr "Utilizza interfaccia a tema" + +#: gitk:10741 +msgid "(change requires restart)" +msgstr "(una modifica richiede il riavvio)" + +#: gitk:10743 +msgid "(currently unavailable)" +msgstr "(momentaneamente non disponibile)" + +#: gitk:10747 msgid "Colors: press to choose" msgstr "Colori: premere per scegliere" -#: gitk:9431 +#: gitk:10750 +msgid "Interface" +msgstr "Interfaccia" + +#: gitk:10751 +msgid "interface" +msgstr "interfaccia" + +#: gitk:10754 msgid "Background" msgstr "Sfondo" -#: gitk:9435 +#: gitk:10755 gitk:10785 +msgid "background" +msgstr "sfondo" + +#: gitk:10758 msgid "Foreground" msgstr "Primo piano" -#: gitk:9439 +#: gitk:10759 +msgid "foreground" +msgstr "primo piano" + +#: gitk:10762 msgid "Diff: old lines" msgstr "Diff: vecchie linee" -#: gitk:9444 +#: gitk:10763 +msgid "diff old lines" +msgstr "vecchie linee" + +#: gitk:10767 msgid "Diff: new lines" msgstr "Diff: nuove linee" -#: gitk:9449 +#: gitk:10768 +msgid "diff new lines" +msgstr "nuove linee" + +#: gitk:10772 msgid "Diff: hunk header" msgstr "Diff: intestazione della sezione" -#: gitk:9455 +#: gitk:10774 +msgid "diff hunk header" +msgstr "intestazione della sezione" + +#: gitk:10778 +msgid "Marked line bg" +msgstr "Sfondo riga selezionata" + +#: gitk:10780 +msgid "marked line background" +msgstr "sfondo riga selezionata" + +#: gitk:10784 msgid "Select bg" -msgstr "Sfondo selezione" +msgstr "Sfondo" -#: gitk:9459 +#: gitk:10788 msgid "Fonts: press to choose" msgstr "Carattere: premere per scegliere" -#: gitk:9461 +#: gitk:10790 msgid "Main font" msgstr "Carattere principale" -#: gitk:9462 +#: gitk:10791 msgid "Diff display font" msgstr "Carattere per differenze" -#: gitk:9463 +#: gitk:10792 msgid "User interface font" msgstr "Carattere per interfaccia utente" -#: gitk:9488 +#: gitk:10829 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: scegliere un colore per %s" -#: gitk:9934 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"Questa versione di Tcl/Tk non può avviare gitk.\n" -" Gitk richiede Tcl/Tk versione 8.4 o superiore." - -#: gitk:10047 +#: gitk:11433 msgid "Cannot find a git repository here." msgstr "Archivio git non trovato." -#: gitk:10051 +#: gitk:11437 #, tcl-format msgid "Cannot find the git directory \"%s\"." msgstr "Directory git \"%s\" non trovata." -#: gitk:10098 +#: gitk:11484 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file" -#: gitk:10110 +#: gitk:11496 msgid "Bad arguments to gitk:" msgstr "Gitk: argomenti errati:" -#: gitk:10170 +#: gitk:11587 msgid "Command line" msgstr "Linea di comando" diff --git a/gitk-git/po/sv.po b/gitk-git/po/sv.po index 624eb2281e..0f5e2fd8d7 100644 --- a/gitk-git/po/sv.po +++ b/gitk-git/po/sv.po @@ -2,39 +2,39 @@ # 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. +# Peter Krefting <peter@softwolves.pp.se>, 2008-2010. # Mikael Magnusson <mikachu@gmail.com>, 2008. msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-13 13:38+0100\n" -"PO-Revision-Date: 2009-08-13 13:40+0100\n" +"POT-Creation-Date: 2010-01-28 13:16+0100\n" +"PO-Revision-Date: 2010-01-28 13:48+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 +#: gitk:115 msgid "Couldn't get list of unmerged files:" msgstr "Kunde inte hämta lista över ej sammanslagna filer:" -#: gitk:269 +#: gitk:274 msgid "Error parsing revisions:" msgstr "Fel vid tolkning av revisioner:" -#: gitk:324 +#: gitk:329 msgid "Error executing --argscmd command:" msgstr "Fel vid körning av --argscmd-kommando:" -#: gitk:337 +#: gitk:342 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 +#: gitk:345 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -42,596 +42,600 @@ msgstr "" "Inga filer valdes: --merge angavs men det finns inga filer inom " "filbegränsningen." -#: gitk:362 gitk:509 +#: gitk:367 gitk:514 msgid "Error executing git log:" msgstr "Fel vid körning av git log:" -#: gitk:380 gitk:525 +#: gitk:385 gitk:530 msgid "Reading" msgstr "Läser" -#: gitk:440 gitk:4123 +#: gitk:445 gitk:4261 msgid "Reading commits..." msgstr "Läser incheckningar..." -#: gitk:443 gitk:1561 gitk:4126 +#: gitk:448 gitk:1578 gitk:4264 msgid "No commits selected" msgstr "Inga incheckningar markerade" -#: gitk:1437 +#: gitk:1454 msgid "Can't parse git log output:" msgstr "Kan inte tolka utdata från git log:" -#: gitk:1657 +#: gitk:1674 msgid "No commit information available" msgstr "Ingen incheckningsinformation är tillgänglig" -#: gitk:1793 gitk:1817 gitk:3916 gitk:8786 gitk:10322 gitk:10498 +#: gitk:1816 +msgid "mc" +msgstr "mc" + +#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804 msgid "OK" msgstr "OK" -#: gitk:1819 gitk:3918 gitk:8383 gitk:8457 gitk:8567 gitk:8616 gitk:8788 -#: gitk:10323 gitk:10499 +#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046 +#: gitk:10586 gitk:10805 msgid "Cancel" msgstr "Avbryt" -#: gitk:1919 +#: gitk:1975 msgid "Update" msgstr "Uppdatera" -#: gitk:1920 +#: gitk:1976 msgid "Reload" msgstr "Ladda om" -#: gitk:1921 +#: gitk:1977 msgid "Reread references" msgstr "Läs om referenser" -#: gitk:1922 +#: gitk:1978 msgid "List references" msgstr "Visa referenser" -#: gitk:1924 +#: gitk:1980 msgid "Start git gui" msgstr "Starta git gui" -#: gitk:1926 +#: gitk:1982 msgid "Quit" msgstr "Avsluta" -#: gitk:1918 +#: gitk:1974 msgid "File" msgstr "Arkiv" -#: gitk:1930 +#: gitk:1986 msgid "Preferences" msgstr "Inställningar" -#: gitk:1929 +#: gitk:1985 msgid "Edit" msgstr "Redigera" -#: gitk:1934 +#: gitk:1990 msgid "New view..." msgstr "Ny vy..." -#: gitk:1935 +#: gitk:1991 msgid "Edit view..." msgstr "Ändra vy..." -#: gitk:1936 +#: gitk:1992 msgid "Delete view" msgstr "Ta bort vy" -#: gitk:1938 +#: gitk:1994 msgid "All files" msgstr "Alla filer" -#: gitk:1933 gitk:3670 +#: gitk:1989 gitk:3808 msgid "View" msgstr "Visa" -#: gitk:1943 gitk:1953 gitk:2654 +#: gitk:1999 gitk:2009 gitk:2780 msgid "About gitk" msgstr "Om gitk" -#: gitk:1944 gitk:1958 +#: gitk:2000 gitk:2014 msgid "Key bindings" msgstr "Tangentbordsbindningar" -#: gitk:1942 gitk:1957 +#: gitk:1998 gitk:2013 msgid "Help" msgstr "Hjälp" -#: gitk:2018 -msgid "SHA1 ID: " -msgstr "SHA1-id: " +#: gitk:2091 gitk:8110 +msgid "SHA1 ID:" +msgstr "SHA1-id:" -#: gitk:2049 +#: gitk:2122 msgid "Row" msgstr "Rad" -#: gitk:2080 +#: gitk:2160 msgid "Find" msgstr "Sök" -#: gitk:2081 +#: gitk:2161 msgid "next" msgstr "nästa" -#: gitk:2082 +#: gitk:2162 msgid "prev" msgstr "föreg" -#: gitk:2083 +#: gitk:2163 msgid "commit" msgstr "incheckning" -#: gitk:2086 gitk:2088 gitk:4284 gitk:4307 gitk:4331 gitk:6272 gitk:6344 -#: gitk:6428 +#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482 +#: gitk:6566 msgid "containing:" msgstr "som innehåller:" -#: gitk:2089 gitk:3162 gitk:3167 gitk:4359 +#: gitk:2169 gitk:3290 gitk:3295 gitk:4497 msgid "touching paths:" msgstr "som rör sökväg:" -#: gitk:2090 gitk:4364 +#: gitk:2170 gitk:4502 msgid "adding/removing string:" msgstr "som lägger/till tar bort sträng:" -#: gitk:2099 gitk:2101 +#: gitk:2179 gitk:2181 msgid "Exact" msgstr "Exakt" -#: gitk:2101 gitk:4439 gitk:6240 +#: gitk:2181 gitk:4577 gitk:6378 msgid "IgnCase" msgstr "IgnVersaler" -#: gitk:2101 gitk:4333 gitk:4437 gitk:6236 +#: gitk:2181 gitk:4471 gitk:4575 gitk:6374 msgid "Regexp" msgstr "Reg.uttr." -#: gitk:2103 gitk:2104 gitk:4458 gitk:4488 gitk:4495 gitk:6364 gitk:6432 +#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570 msgid "All fields" msgstr "Alla fält" -#: gitk:2104 gitk:4456 gitk:4488 gitk:6303 +#: gitk:2184 gitk:4594 gitk:4626 gitk:6441 msgid "Headline" msgstr "Rubrik" -#: gitk:2105 gitk:4456 gitk:6303 gitk:6432 gitk:6866 +#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003 msgid "Comments" msgstr "Kommentarer" -#: gitk:2105 gitk:4456 gitk:4460 gitk:4495 gitk:6303 gitk:6801 gitk:8063 -#: gitk:8078 +#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285 +#: gitk:8300 msgid "Author" msgstr "Författare" -#: gitk:2105 gitk:4456 gitk:6303 gitk:6803 +#: gitk:2185 gitk:4594 gitk:6441 gitk:6940 msgid "Committer" msgstr "Incheckare" -#: gitk:2134 +#: gitk:2216 msgid "Search" msgstr "Sök" -#: gitk:2141 +#: gitk:2224 msgid "Diff" msgstr "Diff" -#: gitk:2143 +#: gitk:2226 msgid "Old version" msgstr "Gammal version" -#: gitk:2145 +#: gitk:2228 msgid "New version" msgstr "Ny version" -#: gitk:2147 +#: gitk:2230 msgid "Lines of context" msgstr "Rader sammanhang" -#: gitk:2157 +#: gitk:2240 msgid "Ignore space change" msgstr "Ignorera ändringar i blanksteg" -#: gitk:2215 +#: gitk:2299 msgid "Patch" msgstr "Patch" -#: gitk:2217 +#: gitk:2301 msgid "Tree" msgstr "Träd" -#: gitk:2361 gitk:2378 +#: gitk:2456 gitk:2473 msgid "Diff this -> selected" msgstr "Diff denna -> markerad" -#: gitk:2362 gitk:2379 +#: gitk:2457 gitk:2474 msgid "Diff selected -> this" msgstr "Diff markerad -> denna" -#: gitk:2363 gitk:2380 +#: gitk:2458 gitk:2475 msgid "Make patch" msgstr "Skapa patch" -#: gitk:2364 gitk:8441 +#: gitk:2459 gitk:8692 msgid "Create tag" msgstr "Skapa tagg" -#: gitk:2365 gitk:8547 +#: gitk:2460 gitk:8808 msgid "Write commit to file" msgstr "Skriv incheckning till fil" -#: gitk:2366 gitk:8604 +#: gitk:2461 gitk:8865 msgid "Create new branch" msgstr "Skapa ny gren" -#: gitk:2367 +#: gitk:2462 msgid "Cherry-pick this commit" msgstr "Plocka denna incheckning" -#: gitk:2368 +#: gitk:2463 msgid "Reset HEAD branch to here" msgstr "Återställ HEAD-grenen hit" -#: gitk:2369 +#: gitk:2464 msgid "Mark this commit" msgstr "Markera denna incheckning" -#: gitk:2370 +#: gitk:2465 msgid "Return to mark" msgstr "Återgå till markering" -#: gitk:2371 +#: gitk:2466 msgid "Find descendant of this and mark" msgstr "Hitta efterföljare till denna och markera" -#: gitk:2372 +#: gitk:2467 msgid "Compare with marked commit" msgstr "Jämför med markerad incheckning" -#: gitk:2386 +#: gitk:2481 msgid "Check out this branch" msgstr "Checka ut denna gren" -#: gitk:2387 +#: gitk:2482 msgid "Remove this branch" msgstr "Ta bort denna gren" -#: gitk:2394 +#: gitk:2489 msgid "Highlight this too" msgstr "Markera även detta" -#: gitk:2395 +#: gitk:2490 msgid "Highlight this only" msgstr "Markera bara detta" -#: gitk:2396 +#: gitk:2491 msgid "External diff" msgstr "Extern diff" -#: gitk:2397 +#: gitk:2492 msgid "Blame parent commit" msgstr "Klandra föräldraincheckning" -#: gitk:2404 +#: gitk:2499 msgid "Show origin of this line" msgstr "Visa ursprunget för den här raden" -#: gitk:2405 +#: gitk:2500 msgid "Run git gui blame on this line" msgstr "Kör git gui blame på den här raden" -#: gitk:2656 +#: gitk:2782 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2008 Paul Mackerras\n" +"Copyright ©9 2005-2009 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" +"Copyright © 2005-2009 Paul Mackerras\n" "\n" "Använd och vidareförmedla enligt villkoren i GNU General Public License" -#: gitk:2664 gitk:2726 gitk:8969 +#: gitk:2790 gitk:2854 gitk:9230 msgid "Close" msgstr "Stäng" -#: gitk:2683 +#: gitk:2811 msgid "Gitk key bindings" msgstr "Tangentbordsbindningar för Gitk" -#: gitk:2686 +#: gitk:2814 msgid "Gitk key bindings:" msgstr "Tangentbordsbindningar för Gitk:" -#: gitk:2688 +#: gitk:2816 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tAvsluta" -#: gitk:2689 +#: gitk:2817 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tGå till första incheckning" -#: gitk:2690 +#: gitk:2818 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tGå till sista incheckning" -#: gitk:2691 +#: gitk:2819 msgid "<Up>, p, i\tMove up one commit" msgstr "<Upp>, p, i\tGå en incheckning upp" -#: gitk:2692 +#: gitk:2820 msgid "<Down>, n, k\tMove down one commit" msgstr "<Ned>, n, k\tGå en incheckning ned" -#: gitk:2693 +#: gitk:2821 msgid "<Left>, z, j\tGo back in history list" msgstr "<Vänster>, z, j\tGå bakåt i historiken" -#: gitk:2694 +#: gitk:2822 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Höger>, x, l\tGå framåt i historiken" -#: gitk:2695 +#: gitk:2823 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tGå upp en sida i incheckningslistan" -#: gitk:2696 +#: gitk:2824 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tGå ned en sida i incheckningslistan" -#: gitk:2697 +#: gitk:2825 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRulla till början av incheckningslistan" -#: gitk:2698 +#: gitk:2826 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRulla till slutet av incheckningslistan" -#: gitk:2699 +#: gitk:2827 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" -#: gitk:2700 +#: gitk:2828 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" -#: gitk:2701 +#: gitk:2829 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" -#: gitk:2702 +#: gitk:2830 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" -#: gitk:2703 +#: gitk:2831 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)" -#: gitk:2704 +#: gitk:2832 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)" -#: gitk:2705 +#: gitk:2833 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tRulla diffvisningen upp en sida" -#: gitk:2706 +#: gitk:2834 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Baksteg>\tRulla diffvisningen upp en sida" -#: gitk:2707 +#: gitk:2835 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Blanksteg>\tRulla diffvisningen ned en sida" -#: gitk:2708 +#: gitk:2836 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRulla diffvisningen upp 18 rader" -#: gitk:2709 +#: gitk:2837 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRulla diffvisningen ned 18 rader" -#: gitk:2710 +#: gitk:2838 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSök" -#: gitk:2711 +#: gitk:2839 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tGå till nästa sökträff" -#: gitk:2712 +#: gitk:2840 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t\tGå till nästa sökträff" -#: gitk:2713 +#: gitk:2841 msgid "/\t\tFocus the search box" msgstr "/\t\tFokusera sökrutan" -#: gitk:2714 +#: gitk:2842 msgid "?\t\tMove to previous find hit" msgstr "?\t\tGå till föregående sökträff" -#: gitk:2715 +#: gitk:2843 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRulla diffvisningen till nästa fil" -#: gitk:2716 +#: gitk:2844 #, 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 +#: gitk:2845 #, 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 +#: gitk:2846 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Num+>\tÖka teckenstorlek" -#: gitk:2719 +#: gitk:2847 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tÖka teckenstorlek" -#: gitk:2720 +#: gitk:2848 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Num->\tMinska teckenstorlek" -#: gitk:2721 +#: gitk:2849 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tMinska teckenstorlek" -#: gitk:2722 +#: gitk:2850 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 +#: gitk:3305 gitk:3314 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fel vid skapande av temporär katalog %s:" -#: gitk:3255 +#: gitk:3327 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fel vid hämtning av \"%s\" från %s:" + +#: gitk:3390 msgid "command failed:" msgstr "kommando misslyckades:" -#: gitk:3401 +#: gitk:3539 msgid "No such commit" msgstr "Incheckning saknas" -#: gitk:3415 +#: gitk:3553 msgid "git gui blame: command failed:" msgstr "git gui blame: kommando misslyckades:" -#: gitk:3446 +#: gitk:3584 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Kunde inte läsa sammanslagningshuvud: %s" -#: gitk:3454 +#: gitk:3592 #, tcl-format msgid "Error reading index: %s" msgstr "Fel vid läsning av index: %s" -#: gitk:3479 +#: gitk:3617 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Kunde inte starta git blame: %s" -#: gitk:3482 gitk:6271 +#: gitk:3620 gitk:6409 msgid "Searching" msgstr "Söker" -#: gitk:3514 +#: gitk:3652 #, tcl-format msgid "Error running git blame: %s" msgstr "Fel vid körning av git blame: %s" -#: gitk:3542 +#: gitk:3680 #, 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 +#: gitk:3694 msgid "External diff viewer failed:" msgstr "Externt diff-verktyg misslyckades:" -#: gitk:3674 +#: gitk:3812 msgid "Gitk view definition" msgstr "Definition av Gitk-vy" -#: gitk:3678 +#: gitk:3816 msgid "Remember this view" msgstr "Spara denna vy" -#: gitk:3679 +#: gitk:3817 msgid "References (space separated list):" msgstr "Referenser (blankstegsavdelad lista):" -#: gitk:3680 +#: gitk:3818 msgid "Branches & tags:" msgstr "Grenar & taggar:" -#: gitk:3681 +#: gitk:3819 msgid "All refs" msgstr "Alla referenser" -#: gitk:3682 +#: gitk:3820 msgid "All (local) branches" msgstr "Alla (lokala) grenar" -#: gitk:3683 +#: gitk:3821 msgid "All tags" msgstr "Alla taggar" -#: gitk:3684 +#: gitk:3822 msgid "All remote-tracking branches" msgstr "Alla fjärrspårande grenar" -#: gitk:3685 +#: gitk:3823 msgid "Commit Info (regular expressions):" msgstr "Incheckningsinfo (reguljära uttryck):" -#: gitk:3686 +#: gitk:3824 msgid "Author:" msgstr "Författare:" -#: gitk:3687 +#: gitk:3825 msgid "Committer:" msgstr "Incheckare:" -#: gitk:3688 +#: gitk:3826 msgid "Commit Message:" msgstr "Incheckningsmeddelande:" -#: gitk:3689 +#: gitk:3827 msgid "Matches all Commit Info criteria" msgstr "Motsvarar alla kriterier för incheckningsinfo" -#: gitk:3690 +#: gitk:3828 msgid "Changes to Files:" msgstr "Ändringar av filer:" -#: gitk:3691 +#: gitk:3829 msgid "Fixed String" msgstr "Fast sträng" -#: gitk:3692 +#: gitk:3830 msgid "Regular Expression" msgstr "Reguljärt uttryck" -#: gitk:3693 +#: gitk:3831 msgid "Search string:" msgstr "Söksträng:" -#: gitk:3694 +#: gitk:3832 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -639,205 +643,201 @@ msgstr "" "Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3695 +#: gitk:3833 msgid "Since:" msgstr "Från:" -#: gitk:3696 +#: gitk:3834 msgid "Until:" msgstr "Till:" -#: gitk:3697 +#: gitk:3835 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 +#: gitk:3836 msgid "Number to show:" msgstr "Antal att visa:" -#: gitk:3699 +#: gitk:3837 msgid "Number to skip:" msgstr "Antal att hoppa över:" -#: gitk:3700 +#: gitk:3838 msgid "Miscellaneous options:" msgstr "Diverse alternativ:" -#: gitk:3701 +#: gitk:3839 msgid "Strictly sort by date" msgstr "Strikt datumsortering" -#: gitk:3702 +#: gitk:3840 msgid "Mark branch sides" msgstr "Markera sidogrenar" -#: gitk:3703 +#: gitk:3841 msgid "Limit to first parent" msgstr "Begränsa till första förälder" -#: gitk:3704 +#: gitk:3842 msgid "Simple history" msgstr "Enkel historik" -#: gitk:3705 +#: gitk:3843 msgid "Additional arguments to git log:" msgstr "Ytterligare argument till git log:" -#: gitk:3706 +#: gitk:3844 msgid "Enter files and directories to include, one per line:" msgstr "Ange filer och kataloger att ta med, en per rad:" -#: gitk:3707 +#: gitk:3845 msgid "Command to generate more commits to include:" msgstr "Kommando för att generera fler incheckningar att ta med:" -#: gitk:3829 +#: gitk:3967 msgid "Gitk: edit view" msgstr "Gitk: redigera vy" -#: gitk:3837 +#: gitk:3975 msgid "-- criteria for selecting revisions" msgstr " - kriterier för val av revisioner" -#: gitk:3842 -msgid "View Name:" -msgstr "Namn på vy:" +#: gitk:3980 +msgid "View Name" +msgstr "Namn på vy" -#: gitk:3917 +#: gitk:4055 msgid "Apply (F5)" msgstr "Använd (F5)" -#: gitk:3955 +#: gitk:4093 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 +#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535 msgid "None" msgstr "Inget" -#: gitk:4456 gitk:6303 gitk:8065 gitk:8080 +#: gitk:4594 gitk:6441 gitk:8287 gitk:8302 msgid "Date" msgstr "Datum" -#: gitk:4456 gitk:6303 +#: gitk:4594 gitk:6441 msgid "CDate" msgstr "Skapat datum" -#: gitk:4605 gitk:4610 +#: gitk:4743 gitk:4748 msgid "Descendant" msgstr "Avkomling" -#: gitk:4606 +#: gitk:4744 msgid "Not descendant" msgstr "Inte avkomling" -#: gitk:4613 gitk:4618 +#: gitk:4751 gitk:4756 msgid "Ancestor" msgstr "Förfader" -#: gitk:4614 +#: gitk:4752 msgid "Not ancestor" msgstr "Inte förfader" -#: gitk:4904 +#: gitk:5042 msgid "Local changes checked in to index but not committed" msgstr "Lokala ändringar sparade i indexet men inte incheckade" -#: gitk:4940 +#: gitk:5078 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokala ändringar, ej sparade i indexet" -#: gitk:6621 +#: gitk:6759 msgid "many" msgstr "många" -#: gitk:6805 +#: gitk:6942 msgid "Tags:" msgstr "Taggar:" -#: gitk:6822 gitk:6828 gitk:8058 +#: gitk:6959 gitk:6965 gitk:8280 msgid "Parent" msgstr "Förälder" -#: gitk:6833 +#: gitk:6970 msgid "Child" msgstr "Barn" -#: gitk:6842 +#: gitk:6979 msgid "Branch" msgstr "Gren" -#: gitk:6845 +#: gitk:6982 msgid "Follows" msgstr "Följer" -#: gitk:6848 +#: gitk:6985 msgid "Precedes" msgstr "Föregår" -#: gitk:7346 +#: gitk:7522 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fel vid hämtning av diff: %s" -#: gitk:7886 +#: gitk:8108 msgid "Goto:" msgstr "Gå till:" -#: gitk:7888 -msgid "SHA1 ID:" -msgstr "SHA1-id:" - -#: gitk:7907 +#: gitk:8129 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Förkortat SHA1-id %s är tvetydigt" -#: gitk:7914 +#: gitk:8136 #, tcl-format msgid "Revision %s is not known" msgstr "Revisionen %s är inte känd" -#: gitk:7924 +#: gitk:8146 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA-id:t %s är inte känt" -#: gitk:7926 +#: gitk:8148 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Revisionen %s finns inte i den nuvarande vyn" -#: gitk:8068 +#: gitk:8290 msgid "Children" msgstr "Barn" -#: gitk:8125 +#: gitk:8348 #, tcl-format msgid "Reset %s branch to here" msgstr "Återställ grenen %s hit" -#: gitk:8127 +#: gitk:8350 msgid "Detached head: can't reset" msgstr "Frånkopplad head: kan inte återställa" -#: gitk:8236 gitk:8242 +#: gitk:8459 gitk:8465 msgid "Skipping merge commit " msgstr "Hoppar över sammanslagningsincheckning " -#: gitk:8251 gitk:8256 +#: gitk:8474 gitk:8479 msgid "Error getting patch ID for " msgstr "Fel vid hämtning av patch-id för " -#: gitk:8252 gitk:8257 +#: gitk:8475 gitk:8480 msgid " - stopping\n" msgstr " - stannar\n" -#: gitk:8262 gitk:8265 gitk:8273 gitk:8283 gitk:8292 +#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519 msgid "Commit " msgstr "Incheckning " -#: gitk:8266 +#: gitk:8489 msgid "" " is the same patch as\n" " " @@ -845,7 +845,7 @@ msgstr "" " är samma patch som\n" " " -#: gitk:8274 +#: gitk:8497 msgid "" " differs from\n" " " @@ -853,117 +853,139 @@ msgstr "" " skiljer sig från\n" " " -#: gitk:8276 -msgid "- stopping\n" -msgstr "- stannar\n" +#: gitk:8499 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "Skillnad mellan incheckningar:\n" +"\n" +"" -#: gitk:8284 gitk:8293 +#: gitk:8511 gitk:8520 #, tcl-format msgid " has %s children - stopping\n" msgstr " har %s barn - stannar\n" -#: gitk:8324 +#: gitk:8539 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Fel vid skrivning av incheckning till fil: %s" + +#: gitk:8545 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Fel vid jämförelse av incheckningar: %s" + +#: gitk:8575 msgid "Top" msgstr "Topp" -#: gitk:8325 +#: gitk:8576 msgid "From" msgstr "Från" -#: gitk:8330 +#: gitk:8581 msgid "To" msgstr "Till" -#: gitk:8354 +#: gitk:8605 msgid "Generate patch" msgstr "Generera patch" -#: gitk:8356 +#: gitk:8607 msgid "From:" msgstr "Från:" -#: gitk:8365 +#: gitk:8616 msgid "To:" msgstr "Till:" -#: gitk:8374 +#: gitk:8625 msgid "Reverse" msgstr "Vänd" -#: gitk:8376 gitk:8561 +#: gitk:8627 gitk:8822 msgid "Output file:" msgstr "Utdatafil:" -#: gitk:8382 +#: gitk:8633 msgid "Generate" msgstr "Generera" -#: gitk:8420 +#: gitk:8671 msgid "Error creating patch:" msgstr "Fel vid generering av patch:" -#: gitk:8443 gitk:8549 gitk:8606 +#: gitk:8694 gitk:8810 gitk:8867 msgid "ID:" msgstr "Id:" -#: gitk:8452 +#: gitk:8703 msgid "Tag name:" msgstr "Taggnamn:" -#: gitk:8456 gitk:8615 +#: gitk:8706 +msgid "Tag message is optional" +msgstr "Taggmeddelandet är valfritt" + +#: gitk:8708 +msgid "Tag message:" +msgstr "Taggmeddelande:" + +#: gitk:8712 gitk:8876 msgid "Create" msgstr "Skapa" -#: gitk:8473 +#: gitk:8730 msgid "No tag name specified" msgstr "Inget taggnamn angavs" -#: gitk:8477 +#: gitk:8734 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Taggen \"%s\" finns redan" -#: gitk:8483 +#: gitk:8744 msgid "Error creating tag:" msgstr "Fel vid skapande av tagg:" -#: gitk:8558 +#: gitk:8819 msgid "Command:" msgstr "Kommando:" -#: gitk:8566 +#: gitk:8827 msgid "Write" msgstr "Skriv" -#: gitk:8584 +#: gitk:8845 msgid "Error writing commit:" msgstr "Fel vid skrivning av incheckning:" -#: gitk:8611 +#: gitk:8872 msgid "Name:" msgstr "Namn:" -#: gitk:8634 +#: gitk:8895 msgid "Please specify a name for the new branch" msgstr "Ange ett namn för den nya grenen" -#: gitk:8639 +#: gitk:8900 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Grenen \"%s\" finns redan. Skriva över?" -#: gitk:8705 +#: gitk:8966 #, 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 +#: gitk:8971 msgid "Cherry-picking" msgstr "Plockar" -#: gitk:8719 +#: gitk:8980 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -973,7 +995,7 @@ msgstr "" "Checka in, återställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:8725 +#: gitk:8986 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -981,32 +1003,32 @@ msgstr "" "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n" "Vill du köra git citool för att lösa den?" -#: gitk:8741 +#: gitk:9002 msgid "No changes committed" msgstr "Inga ändringar incheckade" -#: gitk:8767 +#: gitk:9028 msgid "Confirm reset" msgstr "Bekräfta återställning" -#: gitk:8769 +#: gitk:9030 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Återställa grenen %s till %s?" -#: gitk:8773 +#: gitk:9032 msgid "Reset type:" msgstr "Typ av återställning:" -#: gitk:8777 +#: gitk:9035 msgid "Soft: Leave working tree and index untouched" msgstr "Mjuk: Rör inte utcheckning och index" -#: gitk:8780 +#: gitk:9038 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Blandad: Rör inte utcheckning, återställ index" -#: gitk:8783 +#: gitk:9041 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1014,19 +1036,19 @@ msgstr "" "Hård: Återställ utcheckning och index\n" "(förkastar ALLA lokala ändringar)" -#: gitk:8800 +#: gitk:9058 msgid "Resetting" msgstr "Återställer" -#: gitk:8857 +#: gitk:9118 msgid "Checking out" msgstr "Checkar ut" -#: gitk:8910 +#: gitk:9171 msgid "Cannot delete the currently checked-out branch" msgstr "Kan inte ta bort den just nu utcheckade grenen" -#: gitk:8916 +#: gitk:9177 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1035,16 +1057,16 @@ msgstr "" "Incheckningarna på grenen %s existerar inte på någon annan gren.\n" "Vill du verkligen ta bort grenen %s?" -#: gitk:8947 +#: gitk:9208 #, tcl-format msgid "Tags and heads: %s" msgstr "Taggar och huvuden: %s" -#: gitk:8962 +#: gitk:9223 msgid "Filter" msgstr "Filter" -#: gitk:9257 +#: gitk:9518 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1052,190 +1074,219 @@ msgstr "" "Fel vid läsning av information om incheckningstopologi; information om " "grenar och föregående/senare taggar kommer inte vara komplett." -#: gitk:10243 +#: gitk:10504 msgid "Tag" msgstr "Tagg" -#: gitk:10243 +#: gitk:10504 msgid "Id" msgstr "Id" -#: gitk:10291 +#: gitk:10554 msgid "Gitk font chooser" msgstr "Teckensnittsväljare för Gitk" -#: gitk:10308 +#: gitk:10571 msgid "B" msgstr "F" -#: gitk:10311 +#: gitk:10574 msgid "I" msgstr "K" -#: gitk:10407 +#: gitk:10692 msgid "Gitk preferences" msgstr "Inställningar för Gitk" -#: gitk:10409 +#: gitk:10694 msgid "Commit list display options" msgstr "Alternativ för incheckningslistvy" -#: gitk:10412 +#: gitk:10697 msgid "Maximum graph width (lines)" msgstr "Maximal grafbredd (rader)" -#: gitk:10416 +#: gitk:10700 #, tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximal grafbredd (% av ruta)" -#: gitk:10420 +#: gitk:10703 msgid "Show local changes" msgstr "Visa lokala ändringar" -#: gitk:10423 +#: gitk:10706 msgid "Auto-select SHA1" msgstr "Välj SHA1 automatiskt" -#: gitk:10427 +#: gitk:10709 +msgid "Hide remote refs" +msgstr "Dölj fjärr-referenser" + +#: gitk:10713 msgid "Diff display options" msgstr "Alternativ för diffvy" -#: gitk:10429 +#: gitk:10715 msgid "Tab spacing" msgstr "Blanksteg för tabulatortecken" -#: gitk:10432 +#: gitk:10718 msgid "Display nearby tags" msgstr "Visa närliggande taggar" -#: gitk:10435 -msgid "Hide remote refs" -msgstr "Dölj fjärr-referenser" - -#: gitk:10438 +#: gitk:10721 msgid "Limit diffs to listed paths" msgstr "Begränsa diff till listade sökvägar" -#: gitk:10441 +#: gitk:10724 msgid "Support per-file encodings" msgstr "Stöd för filspecifika teckenkodningar" -#: gitk:10447 gitk:10512 +#: gitk:10730 gitk:10819 msgid "External diff tool" msgstr "Externt diff-verktyg" -#: gitk:10449 +#: gitk:10731 msgid "Choose..." msgstr "Välj..." -#: gitk:10454 +#: gitk:10736 +msgid "General options" +msgstr "Allmänna inställningar" + +#: gitk:10739 +msgid "Use themed widgets" +msgstr "Använd tema på fönsterelement" + +#: gitk:10741 +msgid "(change requires restart)" +msgstr "(ändringen kräver omstart)" + +#: gitk:10743 +msgid "(currently unavailable)" +msgstr "(för närvarande inte tillgängligt)" + +#: gitk:10747 msgid "Colors: press to choose" msgstr "Färger: tryck för att välja" -#: gitk:10457 +#: gitk:10750 +msgid "Interface" +msgstr "Gränssnitt" + +#: gitk:10751 +msgid "interface" +msgstr "gränssnitt" + +#: gitk:10754 msgid "Background" msgstr "Bakgrund" -#: gitk:10458 gitk:10488 +#: gitk:10755 gitk:10785 msgid "background" msgstr "bakgrund" -#: gitk:10461 +#: gitk:10758 msgid "Foreground" msgstr "Förgrund" -#: gitk:10462 +#: gitk:10759 msgid "foreground" msgstr "förgrund" -#: gitk:10465 +#: gitk:10762 msgid "Diff: old lines" msgstr "Diff: gamla rader" -#: gitk:10466 +#: gitk:10763 msgid "diff old lines" msgstr "diff gamla rader" -#: gitk:10470 +#: gitk:10767 msgid "Diff: new lines" msgstr "Diff: nya rader" -#: gitk:10471 +#: gitk:10768 msgid "diff new lines" msgstr "diff nya rader" -#: gitk:10475 +#: gitk:10772 msgid "Diff: hunk header" msgstr "Diff: delhuvud" -#: gitk:10477 +#: gitk:10774 msgid "diff hunk header" msgstr "diff delhuvud" -#: gitk:10481 +#: gitk:10778 msgid "Marked line bg" msgstr "Markerad rad bakgrund" -#: gitk:10483 +#: gitk:10780 msgid "marked line background" msgstr "markerad rad bakgrund" -#: gitk:10487 +#: gitk:10784 msgid "Select bg" msgstr "Markerad bakgrund" -#: gitk:10491 +#: gitk:10788 msgid "Fonts: press to choose" msgstr "Teckensnitt: tryck för att välja" -#: gitk:10493 +#: gitk:10790 msgid "Main font" msgstr "Huvudteckensnitt" -#: gitk:10494 +#: gitk:10791 msgid "Diff display font" msgstr "Teckensnitt för diffvisning" -#: gitk:10495 +#: gitk:10792 msgid "User interface font" msgstr "Teckensnitt för användargränssnitt" -#: gitk:10522 +#: gitk:10829 #, 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 +#: gitk:11433 msgid "Cannot find a git repository here." msgstr "Hittar inget gitk-arkiv här." -#: gitk:11105 +#: gitk:11437 #, tcl-format msgid "Cannot find the git directory \"%s\"." msgstr "Hittar inte git-katalogen \"%s\"." -#: gitk:11152 +#: gitk:11484 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Tvetydigt argument \"%s\": både revision och filnamn" -#: gitk:11164 +#: gitk:11496 msgid "Bad arguments to gitk:" msgstr "Felaktiga argument till gitk:" -#: gitk:11249 +#: gitk:11587 msgid "Command line" msgstr "Kommandorad" +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1-id: " + +#~ msgid "- stopping\n" +#~ msgstr "- stannar\n" + +#~ 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." + #~ msgid "Tag/Head %s is not known" #~ msgstr "Tagg/huvud %s är okänt" |