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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html