focus is kept on main window when closing settingsdialog, filecrypt. Added some ifndefs

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

14 files changed, 268 insertions, 237 deletions

diff --git a/fileencryptiondialog.cpp b/fileencryptiondialog.cpp
index aee52bb..b7b009d 100755
--- a/fileencryptiondialog.cpp
+++ b/fileencryptiondialog.cpp
@@ -34,7 +34,9 @@
 
 #include "fileencryptiondialog.h"
 
-FileEncryptionDialog::FileEncryptionDialog(GpgME::Context *ctx, QString iconPath)
+FileEncryptionDialog::FileEncryptionDialog(GpgME::Context *ctx, QString iconPath, QWidget *parent)
+ : QDialog(parent)
+
 {
 
     mCtx = ctx;
@@ -107,7 +109,8 @@ void FileEncryptionDialog::selectInputFile()
         path=QFileInfo(inputFileEdit->text()).absolutePath();
     }
 
-    QString infileName = QFileDialog::getOpenFileName(this, tr("Open File"), path, tr("Files") + tr("All Files (*)"));
+//    QString infileName = QFileDialog::getOpenFileName(this, tr("Open File"), path, tr("Files") + tr("All Files (*)"));
+    QString infileName = QFileDialog::getOpenFileName(this, tr("Open File"), path);
     inputFileEdit->setText(infileName);
     
     // try to find a matching output-filename, if not yet done
diff --git a/fileencryptiondialog.h b/fileencryptiondialog.h
index 2e9234a..44ad9de 100755
--- a/fileencryptiondialog.h
+++ b/fileencryptiondialog.h
@@ -19,6 +19,9 @@
  *      MA 02110-1301, USA.
  */
 
+#ifndef __FILEENCRYPTIONDIALOG_H__
+#define __FILEENCRYPTIONDIALOG_H__
+
 #include <QDialog>
 #include <QLineEdit>
 #include <QRadioButton>
@@ -31,7 +34,7 @@ class FileEncryptionDialog : public QDialog
     Q_OBJECT
 
 public:
-    FileEncryptionDialog(GpgME::Context *ctx, QString iconPath);
+    FileEncryptionDialog(GpgME::Context *ctx, QString iconPath, QWidget *parent = 0);
 
 public slots:
     void selectInputFile();
@@ -51,3 +54,4 @@ protected:
     KeyList *mKeyList;
 
 };
