updated german tranlation files

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@218 34ebc366-c3a9-4b3c-9f84-69acf7962910

5 files changed, 699 insertions, 139 deletions

diff --git a/keymgmt.cpp b/keymgmt.cpp
index d93c081..b15b999 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -278,10 +278,10 @@ void KeyMgmt::keyGenAccept()
      * check for errors in keygen dialog input
      */
     if ((nameEdit->text()).size() < 5) {
-        errorString.append("  Name must contain at least five characters.  \n");
+        errorString.append(tr("  Name must contain at least five characters.  \n"));
     }
     if (passwordEdit->text() != repeatpwEdit->text()) {
-        errorString.append("  Password and Repeat don't match.  ");
+        errorString.append(tr("  Password and Repeat don't match.  "));
     }
 
 
diff --git a/release/ts/gpg4usb_de.qm b/release/ts/gpg4usb_de.qm
index ed34984..4596898 100644
--- a/release/ts/gpg4usb_de.qm
+++ b/release/ts/gpg4usb_de.qm
diff --git a/release/ts/gpg4usb_de.ts b/release/ts/gpg4usb_de.ts
index 1a789f1..ea618b5 100644
--- a/release/ts/gpg4usb_de.ts
+++ b/release/ts/gpg4usb_de.ts
@@ -1,53 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="de">
+<!DOCTYPE TS>
+<TS version="2.0" language="de">
 <defaultcodec></defaultcodec>
 <context>
     <name>Attachments</name>
     <message>
-        <location filename="../../attachments.cpp" line="62"/>
         <source>Add File</source>
-        <translation>Datei hinzufügen</translation>
+        <translation type="obsolete">Datei hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="63"/>
         <source>Add a file</source>
-        <translation>Füge eine Datei hinzu</translation>
+        <translation type="obsolete">Füge eine Datei hinzu</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="67"/>
         <source>Encrypt</source>
-        <translation>Verschlüsseln</translation>
+        <translation type="obsolete">Verschlüsseln</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="68"/>
         <source>Encrypt marked File(s)</source>
-        <translation>Verschlüssele markierte Datei(en)</translation>
+        <translation type="obsolete">Verschlüssele markierte Datei(en)</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="72"/>
         <source>Decrypt</source>
-        <translation>Entschlüsseln</translation>
+        <translation type="obsolete">Entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="73"/>
         <source>Decrypt marked File(s)</source>
-        <translation>Entschlüssele markierte Datei(en)</translation>
+        <translation type="obsolete">Entschlüssele markierte Datei(en)</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="143"/>
         <source>couldn&apos;t open file: </source>
-        <translation>Konnte Datei nicht öffnen:</translation>
+        <translation type="obsolete">Konnte Datei nicht öffnen:</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="158"/>
         <source>File</source>
-        <translation>Datei</translation>
+        <translation type="obsolete">Datei</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="160"/>
         <source>Cannot write file %1:
 %2.</source>
-        <translation>Kann Datei nicht lesen %1: %2.</translation>
+        <translation type="obsolete">Kann Datei nicht lesen %1: %2.</translation>
+    </message>
+</context>
+<context>
+    <name>FileEncryptionDialog</name>
+    <message>
+        <location filename="../../fileencryptiondialog.cpp" line="21"/>
+        <source>Encrypt / Decrypt File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../fileencryptiondialog.cpp" line="29"/>
+        <location filename="../../fileencryptiondialog.cpp" line="118"/>
+        <source>File</source>
+        <translation type="unfinished">Datei</translation>
+    </message>
+    <message>
+        <location filename="../../fileencryptiondialog.cpp" line="30"/>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../fileencryptiondialog.cpp" line="34"/>
+        <location filename="../../fileencryptiondialog.cpp" line="40"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../fileencryptiondialog.cpp" line="60"/>
+        <source>&amp;Encrypt</source>
+        <translation type="unfinished">&amp;Verschlüsseln</translation>
+    </message>
+    <message>
+        <location filename="../../fileencryptiondialog.cpp" line="62"/>
+        <source>&amp;Decrypt</source>
+        <translation type="unfinished">&amp;Entschlüsseln</translation>
+    </message>
+    <message>
+        <location filename="../../fileencryptiondialog.cpp" line="85"/>
+        <source>Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../fileencryptiondialog.cpp" line="85"/>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../fileencryptiondialog.cpp" line="101"/>
+        <source>couldn&apos;t open file: </source>
+        <translation type="unfinished">Konnte Datei nicht öffnen:</translation>
+    </message>
+    <message>
+        <location filename="../../fileencryptiondialog.cpp" line="119"/>
+        <source>Cannot write file %1:
+%2.</source>
+        <translation type="unfinished">Kann Datei nicht lesen %1: %2.</translation>
     </message>
 </context>
 <context>
