#
#
# patch "guitone/res/i18n/guitone_de.ts"
#  from [8878f9f2068242a95a9fe95838b40260d1a7262a]
#    to [05e0ff4668c37e8b07f8f745bedca6a673e9a6b5]
#
============================================================
--- guitone/res/i18n/guitone_de.ts	8878f9f2068242a95a9fe95838b40260d1a7262a
+++ guitone/res/i18n/guitone_de.ts	05e0ff4668c37e8b07f8f745bedca6a673e9a6b5
@@ -54,9 +54,9 @@
 <context>
     <name>Branches</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location filename="../../src/model/Branches.cpp" line="92"/>
         <source>Branch Name</source>
-        <translation type="obsolete">Zweig-Name</translation>
+        <translation>Zweig-Name</translation>
     </message>
 </context>
 <context>
@@ -191,17 +191,17 @@
         <translation type="obsolete">Bereit</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="276"/>
+        <location filename="../../src/view/Guitone.cpp" line="274"/>
         <source>Select your workspace...</source>
         <translation>Wählen Sie Ihren Arbeitsbereich aus...</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="280"/>
+        <location filename="../../src/view/Guitone.cpp" line="278"/>
         <source>Loading aborted</source>
         <translation>Laden abgebrochen</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="295"/>
+        <location filename="../../src/view/Guitone.cpp" line="293"/>
         <source>Invalid workspace</source>
         <translation>Ungültiger Arbeitsbereich</translation>
     </message>
@@ -211,17 +211,17 @@
         <translation type="obsolete">Das gewählte Verzeichnis ist kein monotone-Arbeitsverzeichnis!</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="309"/>
+        <location filename="../../src/view/Guitone.cpp" line="307"/>
         <source>Inventory could not be read</source>
         <translation>Inventar konnte nicht gelesen werden</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="310"/>
+        <location filename="../../src/view/Guitone.cpp" line="308"/>
         <source>The inventory could not be read. Maybe another task is still running?</source>
         <translation>Das Inventar konnte nicht gelesen werden. Vielleicht läuft noch ein anderer Prozess?</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="320"/>
+        <location filename="../../src/view/Guitone.cpp" line="319"/>
         <source>Loading workspace...</source>
         <translation>Lade Arbeitsbereich...</translation>
     </message>
@@ -238,7 +238,7 @@
         <translation type="obsolete">STRG+Q</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="296"/>
+        <location filename="../../src/view/Guitone.cpp" line="294"/>
         <source>The chosen directory is no monotone workspace!</source>
         <translation>Das gewählte Verzeichnis ist kein monotone-Arbeitsverzeichnis!</translation>
     </message>
@@ -248,7 +248,7 @@
         <translation type="obsolete">&amp;Importiere Arbeitsbereich</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="269"/>
+        <location filename="../../src/view/Guitone.cpp" line="267"/>
         <source>Critical Monotone Error</source>
         <translation>Kritischer monotone-Fehler</translation>
     </message>
@@ -264,12 +264,12 @@
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="337"/>
+        <location filename="../../src/view/Guitone.cpp" line="336"/>
         <source>&amp;Hide ignored files</source>
         <translation>Ignorierte Dateien &amp;verstecken</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="338"/>
+        <location filename="../../src/view/Guitone.cpp" line="337"/>
         <source>&amp;Show ignored files</source>
         <translation>Ignorierte Dateien a&amp;nzeigen</translation>
     </message>
@@ -284,12 +284,12 @@
         <translation>Arbeitsbereich &amp;öffnen</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="368"/>
+        <location filename="../../src/view/Guitone.cpp" line="367"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="359"/>
+        <location filename="../../src/view/Guitone.cpp" line="358"/>
         <source>No previous workspaces available.</source>
         <translation>Keine vorherigen Arbeitsbereiche verfügbar.</translation>
     </message>
@@ -306,7 +306,7 @@
     <message>
         <location filename="../../src/view/Guitone.cpp" line="81"/>
         <source>&amp;Preferences</source>
-        <translation>&amp;Einstellungen</translation>
+        <translation type="obsolete">&amp;Einstellungen</translation>
     </message>
     <message>
         <location filename="../../src/view/Guitone.cpp" line="107"/>
@@ -314,12 +314,12 @@
         <translation type="obsolete">&amp;Schlüsselverwaltung</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="131"/>
+        <location filename="../../src/view/Guitone.cpp" line="129"/>
         <source>About &amp;Qt</source>
         <translation>Über &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../../src/view/Guitone.cpp" line="129"/>
+        <location filename="../../src/view/Guitone.cpp" line="127"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
@@ -333,6 +333,16 @@
         <source>&amp;Show ancestry graph</source>
         <translation>&amp;Historiengraph anzeigen</translation>
     </message>
+    <message>
+        <location filename="../../src/view/Guitone.cpp" line="81"/>
+        <source>&amp;Preferences...</source>
+        <translation>&amp;Einstellungen...</translation>
+    </message>
+    <message>
+        <location filename="../../src/view/Guitone.cpp" line="121"/>
+        <source>&amp;Key Management</source>
+        <translation>&amp;Schlüsselverwaltung</translation>
+    </message>
 </context>
 <context>
     <name>Inventory</name>
