git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Thomas Rast <trast@inf.ethz.ch>
To: Ralf Thielow <ralf.thielow@gmail.com>
Cc: <trast@student.ethz.ch>, <jk@jk.gs>, <stimming@tuhh.de>,
	<git@vger.kernel.org>
Subject: Re: [PATCHv2 1/3] l10n: de.po: switch from pure German to German+English (part 1)
Date: Mon, 15 Jul 2013 23:53:38 +0200	[thread overview]
Message-ID: <87a9ln1od9.fsf@hexa.v.cablecom.net> (raw)
In-Reply-To: <1373478890-8480-2-git-send-email-ralf.thielow@gmail.com> (Ralf Thielow's message of "Wed, 10 Jul 2013 19:54:48 +0200")

Ralf Thielow <ralf.thielow@gmail.com> writes:

>  #: merge-recursive.c:268
>  msgid "error building trees"
> -msgstr "Fehler beim Erstellen der Bäume"
> +msgstr "Fehler beim Erstellen der Verzeichnisse"

This should remain "Bäume" or possibly '"Tree"-Objekte', as it refers to
a failure within write_tree_from_memory().

>  #: merge-recursive.c:1815
>  #, c-format
>  msgid "merging of trees %s and %s failed"
> -msgstr "Zusammenführen der Bäume %s und %s fehlgeschlagen"
> +msgstr "Zusammenführen der Verzeichnisse %s und %s fehlgeschlagen"

Similarly; here merge_trees() is failing.

>  #: pathspec.c:99
>  #, c-format
>  msgid "'%s' is beyond a symbolic link"
> -msgstr "'%s' ist über einem symbolischen Link"
> +msgstr "'%s' ist hinter einem symbolischen Verweis"

Good fix for a pretty bad preimage :-)

>  #: remote.c:1787
>  msgid "  (use \"git push\" to publish your local commits)\n"
> -msgstr "  (benutzen Sie \"git push\" um lokalen Versionen herauszubringen)\n"
> +msgstr "  (benutzen Sie \"git push\" um lokale Commits herauszubringen)\n"

I don't see this in the glossary.  "Publizieren" is a perfectly good
german word, can't we use this?  "Herausbringen" allows some other
interpretations that "publizieren" doesn't.

>  #: sequencer.c:1119
>  msgid "Can't revert as initial commit"
> -msgstr "Rücknahme-Version kann nicht initial sein."
> +msgstr "Revert-Commit kann nicht initial sein."

Not a new problem, but how about

  Kann nicht als allerersten Commit einen Revert ausführen.

(This should then go into the glossary for "initial commit".)

>  #: sequencer.c:1120
>  msgid "Can't cherry-pick into empty head"
> -msgstr "Kann \"cherry-pick\" nicht in einem leeren Zweig ausführen."
> +msgstr "Kann \"cherry-pick\" nicht in einem leeren Branch ausführen."

Could reuse the same formulation as above; the symptom is the same,
though not the English message.

> @@ -1494,7 +1496,7 @@ msgstr "  (alle Konflikte behoben: führen Sie \"git commit\" aus)"
>  #: wt-status.c:970
>  #, c-format
>  msgid "You are currently reverting commit %s."
> -msgstr "Sie nehmen gerade Version '%s' zurück."
> +msgstr "Sie nehmen gerade Commit '%s' zurück."

"Revert" is partly untranslated in other messages.  Any strong opinions?
If you would like to consistently leave it untranslated, this message
could be

  Sie sind gerade an einem Revert von Commit '%s'.

>  #: builtin/apply.c:3850
>  #, c-format
>  msgid "corrupt patch for subproject %s"
> -msgstr "fehlerhafter Patch für Unterprojekt %s"
> +msgstr "fehlerhafter Patch für Submodul %s"

We could change this on the English side too, though the patch format is
frozen and calls them "subprojects" (sigh).

> @@ -2330,12 +2331,12 @@ msgstr "erwartet keinen Kontext"
>  #: builtin/apply.c:4406
>  msgid "leave the rejected hunks in corresponding *.rej files"
>  msgstr ""
> -"hinterlässt zurückgewiesene Patch-Bereiche in den entsprechenden *.rej "
> +"hinterlässt zurückgewiesene Patch-Blöcke in den entsprechenden *.rej "
>  "Dateien"

