Ralf Thielow <ralf.thielow@xxxxxxxxx> writes:
>
>>> msgid ": perhaps a D/F conflict?"
>>> -msgstr ""
>>> +msgstr ": vielleicht ein D/F-Konflikt?"
>>
>> What's the terminology for conflicts in German? For D/F, the user needs
>> to know the English terms. Not that V/D would be much better. Maybe
>> just spell it out.
>>
>
> Thanks. I'll spell it out but would leave the term "Konflikt"?!
Yes, I agree with conflict -> Konflikt.
>>> #: merge-recursive.c:1038 merge-recursive.c:1052
>>> #, c-format
>>> @@ -437,6 +435,8 @@ msgid ""
>>> "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
>>> "in tree."
>>> msgstr ""
>>> +"KONFLIKT (%s/delete): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
>>> +"im Arbeitsbereich gelassen."
>>
>> This needs de-legoification on the first and fourth %s, which can be
>> rename/renamed or modify/modified. Furthermore, in line with the D/F
>> above, perhaps you should translate "delete"? But I see that you have
>> not translated "renamed" etc. below, either. Was that on purpose? It
>> will read a bit odd as
>>
>> KONFLIKT (rename/delete): foo gelöscht in bar und renamed in quux. Stand ...
>
> Gah, I misunderstood the values of the placeholders. The reason why I haven't
> translate "delete" or "rename" is because they're part of the
> "KONFLIKT (%s/delete)"
> messages, aren't they? Translate it all would solve the problem. Thanks
Well, it's a bit confusing. AFAICS the verb (rename/modify) goes into
the parens at the start, and the participle (renamed/modified) goes into
the fourth %s. So if you decided to *not* translate the
"(rename/delete)" conflict description, you would have to translate
"renamed" (to fit it into the sentence) but not "rename".
Which would be really hard to maintain. So let's not do that. I think
it's better if you translate them all.
>>> msgid "fatal: no such branch: $branch_name"
>>> -msgstr ""
>>> +msgstr "fatal: kein solcher Zweig: $branch_name"
>>
>> kein Zweig $branch_name gefunden?
>>
>
> what about "Zweig $branch_name nicht gefunden"?
Sure.
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html