@@ -153,7 +201,7 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="106"/>
+        <location filename="../../gpgwin.cpp" line="105"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>aktuelle Auswahl ausschneiden und in Zwischenablage einfügen</translation>
     </message>
@@ -168,7 +216,7 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="113"/>
+        <location filename="../../gpgwin.cpp" line="112"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>aktuelle Auswahl in Zwischenablage kopieren</translation>
     </message>
@@ -213,200 +261,260 @@
         <translation>Entschlüssele den Text</translation>
     </message>
     <message>
-        <location filename="../gpgwin.cpp" line="138"/>
         <source>&amp;Import Key From File</source>
         <translation type="obsolete">Importiere Schlüssel aus &amp;Datei</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="138"/>
+        <location filename="../../gpgwin.cpp" line="145"/>
         <source>Import New Key From File</source>
         <translation>Importiere einen neuen Schlüssel aus Datei</translation>
     </message>
     <message>
-        <location filename="../gpgwin.cpp" line="144"/>
         <source>Import Key From &amp;Editor</source>
         <translation type="obsolete">Importiere Schlüssel aus Textfeld</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="143"/>
+        <location filename="../../gpgwin.cpp" line="150"/>
         <source>Import New Key From Editor</source>
         <translation>Importiere einen neuen Schlüssel aus dem Textfeld</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="157"/>
+        <location filename="../../gpgwin.cpp" line="170"/>
         <source>&amp;About</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="159"/>
+        <location filename="../../gpgwin.cpp" line="172"/>
         <source>Show the application&apos;s About box</source>
         <translation>Zeige die Information über die Anwendung</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="450"/>
+        <location filename="../../gpgwin.cpp" line="143"/>
+        <location filename="../../gpgwin.cpp" line="188"/>
+        <location filename="../../gpgwin.cpp" line="489"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="173"/>
+        <location filename="../../gpgwin.cpp" line="196"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../gpgwin.cpp" line="173"/>
         <source>&amp;Crypto</source>
         <translation type="obsolete">&amp;Crypt</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="189"/>
+        <location filename="../../gpgwin.cpp" line="215"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="322"/>
+        <location filename="../../gpgwin.cpp" line="350"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="202"/>
+        <location filename="../../gpgwin.cpp" line="230"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="348"/>
+        <location filename="../../gpgwin.cpp" line="136"/>
+        <source>&amp;File Encryption</source>
+        <translatorcomment>Datei Verschlüsselung</translatorcomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="138"/>
+        <source>Encrypt/Decrypt File</source>
+        <translation type="unfinished">Ver-/Entschlüssele Datei</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="158"/>
+        <source>Key Management</source>
+        <translation type="unfinished">Schlüsselverwaltung</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="160"/>
+        <source>Open Keymanagement</source>
+        <translation type="unfinished">Öffne die Schlüsselverwaltung</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="165"/>
+        <source>Open Import New Key Dialog</source>
+        <translation type="unfinished">Öffne den Schlüsselimport Dialog</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="177"/>
+        <source>Delete Selected Key(s)</source>
+        <translation type="unfinished">Lösche den ausgewählten Schlüssel</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="178"/>
+        <source>Delete The Selected Keys</source>
+        <translation type="unfinished">Lösche den/die ausgewählten Schlüssel</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="181"/>
+        <source>Append Selected Key(s) To Text</source>
+        <translation type="unfinished">Hänge die ausgewählten Schlüssel an den Text an</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="182"/>
+        <source>Append The Selected Keys To Text in Editor</source>
+        <translation type="unfinished">Hänge den gewählten Schhlüssel an den Text im Editor an</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="208"/>
+        <source>&amp;Keys</source>
+        <translation type="unfinished">Sch&amp;lüssel</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="209"/>
+        <source>&amp;Import Key From...</source>
+        <translation type="unfinished">&amp;Importiere Schlüssel aus...</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="226"/>
+        <source>Key</source>
+        <translation type="unfinished">Schlüssel</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="238"/>
+        <location filename="../../gpgwin.cpp" line="376"/>
         <source>Ready</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="215"/>
