RFC patchl10n: de.po: translate 2 new messages

> Ralf Thielow <ralf.thielow@gmail.com> writes:
>
>> "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
>> "'current' instead of 'simple' if you sometimes use older versions of Git)"
> [...]
>> +"(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den gleichartigen"
>> +" Modus 'current' anstatt 'simple', falls du gelegentlich ältere Versionen von"
>> +" Git benutzt)"
>
> You translate "similar" as "gleichartig", which sounds too much like
> "the same" to me.  Perhaps "ähnlich"?  Or is there no danger of
> confusing this in de_DE usage?
>
> Ack on the rest.
>

> Translate 2 new messages came from git.pot update in
> ccfca8d (l10n: Update git.pot (2 new, 4 removed messages)).
>
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
>
> Hi German l10n team,
>
> please review this small update on German translation.
> This patch here is based on a preparation commit which
> just contains the "msgmerge" change.
> For an easier review, I'll copy the first message in english
> in this email.
> The second change shows that there are some newlines, came
> from 'msgmerge', on places where we don't want to have them.
> I'll fix that soon.
>
> A hint on this translation:
> I've translated "See 'git help config' and search for" as
> "Führe 'git help config' aus und suche nach...", not as
> "Siehe 'git help config' und suche nach..." because the second
> doesn't sound good to me. Perhaps someone else has a better
> idea.
>
> Thanks,
> Ralf
>
> #: 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"
> "\n"
> "To squelch this message and adopt the new behavior now, use:\n"
> "\n"
> "  git config --global push.default simple\n"
> "\n"
> "See 'git help config' and search for 'push.default' for further "
> "information.\n"
> "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
> "'current' instead of 'simple' if you sometimes use older versions of Git)"
>
>  po/de.po | 20 ++++++++++++++++++--
>  1 Datei geändert, 18 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
>
> diff --git a/po/de.po b/po/de.po
> index f3d232e..df5187e 100644
> --- a/po/de.po
> +++ b/po/de.po
> @@ -4431,6 +4431,23 @@ msgid ""
>  "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
>  "'current' instead of 'simple' if you sometimes use older versions of Git)"
>  msgstr ""
> +"'push.default' ist nicht gesetzt; der implizit gesetzte Wert wird in\n"
> +"Git 2.0 von 'matching' nach 'simple' geändert. Um diese Meldung zu unter-\n"
> +"drücken und das aktuelle Verhalten nach Änderung des Standardwertes\n"
> +"beizubehalten, benutze:"
> +"\n"
> +"  git config --global push.default matching\n"
> +"\n"
> +"Um diese Meldung zu unterdrücken und das neue Verhalten jetzt zu übernehmen,\n"
> +"benutze:\n"
> +"\n"
> +"  git config --global push.default simple\n"
> +"\n"
> +"Führe 'git help config' aus und suche nach 'push.default' für weitere "
> +"Informationen.\n"
> +"(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den gleichartigen"
> +" Modus 'current' anstatt 'simple', falls du gelegentlich ältere Versionen von"
> +" Git benutzt)"
>
>  #: builtin/push.c:199
>  msgid ""
> @@ -4453,7 +4470,6 @@ msgstr ""
>  "für weitere Details."
>
>  #: builtin/push.c:212
> -#, fuzzy
>  msgid ""
>  "Updates were rejected because a pushed branch tip is behind its remote\n"
>  "counterpart. If you did not intend to push that branch, you may want to\n"
> @@ -4465,7 +4481,7 @@ msgstr ""
>  "beabsichtigt hast, diesen Zweig zu versenden, kannst du auch den zu "
>  "versendenden\n"
>  "Zweig spezifizieren oder die Konfigurationsvariable 'push.default' zu "
> -"'current'\n"
> +"'simple', 'current'\n"
>  "oder 'upstream' setzen, um nur den aktuellen Zweig zu versenden."
>
>  #: builtin/push.c:218
> --
> 1.7.12
>

> 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.
>

> 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

> 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

> 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

