From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Fri, 12 Sep 2008 10:23:42 GMT
Subject: Re: [PATCH] git-gui: I18n fix sentence parts into full sentences for translation again.
Message-ID: <bb6f213e0809120323l3c18cd32hfde9ef6756593061@mail.gmail.com>
In-Reply-To: <200809121117.39407.stimming@tuhh.de>

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.