+#endif // __FILEENCRYPTIONDIALOG_H__
diff --git a/gpgwin.cpp b/gpgwin.cpp
index 8f43d0b..db1448d 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -494,7 +494,7 @@ void GpgWin::importKeyFromFile()
     QFile file;
     QByteArray inBuffer;
 
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Open Key"), "", tr("Key Files") + " (*.asc *.txt);;All Files (*)");
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Open Key"), "", tr("Key Files") + " (*.asc *.txt);;"+tr("All Files")+" (*)");
     if (! fileName.isNull()) {
         file.setFileName(fileName);
         if (!file.open(QIODevice::ReadOnly)) {
@@ -570,13 +570,13 @@ void GpgWin::appendSelectedKeys()
 
 void GpgWin::fileEncryption()
 {
-    new FileEncryptionDialog(mCtx, iconPath);
+    new FileEncryptionDialog(mCtx, iconPath, this);
 
 }
 void GpgWin::openSettingsDialog()
 {
 	QSettings settings;
-	new SettingsDialog();
+	new SettingsDialog(this);
 //	restoreSettings();
 	// Iconsize
 	QSize iconSize = settings.value("toolbar/iconsize", QSize(32, 32)).toSize();
diff --git a/gpgwin.h b/gpgwin.h
index 180a87b..d776907 100644
--- a/gpgwin.h
+++ b/gpgwin.h
@@ -18,6 +18,10 @@
  *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *      MA 02110-1301, USA.
  */
+
+#ifndef __GPGWIN_H__
+#define __GPGWIN_H__
+
 #include "context.h"
 #include "keylist.h"
 #include "attachments.h"
@@ -146,3 +150,4 @@ private:
     KeyMgmt *keyMgmt;
 };
 
+#endif // __GPGWIN_H__
diff --git a/keygenthread.h b/keygenthread.h
index ed69785..e811301 100644
--- a/keygenthread.h
+++ b/keygenthread.h
@@ -19,6 +19,9 @@
  *      MA 02110-1301, USA.
  */
 
+#ifndef __KEYGENTHREAD_H__
+#define __KEYGENTHREAD_H__
+
 #include <qthread.h>
 #include <iostream>
 #include <string>
@@ -49,3 +52,4 @@ protected:
     void run();
 
 };
+#endif // __KEYGENTHREAD_H__
diff --git a/release/ts/gpg4usb_de.qm b/release/ts/gpg4usb_de.qm
index f64b602..a5c8c7a 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 9eda968..777ce37 100644
--- a/release/ts/gpg4usb_de.ts
+++ b/release/ts/gpg4usb_de.ts
@@ -4,73 +4,71 @@
 <context>
     <name>FileEncryptionDialog</name>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="41"/>
+        <location filename="../../fileencryptiondialog.cpp" line="43"/>
         <source>Encrypt / Decrypt File</source>
         <translation>Datei Ver/Entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="49"/>
-        <location filename="../../fileencryptiondialog.cpp" line="163"/>
+        <location filename="../../fileencryptiondialog.cpp" line="51"/>
+        <location filename="../../fileencryptiondialog.cpp" line="166"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="50"/>
+        <location filename="../../fileencryptiondialog.cpp" line="52"/>
         <source>Action</source>
         <translation>Aktion</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="60"/>
+        <location filename="../../fileencryptiondialog.cpp" line="62"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="56"/>
+        <location filename="../../fileencryptiondialog.cpp" line="58"/>
         <source>Input</source>
         <translation>Eingabedatei</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="62"/>
+        <location filename="../../fileencryptiondialog.cpp" line="64"/>
         <source>Output</source>
         <translation>Ausgabedatei</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="80"/>
+        <location filename="../../fileencryptiondialog.cpp" line="82"/>
         <source>&amp;Encrypt</source>
         <translation>&amp;Verschlüsseln</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="82"/>
+        <location filename="../../fileencryptiondialog.cpp" line="84"/>
         <source>&amp;Decrypt</source>
         <translation>&amp;Entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
+        <location filename="../../fileencryptiondialog.cpp" line="113"/>
         <source>Open File</source>
         <translation>Datei Öffnen</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
         <source>Files</source>
-        <translation>Dateien</translation>
+        <translation type="obsolete">Dateien</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
         <source>All Files (*)</source>
-        <translation>Alle Dateien (*) </translation>
+        <translation type="obsolete">Alle Dateien (*) </translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="136"/>
+        <location filename="../../fileencryptiondialog.cpp" line="139"/>
         <source>Save File</source>
         <translation>Datei Speichern</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="146"/>
+        <location filename="../../fileencryptiondialog.cpp" line="149"/>
         <source>couldn&apos;t open file: </source>
         <translation>Konnte Datei nicht öffnen:</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="164"/>
+        <location filename="../../fileencryptiondialog.cpp" line="167"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Kann Datei nicht schreiben %1: %2.</translation>
@@ -409,7 +407,7 @@ Do you want to save your changes?</source>
     <message>
         <location filename="../../gpgwin.cpp" line="431"/>
         <source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-message or file.&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;&lt;b&gt;Translation:&lt;/b&gt;&lt;br&gt;Kirill (ru)&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 xmpp-channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</source>
-        <translation type="unfinished">&lt;center&gt;Diese Anwendung erlaubt das einfache&lt;br&gt; Ver-und Entschlüsseln von Texten und Dateien.&lt;br&gt;Die Anwendung ist lizensiert unter der GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Entwickler:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Übersetzung:&lt;/b&gt;&lt;br&gt;Kirill (ru), Alessandro (pt)&lt;br&gt;&lt;br&gt;Falls sie Fragen oder Anregungen haben,&lt;br&gt; kontaktieren sie uns unter gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;oder treffen sie uns in unserem XMPP-Channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
+        <translation>&lt;center&gt;Diese Anwendung erlaubt das einfache&lt;br&gt; Ver-und Entschlüsseln von Texten und Dateien.&lt;br&gt;Die Anwendung ist lizensiert unter der GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Entwickler:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Übersetzung:&lt;/b&gt;&lt;br&gt;Kirill (ru), Alessandro (pt)&lt;br&gt;&lt;br&gt;Falls sie Fragen oder Anregungen haben,&lt;br&gt; kontaktieren sie uns unter gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;oder treffen sie uns in unserem XMPP-Channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="501"/>
@@ -460,6 +458,11 @@ Do you want to save your changes?</source>
         <translation>Schlüssel Dateien</translation>
     </message>
     <message>
+        <location filename="../../gpgwin.cpp" line="497"/>
+        <source>All Files</source>
+        <translation>Alle Dateien</translation>
+    </message>
+    <message>
         <location filename="../../gpgwin.cpp" line="533"/>
         <source>Import Key From...</source>
         <translation>Impoertiere neuen Schlüssel aus...</translation>
@@ -814,83 +817,83 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...)</translation>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../../settingsdialog.cpp" line="40"/>
+        <location filename="../../settingsdialog.cpp" line="41"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="47"/>
+        <location filename="../../settingsdialog.cpp" line="48"/>
         <source>Iconsize</source>
         <translation>Optionen</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="49"/>
+        <location filename="../../settingsdialog.cpp" line="50"/>
         <source>small</source>
         <translation>klein</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="50"/>
+        <location filename="../../settingsdialog.cpp" line="51"/>
         <source>medium</source>
         <translation>mittel</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="51"/>
+        <location filename="../../settingsdialog.cpp" line="52"/>
         <source>large</source>
         <translation>gross</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="67"/>
+        <location filename="../../settingsdialog.cpp" line="68"/>
         <source>Iconstyle</source>
         <translation>Iconstil</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="69"/>
+        <location filename="../../settingsdialog.cpp" line="70"/>
         <source>just text</source>
         <translation>Nur Text</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="70"/>
+        <location filename="../../settingsdialog.cpp" line="71"/>
         <source>just icons</source>
         <translation>Nur Icons</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="71"/>
+        <location filename="../../settingsdialog.cpp" line="72"/>
         <source>text and icons</source>
         <translation>Text und Icons</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="87"/>
+        <location filename="../../settingsdialog.cpp" line="88"/>
         <source>Windowstate</source>
         <translation>Fenstereinstellungen</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="89"/>
+        <location filename="../../settingsdialog.cpp" line="90"/>
         <source>save window size and position on exit</source>
         <translation>Speichere Fenstergröße und -position beim Beenden</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="96"/>
+        <location filename="../../settingsdialog.cpp" line="97"/>
         <source>Language</source>
         <translation>Sprache</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="106"/>
+        <location filename="../../settingsdialog.cpp" line="107"/>
         <source>Language change is applied after restarting program.</source>
         <translation>DIe Änderung der Sprache wird beim nächsten Progrmmstart übernommen.</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="214"/>