+        <location filename="../../gpgwin.cpp" line="243"/>
         <source>Encrypt for:</source>
         <translation>Verschlüssele für:</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="307"/>
+        <location filename="../../gpgwin.cpp" line="295"/>
+        <location filename="../../gpgwin.cpp" line="335"/>
         <source>Application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="269"/>
+        <location filename="../../gpgwin.cpp" line="296"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Kann Datei nicht lesen %1: %2.</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="280"/>
+        <location filename="../../gpgwin.cpp" line="308"/>
         <source>File loaded</source>
         <translation>Datei geladen</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="295"/>
+        <location filename="../../gpgwin.cpp" line="323"/>
         <source>%1[*] - %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="308"/>
+        <location filename="../../gpgwin.cpp" line="336"/>
         <source>The document has been modified.
 Do you want to save your changes?</source>
         <translation>Die Datei würde verändert. Möchten Sie die Änderung speichern?</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="324"/>
+        <location filename="../../gpgwin.cpp" line="351"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Kann Datei nicht lesen %1: %2.</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="332"/>
+        <location filename="../../gpgwin.cpp" line="360"/>
         <source>Saved &apos;%1&apos;</source>
         <translation>%1 gespeichert</translation>
     </message>
     <message>
-        <location filename="../gpgwin.cpp" line="347"/>
         <source>About gpg4usb</source>
         <translation type="obsolete">Über gpg4usb</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="368"/>
+        <location filename="../../gpgwin.cpp" line="385"/>
         <source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-files.&lt;br&gt;It&apos;s licensed under the GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Developer:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;If you have any questions and/or&lt;br&gt;suggestions, contact us at&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;or feel free to meet us in our channel at&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;br&gt;&lt;br&gt;and always remember:&lt;br&gt;cpunk is NOT a bot...&lt;/center&gt;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="423"/>
+        <location filename="../../gpgwin.cpp" line="452"/>
         <source>Open Key</source>
         <translation>Öffne Datei</translation>
     </message>
     <message>
-        <location filename="../gpgwin.cpp" line="389"/>
         <source>Key Files (*.asc *.txt);;All Files (*.*)</source>
         <translation type="obsolete">Schhlüsseldateien (*.asc *.txt);;Alle Dateien (*.*)</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="291"/>
+        <location filename="../../gpgwin.cpp" line="319"/>
         <source>untitled.txt</source>
         <translation>Neue Datei.txt</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="428"/>
+        <location filename="../../gpgwin.cpp" line="456"/>
         <source>couldn&apos;t open file: </source>
         <translation>Konnte Datei nicht öffnen:</translation>
     </message>
     <message>
-        <location filename="../gpgwin.cpp" line="285"/>
         <source>gpg4usb</source>
         <translation type="obsolete">gpg4usb</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="451"/>
+        <location filename="../../gpgwin.cpp" line="148"/>
+        <location filename="../../gpgwin.cpp" line="490"/>
         <source>&amp;Editor</source>
         <translation>&amp;Editor</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="452"/>
+        <location filename="../../gpgwin.cpp" line="153"/>
+        <location filename="../../gpgwin.cpp" line="491"/>
         <source>&amp;Clipboard</source>
         <translation>&amp;Zwischenablage</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="148"/>
+        <location filename="../../gpgwin.cpp" line="155"/>
         <source>Import New Key From Clipboard</source>
         <translation>Importiere neuen Schlüssel aus der Zwischenablage</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="441"/>
