{"thread":{"id":"15497","subject":"[PATCH] git-gui: I18n fix sentence parts into full sentences for translation again.","startedAt":"2008-09-12T09:17:38Z","lastAt":"2008-09-12T15:39:34Z","messageCount":4,"participants":["Christian Stimming","Alexander Gavrilov","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"90525","messageId":"200809121117.39407.stimming@tuhh.de","threadId":"15497","inReplyTo":null,"subject":"[PATCH] git-gui: I18n fix sentence parts into full sentences for translation again.","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-09-12T09:17:38Z","receivedAt":"2008-09-12T09:17:38Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"For translations, it is almost always impossible to correctly translate\nparts of sentences in almost any other language. Hence, messages like this\nmust be re-organized into full sentences.\n\nSigned-off-by: Christian Stimming \n---\nPatch against origin/master of git-gui.git at repo.or.cz.\n\n lib/mergetool.tcl | 12 ++++++------\n 1 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/lib/mergetool.tcl b/lib/mergetool.tcl\nindex 79c58bc..d10cadd 100644\n--- a/lib/mergetool.tcl\n+++ b/lib/mergetool.tcl\n@@ -5,18 +5,18 @@ proc merge_resolve_one {stage} {\n \tglobal current_diff_path\n \n \tswitch -- $stage {\n-\t\t1 { set target [mc \"the base version\"] }\n-\t\t2 { set target [mc \"this branch\"] }\n-\t\t3 { set target [mc \"the other branch\"] }\n+\t\t1 { set targetquestion [mc \"Force resolution to the base version?\"] }\n+\t\t2 { set targetquestion [mc \"Force resolution to this branch?\"] }\n+\t\t3 { set targetquestion [mc \"Force resolution to the other branch?\"] }\n \t}\n \n-\tset op_question [mc \"Force resolution to %s?\n-Note that the diff shows only conflicting changes.\n+ set op_question [strcat $targetquestion \"\\n\" \\\n+[mc \"Note that the diff shows only conflicting changes.\n \n %s will be overwritten.\n \n This operation can be undone only by restarting the merge.\" \\\n-\t\t$target [short_path $current_diff_path]]\n+\t \t$targetquestion [short_path $current_diff_path]]]\n \n \tif {[ask_popup $op_question] eq {yes}} {\n \t\tmerge_load_stages $current_diff_path [list merge_force_stage $stage]\n-- \n1.6.0.rc1.34.g0fe8c\n"},{"id":"90527","messageId":"bb6f213e0809120323l3c18cd32hfde9ef6756593061@mail.gmail.com","threadId":"15497","inReplyTo":"200809121117.39407.stimming@tuhh.de","subject":"Re: [PATCH] git-gui: I18n fix sentence parts into full sentences for translation again.","fromName":"Alexander Gavrilov","fromEmail":"angavrilov@gmail.com","sentAt":"2008-09-12T10:23:42Z","receivedAt":"2008-09-12T10:23:42Z","isPatch":true,"sender":{"key":"angavrilov@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42666?v=4"},"body":"On Fri, Sep 12, 2008 at 1:17 PM, Christian Stimming wrote:\n>- set op_question [mc \"Force resolution to %s?\n>-Note that the diff shows only conflicting changes.\n>+ set op_question [strcat $targetquestion \"\\n\" \\\n>+[mc \"Note that the diff shows only conflicting changes.\n...\n> - $target [short_path $current_diff_path]]\n> + $targetquestion [short_path $current_diff_path]]]\n\nYou should remove this $target completely -- there is no %s to match it anymore.\n\nAlexander.\n"},{"id":"90528","messageId":"200809121232.14364.stimming@tuhh.de","threadId":"15497","inReplyTo":"bb6f213e0809120323l3c18cd32hfde9ef6756593061@mail.gmail.com","subject":"Re: [PATCH] git-gui: I18n fix sentence parts into full sentences for translation again.","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-09-12T10:32:13Z","receivedAt":"2008-09-12T10:32:13Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"Am Freitag, 12. September 2008 12:23 schrieb Alexander Gavrilov:\n> On Fri, Sep 12, 2008 at 1:17 PM, Christian Stimming \nwrote:\n> >- set op_question [mc \"Force resolution to %s?\n> >-Note that the diff shows only conflicting changes.\n> >+ set op_question [strcat $targetquestion \"\\n\" \\\n> >+[mc \"Note that the diff shows only conflicting changes.\n>\n> ...\n>\n> > - $target [short_path $current_diff_path]]\n> > + $targetquestion [short_path $current_diff_path]]]\n>\n> You should remove this $target completely -- there is no %s to match it\n> anymore.\n\nOh - right. Thanks for pointing this out. Please modify the patch accordingly.\n\nChristian\n"},{"id":"90569","messageId":"20080912153934.GG22960@spearce.org","threadId":"15497","inReplyTo":"200809121232.14364.stimming@tuhh.de","subject":"Re: [PATCH] git-gui: I18n fix sentence parts into full sentences for translation again.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-09-12T15:39:34Z","receivedAt":"2008-09-12T15:39:34Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Christian Stimming wrote:\n> Am Freitag, 12. September 2008 12:23 schrieb Alexander Gavrilov:\n> > On Fri, Sep 12, 2008 at 1:17 PM, Christian Stimming \n> wrote:\n> > >- set op_question [mc \"Force resolution to %s?\n> > >-Note that the diff shows only conflicting changes.\n> > >+ set op_question [strcat $targetquestion \"\\n\" \\\n> > >+[mc \"Note that the diff shows only conflicting changes.\n> >\n> > ...\n> >\n> > > - $target [short_path $current_diff_path]]\n> > > + $targetquestion [short_path $current_diff_path]]]\n> >\n> > You should remove this $target completely -- there is no %s to match it\n> > anymore.\n> \n> Oh - right. Thanks for pointing this out. Please modify the patch accordingly.\n\nFixed and applied. Thanks, both.\n\n-- \nShawn.\n"}]}