Not a new problem, but "in entsprechenden *.rej" (dropping the article)
would be more accurate, wouldn't it?

>  #: builtin/blame.c:2369
>  msgid "Ignore whitespace differences"
> -msgstr "Ignoriert Unterschiede in Leerzeichen"
> +msgstr "Ignoriert Unterschiede in Whitespaces"

  Ignoriert Unterschiede in Whitespace

(dropping the final s)?

I saw that you matched the German gender of the English words to the
gender that your favorite translation has in German, which I think is
fine.  But whitespace is not countable (at least in my ears), and I
think that should be inherited into the pseudo-German usage.

>  #: builtin/branch.c:585
>  #, c-format
>  msgid "(no branch, bisect started on %s)"
> -msgstr "(kein Zweig, Neuaufbau begonnen bei %s)"
> +msgstr "(kein Branch, Rebase begonnen bei %s)"

You turned bisect into rebase (not new, but still).

>  #: builtin/checkout.c:1053
>  msgid "new unparented branch"
> -msgstr "neuer Zweig ohne Elternversion"
> +msgstr "neuer Branch ohne Elternversion"

Elternversions should become Eltern-Commit according to the glossary.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

  parent reply	other threads:[~2013-07-15 21:53 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-12 17:15 [PATCH 0/3] Switch German translation from pure German to German+English Ralf Thielow
2013-06-12 17:15 ` [PATCH 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-06-12 17:15   ` [PATCH 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-06-12 17:15     ` [PATCH 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-10 17:54 ` [PATCHv2 0/3] Switch German translation to G+E Ralf Thielow
2013-07-10 17:54   ` [PATCHv2 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-10 17:54     ` [PATCHv2 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-07-10 17:54       ` [PATCHv2 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-15 21:53         ` Thomas Rast
2013-07-15 21:53       ` [PATCHv2 2/3] l10n: de.po: switch from pure German to German+English (part 2) Thomas Rast
2013-07-15 21:53     ` Thomas Rast [this message]
2013-07-15 21:53   ` [PATCHv2 0/3] Switch German translation to G+E Thomas Rast
2013-07-16  9:21     ` [PATCH 1/2] apply, entry: speak of submodules instead of subprojects Thomas Rast
2013-07-16  9:22       ` [PATCH 2/2] show-branch: fix description of --date-order Thomas Rast
2013-07-16 18:22         ` Jonathan Nieder
2013-07-16 20:11           ` Thomas Rast
2013-07-16 18:07       ` [PATCH 1/2] apply, entry: speak of submodules instead of subprojects Jonathan Nieder
2013-07-16 19:05         ` Jens Lehmann
2013-07-16 20:07           ` Thomas Rast
2013-07-17 20:34             ` Junio C Hamano
2013-07-17  5:51     ` [PATCHv3 0/3] Switch German translation to G+E Ralf Thielow
2013-07-17  5:51       ` [PATCHv3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-17  5:51         ` [PATCHv3 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-07-17  5:51           ` [PATCHv3 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-17  9:35         ` [PATCHv3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Thomas Rast
2013-07-17 16:24       ` [PATCH v3 0/3] Switch German translation to G+E Ralf Thielow
2013-07-17 16:24         ` [PATCH v3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-17 16:24           ` [PATCH v3 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-07-17 16:24             ` [PATCH v3 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-19 16:45           ` [PATCH v3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-18 12:09         ` [PATCH v3 0/3] Switch German translation to G+E Thomas Rast
2013-07-18 19:37           ` Junio C Hamano
2013-07-21 13:53             ` Jiang Xin
2013-07-18 12:26     ` [PATCH v2 1/2] apply, entry: speak of submodules instead of subprojects Thomas Rast
2013-07-18 12:26       ` [PATCH v2 2/2] show-branch: fix description of --date-order Thomas Rast

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=87a9ln1od9.fsf@hexa.v.cablecom.net \
    --to=trast@inf.ethz.ch \
    --cc=git@vger.kernel.org \
    --cc=jk@jk.gs \
    --cc=ralf.thielow@gmail.com \
    --cc=stimming@tuhh.de \
    --cc=trast@student.ethz.ch \
    /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).