[PATCH] git-gui: I18n fix sentence parts into full sentences for translation again.

[PATCH] git-gui: I18n fix sentence parts into full sentences for translation again.

[Christian Stimming]

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 <stimming@tuhh.de>
---
Patch against origin/master of git-gui.git at repo.or.cz.

 lib/mergetool.tcl |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl
index 79c58bc..d10cadd 100644
--- a/lib/mergetool.tcl
+++ b/lib/mergetool.tcl
@@ -5,18 +5,18 @@ proc merge_resolve_one {stage} {
 	global current_diff_path
 
 	switch -- $stage {
-		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]]
+	 	$targetquestion [short_path $current_diff_path]]]
 
 	if {[ask_popup $op_question] eq {yes}} {
 		merge_load_stages $current_diff_path [list merge_force_stage $stage]
-- 
1.6.0.rc1.34.g0fe8c

Re: [PATCH] git-gui: I18n fix sentence parts into full sentences for translation again.

[Alexander Gavrilov]

On Fri, Sep 12, 2008 at 1:17 PM, Christian Stimming <stimming@tuhh.de> wrote:
>-       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.
...
> -               $target [short_path $current_diff_path]]
> +               $targetquestion [short_path $current_diff_path]]]

You should remove this $target completely -- there is no %s to match it anymore.

Alexander.

Re: [PATCH] git-gui: I18n fix sentence parts into full sentences for translation again.

[Christian Stimming]

Am Freitag, 12. September 2008 12:23 schrieb Alexander Gavrilov:
> On Fri, Sep 12, 2008 at 1:17 PM, Christian Stimming <stimming@tuhh.de> 
wrote:
> >-       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.
>
> ...
>
> > -               $target [short_path $current_diff_path]]
> > +               $targetquestion [short_path $current_diff_path]]]
>
> You should remove this $target completely -- there is no %s to match it
> anymore.

Oh - right. Thanks for pointing this out. Please modify the patch accordingly.

Christian

Re: [PATCH] git-gui: I18n fix sentence parts into full sentences for translation again.

[Shawn O. Pearce]

Christian Stimming <stimming@tuhh.de> wrote:
> Am Freitag, 12. September 2008 12:23 schrieb Alexander Gavrilov:
> > On Fri, Sep 12, 2008 at 1:17 PM, Christian Stimming <stimming@tuhh.de> 
> wrote:
> > >-       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.
> >
> > ...
> >
> > > -               $target [short_path $current_diff_path]]
> > > +               $targetquestion [short_path $current_diff_path]]]
> >
> > You should remove this $target completely -- there is no %s to match it
> > anymore.
> 
> Oh - right. Thanks for pointing this out. Please modify the patch accordingly.

Fixed and applied.  Thanks, both.

-- 
Shawn.