Hi, I think the discussion might work better via ML than GitHub. This is the full glossary of git's de.po as it would look like with (hopefully) all the changes included that have been discussed here. Still without any reasoning for decisions (except HEAD). Thanks for reading. +Basic repository objects: + + blob = Blob + tree = Baum, Baum-Objekt (bevorzugt), "Tree"-Objekt + submodule = Submodul + pack(noun) = Pack-Datei + pack(verb) = packen (ggf. Pack-Datei erstellen) + ancestor = Vorfahre, Vorgänger, Vorgänger-Commit (bevorzugt) + +Content in a repository: + + file(s) = Datei(en) + tracked file = beobachtete Datei + track file = beobachte Datei + untracked file = unbeobachtete Datei + directory = Verzeichnis + +Repositories / tracking concepts: + + clone (verb) = klonen + clone (noun) = der Klon + repository = Repository + + bare repository = bloßes Repository + working directory = Arbeitsverzeichnis + + remote branch = externer Zweig + remote tracking branch = externer Übernahmezweig + upstream branch = -||- + tracking branch = Übernahmezweig + + remote repository = externes Repository + remote(noun) = -||- + remote(adj) = extern + +Authorship: + + author = Autor + committer = Commit-Ersteller + tagger = Tag-Ersteller + +Commits, tags and other references: + + HEAD = HEAD + Konzept aus der Git-Welt, daher nicht zu übersetzen. + detached HEAD = losgelöster HEAD + + commit(noun) = Commit + commit(verb) = committen + commit the result = das Ergebnis committen + parent commit = Eltern-Commit + child commit = Kind-Commit + commit message = Commit-Beschreibung + + stash(noun) = der Stash + stash(verb) = "stashen", "stash" benutzen (bevorzugt) + unstash(verb) = "unstashen", "zurückladen", "aus 'stash' zurückladen" (bevorzugt) + + reference = Referenz + revision = Commit + branch = Zweig (or Branch) + tag(noun) = Tag + tag(verb) = taggen, Tag erstellen + annotated tag = annotierter Tag + tag message = Tag-Beschreibung + + orphan commit = + orphan reference = + + boundary commit = Grenz-Commit + root commit = Ursprungs-Commit, Wurzel-Commit + + stage/index (noun) = Staging-Area, Index + stage/index (verb) = (für einen | zum) Commit vormerken, zur Staging Area hinzufügen, dem Index hinzufügen + unstage (verb) = aus Staging Area entfernen/nehmen, aus Index entfernen/nehmen + +The DAG: + + commit graph = Commit-Graph + merge = Merge + +References in relation to other references: + + branches that have diverged = Zweige sind divergiert + diverging references = divergierte Referenzen + your branch is ahead = dein Zweig ist voraus + your branch is behind = dein Zweig ist hinterher + +Moving data around: + + fetch = anfordern + pull = zusammenführen + push = versenden + + fast-forward = vorspulen + non-fast-forward = nicht vorspulen + +Commands: + + log = Log + interactive commit = interaktiver Commit + cherry-pick = "cherry-pick" benutzen + rebase(verb) = "rebase" benutzen + rebase(noun) = "rebase" + archive = archivieren + revert = zurücknehmen + clean(verb) = + clean(noun) = + merge = mergen + + bundle(noun) = Paket + bundle(verb) = Paket erstellen + unbundle(verb) = Paket entpacken + + bisect = binäre Suche + bisecting = bei einer binären Suche sein, binäre Suche durchführen + +Diff/patch related: + + diff = Differenz + delta = Differenz (or Delta) + patch = Patch + apply = anwenden + diffstat = (leave it as it is) + hunk = Bereich + whitespace = Leerzeichen (FIXME?) (maybe "Leerraum") + +Still being worked out: + + prune = veraltete(n) Zweig(e) entfernen + checkout(verb) = auschecken + + git add = hinzufügen + + merge conflict = Merge-Konflikt + 3-way merge = 3-Wege-Merge + paths = Pfade + + symbolic link = symbolische Verknüfung + path = Pfad + link = Verknüpfung + + reflog = Referenzprotokoll + partial commit = teilweise committen, partiell committen + + reset = neu setzen (maybe "umsetzen"?) + + register = in die Konfiguration eintragen + unregister = aus der Konfiguration austragen -- -- 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