{"thread":{"id":"15847","subject":"[PATCH] git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization","startedAt":"2008-10-03T11:13:42Z","lastAt":"2008-10-03T11:13:42Z","messageCount":1,"participants":["Johannes Sixt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"92721","messageId":"48E5FE66.4020704@viscovery.net","threadId":"15847","inReplyTo":null,"subject":"[PATCH] git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2008-10-03T11:13:42Z","receivedAt":"2008-10-03T11:13:42Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"From: Johannes Sixt <johannes.sixt@telecom.at>\n\nSigned-off-by: Johannes Sixt <johannes.sixt@telecom.at>\n---\n lib/diff.tcl |   22 +++++++++++-----------\n 1 files changed, 11 insertions(+), 11 deletions(-)\n\ndiff --git a/lib/diff.tcl b/lib/diff.tcl\nindex abe502d..484ebb4 100644\n--- a/lib/diff.tcl\n+++ b/lib/diff.tcl\n@@ -117,22 +117,22 @@ proc show_unmerged_diff {cont_info} {\n \tif {$merge_stages(2) eq {}} {\n \t\tset is_conflict_diff 1\n \t\tlappend current_diff_queue \\\n-\t\t\t[list \"LOCAL: deleted\\nREMOTE:\\n\" d======= \\\n+\t\t\t[list [mc \"LOCAL: deleted\\nREMOTE:\\n\"] d======= \\\n \t\t\t    [list \":1:$current_diff_path\" \":3:$current_diff_path\"]]\n \t} elseif {$merge_stages(3) eq {}} {\n \t\tset is_conflict_diff 1\n \t\tlappend current_diff_queue \\\n-\t\t\t[list \"REMOTE: deleted\\nLOCAL:\\n\" d======= \\\n+\t\t\t[list [mc \"REMOTE: deleted\\nLOCAL:\\n\"] d======= \\\n \t\t\t    [list \":1:$current_diff_path\" \":2:$current_diff_path\"]]\n \t} elseif {[lindex $merge_stages(1) 0] eq {120000}\n \t\t|| [lindex $merge_stages(2) 0] eq {120000}\n \t\t|| [lindex $merge_stages(3) 0] eq {120000}} {\n \t\tset is_conflict_diff 1\n \t\tlappend current_diff_queue \\\n-\t\t\t[list \"LOCAL:\\n\" d======= \\\n+\t\t\t[list [mc \"LOCAL:\\n\"] d======= \\\n \t\t\t    [list \":1:$current_diff_path\" \":2:$current_diff_path\"]]\n \t\tlappend current_diff_queue \\\n-\t\t\t[list \"REMOTE:\\n\" d======= \\\n+\t\t\t[list [mc \"REMOTE:\\n\"] d======= \\\n \t\t\t    [list \":1:$current_diff_path\" \":3:$current_diff_path\"]]\n \t} else {\n \t\tstart_show_diff $cont_info\n@@ -218,17 +218,17 @@ proc show_other_diff {path w m cont_info} {\n \t\t\t\td_@\n \t\t} else {\n \t\t\tif {$sz > $max_sz} {\n-\t\t\t\t$ui_diff insert end \\\n-\"* Untracked file is $sz bytes.\n-* Showing only first $max_sz bytes.\n-\" d_@\n+\t\t\t\t$ui_diff insert end [mc \\\n+\"* Untracked file is %d bytes.\n+* Showing only first %d bytes.\n+\" $sz $max_sz] d_@\n \t\t\t}\n \t\t\t$ui_diff insert end $content\n \t\t\tif {$sz > $max_sz} {\n-\t\t\t\t$ui_diff insert end \"\n-* Untracked file clipped here by [appname].\n+\t\t\t\t$ui_diff insert end [mc \"\n+* Untracked file clipped here by %s.\n * To see the entire file, use an external editor.\n-\" d_@\n+\" [appname]] d_@\n \t\t\t}\n \t\t}\n \t\t$ui_diff conf -state disabled\n-- \n1.6.0.2.319.gffa7c\n"}]}