mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization

Browse Source 
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Johannes Sixt
2008-10-03 13:13:42 +02:00
committed by Shawn O. Pearce
parent f2df8a5bfb
commit 7f15b00273
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/diff.tcl
View File

@ -117,22 +117,22 @@ proc show_unmerged_diff {cont_info} {
if {$merge_stages(2) eq {}} { if {$merge_stages(2) eq {}} {
set is_conflict_diff 1 set is_conflict_diff 1
lappend current_diff_queue \ lappend current_diff_queue \
[list "LOCAL: deleted\nREMOTE:\n" d======= \ [list [mc "LOCAL: deleted\nREMOTE:\n"] d======= \
[list ":1:$current_diff_path" ":3:$current_diff_path"]] [list ":1:$current_diff_path" ":3:$current_diff_path"]]
} elseif {$merge_stages(3) eq {}} { } elseif {$merge_stages(3) eq {}} {
set is_conflict_diff 1 set is_conflict_diff 1
lappend current_diff_queue \ lappend current_diff_queue \
[list "REMOTE: deleted\nLOCAL:\n" d======= \ [list [mc "REMOTE: deleted\nLOCAL:\n"] d======= \
[list ":1:$current_diff_path" ":2:$current_diff_path"]] [list ":1:$current_diff_path" ":2:$current_diff_path"]]
} elseif {[lindex $merge_stages(1) 0] eq {120000} } elseif {[lindex $merge_stages(1) 0] eq {120000}
|| [lindex $merge_stages(2) 0] eq {120000} || [lindex $merge_stages(2) 0] eq {120000}
|| [lindex $merge_stages(3) 0] eq {120000}} { || [lindex $merge_stages(3) 0] eq {120000}} {
set is_conflict_diff 1 set is_conflict_diff 1
lappend current_diff_queue \ lappend current_diff_queue \
[list "LOCAL:\n" d======= \ [list [mc "LOCAL:\n"] d======= \
[list ":1:$current_diff_path" ":2:$current_diff_path"]] [list ":1:$current_diff_path" ":2:$current_diff_path"]]
lappend current_diff_queue \ lappend current_diff_queue \
[list "REMOTE:\n" d======= \ [list [mc "REMOTE:\n"] d======= \
[list ":1:$current_diff_path" ":3:$current_diff_path"]] [list ":1:$current_diff_path" ":3:$current_diff_path"]]
} else { } else {
start_show_diff $cont_info start_show_diff $cont_info
@ -218,17 +218,17 @@ proc show_other_diff {path w m cont_info} {
d_@ d_@
} else { } else {
if {$sz > $max_sz} { if {$sz > $max_sz} {
$ui_diff insert end \ $ui_diff insert end [mc \
"* Untracked file is $sz bytes. "* Untracked file is %d bytes.
* Showing only first $max_sz bytes. * Showing only first %d bytes.
" d_@ " $sz $max_sz] d_@
} }
$ui_diff insert end $content $ui_diff insert end $content
if {$sz > $max_sz} { if {$sz > $max_sz} {
$ui_diff insert end " $ui_diff insert end [mc "
* Untracked file clipped here by [appname]. * Untracked file clipped here by %s.
* To see the entire file, use an external editor. * To see the entire file, use an external editor.
" d_@ " [appname]] d_@
} }
} }
$ui_diff conf -state disabled $ui_diff conf -state disabled