Skip to content

Commit 3945d2c

Browse files
cstimpaulusmack
authored andcommitted
gitk: Add untranslated error messages to translation
Signed-off-by: Christian Stimming <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
1 parent b8a640e commit 3945d2c

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

gitk

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ proc parseviewrevs {view revs} {
269269
lappend badrev $line
270270
}
271271
}
272-
error_popup "Error parsing revisions: $err"
272+
error_popup "[mc "Error parsing revisions:"] $err"
273273
return {}
274274
}
275275
set ret {}
@@ -324,7 +324,7 @@ proc start_rev_list {view} {
324324
if {[catch {
325325
set str [exec sh -c $viewargscmd($view)]
326326
} err]} {
327-
error_popup "Error executing --argscmd command: $err"
327+
error_popup "[mc "Error executing --argscmd command:"] $err"
328328
return 0
329329
}
330330
set args [concat $args [split $str "\n"]]
@@ -500,7 +500,7 @@ proc updatecommits {} {
500500
set fd [open [concat | git log --no-color -z --pretty=raw --parents \
501501
--boundary $args "--" $vfilelimit($view)] r]
502502
} err]} {
503-
error_popup "Error executing git log: $err"
503+
error_popup "[mc "Error executing git log:"] $err"
504504
return
505505
}
506506
if {$viewactive($view) == 0} {
@@ -2937,7 +2937,7 @@ proc save_file_from_commit {filename output what} {
29372937
if {[string match "fatal: bad revision *" $err]} {
29382938
return $nullfile
29392939
}
2940-
error_popup "Error getting \"$filename\" from $what: $err"
2940+
error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err"
29412941
return {}
29422942
}
29432943
return $output
@@ -2994,7 +2994,7 @@ proc external_diff {} {
29942994
set gitktmpdir [file join [file dirname $gitdir] \
29952995
[format ".gitk-tmp.%s" [pid]]]
29962996
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"
29982998
unset gitktmpdir
29992999
return
30003000
}
@@ -3003,7 +3003,7 @@ proc external_diff {} {
30033003
incr diffnum
30043004
set diffdir [file join $gitktmpdir $diffnum]
30053005
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"
30073007
return
30083008
}
30093009

@@ -3016,7 +3016,7 @@ proc external_diff {} {
30163016
[list $difffromfile $difftofile]]
30173017
if {[catch {set fl [open $cmd r]} err]} {
30183018
file delete -force $diffdir
3019-
error_popup [mc "$extdifftool: command failed: $err"]
3019+
error_popup "$extdifftool: [mc "command failed:"] $err"
30203020
} else {
30213021
fconfigure $fl -blocking 0
30223022
filerun $fl [list delete_at_eof $fl $diffdir]
@@ -3041,7 +3041,7 @@ proc external_blame {parent_idx} {
30413041
}
30423042

30433043
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"
30453045
}
30463046
}
30473047

@@ -3050,7 +3050,7 @@ proc delete_at_eof {f dir} {
30503050
while {[gets $f line] >= 0} {}
30513051
if {[eof $f]} {
30523052
if {[catch {close $f} err]} {
3053-
error_popup "External diff viewer failed: $err"
3053+
error_popup "[mc "External diff viewer failed:"] $err"
30543054
}
30553055
file delete -force $dir
30563056
return 0

0 commit comments

Comments
 (0)