@@ -413,183 +423,244 @@
 <context>
     <name>InventoryView</name>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="160"/>
+        <location filename="../../src/view/InventoryView.cpp" line="167"/>
         <source>&amp;Add</source>
         <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="161"/>
+        <location filename="../../src/view/InventoryView.cpp" line="168"/>
         <source>Ctrl+A</source>
         <comment>Add</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="162"/>
+        <location filename="../../src/view/InventoryView.cpp" line="169"/>
         <source>Add to workspace</source>
         <translation>Zum Arbeitsbereich hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="165"/>
+        <location filename="../../src/view/InventoryView.cpp" line="172"/>
         <source>&amp;Remove</source>
         <translation>En&amp;tfernen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="166"/>
+        <location filename="../../src/view/InventoryView.cpp" line="173"/>
         <source>Ctrl+R</source>
         <comment>Remove</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="167"/>
+        <location filename="../../src/view/InventoryView.cpp" line="174"/>
         <source>Remove from workspace</source>
         <translation>Vom Arbeitsbereich entfernen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="170"/>
+        <location filename="../../src/view/InventoryView.cpp" line="177"/>
         <source>&amp;Commit</source>
         <translation>&amp;Einpflegen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="171"/>
+        <location filename="../../src/view/InventoryView.cpp" line="178"/>
         <source>Ctrl+C</source>
         <comment>Commit</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="172"/>
+        <location filename="../../src/view/InventoryView.cpp" line="179"/>
         <source>Commit</source>
         <translation>Einpflegen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="175"/>
+        <location filename="../../src/view/InventoryView.cpp" line="182"/>
         <source>I&amp;gnore</source>
         <translation>Datei &amp;ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="176"/>
+        <location filename="../../src/view/InventoryView.cpp" line="183"/>
         <source>Ctrl+G</source>
         <comment>Ignore</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="177"/>
+        <location filename="../../src/view/InventoryView.cpp" line="184"/>
         <source>Ignore file</source>
         <translation>Datei ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="180"/>
+        <location filename="../../src/view/InventoryView.cpp" line="187"/>
         <source>&amp;Unignore</source>
         <translation>Datei nicht ign&amp;orieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="181"/>
+        <location filename="../../src/view/InventoryView.cpp" line="188"/>
         <source>Ctrl+U</source>
         <comment>Unignore</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="182"/>
+        <location filename="../../src/view/InventoryView.cpp" line="189"/>
         <source>Unignore file</source>
         <translation>Datei nicht mehr ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="185"/>
+        <location filename="../../src/view/InventoryView.cpp" line="192"/>
         <source>R&amp;evert</source>
         <translation>&amp;Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="186"/>
+        <location filename="../../src/view/InventoryView.cpp" line="193"/>
         <source>Ctrl+E</source>
         <comment>Revert</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="187"/>
+        <location filename="../../src/view/InventoryView.cpp" line="194"/>
         <source>Revert uncommitted changes</source>
         <translation>Nicht eingepflegte Änderungen verwerfen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="195"/>
+        <location filename="../../src/view/InventoryView.cpp" line="202"/>
         <source>Rena&amp;me</source>
         <translation>Um&amp;benennen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="196"/>
+        <location filename="../../src/view/InventoryView.cpp" line="203"/>
         <source>Ctrl+M</source>
         <comment>Rename</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="197"/>
+        <location filename="../../src/view/InventoryView.cpp" line="204"/>
         <source>Rename file</source>
         <translation>Datei umbenennen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="190"/>
+        <location filename="../../src/view/InventoryView.cpp" line="197"/>
         <source>D&amp;iff</source>
         <translation>U&amp;nterschiede anzeigen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="191"/>
+        <location filename="../../src/view/InventoryView.cpp" line="198"/>
         <source>Ctrl+D</source>
         <comment>Diff</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="192"/>
+        <location filename="../../src/view/InventoryView.cpp" line="199"/>
         <source>Diff against base revision</source>
         <translation>Unterschiede im Vergleich zur Basisrevision anzeigen</translation>
     </message>
 </context>
 <context>
+    <name>KeyManagement</name>
+    <message>
+        <location filename="../dialogs/key_management.ui" line="13"/>
+        <source>Key Management</source>
+        <translation>Schlüsselverwaltung</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/key_management.ui" line="57"/>
+        <source>Generate Keypair</source>
+        <translation>Schlüsselpaar erzeugen</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/key_management.ui" line="64"/>
+        <source>Show signed Revisions</source>
+        <translation>Zeige signierte Revisionen</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/key_management.ui" line="84"/>
+        <source>Close</source>
+        <translation>Schliessen</translation>
+    </message>
+</context>
+<context>
     <name>KeyManagment</name>
     <message>
         <location filename="../dialogs/KeyManagment.ui" line="16"/>
         <source>Key Managment</source>
