Re: [PATCH/RFC] l10n: de.po: translate 2 new messages

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 7, 2012, 17:44 UTC
Message-ID: <7vhar9ybgk.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAN0XMOL9cxy8noicF-P-cjLkw76Zf3Uyu4C2RqbcTYrug5+w8Q@mail.gmail.com>

Ralf Thielow <ralf.thielow@gmail.com> writes:

Show 23 quoted lines

> On Fri, Sep 7, 2012 at 6:36 PM, Ralf Thielow <ralf.thielow@gmail.com> wrote:
>> On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin <worldhello.net@gmail.com> wrote:
>>> I just notice that the 1st line of the orignal message below has
>>> only 56  characters, much shorter than other lines. It is because
>>> this is a warning message, and would add a prefix: "warning: ".
>>>
>>> #: builtin/push.c:151
>>> msgid ""
>>> "push.default is unset; its implicit value is changing in\n"
>>> "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
>>> "and maintain the current behavior after the default changes, use:\n"
>>> "\n"
>>> "  git config --global push.default matching\n"
>>>
>>> For this reason, translations as follows are not well-formed.
>>> So I rewind git-po, and your commits may need a bit amend.
>>>
>>
>> I admit that I don't really understand what you mean. I can't
>> see a big difference in line lengths. It's not more than others
>
> I got it. This "warning: " is added automatically.
> Sorry

We may want to revisit this behaviour, by the way.

If you have a long string that barely happens to fit on a line with "warning: " prefix in the original, your translation might want to spell it in two lines, i.e.

	warning(_("A quick brown fox jumps over the lazy dog."));

which gives

	warning: A quick brown fox jumps over the lazy dog.<LF>

might want to turn into

	warning("AA qquuiicckk bbrroowwnn ffooxx\n"
        	"jjuummppss oovveerr tthhee llaazzyy ddoogg.");

and currently gives:

	wwaarrnniinngg: AA qquuiicckk bbrroowwnn ffooxx<LF>
        jjuummppss oovveerr tthhee llaazzyy ddoogg.<LF>

But we may want to give

	wwaarrnniinngg: AA qquuiicckk bbrroowwnn ffooxx<LF>
        wwaarrnniinngg: jjuummppss oovveerr tthhee llaazzyy ddoogg.<LF>

instead.

Check out the way advice.c::advise() does its "hints: " prefix for hints, but we probably would want to avoid anything that allocates more memory in the die() codepath.