Re: [PATCH 1/2] po/de.po: add German translation

[Thomas Rast <trast@student.ethz.ch>]

Hi Jan

First off thanks for taking on the mammoth job of translating this.  I
skimmed the entire file, and apart from the comments below everything
looks sane, though I may of course have missed something.

I already like the translation way better than the one that
gitk/git-gui have, because it doesn't try so hard to translate *every*
term.  Maybe it would help to make a little translation glossary,
here's a start:

  bare repository       Lager-Repository
  blob object           Blob-Objekt
  branch                Branch (m.)
  checkout              auschecken
  commit                Commit/committen
  commit object         Commit-Objekt
  dangling ...          ... zeigt ins Leere
  detached HEAD         von HEAD abgetrennt  [but see below]
  directory             Verzeichnis
  fast-forward          Update ohne Merge
  fetch                 holen
  file system           Dateisystem
  index                 Index
  merge                 Merge
  object                Objekt
  origin                Ursprung
  parent                [unused, but would be interesting]
  pull                  [dito]
  push                  push [though only used as the command name so far]
  reference             Referenz
  reflog                Reflog
  refspec               Refspec
  repository            Repository
  resolve               auflösen
  revision              Revision
  tag                   Tag
  tracking branch       ... verfolgt ...
  tree                  Tree
  unmerged              verbleibende Konflikte
  upstream branch       Ursprung [note collision with "origin"]
  working tree          Arbeitsverzeichnis

As I said, I agree with the general idea of leaving certain terms
untranslated.  You said on IRC that you left all English terms that
are also used on

  http://de.wikipedia.org/wiki/Versionskontrolle

which seems a sound rule.  In any case it roughly matches (or still
stays slightly on the more-German side of) the colloquial usage in my
group, if that is any indication.

avarab@gmail.com wrote:
> +#, c-format
> +msgid "nothing added to commit but untracked files present%s\n"
> +msgstr "keine Änderungen für den Commit vorgemerkt, aber unberücksichtigte Dateien vorhanden\n"

Loses the %s (which is used for advice).

> +#, c-format
> +msgid "unexpected diff status %c"
> +msgstr "unerwarteter Diff-Status %s"

Changes the format type.

[way earlier, and same goes for "by us" -> "hier" [lit. "here"]]
> +msgid "deleted by them:"
> +msgstr "dort gelöscht:"
[lit. "deleted there"]
> +
[...]
> +#, c-format
> +msgid "behind %d] "
> +msgstr "nur dort %d] "
[lit. "only there"]

This had me pause for a moment.  The concepts of "[merge side] theirs"
and "behind" are quite different; is it a good idea to translate these
to the same?

Especially so since later on you translate

> +#, c-format
> +msgid "path '%s' does not have our version"
> +msgstr "Pfad '%s' hat keine Version 'von uns' im Index"
[lit. "... 'of us' ..."]

I do agree that the best I can come up with, "von den anderen
gelöscht", would be quite awkward.

> +msgid "You are on a branch yet to be born"
> +msgstr "Der aktive Branch ist noch nicht angelegt"

ISTR you asked about this on IRC, very nice solution.

> +msgid "--patch is incompatible with all other options"
> +msgstr "--patch verträgt sich nicht mit allen anderen Optionen"

Nit: "... den restlichen Optionen" would be less ambiguous as to how
many of them you can give until it conflicts with --patch.

> +#, c-format
> +msgid "Remote branch %s not found in upstream %s, using HEAD instead"
> +msgstr ""
> +"Remote-branch %s nicht in Ursprung %s gefunden, benutze stattdessen HEAD"
["Ursprung" is literally "origin"]

This also has a slight danger of confusion with the canonical upstream
'origin'.

> +#, c-format
> +msgid ""
> +" Lines starting\n"
> +"# with '#' will be kept; you may remove them yourself if you want to.\n"
> +"# An empty message aborts the commit.\n"
> +msgstr ""
> +" Zeilen, die mit '#'\n"
> +"# anfangen, werden beibehalten; du kannst sie selbst entfernen, wenn du\n"
> +"willst. Ein leerer Kommentar bricht den Commit ab.\n"

The last line lacks a #.

> +msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
> +msgstr ""
> +"Pfade angegeben ohne ausdrückliches -i oder -o angegeben, ich nehme -o an..."

There's a stray "angegeben".

> +# FIXME: ich hab keine Ahnung, worum es hier geht
> +#, c-format
> +msgid "'%s': short read %s"
> +msgstr "'%s': short read %s"

Judging from the code, the file size changed between lstat() and
read_in_full(), and/or read() failed to read the end of the file.
Maybe "unvollständig gelesen".

> +msgid "You cannot combine --no-ff with --ff-only."
> +msgstr "Du kannst --no-ff nicht mit --ff-only kombinieren (wirklich wahr)."

:-)

> +#, c-format
> +msgid "%s - not something we can merge"
> +msgstr "%s ist etwas, das wir nicht mergen können"

That's the message you get if you say "git merge nonexistent" in an
unborn branch, so the implication (in the German version) that %s
exists is not accurate.  Maybe "Ich kann mit %s nichts anfangen" or
"%s taugt nicht für einen Merge"?

> +msgid "Fast-forward"
> +msgstr "Update ohne Merge"

Clever!

> +#, c-format
> +msgid "Pushing to %s\n"
> +msgstr "Übertrag zu %s\n"

"Übertrage"?

[probably out of order, I found it while compiling the glossary]
> +msgid "detached HEAD"
> +msgstr "von HEAD abgetrennt"

That's not strictly speaking true; HEAD always points to a commit
except in an unborn branch, and in any case (this is from commit.c)
points to a commit after this message is output.  You could try
"abgetrennter HEAD", "entkoppelter HEAD" or so...

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