-        <translation>Schlüsselverwaltung</translation>
+        <translation type="obsolete">Schlüsselverwaltung</translation>
     </message>
     <message>
         <location filename="../dialogs/KeyManagment.ui" line="29"/>
         <source>Hash</source>
-        <translation>Prüfsumme</translation>
+        <translation type="obsolete">Prüfsumme</translation>
     </message>
     <message>
         <location filename="../dialogs/KeyManagment.ui" line="34"/>
         <source>Name</source>
-        <translation>Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <location filename="../dialogs/KeyManagment.ui" line="39"/>
         <source>Pub Loc</source>
-        <translation>Pfad zu öffentl. Schlüssel</translation>
+        <translation type="obsolete">Pfad zu öffentl. Schlüssel</translation>
     </message>
     <message>
         <location filename="../dialogs/KeyManagment.ui" line="44"/>
         <source>Priv Loc</source>
-        <translation>Pfad zu priv. Schlüssel</translation>
+        <translation type="obsolete">Pfad zu priv. Schlüssel</translation>
     </message>
     <message>
         <location filename="../dialogs/KeyManagment.ui" line="60"/>
         <source>Generate</source>
-        <translation>Erzeugen</translation>
+        <translation type="obsolete">Erzeugen</translation>
     </message>
     <message>
         <location filename="../dialogs/KeyManagment.ui" line="67"/>
         <source>Remove</source>
-        <translation>Entfernen</translation>
+        <translation type="obsolete">Entfernen</translation>
     </message>
     <message>
         <location filename="../dialogs/KeyManagment.ui" line="110"/>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
     <message>
         <location filename="../dialogs/KeyManagment.ui" line="117"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
     </message>
 </context>
 <context>
+    <name>Keys</name>
+    <message>
+        <location filename="../../src/model/Keys.cpp" line="196"/>
+        <source>Database</source>
+        <translation>Datenbank</translation>
+    </message>
+    <message>
+        <location filename="../../src/model/Keys.cpp" line="198"/>
+        <source>Keystore</source>
+        <translation>Schlüsselspeicher</translation>
+    </message>
+    <message>
+        <location filename="../../src/model/Keys.cpp" line="213"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="../../src/model/Keys.cpp" line="214"/>
+        <source>Public Hash</source>
+        <translation>Öffentliche Prüfsumme</translation>
+    </message>
+    <message>
+        <location filename="../../src/model/Keys.cpp" line="215"/>
+        <source>Private Hash</source>
+        <translation>Private Prüfsumme</translation>
+    </message>
+    <message>
+        <location filename="../../src/model/Keys.cpp" line="216"/>
+        <source>Public Locations</source>
+        <translation>Öffentliche Speicherorte</translation>
+    </message>
+    <message>
+        <location filename="../../src/model/Keys.cpp" line="217"/>
+        <source>Private Locations</source>
+        <translation>Private Speicherorte</translation>
+    </message>
+</context>
+<context>
     <name>Manifest</name>
     <message>
         <location filename="" line="7471221"/>
@@ -920,27 +991,27 @@ korrekt installiert?</translation>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="35"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="34"/>
         <source>Branch</source>
         <translation>Zweig</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="36"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="35"/>
         <source>Tag</source>
         <translation>Marke</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="37"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="36"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="38"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="37"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="39"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="38"/>
         <source>Custom</source>
         <translation>Selbstdefiniert</translation>
     </message>
@@ -950,32 +1021,60 @@ korrekt installiert?</translation>
         <translation>beinhaltet</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="34"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="33"/>
         <source>Revision</source>
         <translation>Revision</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="95"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="133"/>
         <source>Revision list could not be read</source>
         <translation>Revisions-Liste konnte nicht gelesen werden</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="96"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="134"/>
         <source>The revision list could not be read. Maybe another task is still running?</source>
         <translation>Die Liste der Revisionen konnte nicht gelesen werden. Eventuell ist noch ein anderer Prozess aktiv?</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="110"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="148"/>
         <source>Invalid selection</source>
         <translation>Ungültige Auswahl</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="111"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="149"/>
         <source>The given selection could not be processed: %1</source>
         <translation>Die eingegebene Auswahl kann nicht ausgeführt werden: %1</translation>
     </message>
+    <message>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="39"/>
+        <source>Combined</source>
+        <translation>Kombiniert</translation>
+    </message>
 </context>
 <context>
+    <name>Tags</name>
+    <message>
+        <location filename="../../src/model/Tags.cpp" line="161"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="../../src/model/Tags.cpp" line="162"/>
+        <source>Revision</source>
+        <translation>Revision</translation>
+    </message>
+    <message>
+        <location filename="../../src/model/Tags.cpp" line="163"/>
+        <source>Signer</source>
+        <translation>Unterzeichner</translation>
+    </message>
+    <message>
+        <location filename="../../src/model/Tags.cpp" line="164"/>
+        <source>Branches</source>
+        <translation>Zweige</translation>
+    </message>
+</context>
+<context>
     <name>WorkspaceItem</name>
     <message>
         <location filename="" line="7471221"/>