+        <location filename="../../settingsdialog.cpp" line="215"/>
         <source>English</source>
         <comment>Insert local name of language here. This is used for the language menu of the settingsdialog</comment>
         <translation>Deutsch</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="233"/>
+        <location filename="../../settingsdialog.cpp" line="234"/>
         <source>English</source>
         <translation>Deutsch</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="219"/>
+        <location filename="../../settingsdialog.cpp" line="220"/>
         <source>System Default</source>
         <translation>Systemstandard</translation>
     </message>
diff --git a/release/ts/gpg4usb_en.ts b/release/ts/gpg4usb_en.ts
index 841658c..4d74201 100644
--- a/release/ts/gpg4usb_en.ts
+++ b/release/ts/gpg4usb_en.ts
@@ -4,73 +4,63 @@
 <context>
     <name>FileEncryptionDialog</name>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="41"/>
+        <location filename="../../fileencryptiondialog.cpp" line="43"/>
         <source>Encrypt / Decrypt File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="49"/>
-        <location filename="../../fileencryptiondialog.cpp" line="163"/>
+        <location filename="../../fileencryptiondialog.cpp" line="51"/>
+        <location filename="../../fileencryptiondialog.cpp" line="166"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="50"/>
+        <location filename="../../fileencryptiondialog.cpp" line="52"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="60"/>
+        <location filename="../../fileencryptiondialog.cpp" line="62"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="56"/>
+        <location filename="../../fileencryptiondialog.cpp" line="58"/>
         <source>Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="62"/>
+        <location filename="../../fileencryptiondialog.cpp" line="64"/>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="80"/>
+        <location filename="../../fileencryptiondialog.cpp" line="82"/>
         <source>&amp;Encrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="82"/>
+        <location filename="../../fileencryptiondialog.cpp" line="84"/>
         <source>&amp;Decrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
+        <location filename="../../fileencryptiondialog.cpp" line="113"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
-        <source>Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../fileencryptiondialog.cpp" line="136"/>
+        <location filename="../../fileencryptiondialog.cpp" line="139"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="146"/>
+        <location filename="../../fileencryptiondialog.cpp" line="149"/>
         <source>couldn&apos;t open file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="164"/>
+        <location filename="../../fileencryptiondialog.cpp" line="167"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -406,6 +396,11 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../gpgwin.cpp" line="497"/>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../gpgwin.cpp" line="501"/>
         <source>couldn&apos;t open file: </source>
         <translation type="unfinished"></translation>
@@ -806,83 +801,83 @@ Weak -&gt; Strong</source>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../../settingsdialog.cpp" line="40"/>
+        <location filename="../../settingsdialog.cpp" line="41"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="47"/>
+        <location filename="../../settingsdialog.cpp" line="48"/>
         <source>Iconsize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="49"/>
+        <location filename="../../settingsdialog.cpp" line="50"/>
         <source>small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="50"/>
+        <location filename="../../settingsdialog.cpp" line="51"/>
         <source>medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="51"/>
+        <location filename="../../settingsdialog.cpp" line="52"/>
         <source>large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="67"/>
+        <location filename="../../settingsdialog.cpp" line="68"/>
         <source>Iconstyle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="69"/>
+        <location filename="../../settingsdialog.cpp" line="70"/>
         <source>just text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="70"/>
+        <location filename="../../settingsdialog.cpp" line="71"/>
         <source>just icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="71"/>
+        <location filename="../../settingsdialog.cpp" line="72"/>
         <source>text and icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="87"/>
+        <location filename="../../settingsdialog.cpp" line="88"/>
         <source>Windowstate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="89"/>
+        <location filename="../../settingsdialog.cpp" line="90"/>
         <source>save window size and position on exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="96"/>
+        <location filename="../../settingsdialog.cpp" line="97"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="106"/>
+        <location filename="../../settingsdialog.cpp" line="107"/>
         <source>Language change is applied after restarting program.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="214"/>
+        <location filename="../../settingsdialog.cpp" line="215"/>
         <source>English</source>
         <comment>Insert local name of language here. This is used for the language menu of the settingsdialog</comment>
         <translation type="unfinished">English</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="233"/>
+        <location filename="../../settingsdialog.cpp" line="234"/>
         <source>English</source>
         <translation type="unfinished">English</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="219"/>
+        <location filename="../../settingsdialog.cpp" line="220"/>
         <source>System Default</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/release/ts/gpg4usb_fr.ts b/release/ts/gpg4usb_fr.ts
index 16a54f2..87b99b5 100644
--- a/release/ts/gpg4usb_fr.ts
+++ b/release/ts/gpg4usb_fr.ts
@@ -4,73 +4,71 @@
 <context>
     <name>FileEncryptionDialog</name>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="41"/>
+        <location filename="../../fileencryptiondialog.cpp" line="43"/>
         <source>Encrypt / Decrypt File</source>
         <translation>Crypter / Decrypter fichier</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="49"/>
-        <location filename="../../fileencryptiondialog.cpp" line="163"/>
+        <location filename="../../fileencryptiondialog.cpp" line="51"/>
+        <location filename="../../fileencryptiondialog.cpp" line="166"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="50"/>
+        <location filename="../../fileencryptiondialog.cpp" line="52"/>
         <source>Action</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="60"/>
+        <location filename="../../fileencryptiondialog.cpp" line="62"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="56"/>
+        <location filename="../../fileencryptiondialog.cpp" line="58"/>
         <source>Input</source>
         <translation>Données à traiter</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="62"/>
