Re: [PATCH v2 25/25] sequencer: remove bogus hint for translators

2016-10-06 Thread Johannes Schindelin
Hi Junio,

On Sun, 11 Sep 2016, Junio C Hamano wrote:

> Johannes Schindelin  writes:
> 
> > When translating error messages, we need to be careful *not* to translate
> > the todo commands such as "pick", "reword", etc because they are commands,
> > and Git would not understand translated versions of those commands.
> >
> > Therefore, translating the commands in the error messages would simply be
> > misleading.
> 
> This comes from b9c993e0 ("i18n: git-revert literal "me" messages",
> 2011-02-22) where it said
> 
> Author: Ævar Arnfjörð Bjarmason 
> 
> i18n: git-revert literal "me" messages
> 
> Translate messages that use the `me' variable. These are all error
> messages referencing the command name, so the name shouldn't be
> translated.
> 
> Reported-by: Jonathan Nieder 
> Signed-off-by: Ævar Arnfjörð Bjarmason 
> Signed-off-by: Junio C Hamano 
> 
> This looks like a positive attempt to remind translators that their
> translation must flow with these literal command names that will not
> get translated in place, not a bogus hint at all, at least to me.

Alright, I misread it to mean: "You need to translate these terms".

I fixed it by skipping this patch, and amending the "revamp the todo
parsing" patch: the first %s now actually refers to the much more helpful
todo command rather than the overall Git command.

Thanks,
Dscho

Re: [PATCH v2 25/25] sequencer: remove bogus hint for translators

2016-09-11 Thread Junio C Hamano
Johannes Schindelin  writes:

> When translating error messages, we need to be careful *not* to translate
> the todo commands such as "pick", "reword", etc because they are commands,
> and Git would not understand translated versions of those commands.
>
> Therefore, translating the commands in the error messages would simply be
> misleading.

This comes from b9c993e0 ("i18n: git-revert literal "me" messages",
2011-02-22) where it said

Author: Ævar Arnfjörð Bjarmason 

i18n: git-revert literal "me" messages

Translate messages that use the `me' variable. These are all error
messages referencing the command name, so the name shouldn't be
translated.

Reported-by: Jonathan Nieder 
Signed-off-by: Ævar Arnfjörð Bjarmason 
Signed-off-by: Junio C Hamano 

This looks like a positive attempt to remind translators that their
translation must flow with these literal command names that will not
get translated in place, not a bogus hint at all, at least to me.

>
> Signed-off-by: Johannes Schindelin 
> ---
>  sequencer.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 465e018..cdff0f1 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -697,8 +697,6 @@ static int do_pick_commit(enum todo_command command, 
> struct commit *commit,
>   return fast_forward_to(commit->object.oid.hash, head, unborn, 
> opts);
>  
>   if (parent && parse_commit(parent) < 0)
> - /* TRANSLATORS: The first %s will be "revert" or
> -"cherry-pick", the second %s a SHA1 */
>   return error(_("%s: cannot parse parent commit %s"),
>   command_to_string(command),
>   oid_to_hex(&parent->object.oid));