> Extract a function that allows to print messages
> with a prefix.
>
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
>  advice.c | 14 ++++++++++----
>  advice.h |  1 +
>  2 Dateien geändert, 11 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
>
> diff --git a/advice.c b/advice.c
> index edfbd4a..e73d53b 100644
> --- a/advice.c
> +++ b/advice.c
> @@ -25,25 +25,31 @@ static struct {
>  	{ "detachedhead", &advice_detached_head },
>  };
>  
> -void advise(const char *advice, ...)
> +void print_with_prefix(const char *prefix, const char *msg, ...)
>  {
>  	struct strbuf buf = STRBUF_INIT;
>  	va_list params;
>  	const char *cp, *np;
>  
> -	va_start(params, advice);
> -	strbuf_vaddf(&buf, advice, params);
> +	va_start(params, msg);
> +	strbuf_vaddf(&buf, msg, params);
>  	va_end(params);
>  
>  	for (cp = buf.buf; *cp; cp = np) {
>  		np = strchrnul(cp, '\n');
> -		fprintf(stderr,	_("hint: %.*s\n"), (int)(np - cp), cp);
> +		fprintf(stderr,	 "%s %.*s\n", prefix, (int)(np - cp), cp);

> Ralf Thielow <ralf.thielow@gmail.com> writes:
>
>> Extract a function that allows to print messages
>> with a prefix.
>>
>> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
>> ---
>>  advice.c | 14 ++++++++++----
>>  advice.h |  1 +
>>  2 Dateien geändert, 11 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
>>
>> diff --git a/advice.c b/advice.c
>> index edfbd4a..e73d53b 100644
>> --- a/advice.c
>> +++ b/advice.c
>> @@ -25,25 +25,31 @@ static struct {
>>       { "detachedhead", &advice_detached_head },
>>  };
>>
>> -void advise(const char *advice, ...)
>> +void print_with_prefix(const char *prefix, const char *msg, ...)
>>  {
>>       struct strbuf buf = STRBUF_INIT;
>>       va_list params;
>>       const char *cp, *np;
>>
>> -     va_start(params, advice);
>> -     strbuf_vaddf(&buf, advice, params);
>> +     va_start(params, msg);
>> +     strbuf_vaddf(&buf, msg, params);
>>       va_end(params);
>>
>>       for (cp = buf.buf; *cp; cp = np) {
>>               np = strchrnul(cp, '\n');
>> -             fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp);
>> +             fprintf(stderr,  "%s %.*s\n", prefix, (int)(np - cp), cp);
>
> Hrm, naively, printf("%s: %.*s\n", _("hint"), ...) might look more
> natural, but I vaguely recall that the current code places _()
> around the entire "hint: %.*s\n" on purpose.  IIRC, it was to allow
> translations that flow from RTL e.g. ".siht od t'nod :tnih".
>
> Doesn't this patch break it?

> On Fri, Sep 7, 2012 at 9:32 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
>>> -             fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp);
>>> +             fprintf(stderr,  "%s %.*s\n", prefix, (int)(np - cp), cp);
>>
>> Hrm, naively, printf("%s: %.*s\n", _("hint"), ...) might look more
>> natural, but I vaguely recall that the current code places _()
>> around the entire "hint: %.*s\n" on purpose.  IIRC, it was to allow
>> translations that flow from RTL e.g. ".siht od t'nod :tnih".
>>
>> Doesn't this patch break it?
>
> Sorry but I don't know what you mean with "translations that flow
> from RTL e.g. ".siht od t'nod :tnih"." so I can't check this.
> As far as I can see the callers only put a simple message in it,
> e.g. advise(_("Commit your changes or stash them to proceed."));
> So I don't think that this patch would break anything.

> Ralf Thielow <ralf.thielow@gmail.com> writes:
>
>> On Fri, Sep 7, 2012 at 9:32 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>
>>>> -             fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp);
>>>> +             fprintf(stderr,  "%s %.*s\n", prefix, (int)(np - cp), cp);
>>>
>>> Hrm, naively, printf("%s: %.*s\n", _("hint"), ...) might look more
>>> natural, but I vaguely recall that the current code places _()
>>> around the entire "hint: %.*s\n" on purpose.  IIRC, it was to allow
>>> translations that flow from RTL e.g. ".siht od t'nod :tnih".
>>>
>>> Doesn't this patch break it?
>>
>> Sorry but I don't know what you mean with "translations that flow
>> from RTL e.g. ".siht od t'nod :tnih"." so I can't check this.
>> As far as I can see the callers only put a simple message in it,
>> e.g. advise(_("Commit your changes or stash them to proceed."));
>> So I don't think that this patch would break anything.
>
> Your patch would not allow target languages that want to put the
> _("hint") at the *tail* end of each line of the message.  With the
> original, with something like this:
>
>         msgid "hint: %.*s\n"
>         msgstr "%.*s :tnih\n"
>
> you could do that if you wanted to.
>

> On Fri, Sep 7, 2012 at 10:52 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Ralf Thielow <ralf.thielow@gmail.com> writes:
>>
>>> On Fri, Sep 7, 2012 at 9:32 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>>
>>>>> -             fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp);
>>>>> +             fprintf(stderr,  "%s %.*s\n", prefix, (int)(np - cp), cp);
>>>>
>>>> Hrm, naively, printf("%s: %.*s\n", _("hint"), ...) might look more
>>>> natural, but I vaguely recall that the current code places _()
>>>> around the entire "hint: %.*s\n" on purpose.  IIRC, it was to allow
>>>> translations that flow from RTL e.g. ".siht od t'nod :tnih".
>>>>
>>>> Doesn't this patch break it?
>>>
>>> Sorry but I don't know what you mean with "translations that flow
>>> from RTL e.g. ".siht od t'nod :tnih"." so I can't check this.
>>> As far as I can see the callers only put a simple message in it,
>>> e.g. advise(_("Commit your changes or stash them to proceed."));
>>> So I don't think that this patch would break anything.
>>
>> Your patch would not allow target languages that want to put the
>> _("hint") at the *tail* end of each line of the message.  With the
>> original, with something like this:
>>
>>         msgid "hint: %.*s\n"
>>         msgstr "%.*s :tnih\n"
>>
>> you could do that if you wanted to.
>
> Is there a need actually?
> It's easy to add a "_(...)" around this string, but then we'll have a
> msgid in "git.pot" without ever having a sensible translation. Not?