+        <location filename="../../fileencryptiondialog.cpp" line="64"/>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="80"/>
+        <location filename="../../fileencryptiondialog.cpp" line="82"/>
         <source>&amp;Encrypt</source>
         <translation>&amp;Crypter</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="82"/>
+        <location filename="../../fileencryptiondialog.cpp" line="84"/>
         <source>&amp;Decrypt</source>
         <translation>&amp;Decrypter</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
+        <location filename="../../fileencryptiondialog.cpp" line="113"/>
         <source>Open File</source>
         <translation>Ouvrir Fichier</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
         <source>Files</source>
-        <translation>Fichiers</translation>
+        <translation type="obsolete">Fichiers</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
         <source>All Files (*)</source>
-        <translation>Tous les fichiers</translation>
+        <translation type="obsolete">Tous les fichiers</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="136"/>
+        <location filename="../../fileencryptiondialog.cpp" line="139"/>
         <source>Save File</source>
         <translation>Enregistrer fichier</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="146"/>
+        <location filename="../../fileencryptiondialog.cpp" line="149"/>
         <source>couldn&apos;t open file: </source>
         <translation>Fichier non-ouvrable:</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="164"/>
+        <location filename="../../fileencryptiondialog.cpp" line="167"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Fichier non-enregistrable %1: %2.</translation>
@@ -453,6 +451,11 @@ Do you want to save your changes?</source>
     <message>
         <location filename="../../gpgwin.cpp" line="497"/>
         <source>Key Files</source>
+        <translation type="unfinished">Fichiers des cles</translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="497"/>
+        <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -808,83 +811,83 @@ Weak -&gt; Strong</source>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../../settingsdialog.cpp" line="40"/>
+        <location filename="../../settingsdialog.cpp" line="41"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="47"/>
+        <location filename="../../settingsdialog.cpp" line="48"/>
         <source>Iconsize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="49"/>
+        <location filename="../../settingsdialog.cpp" line="50"/>
         <source>small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="50"/>
+        <location filename="../../settingsdialog.cpp" line="51"/>
         <source>medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="51"/>
+        <location filename="../../settingsdialog.cpp" line="52"/>
         <source>large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="67"/>
+        <location filename="../../settingsdialog.cpp" line="68"/>
         <source>Iconstyle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="69"/>
+        <location filename="../../settingsdialog.cpp" line="70"/>
         <source>just text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="70"/>
+        <location filename="../../settingsdialog.cpp" line="71"/>
         <source>just icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="71"/>
+        <location filename="../../settingsdialog.cpp" line="72"/>
         <source>text and icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="87"/>
+        <location filename="../../settingsdialog.cpp" line="88"/>
         <source>Windowstate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="89"/>
+        <location filename="../../settingsdialog.cpp" line="90"/>
         <source>save window size and position on exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="96"/>
+        <location filename="../../settingsdialog.cpp" line="97"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="106"/>
+        <location filename="../../settingsdialog.cpp" line="107"/>
         <source>Language change is applied after restarting program.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="214"/>
+        <location filename="../../settingsdialog.cpp" line="215"/>
         <source>English</source>
         <comment>Insert local name of language here. This is used for the language menu of the settingsdialog</comment>
         <translation type="unfinished">Français</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="233"/>
+        <location filename="../../settingsdialog.cpp" line="234"/>
         <source>English</source>
         <translation>Français</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="219"/>
+        <location filename="../../settingsdialog.cpp" line="220"/>
         <source>System Default</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/release/ts/gpg4usb_pt.qm b/release/ts/gpg4usb_pt.qm
index 969be29..a827491 100644
--- a/release/ts/gpg4usb_pt.qm
+++ b/release/ts/gpg4usb_pt.qm
diff --git a/release/ts/gpg4usb_pt.ts b/release/ts/gpg4usb_pt.ts
index 864e661..451575e 100644
--- a/release/ts/gpg4usb_pt.ts
+++ b/release/ts/gpg4usb_pt.ts
@@ -4,73 +4,71 @@
 <context>
     <name>FileEncryptionDialog</name>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="41"/>
+        <location filename="../../fileencryptiondialog.cpp" line="43"/>
         <source>Encrypt / Decrypt File</source>
         <translation>Encriptar / Decriptar Arquivo</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="49"/>
-        <location filename="../../fileencryptiondialog.cpp" line="163"/>
+        <location filename="../../fileencryptiondialog.cpp" line="51"/>
+        <location filename="../../fileencryptiondialog.cpp" line="166"/>
         <source>File</source>
         <translation>Arquivo</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="50"/>
+        <location filename="../../fileencryptiondialog.cpp" line="52"/>
         <source>Action</source>
         <translation>Ação</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="60"/>
+        <location filename="../../fileencryptiondialog.cpp" line="62"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="56"/>
+        <location filename="../../fileencryptiondialog.cpp" line="58"/>
         <source>Input</source>
         <translation>Entrada</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="62"/>
+        <location filename="../../fileencryptiondialog.cpp" line="64"/>
         <source>Output</source>
         <translation>Saída</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="80"/>
+        <location filename="../../fileencryptiondialog.cpp" line="82"/>
         <source>&amp;Encrypt</source>
         <translation>&amp;Encriptar</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="82"/>
+        <location filename="../../fileencryptiondialog.cpp" line="84"/>
         <source>&amp;Decrypt</source>
         <translation>&amp;Decriptar</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
+        <location filename="../../fileencryptiondialog.cpp" line="113"/>
         <source>Open File</source>
         <translation>Abrir Arquivo</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
         <source>Files</source>
