diff options
Diffstat (limited to 'gitk-git')
| -rw-r--r-- | gitk-git/gitk | 21 | ||||
| -rw-r--r-- | gitk-git/po/de.po | 51 |
2 files changed, 55 insertions, 17 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk index f7f177621c..64a873d2ef 100644 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -199,11 +199,7 @@ proc parseviewargs {n arglist} { set nextisval 1 lappend glflags $arg } - "--not" { - set notflag [expr {!$notflag}] - lappend revargs $arg - } - "--all" { + "--not" - "--all" { lappend revargs $arg } "--merge" { @@ -1915,6 +1911,9 @@ proc makewindow {} { {mc "Reload" command reloadcommits -accelerator Meta1-F5} {mc "Reread references" command rereadrefs} {mc "List references" command showrefs -accelerator F2} + {xx "" separator} + {mc "Start git gui" command {exec git gui &}} + {xx "" separator} {mc "Quit" command doquit -accelerator Meta1-Q} }} {mc "Edit" cascade { @@ -3406,6 +3405,7 @@ proc show_line_source {} { error_popup [mc "Couldn't start git blame: %s" $err] return } + nowbusy blaming [mc "Searching"] fconfigure $f -blocking 0 set i [reg_instance $f] set blamestuff($i) {} @@ -3419,6 +3419,7 @@ proc stopblaming {} { if {[info exists blameinst]} { stop_instance $blameinst unset blameinst + notbusy blaming } } @@ -3433,6 +3434,7 @@ proc read_line_source {fd inst} { } unset commfd($inst) unset blameinst + notbusy blaming fconfigure $fd -blocking 1 if {[catch {close $fd} err]} { error_popup [mc "Error running git blame: %s" $err] @@ -4121,7 +4123,7 @@ proc askvhighlight {row id} { proc hfiles_change {} { global highlight_files filehighlight fhighlights fh_serial - global highlight_paths gdttype + global highlight_paths if {[info exists filehighlight]} { # delete previous highlights @@ -6286,10 +6288,11 @@ proc findmore {} { proc findselectline {l} { global findloc commentend ctext findcurline markingmatches gdttype - set markingmatches 1 + set markingmatches [expr {$gdttype eq [mc "containing:"]}] set findcurline $l selectline $l 1 - if {$findloc == [mc "All fields"] || $findloc == [mc "Comments"]} { + if {$markingmatches && + ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} { # highlight the matches in the comments set f [$ctext get 1.0 $commentend] set matches [findmatches $f] @@ -7129,7 +7132,7 @@ proc gettreediffline {gdtf ids} { set treediffs($ids) $treediff } unset treepending - if {$cmitmode eq "tree"} { + if {$cmitmode eq "tree" && [llength $diffids] == 1} { gettree $diffids } elseif {$ids != $diffids} { if {![info exists diffmergeid]} { diff --git a/gitk-git/po/de.po b/gitk-git/po/de.po index c86cc2df5e..e0a6deeded 100644 --- a/gitk-git/po/de.po +++ b/gitk-git/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-18 22:03+1100\n" -"PO-Revision-Date: 2008-05-24 22:40+0200\n" +"POT-Creation-Date: 2008-10-25 13:18+0200\n" +"PO-Revision-Date: 2008-10-25 13:23+0200\n" "Last-Translator: Christian Stimming <stimming@tuhh.de>\n" "Language-Team: German\n" "MIME-Version: 1.0\n" @@ -19,6 +19,14 @@ msgstr "" msgid "Couldn't get list of unmerged files:" msgstr "Liste der nicht-zusammengeführten Dateien nicht gefunden:" +#: gitk:272 +msgid "Error parsing revisions:" +msgstr "Fehler beim Laden der Versionen:" + +#: gitk:327 +msgid "Error executing --argscmd command:" +msgstr "Fehler beim --argscmd Kommando:" + #: gitk:340 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" @@ -283,9 +291,9 @@ msgstr "Nur diesen hervorheben" msgid "External diff" msgstr "Externer Vergleich" -#: gitk:2245 +#: gitk:2255 msgid "Blame parent commit" -msgstr "" +msgstr "Annotieren der Elternversion" #: gitk:2488 msgid "" @@ -471,7 +479,33 @@ msgstr "<%s-Minus>\tSchriftgröße verkleinern" msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tAktualisieren" -#: gitk:3200 +#: gitk:2979 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fehler beim Holen von »%s« von »%s«:" + +#: gitk:3036 gitk:3045 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Fehler beim Erzeugen eines temporären Verzeichnisses »%s«:" + +#: gitk:3058 +msgid "command failed:" +msgstr "Kommando fehlgeschlagen:" + +#: gitk:3078 +msgid "No such commit" +msgstr "Version nicht gefunden" + +#: gitk:3083 +msgid "git gui blame: command failed:" +msgstr "git gui blame: Kommando fehlgeschlagen:" + +#: gitk:3092 +msgid "External diff viewer failed:" +msgstr "Externes Vergleich-(Diff-)Programm fehlgeschlagen:" + +#: gitk:3210 msgid "Gitk view definition" msgstr "Gitk Ansichten" @@ -692,9 +726,10 @@ msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." #, 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:7708 +#: gitk:7718 msgid "Cherry-picking" msgstr "Version pflücken" @@ -836,7 +871,7 @@ msgstr "Vergleich nur für angezeigte Pfade" #: gitk:9414 msgid "Support per-file encodings" -msgstr "" +msgstr "Zeichenkodierung pro Datei ermitteln" #: gitk:9421 msgid "External diff tool" |