Re: [PATCH] l10n: de.po: translate 260 new messages

[Ralf Thielow <ralf.thielow@gmail.com>]

Hi Matthias,

thanks for review!  Your findings and suggestions are very good and
I will integrate them in a new version.

2016-10-03 0:23 GMT+02:00 Matthias Rüster <matthias.ruester@gmail.com>:
>>  #: builtin/merge.c:960
>>  #, c-format
>>  msgid "Bad value '%s' in environment '%s'"
>> -msgstr ""
>> +msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
>
> I do not know the context but I would translate it to:
> "... Umgebung '%s'"
>

That was my first translation, too.  Then I was wondering what environment
can Git even mean and looked at the sources.  It turned out it really is
about an environment variable.

>
>>  #: git-rebase--interactive.sh:147
>>  msgid ""
>>  "\n"
>>  "Commands:\n"
>>  " p, pick = use commit\n"
>>  " r, reword = use commit, but edit the commit message\n"
>>  " e, edit = use commit, but stop for amending\n"
>>  " s, squash = use commit, but meld into previous commit\n"
>>  " f, fixup = like \"squash\", but discard this commit's log message\n"
>>  " x, exec = run command (the rest of the line) using shell\n"
>>  " d, drop = remove commit\n"
>>  "\n"
>>  "These lines can be re-ordered; they are executed from top to bottom.\n"
>>  msgstr ""
>> +"\n"
>> +"Befehle:\n"
>> +" p, pick = Commit verwenden\n"
>> +" r, reword = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
>> +" e, edit = Commit verwenden, aber zum Nachbessern anhalten\n"
>> +" s, squash = Commit verwenden, aber mit vorherigem Commit vereinen\n"
>> +" f, fixup = wie \"squash\", aber die Log-Nachricht des Commits verwerden\n"
>> +" x, exec = Befehl (Rest der Zeile) mittels Shell ausführen\n"
>> +" d, drop = Commit entfernen\n"
>> +"\n"
>> +"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
>> +"ausgeführt.\n"
>
> In my opinion fixup needs a more detailed description here.
> Something like:
>
> "fixup: wie \"squash\", aber die Commit-Beschreibung vom Vorgänger
> verwenden\n".
>
> or:
>
> "fixup: wie \"squash\", aber diese Commit-Beschreibung verwerfen\n".
>

I think this one is the correct translation.  The first can be
confusing or wrong
when there are squashes before, I think.

Thanks!

Ralf