-        <translation>Arquivos</translation>
+        <translation type="obsolete">Arquivos</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
         <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Todos os Arquivos (*)</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="136"/>
+        <location filename="../../fileencryptiondialog.cpp" line="139"/>
         <source>Save File</source>
         <translation>Salvar Arquivo</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="146"/>
+        <location filename="../../fileencryptiondialog.cpp" line="149"/>
         <source>couldn&apos;t open file: </source>
         <translation>não pode abrir o arquivo: </translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="164"/>
+        <location filename="../../fileencryptiondialog.cpp" line="167"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Não pode escrever o arquivo %1:
@@ -87,7 +85,7 @@
     <message>
         <location filename="../../gpgwin.cpp" line="98"/>
         <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="99"/>
@@ -102,7 +100,7 @@
     <message>
         <location filename="../../gpgwin.cpp" line="104"/>
         <source>Ctrl+S</source>
-        <translation>Ctr+S</translation>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="105"/>
@@ -117,7 +115,7 @@
     <message>
         <location filename="../../gpgwin.cpp" line="149"/>
         <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="110"/>
@@ -132,7 +130,7 @@
     <message>
         <location filename="../../gpgwin.cpp" line="115"/>
         <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="116"/>
@@ -142,12 +140,12 @@
     <message>
         <location filename="../../gpgwin.cpp" line="119"/>
         <source>&amp;Quit</source>
-        <translation>&amp;Sair</translation>
+        <translation>Sai&amp;r</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="120"/>
         <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="122"/>
@@ -157,7 +155,8 @@
     <message>
         <location filename="../../gpgwin.cpp" line="127"/>
         <source>&amp;Paste</source>
-        <translation>&amp;Colar</translation>
+        <translatorcomment>i used this without accelerator &amp; to avoid confusion with windows native paste (ctrl+v)</translatorcomment>
+        <translation>Colar</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="129"/>
@@ -172,7 +171,8 @@
     <message>
         <location filename="../../gpgwin.cpp" line="133"/>
         <source>Cu&amp;t</source>
-        <translation>&amp;Recortar</translation>
+        <translatorcomment>i used this without accelerator &amp; to avoid confusion with native windows cut ctrl+x</translatorcomment>
+        <translation>Recortar</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="135"/>
@@ -182,7 +182,7 @@
     <message>
         <location filename="../../gpgwin.cpp" line="136"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
-        <translation>Recortar o conteúdo da seleção atual para a Área de Transferência</translation>
+        <translation>Recortar a seleção atual para a Área de Transferência</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="140"/>
@@ -212,12 +212,12 @@
     <message>
         <location filename="../../gpgwin.cpp" line="153"/>
         <source>Se&amp;ttings</source>
-        <translation type="unfinished"></translation>
+        <translation>Con&amp;figurações</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="154"/>
         <source>Open settings dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Abre janela de configurações</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="159"/>
@@ -232,7 +232,7 @@
     <message>
         <location filename="../../gpgwin.cpp" line="162"/>
         <source>Encrypt Message</source>
-        <translation>Encriptar a Mensagem</translation>
+        <translation>Encriptar Mensagem</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="165"/>
@@ -247,7 +247,7 @@
     <message>
         <location filename="../../gpgwin.cpp" line="168"/>
         <source>Decrypt Message</source>
-        <translation>Decriptar a Mensagem</translation>
+        <translation>Decriptar Mensagem</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="171"/>
@@ -272,7 +272,7 @@
     <message>
         <location filename="../../gpgwin.cpp" line="193"/>
         <source>Key Management</source>
-        <translation>Gerenciamento de Chaves</translation>
+        <translation>Gerenciar Chaves</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="195"/>
@@ -292,7 +292,7 @@
     <message>
         <location filename="../../gpgwin.cpp" line="207"/>
         <source>Show the application&apos;s About box</source>
-        <translation>Exibir a caixa &apos;sobre&apos;</translation>
+        <translation>Exibe a caixa &apos;sobre&apos;</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="178"/>
@@ -304,12 +304,12 @@
     <message>
         <location filename="../../gpgwin.cpp" line="227"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
+        <translation>E&amp;ditar</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="250"/>
         <source>&amp;Help</source>
-        <translation>&amp;Ajuda</translation>
+        <translation>A&amp;juda</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="396"/>
@@ -324,12 +324,12 @@
     <message>
         <location filename="../../gpgwin.cpp" line="212"/>
         <source>Append Selected Key(s) To Text</source>
-        <translation>Anexar as Chaves Marcadas para o Texto</translation>
+        <translation>Anexar Chaves Marcadas no Texto</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="213"/>
         <source>Append The Selected Keys To Text in Editor</source>
-        <translation>Anexar as Chaves Marcadas ao Texto no Editor</translation>
+        <translation>Anexar Chaves Marcadas no Texto do Editor</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="240"/>
@@ -344,7 +344,7 @@
     <message>
         <location filename="../../gpgwin.cpp" line="248"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation>E&amp;xibir</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="262"/>
@@ -372,7 +372,7 @@
         <location filename="../../gpgwin.cpp" line="342"/>
         <source>Cannot read file %1:
 %2.</source>
-        <translation>Não pode ler o arquivo %1: %2.</translation>
+        <translation>Não leu o arquivo %1: %2.</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="354"/>
@@ -395,17 +395,18 @@ Deseja salvar as alterações?</translation>
         <location filename="../../gpgwin.cpp" line="397"/>
         <source>Cannot write file %1:
 %2.</source>
