On Mon, Sep 6, 2010 at 15:41, Thomas Rast <trast@xxxxxxxxxxxxxxx> wrote: > 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 git-gui/po/glossary/git-gui-glossary.txt also has something like that. It would be useful to merge this and that into some documentation in a top-level po/ glossary. >> +#, 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 #. Something msgfmt --check wouldn't flag, but running the test suite under German would (I plan to add support for that down the line). >> +msgid "Fast-forward" >> +msgstr "Update ohne Merge" > > Clever! I think Fast-forward should be changed to "Update without merge" in the English version, although that might not be viable at this point. It would probably improve Git for newbies a lot if we clearly told them during every "git pull" that whether we did a merge or not by using wording to that effect consistently. A lot of people coming from svn/perforce/cvs don't understand why they keep getting merge commits on "git pull", wording might help there. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html