+        <location filename="../../gpgwin.cpp" line="163"/>
+        <location filename="../../gpgwin.cpp" line="480"/>
         <source>Import Key</source>
         <translation>Importiere Schlüssel</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="153"/>
         <source>Import New Key</source>
-        <translation>Importiere neuen Schlüssel</translation>
+        <translation type="obsolete">Importiere neuen Schlüssel</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="179"/>
+        <location filename="../../gpgwin.cpp" line="202"/>
         <source>&amp;Crypt</source>
         <translation>&amp;Crypt</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="184"/>
         <source>&amp;Import key from...</source>
-        <translation>&amp;Importiere neuen Schlüssel aus...</translation>
+        <translation type="obsolete">&amp;Importiere neuen Schlüssel aus...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="195"/>
+        <location filename="../../gpgwin.cpp" line="221"/>
         <source>Crypt</source>
         <translation>Crypt</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="354"/>
+        <location filename="../../gpgwin.cpp" line="382"/>
         <source>About </source>
         <translation>Über</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="423"/>
+        <location filename="../../gpgwin.cpp" line="452"/>
         <source>Key Files</source>
         <translation>Schlüssel Dateien</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="449"/>
+        <location filename="../../gpgwin.cpp" line="488"/>
         <source>Import Key From...</source>
         <translation>Impoertiere neuen Schlüssel aus...</translation>
     </message>
@@ -414,29 +522,229 @@ Do you want to save your changes?</source>
 <context>
     <name>KeyList</name>
     <message>
-        <location filename="keylist.cpp" line="35"/>
         <source>Delete Selected Keys</source>
         <translation type="obsolete">Lösche die markierten Schlüssel</translation>
     </message>
     <message>
-        <location filename="../../keylist.cpp" line="152"/>
         <source>Delete Key</source>
-        <translation>Lösche Schlüssel</translation>
+        <translation type="obsolete">Lösche Schlüssel</translation>
     </message>
     <message>
-        <location filename="keylist.cpp" line="117"/>
         <source>Delete the selected keys</source>
         <translation type="obsolete">Lösche die markierten Schlüssel</translation>
     </message>
     <message>
-        <location filename="../../keylist.cpp" line="42"/>
         <source>Delete Checked Keys</source>
-        <translation>Gewählte Schlüssel löschen</translation>
+        <translation type="obsolete">Gewählte Schlüssel löschen</translation>
     </message>
     <message>
-        <location filename="../../keylist.cpp" line="153"/>
         <source>Delete the checked keys</source>
