From: Thomas Rast <trast@student.ethz.ch>
To: Ralf Thielow <ralf.thielow@gmail.com>
Cc: <jk@jk.gs>, <stimming@tuhh.de>, <git@vger.kernel.org>,
<worldhello.net@gmail.com>
Subject: Re: [RFC] l10n: de.po: translate 76 new messages
Date: Fri, 3 Aug 2012 14:16:23 +0200 [thread overview]
Message-ID: <874nok5fxk.fsf@thomas.inf.ethz.ch> (raw)
In-Reply-To: <CAN0XMOLp_m4jUKv_=qfXdYx4jDJMBYQtY2-19sfC_7LzfY6uXA@mail.gmail.com> (Ralf Thielow's message of "Fri, 3 Aug 2012 12:41:12 +0200")
Ralf Thielow <ralf.thielow@gmail.com> 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
next prev parent reply other threads:[~2012-08-03 12:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-02 17:12 [RFC] l10n: de.po: translate 76 new messages Ralf Thielow
2012-08-03 8:59 ` Thomas Rast
2012-08-03 10:41 ` Ralf Thielow
2012-08-03 12:16 ` Thomas Rast [this message]
2012-08-03 12:28 ` Ralf Thielow
2012-08-05 7:13 ` [RFCv2] " Ralf Thielow
2012-08-03 12:16 ` [PATCH 1/2] diff_setup_done(): return void Thomas Rast
2012-08-03 12:16 ` [PATCH 2/2] merge-recursive: eliminate flush_buffer() in favor of write_in_full() Thomas Rast
2012-08-03 12:17 ` [PATCH 1/2] diff_setup_done(): return void Thomas Rast
2012-08-03 16:26 ` [RFC] l10n: de.po: translate 76 new messages Ralf Thielow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874nok5fxk.fsf@thomas.inf.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=jk@jk.gs \
--cc=ralf.thielow@gmail.com \
--cc=stimming@tuhh.de \
--cc=worldhello.net@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).