From 8b56a18dea33e8b55810b4e561279b118bc1ada8 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Fri, 12 Sep 2008 11:17:38 +0200 Subject: [PATCH] git-gui: I18n fix sentence parts into full sentences for translation again. For translations, it is almost always impossible to correctly translate parts of sentences in almost any other language. Hence, messages like this must be re-organized into full sentences. Signed-off-by: Christian Stimming Signed-off-by: Shawn O. Pearce --- lib/mergetool.tcl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index dd2315b85..a44a7258b 100644 --- a/lib/mergetool.tcl +++ b/lib/mergetool.tcl @@ -11,18 +11,18 @@ proc merge_resolve_one {stage} { return } - 1 { set target [mc "the base version"] } - 2 { set target [mc "this branch"] } - 3 { set target [mc "the other branch"] } + 1 { set targetquestion [mc "Force resolution to the base version?"] } + 2 { set targetquestion [mc "Force resolution to this branch?"] } + 3 { set targetquestion [mc "Force resolution to the other branch?"] } } - set op_question [mc "Force resolution to %s? -Note that the diff shows only conflicting changes. + set op_question [strcat $targetquestion "\n" \ +[mc "Note that the diff shows only conflicting changes. %s will be overwritten. This operation can be undone only by restarting the merge." \ - $target [short_path $current_diff_path]] + [short_path $current_diff_path]]] if {[ask_popup $op_question] eq {yes}} { merge_load_stages $current_diff_path [list merge_force_stage $stage] -- 2.26.2