-        <translation>Lösche die gewählte Schlüssel </translation>
+        <translation type="obsolete">Lösche die gewählte Schlüssel </translation>
+    </message>
+</context>
+<context>
+    <name>KeyMgmt</name>
+    <message>
+        <location filename="../../keymgmt.cpp" line="45"/>
+        <source>Keymanagement</source>
+        <translation type="unfinished">Schlüsselverwaltung</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="51"/>
+        <source>&amp;Close Key Management</source>
+        <translation type="unfinished">Beende &amp;Schlüsselverwaltung</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="52"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="54"/>
+        <source>Close Key Management</source>
+        <translation type="unfinished">Beende die Schlüsselverwaltung</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="57"/>
+        <source>Import From &amp;File</source>
+        <translation type="unfinished">Importiere aus &amp;Datei</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="59"/>
+        <source>Import New Key From File</source>
+        <translation type="unfinished">Importiere einen neuen Schlüssel aus einer DateiImportiere einen neuen Schlüssel aus Datei</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="62"/>
+        <source>Import From &amp;Clipboard</source>
+        <translation type="unfinished">Importiere aus der &amp;Zwischenablage</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="64"/>
+        <source>Import New Key From Clipboard</source>
+        <translation type="unfinished">Importiere einen neuen Schlüssel aus der ZwischenablageImportiere neuen Schlüssel aus der Zwischenablage</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="67"/>
+        <source>Export To &amp;Clipboard</source>
+        <translation type="unfinished">Exportiere in die &amp;Zwischenablage</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="69"/>
+        <source>Export Selected Key(s) To Clipboard</source>
+        <translation type="unfinished">Exportiere die gewählten Schlüssel in die Zwischenablage</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="72"/>
+        <source>Export To &amp;File</source>
+        <translation type="unfinished">Exportiere in &amp;Datei</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="74"/>
+        <source>Export Selected Key(s) To File</source>
+        <translation type="unfinished">Exportiere die gewählten Schlüssel in eine Datei</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="77"/>
+        <source>Delete Selected Key(s)</source>
+        <translation type="unfinished">Lösche die gewählten Schlüssel</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="78"/>
+        <source>Delete the Selected keys</source>
+        <translation type="unfinished">Lösche die ausgewählten Schlüssel</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="81"/>
+        <source>Delete Checked Key(s)</source>
+        <translation type="unfinished">Lösche die markierten Schlüssel</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="82"/>
+        <source>Delete the Checked keys</source>
+        <translation type="unfinished">Lösche die markierten Schlüssel</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="86"/>
+        <location filename="../../keymgmt.cpp" line="185"/>
+        <source>Generate Key</source>
+        <translation type="unfinished">Erzeuge neuen Schlüssel</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="87"/>
+        <source>Generate New Key</source>
+        <translation type="unfinished">Erzeuge einen neuen Schlüssel</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="94"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Datei</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="97"/>
+        <source>&amp;Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="111"/>
+        <source>Crypt</source>
+        <translation type="unfinished">Crypt</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="123"/>
+        <source>Open Key</source>
+        <translation type="unfinished">Öffne Datei</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="123"/>
+        <location filename="../../keymgmt.cpp" line="158"/>
+        <source>Key Files</source>
+        <translation type="unfinished">Schlüssel Dateien</translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="128"/>
+        <source>Couldn&apos;t Open File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="158"/>
+        <source>Export Key To File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="188"/>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="189"/>
+        <source>E-Mailaddress::</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="190"/>
+        <source>Comment:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="191"/>
+        <source>KeySize (in Bit):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="192"/>
+        <source>Expiration Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="193"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="194"/>
+        <source>Repeat Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="195"/>
+        <source>Never Expire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="196"/>
+        <source>Password: Strength
+Weak -&gt; Strong</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="227"/>
+        <source>Password Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="281"/>
+        <source>  Name must contain at least five characters.  
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="284"/>
+        <source>  Password and Repeat don&apos;t match.  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="320"/>
+        <source>Generating Key...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="322"/>
+        <source>Collecting random data for key generation.
+ This may take a while.
+ To speed up the process use your computer
+ (e.g. browse the net, listen to music,...)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/release/ts/gpg4usb_en.qm b/release/ts/gpg4usb_en.qm
index b010735..53fb109 100644
--- a/release/ts/gpg4usb_en.qm
+++ b/release/ts/gpg4usb_en.qm
diff --git a/release/ts/gpg4usb_en.ts b/release/ts/gpg4usb_en.ts
index fc56003..916e202 100644
--- a/release/ts/gpg4usb_en.ts
+++ b/release/ts/gpg4usb_en.ts
@@ -1,49 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1">
+<!DOCTYPE TS>
+<TS version="2.0">
 <context>
-    <name>Attachments</name>
+    <name>FileEncryptionDialog</name>
     <message>
