German translation for git-gui

diff --git a/lib/diff.tcl b/lib/diff.tcl
index 05bf75179bdc04cc31e887f9d0817524db8a1cf4..b1129d551b31184f530f52d4e432f1e056e0d630 100644 (file)
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -39,13 +39,13 @@ proc handle_empty_diff {} {
        set s $file_states($path)
        if {[lindex $s 0] ne {_M}} return
 
-       info_popup "No differences detected.
+       info_popup [mc "No differences detected.
 
-[short_path $path] has no changes.
+%s has no changes.
 
 The modification date of this file was updated by another application, but the content within the file was not changed.
 
-A rescan will be automatically started to find other files which may have the same state."
+A rescan will be automatically started to find other files which may have the same state." [short_path $path]]
 
        clear_diff
        display_file $path __
@@ -86,6 +86,7 @@ proc show_diff {path w {lno {}}} {
                set max_sz [expr {128 * 1024}]
                if {[catch {
                                set fd [open $path r]
+                               fconfigure $fd -eofchar {}
                                set content [read $fd $max_sz]
                                close $fd
                                set sz [file size $path]
@@ -93,7 +94,7 @@ proc show_diff {path w {lno {}}} {
                        set diff_active 0
                        unlock_index
                        ui_status "Unable to display [escape_path $path]"
-                       error_popup "Error loading file:\n\n$err"
+                   error_popup [append [mc "Error loading file:"] "\n\n$err"]
                        return
                }
                $ui_diff conf -state normal
@@ -131,7 +132,7 @@ proc show_diff {path w {lno {}}} {
                return
        }
 
-       set cmd [list | git]
+       set cmd [list]
        if {$w eq $ui_index} {
                lappend cmd diff-index
                lappend cmd --cached
@@ -154,11 +155,11 @@ proc show_diff {path w {lno {}}} {
        lappend cmd --
        lappend cmd $path
 
-       if {[catch {set fd [open $cmd r]} err]} {
+       if {[catch {set fd [eval git_read --nice $cmd]} err]} {
                set diff_active 0
                unlock_index
                ui_status "Unable to display [escape_path $path]"
-               error_popup "Error loading diff:\n\n$err"
+               error_popup [append [mc "Error loading diff:"] "\n\n$err"]
                return
        }
 
@@ -271,17 +272,17 @@ proc apply_hunk {x y} {
        if {$current_diff_path eq {} || $current_diff_header eq {}} return
        if {![lock_index apply_hunk]} return
 
-       set apply_cmd {git apply --cached --whitespace=nowarn}
+       set apply_cmd {apply --cached --whitespace=nowarn}
        set mi [lindex $file_states($current_diff_path) 0]
        if {$current_diff_side eq $ui_index} {
-               set mode unstage
+               set failed_msg [mc "Failed to unstage selected hunk."]
                lappend apply_cmd --reverse
                if {[string index $mi 0] ne {M}} {
                        unlock_index
                        return
                }
        } else {
-               set mode stage
+               set failed_msg [mc "Failed to stage selected hunk."]
                if {[string index $mi 1] ne {M}} {
                        unlock_index
                        return
@@ -301,12 +302,12 @@ proc apply_hunk {x y} {
        }
 
        if {[catch {
-               set p [open "| $apply_cmd" w]
+               set p [eval git_write $apply_cmd]
                fconfigure $p -translation binary -encoding binary
                puts -nonewline $p $current_diff_header
                puts -nonewline $p [$ui_diff get $s_lno $e_lno]
                close $p} err]} {
-               error_popup "Failed to $mode selected hunk.\n\n$err"
+               error_popup [append $failed_msg "\n\n$err"]
                unlock_index
                return
        }