From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Wed, 06 Jul 2011 09:30:46 GMT
Subject: Re: [PATCH 05/14] revert: Propogate errors upwards from do_pick_commit
Message-ID: <CALkWK0kC36d72kxmWz1L=1tdjGeq9BVc2_UUE5SvvKXnefEG4g@mail.gmail.com>
In-Reply-To: <20110706085007.GB15682@elie>

Hi again,

Jonathan Nieder writes:
>> --- a/builtin/revert.c
>> +++ b/builtin/revert.c
>> @@ -250,25 +250,20 @@ static struct tree *empty_tree(void)
> [...]
>> +     if (action == CHERRY_PICK)
>> +             error(_("Your local changes would be overwritten by %s."), me);
>> +     else
>> +             error(_("Your local changes would be overwritten by %s."), me);
>
> gettext creates one msgid for these two strings, so translators have
> no choice but to give them the same translation.  Is that the intent?
>
> [...]
>> +     if (res < 0)
>> +             die(_("%s failed"), me);
>> +     return res;
>>  }
>
> Likewise.

Oops, I didn't realize that! Will fix.

-- Ram