-        <translation>Não pode escrever o arquivo %1: %2.</translation>
+        <translation>Não escreveu o arquivo %1: %2.</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="406"/>
         <source>Saved &apos;%1&apos;</source>
-        <translation>Salvo &apos;%1&apos;</translation>
+        <translatorcomment>i used inverse order because its more natural speak in this way</translatorcomment>
+        <translation>&apos;%1&apos; salvo.</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="431"/>
         <source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-message or file.&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;&lt;b&gt;Translation:&lt;/b&gt;&lt;br&gt;Kirill (ru)&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 xmpp-channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</source>
-        <translation>&lt;center&gt; Esse aplicativo permite a encriptação/decriptação simplificada&lt;br&gt;das suas mensagens de texto ou arquivos.&lt;br&gt;E possui licença GPL-V2.0&lt;br&gt;&lt;br&gt;Desenvolvedor:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Tradução:&lt;/b&gt;&lt;br&gt;Krill(ru)&lt;br&gt;Alessandro Benevenuto (pt-br)&lt;br&gt;&lt;br&gt;Caso tenha dúvidas e/ou sugestões, entre em contato&lt;br&gt;através de gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;ou nos encontre no canal xmpp&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
+        <translation>&lt;center&gt; Este aplicativo permite a encriptação/decriptação&lt;br&gt;simplificada das suas mensagens de texto ou arquivos.&lt;br&gt;E é liberado sob licença GPL-V2.0&lt;br&gt;&lt;br&gt;Desenvolvedores:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Tradução:&lt;/b&gt;&lt;br&gt;Krill(ru)&lt;br&gt;Alessandro Benevenuto (pt-br)&lt;br&gt;&lt;br&gt;Caso tenha dúvidas e/ou sugestões, entre em&lt;br&gt;contatoatravés de gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;ou no canal xmpp&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
     </message>
     <message>
         <location filename="../../gpgwin.cpp" line="497"/>
@@ -418,6 +419,11 @@ Deseja salvar as alterações?</translation>
         <translation>Arquivos de Chaves</translation>
     </message>
     <message>
+        <location filename="../../gpgwin.cpp" line="497"/>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../gpgwin.cpp" line="501"/>
         <source>couldn&apos;t open file: </source>
         <translation>Não pode abrir o arquivo:</translation>
@@ -481,7 +487,7 @@ Deseja salvar as alterações?</translation>
     <message>
         <location filename="../../keydetailsdialog.cpp" line="32"/>
         <source>Fingerprint</source>
-        <translation>Impressão digital</translation>
+        <translation>Assinatura digital</translation>
     </message>
     <message>
         <location filename="../../keydetailsdialog.cpp" line="36"/>
@@ -506,7 +512,7 @@ Deseja salvar as alterações?</translation>
     <message>
         <location filename="../../keydetailsdialog.cpp" line="41"/>
         <source>Created on: </source>
-        <translation>Criado em:</translation>
+        <translation>Criada em:</translation>
     </message>
     <message>
         <location filename="../../keydetailsdialog.cpp" line="128"/>
@@ -516,7 +522,7 @@ Deseja salvar as alterações?</translation>
     <message>
         <location filename="../../keydetailsdialog.cpp" line="147"/>
         <source>Key Files </source>
-        <translation type="unfinished"></translation>
+        <translation>Arquivos de Chaves</translation>
     </message>
     <message>
         <location filename="../../keydetailsdialog.cpp" line="39"/>
@@ -586,22 +592,22 @@ Guarde-a em segurança.</translation>
     <message>
         <location filename="../../keymgmt.cpp" line="65"/>
         <source>Keymanagement</source>
-        <translation>Gerenciamento de Chaves</translation>
+        <translation>Gerenciador de Chaves</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="72"/>
         <source>&amp;Close Key Management</source>
-        <translation>&amp;Fechar Gerenciamento de Chaves</translation>
+        <translation>&amp;Fechar Gerenciador de Chaves</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="73"/>
         <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="75"/>
         <source>Close Key Management</source>
-        <translation>Fechar Gerenciamento de Chaves</translation>
+        <translation>Fechar Gerenciador de Chaves</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="78"/>
@@ -626,12 +632,12 @@ Guarde-a em segurança.</translation>
     <message>
         <location filename="../../keymgmt.cpp" line="88"/>
         <source>Export To &amp;Clipboard</source>
-        <translation>Exportar para a Área de &amp;Transferência</translation>
+        <translation>Exportar para Área de &amp;Transferência</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="90"/>
         <source>Export Selected Key(s) To Clipboard</source>
-        <translation>Exportar as chaves selecionadas para a Área de Transferência</translation>
+        <translation>Exportar chaves marcadas para Área de Transferência</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="93"/>
@@ -641,27 +647,27 @@ Guarde-a em segurança.</translation>
     <message>
         <location filename="../../keymgmt.cpp" line="95"/>
         <source>Export Selected Key(s) To File</source>
-        <translation>Exportar as Chaves Selecionadas para Arquivo</translation>
+        <translation>Exportar as Chaves Marcadas para Arquivo</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="98"/>
         <source>Delete Selected Key(s)</source>
-        <translation>Excluir as Chaves Selecionadas</translation>
+        <translation>Excluir Chaves Selecionadas</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="99"/>
         <source>Delete the Selected keys</source>
-        <translation>Excluir as Chaves Selecionadas</translation>
+        <translation>Excluir Chaves Selecionadas</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="102"/>
         <source>Delete Checked Key(s)</source>
-        <translation>Excluir as Chaves Marcadas</translation>
+        <translation>Excluir Chaves Marcadas</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="103"/>
         <source>Delete the Checked keys</source>
