@@ -269,7 +269,7 @@ proc parseviewrevs {view revs} {
269
269
lappend badrev $line
270
270
}
271
271
}
272
- error_popup " Error parsing revisions: $err "
272
+ error_popup " [ mc " Error parsing revisions:" ] $err "
273
273
return {}
274
274
}
275
275
set ret {}
@@ -324,7 +324,7 @@ proc start_rev_list {view} {
324
324
if {[catch {
325
325
set str [exec sh -c $viewargscmd($view) ]
326
326
} err]} {
327
- error_popup " Error executing --argscmd command: $err "
327
+ error_popup " [ mc " Error executing --argscmd command:" ] $err "
328
328
return 0
329
329
}
330
330
set args [concat $args [split $str " \n " ]]
@@ -500,7 +500,7 @@ proc updatecommits {} {
500
500
set fd [open [concat | git log --no-color -z --pretty=raw --parents \
501
501
--boundary $args " --" $vfilelimit($view) ] r]
502
502
} err]} {
503
- error_popup " Error executing git log: $err "
503
+ error_popup " [ mc " Error executing git log:" ] $err "
504
504
return
505
505
}
506
506
if {$viewactive($view) == 0} {
@@ -2937,7 +2937,7 @@ proc save_file_from_commit {filename output what} {
2937
2937
if {[string match " fatal: bad revision *" $err ]} {
2938
2938
return $nullfile
2939
2939
}
2940
- error_popup " Error getting \" $filename \" from $ what: $err "
2940
+ error_popup " [ mc " Error getting \" %s \" from %s: " $filename $ what] $err "
2941
2941
return {}
2942
2942
}
2943
2943
return $output
@@ -2994,7 +2994,7 @@ proc external_diff {} {
2994
2994
set gitktmpdir [file join [file dirname $gitdir ] \
2995
2995
[format " .gitk-tmp.%s" [pid ]]]
2996
2996
if {[catch {file mkdir $gitktmpdir } err]} {
2997
- error_popup " Error creating temporary directory $gitktmpdir : $err "
2997
+ error_popup " [ mc " Error creating temporary directory %s: " $gitktmpdir ] $err "
2998
2998
unset gitktmpdir
2999
2999
return
3000
3000
}
@@ -3003,7 +3003,7 @@ proc external_diff {} {
3003
3003
incr diffnum
3004
3004
set diffdir [file join $gitktmpdir $diffnum ]
3005
3005
if {[catch {file mkdir $diffdir } err]} {
3006
- error_popup " Error creating temporary directory $diffdir : $err "
3006
+ error_popup " [ mc " Error creating temporary directory %s: " $diffdir ] $err "
3007
3007
return
3008
3008
}
3009
3009
@@ -3016,7 +3016,7 @@ proc external_diff {} {
3016
3016
[list $difffromfile $difftofile ]]
3017
3017
if {[catch {set fl [open $cmd r]} err]} {
3018
3018
file delete -force $diffdir
3019
- error_popup [mc " $extdifftool : command failed: $err " ]
3019
+ error_popup " $extdifftool : [ mc " command failed:" ] $err "
3020
3020
} else {
3021
3021
fconfigure $fl -blocking 0
3022
3022
filerun $fl [list delete_at_eof $fl $diffdir ]
@@ -3041,7 +3041,7 @@ proc external_blame {parent_idx} {
3041
3041
}
3042
3042
3043
3043
if {[catch {exec git gui blame $base_commit $flist_menu_file &} err]} {
3044
- error_popup [mc " git gui blame: command failed: $err " ]
3044
+ error_popup " [ mc " git gui blame: command failed:" ] $err "
3045
3045
}
3046
3046
}
3047
3047
@@ -3050,7 +3050,7 @@ proc delete_at_eof {f dir} {
3050
3050
while {[gets $f line] >= 0} {}
3051
3051
if {[eof $f ]} {
3052
3052
if {[catch {close $f } err]} {
3053
- error_popup " External diff viewer failed: $err "
3053
+ error_popup " [ mc " External diff viewer failed:" ] $err "
3054
3054
}
3055
3055
file delete -force $dir
3056
3056
return 0
0 commit comments