Re: [PATCH v6 5/7] i18n: am: mark more strings for translation

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 25, 2012, 17:18 UTC
Message-ID: <7v8ve7daje.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7483bb4c75600ac3ffd4f740040a4256ff70821f.1343227806.git.worldhello.net@gmail.com>

Jiang Xin <worldhello.net@gmail.com> writes:

Show 18 quoted lines

> Mark strings in 'git-am.sh' for translation. In the last chunk, I
> changed '$1' to '-b/--binary' for this reason:
>
>  * First, if there is a variable in the l10n message, we could not use
>    gettext. Because the variable will be expanded (evaluated) and will
>    never match the entry in the po file.
>
>  * Second, if there is a positional parameter ($1, $2,...) in the
>    message, we could not use eval_gettext either. Because eval_gettext
>    may be a wapper for gettext, and the positional parameter would
>    lose its original context.
>
> Also reduce one indentation level for one gettextln clause introduced
> in commit de88c1c.
>
> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
> Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com>
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

Thanks. I've reworded the rationale for -b/--binary, though, as the above sounds as if we are clueless as to how to i18n this message properly even if we wanted to, which is not the case.

    Mark strings in 'git-am.sh' for translation. In the last chunk,
    change '$1' to '-b/--binary', as it is not worth turning this
    message to "The %s option has been..." and using printf on it.