-        <translation>Excluir as Chaves Marcadas</translation>
+        <translation>Excluir Chaves Marcadas</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="107"/>
@@ -730,7 +736,7 @@ A ação não poderá ser desfeita.</translation>
     <message>
         <location filename="../../keymgmt.cpp" line="208"/>
         <source>Export Key To File</source>
-        <translation>Exportar a Chave para Arquivo</translation>
+        <translation>Exportar Chave para Arquivo</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="238"/>
@@ -776,7 +782,7 @@ A ação não poderá ser desfeita.</translation>
         <location filename="../../keymgmt.cpp" line="246"/>
         <source>Password: Strength
 Weak -&gt; Strong</source>
-        <translation>Senha: Força Fraca -&gt; Forte</translation>
+        <translation>Força da Senha: Fraca -&gt; Forte</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="277"/>
@@ -805,7 +811,7 @@ Weak -&gt; Strong</source>
  This may take a while.
  To speed up the process use your computer
  (e.g. browse the net, listen to music,...)</source>
-        <translation>Coletando dados randômicos para a geração da chave.
+        <translation>Coletando dados aleatórios para a geração da chave.
 Isso pode demorar um pouco.
 Para agilizar o processo use seu computador
  (ex: navegue na internet, ouça música,...)</translation>
@@ -814,85 +820,85 @@ Para agilizar o processo use seu computador
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../../settingsdialog.cpp" line="40"/>
+        <location filename="../../settingsdialog.cpp" line="41"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="47"/>
+        <location filename="../../settingsdialog.cpp" line="48"/>
         <source>Iconsize</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho do ícone</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="49"/>
+        <location filename="../../settingsdialog.cpp" line="50"/>
         <source>small</source>
-        <translation type="unfinished"></translation>
+        <translation>pequeno</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="50"/>
+        <location filename="../../settingsdialog.cpp" line="51"/>
         <source>medium</source>
-        <translation type="unfinished"></translation>
+        <translation>médio</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="51"/>
+        <location filename="../../settingsdialog.cpp" line="52"/>
         <source>large</source>
-        <translation type="unfinished"></translation>
+        <translation>grande</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="67"/>
+        <location filename="../../settingsdialog.cpp" line="68"/>
         <source>Iconstyle</source>
-        <translation type="unfinished"></translation>
+        <translation>Estilo do ícone</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="69"/>
+        <location filename="../../settingsdialog.cpp" line="70"/>
         <source>just text</source>
-        <translation type="unfinished"></translation>
+        <translation>somente texto</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="70"/>
+        <location filename="../../settingsdialog.cpp" line="71"/>
         <source>just icons</source>
-        <translation type="unfinished"></translation>
+        <translation>somente ícones</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="71"/>
+        <location filename="../../settingsdialog.cpp" line="72"/>
         <source>text and icons</source>
-        <translation type="unfinished"></translation>
+        <translation>texto e ícones</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="87"/>
+        <location filename="../../settingsdialog.cpp" line="88"/>
         <source>Windowstate</source>
-        <translation type="unfinished"></translation>
+        <translation>Status da Janela</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="89"/>
+        <location filename="../../settingsdialog.cpp" line="90"/>
         <source>save window size and position on exit</source>
-        <translation type="unfinished"></translation>
+        <translation>Salvar posição e tamanho  da janela ao sair</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="96"/>
+        <location filename="../../settingsdialog.cpp" line="97"/>
         <source>Language</source>
-        <translation type="unfinished"></translation>
+        <translation>Idioma</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="106"/>
+        <location filename="../../settingsdialog.cpp" line="107"/>
         <source>Language change is applied after restarting program.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alteração de idioma disponível após reiniciar o programa.</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="214"/>
+        <location filename="../../settingsdialog.cpp" line="215"/>
         <source>English</source>
         <comment>Insert local name of language here. This is used for the language menu of the settingsdialog</comment>
-        <translation type="unfinished">Português</translation>
+        <translation>Português do Brasil</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="233"/>
+        <location filename="../../settingsdialog.cpp" line="234"/>
         <source>English</source>
-        <translation>Português</translation>
+        <translation>Inglês</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="219"/>
+        <location filename="../../settingsdialog.cpp" line="220"/>
         <source>System Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Padrão do Sistema</translation>
     </message>
 </context>
 </TS>
diff --git a/release/ts/gpg4usb_ru.ts b/release/ts/gpg4usb_ru.ts
index 268a670..2985d62 100644
--- a/release/ts/gpg4usb_ru.ts
+++ b/release/ts/gpg4usb_ru.ts
@@ -4,73 +4,71 @@
 <context>
     <name>FileEncryptionDialog</name>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="41"/>
+        <location filename="../../fileencryptiondialog.cpp" line="43"/>
         <source>Encrypt / Decrypt File</source>
         <translation>За-/Расшифровать файл</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="49"/>
-        <location filename="../../fileencryptiondialog.cpp" line="163"/>
+        <location filename="../../fileencryptiondialog.cpp" line="51"/>
+        <location filename="../../fileencryptiondialog.cpp" line="166"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="50"/>
+        <location filename="../../fileencryptiondialog.cpp" line="52"/>
         <source>Action</source>
         <translation>Действие</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="60"/>
+        <location filename="../../fileencryptiondialog.cpp" line="62"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="56"/>
+        <location filename="../../fileencryptiondialog.cpp" line="58"/>
         <source>Input</source>
         <translation>Файл ввода</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="62"/>
+        <location filename="../../fileencryptiondialog.cpp" line="64"/>
         <source>Output</source>
         <translation>Файл вывода</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="80"/>
