From: Thomas Rast <trast@inf.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 10:59:27 +0200 [thread overview]
Message-ID: <87y5lw73m8.fsf@thomas.inf.ethz.ch> (raw)
In-Reply-To: <1343927525-3338-1-git-send-email-ralf.thielow@gmail.com> (Ralf Thielow's message of "Thu, 2 Aug 2012 19:12:05 +0200")
Hi Ralf
Thanks a lot for your work. Below I am pointing out several items that
actually need to be fixed in code (mostly lego messages), so it's a bit
of a TODO list and I don't mean to imply that you should fix those
before your patch goes in.
Ralf Thielow <ralf.thielow@gmail.com> writes:
> #: merge-recursive.c:497
> -#, fuzzy
> msgid "diff setup failed"
> -msgstr "diff_setup_done fehlgeschlagen"
> +msgstr "Einrichtung der Optionen zur Bestimmung der Unterschiede "
> +"fehlgeschlagen"
That one is really unwieldy. Judging from a cursory look at the code,
it's an internal error anyway and should probably be "BUG:
diff_setup_done failed" to begin with.
> #: merge-recursive.c:627
> msgid "merge-recursive: disk full?"
> -msgstr ""
> +msgstr "merge-recursive: Speicher voll?"
Maybe "Festplatte voll?" to distinguish from RAM.
The funny thing is that write_in_full() never returns 0 unless count=0:
it explicitly sets errno=ENOSPC and returns -1 if write() returned 0.
So this error will not trigger unless the caller passes in size=0, in
which case it is misguided.
> #: merge-recursive.c:690
> -#, fuzzy, c-format
> +#, c-format
> msgid "failed to create path '%s'%s"
> -msgstr "Konnte Verknüpfung '%s' nicht erstellen"
> +msgstr "Fehler beim Erstellen des Pfades '%s'%s"
This will need un-legoing...
> 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.
> #: merge-recursive.c:726
> -#, fuzzy, c-format
> +#, c-format
> msgid "refusing to lose untracked file at '%s'"
> -msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien"
> +msgstr "verweigere, da ungefolgte Dateien in '%s' verloren gehen
> würden"
Your glossary[1] says we call them "unbeobachtet"?
> #: 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 ...
> #: merge-recursive.c:1591
> msgid "content"
> -msgstr ""
> +msgstr "content"
>
> #: merge-recursive.c:1598
> msgid "add/add"
> -msgstr ""
> +msgstr "add/add"
[...]
> msgid "CONFLICT (%s): Merge conflict in %s"
> -msgstr ""
> +msgstr "KONFLIKT (%s): Zusammenführungskonflikt in %s"
More candidates for de-legoification.
> #: merge-recursive.c:1832
> #, c-format
> msgid "merging of trees %s and %s failed"
> -msgstr ""
> +msgstr "zusammenführen der Bäume %s und %s fehlgeschlagen"
Capital Z?
> #: merge-recursive.c:1862
> #, c-format
> msgid "Unprocessed path??? %s"
> -msgstr ""
> +msgstr " unverarbeiteter Pfad??? %s"
Stray space at the beginning.
> #: merge-recursive.c:1918
> #, c-format
> msgid "found %u common ancestor(s):"
> -msgstr ""
> +msgstr "%u gemeinsame Vorgänger gefunden"
"ancestor(s)" is not listed in the glossary. I'd personally pick
"Vorfahren" but I'm probably bikeshedding.
> +"Wenn du das Problem aufgelöst hast, führe \"git rebase --continue\" aus.\n"
Not what you are actually changing, but "resolve" (a merge conflict) is
not in the glossary. For me
Wenn du das Problem _gelöst_ hast...
sounds nicer. "aufgelöst" sounds like "resolve a domain name" or such.
> msgid "fatal: no such branch: $branch_name"
> -msgstr ""
> +msgstr "fatal: kein solcher Zweig: $branch_name"
kein Zweig $branch_name gefunden?
> #: git-rebase.sh:474
> msgid "Please commit or stash them."
> -msgstr ""
> +msgstr "Bitte trage die Änderungen ein oder benutze \"stash\"."
I really like this way of dodging the "stash" translation :-)
Footnotes:
[1] https://github.com/ralfth/git-po-de/wiki/Glossary
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2012-08-03 8:59 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 [this message]
2012-08-03 10:41 ` Ralf Thielow
2012-08-03 12:16 ` Thomas Rast
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=87y5lw73m8.fsf@thomas.inf.ethz.ch \
--to=trast@inf.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).