-        <location filename="../../attachments.cpp" line="62"/>
-        <source>Add File</source>
+        <location filename="../../fileencryptiondialog.cpp" line="21"/>
+        <source>Encrypt / Decrypt File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="63"/>
-        <source>Add a file</source>
+        <location filename="../../fileencryptiondialog.cpp" line="29"/>
+        <location filename="../../fileencryptiondialog.cpp" line="118"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="67"/>
-        <source>Encrypt</source>
+        <location filename="../../fileencryptiondialog.cpp" line="30"/>
+        <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="68"/>
-        <source>Encrypt marked File(s)</source>
+        <location filename="../../fileencryptiondialog.cpp" line="34"/>
+        <location filename="../../fileencryptiondialog.cpp" line="40"/>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="72"/>
-        <source>Decrypt</source>
+        <location filename="../../fileencryptiondialog.cpp" line="60"/>
+        <source>&amp;Encrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="73"/>
-        <source>Decrypt marked File(s)</source>
+        <location filename="../../fileencryptiondialog.cpp" line="62"/>
+        <source>&amp;Decrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="143"/>
-        <source>couldn&apos;t open file: </source>
+        <location filename="../../fileencryptiondialog.cpp" line="85"/>
+        <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="158"/>
-        <source>File</source>
+        <location filename="../../fileencryptiondialog.cpp" line="85"/>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../fileencryptiondialog.cpp" line="101"/>
+        <source>couldn&apos;t open file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="160"/>
+        <location filename="../../fileencryptiondialog.cpp" line="119"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -152,7 +160,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="106"/>
+        <location filename="../../gpgwin.cpp" line="105"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -167,7 +175,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="113"/>
+        <location filename="../../gpgwin.cpp" line="112"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -212,189 +220,433 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../gpgwin.cpp" line="136"/>
+        <source>&amp;File Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../gpgwin.cpp" line="138"/>
+        <source>Encrypt/Decrypt File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="145"/>
         <source>Import New Key From File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="143"/>
+        <location filename="../../gpgwin.cpp" line="150"/>
         <source>Import New Key From Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="157"/>
+        <location filename="../../gpgwin.cpp" line="158"/>
+        <source>Key Management</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="160"/>
+        <source>Open Keymanagement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="165"/>
+        <source>Open Import New Key Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="170"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="159"/>
+        <location filename="../../gpgwin.cpp" line="172"/>
         <source>Show the application&apos;s About box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="450"/>
