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

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:

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

Changes the format type.

[way earlier, and same goes for "by us" -> "hier" [lit. "here"]]

[lit. "deleted there"]

[...]

[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

[lit. "... 'of us' ..."]

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

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

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

["Ursprung" is literally "origin"]

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

The last line lacks a #.

There's a stray "angegeben".

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".

:-)

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"?

Clever!

"Übertrage"?

[probably out of order, I found it while compiling the glossary]

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...