Re: [PATCH 3/6] merge-recursive: remove i18n legos in conflict messages

From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date: May 31, 2012, 13:56 UTC
Message-ID: <CACsJy8Dnk6Nnkh94OMx4L-=8CUZK22yG8_BA6EUtW1o+=qyGxg@mail.gmail.com>
In-Reply-To: <20120531135222.GB10523@burratino>

On Thu, May 31, 2012 at 8:52 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:

Show 17 quoted lines

> Nguyễn Thái Ngọc Duy wrote:
>
>> +     const char *msg[] = {
>> +             "CONFLICT (rename/delete): %s deleted in %s and renamed in %s. Version %s of %s left in tree.",
>> +             "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s of %s left in tree.",
>> +     };
>> +     const char *renamed_msg[] = {
>> +             "CONFLICT (rename/delete): %s deleted in %s and renamed in %s. Version %s of %s left in tree at %s.",
>> +             "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s of %s left in tree at %s.",
>> +     };
>
> Is lego by sentence ok?  i.e., having 4 translated messages:
>
>        CONFLICT (rename/delete): %s deleted in %s and renamed in %s.
>        CONFLICT (modify/delete): %s deleted in %s and modified in %s.
>        Version %s of %s left in tree.
>        Version %s of %s left in tree at %s.

Yeah, should have separated these sentences, less work for translators.

-- 
Duy