Merge branch 'rs/use-modern-git-merge-syntax' into pu

diff --git a/po/glossary/de.po b/po/glossary/de.po
index c94786c6abf7410bdb625ffc29379614ca70471e..35764d1d22da45e90638b2db3e0bfbcb332e8696 100644 (file)
--- a/po/glossary/de.po
+++ b/po/glossary/de.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: git-gui glossary\n"
-"POT-Creation-Date: 2007-10-19 21:43+0200\n"
-"PO-Revision-Date: 2007-10-20 15:24+0200\n"
+"POT-Creation-Date: 2008-01-07 21:20+0100\n"
+"PO-Revision-Date: 2008-02-16 21:48+0100\n"
 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
@@ -62,7 +62,7 @@ msgstr ""
 
 #. ""
 msgid "clone [verb]"
-msgstr "kopieren"
+msgstr "klonen"
 
 #. "A single point in the git history."
 msgid "commit [noun]"
@@ -92,6 +92,10 @@ msgstr "Schnellzusammenführung"
 msgid "fetch"
 msgstr "anfordern (holen?)"
 
+#. "One context of consecutive lines in a whole patch, which consists of many such hunks"
+msgid "hunk"
+msgstr "Kontext"
+
 #. "A collection of files. The index is a stored version of your working tree."
 msgid "index (in git-gui: staging area)"
 msgstr "Bereitstellung"
@@ -110,7 +114,7 @@ msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)"
 
 #. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
 msgid "prune"
-msgstr "entfernen"
+msgstr "aufräumen (entfernen?)"
 
 #. "Pulling a branch means to fetch it and merge it."
 msgid "pull"
@@ -138,7 +142,7 @@ msgstr "zurücksetzen (zurückkehren?)"
 
 #. ""
 msgid "revert"
-msgstr "revidieren"
+msgstr "verwerfen (bei git-reset), revidieren (bei git-revert, also mit neuem commit)"
 
 #. "A particular state of files and directories which was stored in the object database."
 msgid "revision"