+        <location filename="../../gpgwin.cpp" line="143"/>
+        <location filename="../../gpgwin.cpp" line="188"/>
+        <location filename="../../gpgwin.cpp" line="489"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="173"/>
+        <location filename="../../gpgwin.cpp" line="196"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="189"/>
+        <location filename="../../gpgwin.cpp" line="215"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="322"/>
+        <location filename="../../gpgwin.cpp" line="350"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="202"/>
+        <location filename="../../gpgwin.cpp" line="230"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="348"/>
+        <location filename="../../gpgwin.cpp" line="177"/>
+        <source>Delete Selected Key(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="178"/>
+        <source>Delete The Selected Keys</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="181"/>
+        <source>Append Selected Key(s) To Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="182"/>
+        <source>Append The Selected Keys To Text in Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="208"/>
+        <source>&amp;Keys</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="209"/>
+        <source>&amp;Import Key From...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="226"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="238"/>
+        <location filename="../../gpgwin.cpp" line="376"/>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="215"/>
+        <location filename="../../gpgwin.cpp" line="243"/>
         <source>Encrypt for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="307"/>
+        <location filename="../../gpgwin.cpp" line="295"/>
+        <location filename="../../gpgwin.cpp" line="335"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="269"/>
+        <location filename="../../gpgwin.cpp" line="296"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="280"/>
+        <location filename="../../gpgwin.cpp" line="308"/>
         <source>File loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="291"/>
+        <location filename="../../gpgwin.cpp" line="319"/>
         <source>untitled.txt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="295"/>
+        <location filename="../../gpgwin.cpp" line="323"/>
         <source>%1[*] - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="308"/>
+        <location filename="../../gpgwin.cpp" line="336"/>
         <source>The document has been modified.
 Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="324"/>
+        <location filename="../../gpgwin.cpp" line="351"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="332"/>
+        <location filename="../../gpgwin.cpp" line="360"/>
         <source>Saved &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="368"/>
+        <location filename="../../gpgwin.cpp" line="385"/>
         <source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-files.&lt;br&gt;It&apos;s licensed under the GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Developer:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;If you have any questions and/or&lt;br&gt;suggestions, contact us at&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;or feel free to meet us in our channel at&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;br&gt;&lt;br&gt;and always remember:&lt;br&gt;cpunk is NOT a bot...&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="423"/>
+        <location filename="../../gpgwin.cpp" line="452"/>
         <source>Open Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="423"/>
+        <location filename="../../gpgwin.cpp" line="452"/>
         <source>Key Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="428"/>
+        <location filename="../../gpgwin.cpp" line="456"/>
         <source>couldn&apos;t open file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="451"/>
+        <location filename="../../gpgwin.cpp" line="148"/>
+        <location filename="../../gpgwin.cpp" line="490"/>
         <source>&amp;Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="452"/>
+        <location filename="../../gpgwin.cpp" line="153"/>
+        <location filename="../../gpgwin.cpp" line="491"/>
         <source>&amp;Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="148"/>
+        <location filename="../../gpgwin.cpp" line="155"/>
         <source>Import New Key From Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="441"/>
+        <location filename="../../gpgwin.cpp" line="163"/>
+        <location filename="../../gpgwin.cpp" line="480"/>
         <source>Import Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="153"/>
-        <source>Import New Key</source>
+        <location filename="../../gpgwin.cpp" line="202"/>
+        <source>&amp;Crypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="179"/>
-        <source>&amp;Crypt</source>
+        <location filename="../../gpgwin.cpp" line="221"/>
+        <source>Crypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="184"/>
-        <source>&amp;Import key from...</source>
+        <location filename="../../gpgwin.cpp" line="382"/>
+        <source>About </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="195"/>
+        <location filename="../../gpgwin.cpp" line="488"/>
+        <source>Import Key From...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KeyMgmt</name>
+    <message>
+        <location filename="../../keymgmt.cpp" line="45"/>
+        <source>Keymanagement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="51"/>
+        <source>&amp;Close Key Management</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="52"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="54"/>
+        <source>Close Key Management</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="57"/>
+        <source>Import From &amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="59"/>
+        <source>Import New Key From File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="62"/>
+        <source>Import From &amp;Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="64"/>
+        <source>Import New Key From Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="67"/>
+        <source>Export To &amp;Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="69"/>
+        <source>Export Selected Key(s) To Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="72"/>
+        <source>Export To &amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="74"/>
+        <source>Export Selected Key(s) To File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="77"/>
+        <source>Delete Selected Key(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="78"/>
+        <source>Delete the Selected keys</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="81"/>
+        <source>Delete Checked Key(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="82"/>
+        <source>Delete the Checked keys</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="86"/>
+        <location filename="../../keymgmt.cpp" line="185"/>
+        <source>Generate Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="87"/>
+        <source>Generate New Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="94"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="97"/>
+        <source>&amp;Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="111"/>
         <source>Crypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="354"/>
-        <source>About </source>
+        <location filename="../../keymgmt.cpp" line="123"/>
+        <source>Open Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="449"/>
-        <source>Import Key From...</source>
+        <location filename="../../keymgmt.cpp" line="123"/>
+        <location filename="../../keymgmt.cpp" line="158"/>
+        <source>Key Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="128"/>
+        <source>Couldn&apos;t Open File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="158"/>
+        <source>Export Key To File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="188"/>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="189"/>
+        <source>E-Mailaddress::</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="190"/>
+        <source>Comment:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="191"/>
+        <source>KeySize (in Bit):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="192"/>
+        <source>Expiration Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="193"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="194"/>
+        <source>Repeat Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="195"/>
+        <source>Never Expire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="196"/>
+        <source>Password: Strength
+Weak -&gt; Strong</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="227"/>
+        <source>Password Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../keymgmt.cpp" line="281"/>
+        <source>  Name must contain at least five characters.  
+</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>KeyList</name>
     <message>
-        <location filename="../../keylist.cpp" line="152"/>
-        <source>Delete Key</source>
+        <location filename="../../keymgmt.cpp" line="284"/>
+        <source>  Password and Repeat don&apos;t match.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keylist.cpp" line="42"/>
-        <source>Delete Checked Keys</source>
+        <location filename="../../keymgmt.cpp" line="320"/>
+        <source>Generating Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keylist.cpp" line="153"/>
-        <source>Delete the checked keys</source>
+        <location filename="../../keymgmt.cpp" line="322"/>
+        <source>Collecting random data for key generation.
+ This may take a while.
+ To speed up the process use your computer
+ (e.g. browse the net, listen to music,...)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>