+        <location filename="../../fileencryptiondialog.cpp" line="82"/>
         <source>&amp;Encrypt</source>
         <translation>З&amp;ашифровать</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="82"/>
+        <location filename="../../fileencryptiondialog.cpp" line="84"/>
         <source>&amp;Decrypt</source>
         <translation>Расшифро&amp;вать</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
+        <location filename="../../fileencryptiondialog.cpp" line="113"/>
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
         <source>Files</source>
-        <translation>Файлы</translation>
+        <translation type="obsolete">Файлы</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="110"/>
         <source>All Files (*)</source>
-        <translation>Все файлы</translation>
+        <translation type="obsolete">Все файлы</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="136"/>
+        <location filename="../../fileencryptiondialog.cpp" line="139"/>
         <source>Save File</source>
         <translation>Сохранить файл</translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="146"/>
+        <location filename="../../fileencryptiondialog.cpp" line="149"/>
         <source>couldn&apos;t open file: </source>
         <translation>Не удалось открыть файл: </translation>
     </message>
     <message>
-        <location filename="../../fileencryptiondialog.cpp" line="164"/>
+        <location filename="../../fileencryptiondialog.cpp" line="167"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Не удалось записать файл %1:
@@ -463,6 +461,11 @@ Do you want to save your changes?</source>
         <translation>Файлы ключей</translation>
     </message>
     <message>
+        <location filename="../../gpgwin.cpp" line="497"/>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../gpgwin.cpp" line="533"/>
         <source>Import Key From...</source>
         <translation>Импорт ключа из...</translation>
@@ -818,85 +821,85 @@ Weak -&gt; Strong</source>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../../settingsdialog.cpp" line="40"/>
+        <location filename="../../settingsdialog.cpp" line="41"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="47"/>
+        <location filename="../../settingsdialog.cpp" line="48"/>
         <source>Iconsize</source>
         <translation>Размер иконок</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="49"/>
+        <location filename="../../settingsdialog.cpp" line="50"/>
         <source>small</source>
         <translation>Маленький</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="50"/>
+        <location filename="../../settingsdialog.cpp" line="51"/>
         <source>medium</source>
         <translation>Средний</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="51"/>
+        <location filename="../../settingsdialog.cpp" line="52"/>
         <source>large</source>
         <translation>Большой</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="67"/>
+        <location filename="../../settingsdialog.cpp" line="68"/>
         <source>Iconstyle</source>
         <translation>Стиль иконок</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="69"/>
+        <location filename="../../settingsdialog.cpp" line="70"/>
         <source>just text</source>
         <translation>Только текст</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="70"/>
+        <location filename="../../settingsdialog.cpp" line="71"/>
         <source>just icons</source>
         <translation>Только значки</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="71"/>
+        <location filename="../../settingsdialog.cpp" line="72"/>
         <source>text and icons</source>
         <translation>Значки и текст</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="87"/>
+        <location filename="../../settingsdialog.cpp" line="88"/>
         <source>Windowstate</source>
         <translation>Системные настройки</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="89"/>
+        <location filename="../../settingsdialog.cpp" line="90"/>
         <source>save window size and position on exit</source>
         <translation>Сохранять размер окна при выходе</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="96"/>
+        <location filename="../../settingsdialog.cpp" line="97"/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="106"/>
+        <location filename="../../settingsdialog.cpp" line="107"/>
         <source>Language change is applied after restarting program.</source>
         <translation>Изменение языка вступит в силу после перезапуска программы.</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="214"/>
+        <location filename="../../settingsdialog.cpp" line="215"/>
         <source>English</source>
         <comment>Insert local name of language here. This is used for the language menu of the settingsdialog</comment>
         <translatorcomment>Local language here is russian</translatorcomment>
         <translation>Русский</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="233"/>
+        <location filename="../../settingsdialog.cpp" line="234"/>
         <source>English</source>
         <translatorcomment>Also local language here?</translatorcomment>
         <translation>Русский</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="219"/>
+        <location filename="../../settingsdialog.cpp" line="220"/>
         <source>System Default</source>
         <translation>Стандартнай язык системы</translation>
     </message>
diff --git a/settingsdialog.cpp b/settingsdialog.cpp
index 412fa58..d96b96a 100755
--- a/settingsdialog.cpp
+++ b/settingsdialog.cpp
@@ -35,7 +35,8 @@ class QLabel;
 class QButtonGroup;
 class QGroupBox;
 
-SettingsDialog::SettingsDialog()
+SettingsDialog::SettingsDialog(QWidget *parent)
+ : QDialog(parent)
 {
     setWindowTitle(tr("Settings"));
     resize(500, 200);
diff --git a/settingsdialog.h b/settingsdialog.h
index 173b284..88dd424 100755
--- a/settingsdialog.h
+++ b/settingsdialog.h
@@ -19,6 +19,9 @@
  *      MA 02110-1301, USA.
  */
 
+#ifndef __SETTINGSDIALOG_H__
+#define __SETTINGSDIALOG_H__
+
 #include <QDialog>
 #include <QButtonGroup>
 #include <QGroupBox>
@@ -36,7 +39,7 @@ class SettingsDialog : public QDialog
     Q_OBJECT
 
 public:
-    SettingsDialog();
+    SettingsDialog(QWidget *parent = 0);
 
 private:
 	QGroupBox *iconSizeBox;
@@ -69,3 +72,4 @@ private slots:
 
     QHash<QString, QString> listLanguages();
 };
+#endif  // __SETTINGSDIALOG_H__