Prepare for release

lupdate translations Always try to clean Klipper history git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@293 b624d157-de02-0410-bad0-e51aec6abb33
16 years ago · 104832fc96
parent b350020034
commit 104832fc96
17 changed files with 1134 additions and 1156 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
 MESSAGE("CMake is still experimental, use qmake instead")

 SET( keepassx_VERSION_SHORT "0.4.0" )
-SET( keepassx_VERSION "0.4.0beta1" )
+SET( keepassx_VERSION "0.4.0" )

 ADD_DEFINITIONS(-D'KEEPASSX_VERSION="${keepassx_VERSION}"')

--- a/2
+++ b/2
@ -1,5 +1,5 @@
 ----------------------------
-    0.4.0 (2009-03-??)
+    0.4.0 (2009-03-19)
 ----------------------------
 - Added pronounceable password generator
 - Added action "Copy URL to Clipboard"
--- a/src/keepassx.h
+++ b/src/keepassx.h
@ -26,7 +26,7 @@
 #define APP_CODE_NAME       "keepassx"
 #define APP_SHORT_FUNC      "Password Manager"
 #define APP_LONG_FUNC       "Cross Platform Password Manager"
-#define APP_VERSION         "0.4.0beta1"
+#define APP_VERSION         "0.4.0"

 #define BUILTIN_ICONS 69

--- a/src/lib/AutoTypeGlobalX11.cpp
+++ b/src/lib/AutoTypeGlobalX11.cpp
@ -34,7 +34,7 @@ void initAutoType(KeepassMainWindow* mainWin) {
 AutoTypeGlobalX11::AutoTypeGlobalX11(KeepassMainWindow* mainWin) : AutoTypeX11(mainWin) {
 	wm_state = XInternAtom(dpy, "WM_STATE", true);
 	windowRoot = XRootWindow(dpy, mainWin->x11Info().screen());
-	focusedWindow = NULL;
+	focusedWindow = 0;
 	//windowBlacklist << "kicker" << "KDE Desktop";
 	classBlacklist << "desktop_window" << "gnome-panel"; // Gnome
 	classBlacklist << "kdesktop" << "kicker"; // KDE 3
@ -44,7 +44,7 @@ AutoTypeGlobalX11::AutoTypeGlobalX11(KeepassMainWindow* mainWin) : AutoTypeX11(m
 void AutoTypeGlobalX11::perform(IEntryHandle* entry, bool hideWindow, int nr, bool wasLocked){
 	if (focusedWindow && (!hideWindow || wasLocked)) { // detect if global auto-type
 		XSetInputFocus(dpy, focusedWindow, RevertToPointerRoot, CurrentTime);
-		focusedWindow = NULL;
+		focusedWindow = 0;
 	}
 	AutoTypeX11::perform(entry, hideWindow, nr, wasLocked);
 }
@ -205,7 +205,7 @@ void AutoTypeGlobalX11::performGlobal(){
 	}
 	
 	if (validEntries.size()==1){
-		focusedWindow = NULL;
+		focusedWindow = 0;
 		perform(validEntries[0],wasLocked,entryNumbers[0],wasLocked);
 	}
 	else if (validEntries.size()>1){
--- a/src/lib/EntryView.cpp
+++ b/src/lib/EntryView.cpp
@ -354,18 +354,8 @@ void KeepassEntryView::OnClipboardTimeOut(){
 		Clipboard->clear(QClipboard::Selection);
 	}
 #ifdef Q_WS_X11
-	static bool clearKlipper3 = true;
-	static bool clearKlipper4 = true;
-	
-	if (clearKlipper3){
-		if (QProcess::execute("dcop klipper klipper clearClipboardHistory")!=0)
-			clearKlipper3 = false;
-	}
-	
-	if (clearKlipper4){
-		if (QProcess::execute("dbus-send --type=method_call --print-reply --dest=org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory")!=0)
-			clearKlipper4 = false;
-	}
+	QProcess::execute("dcop klipper klipper clearClipboardHistory");
+	QProcess::execute("dbus-send --type=method_call --dest=org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory");
 #endif
 }

--- a/src/src.pro
+++ b/src/src.pro
@ -144,21 +144,22 @@ FORMS += forms/AboutDlg.ui \
         forms/WorkspaceLockedWidget.ui

 TRANSLATIONS_KX = translations/keepassx-de_DE.ts \
-#                  translations/keepassx-cs_CZ.ts \
                  translations/keepassx-es_ES.ts \
                  translations/keepassx-fi_FI.ts \
                  translations/keepassx-fr_FR.ts \
                  translations/keepassx-gl_ES.ts \
                  translations/keepassx-it_IT.ts \
-#                  translations/keepassx-ja_JP.ts \
                  translations/keepassx-ru_RU.ts \
                  translations/keepassx-tr_TR.ts

+TRANSLATIONS_DISABLED = translations/keepassx-cs_CZ.ts \
+                        translations/keepassx-ja_JP.ts
+
 TRANSLATIONS_QT = translations/qt_fi.ts \
                  translations/qt_it.ts \
                  translations/qt_tr.ts

-TRANSLATIONS = $$TRANSLATIONS_KX translations/keepassx-xx_XX.ts
+TRANSLATIONS = $$TRANSLATIONS_KX $$TRANSLATIONS_DISABLED translations/keepassx-xx_XX.ts
 TRANSLATIONS_COMPILE = $$TRANSLATIONS_KX $$TRANSLATIONS_QT

 HEADERS += main.h \
--- a/src/translations/keepassx-cs_CZ.ts
+++ b/src/translations/keepassx-cs_CZ.ts
@ -322,7 +322,7 @@ Je dovolena pouze jedna na každý záznam.</translation>
        <translation type="obsolete">Zrušit</translation>
    </message>
    <message>
-        <location filename="../dialogs/AutoTypeDlg.cpp" line="89"/>
+        <location filename="../dialogs/AutoTypeDlg.cpp" line="90"/>
        <source>Auto-Type</source>
        <translation type="unfinished"></translation>
    </message>
@ -956,20 +956,25 @@ Prosím zkontrolujte jeho parametry.</translation>
 <context>
    <name>CSettingsDlg</name>
    <message>
-        <location filename="../dialogs/SettingsDlg.cpp" line="349"/>
+        <location filename="../dialogs/SettingsDlg.cpp" line="350"/>
        <source>Settings</source>
        <translation>Nastavení</translation>
    </message>
    <message>
-        <location filename="../dialogs/SettingsDlg.cpp" line="354"/>
+        <location filename="../dialogs/SettingsDlg.cpp" line="355"/>
        <source>Select a directory...</source>
        <translation>Výběr adresáře...</translation>
    </message>
    <message>
-        <location filename="../dialogs/SettingsDlg.cpp" line="361"/>
+        <location filename="../dialogs/SettingsDlg.cpp" line="362"/>
        <source>Select an executable...</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="../dialogs/SettingsDlg.cpp" line="424"/>
+        <source>System Language</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CalendarDialog</name>
@ -1604,77 +1609,77 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>FileErrors</name>
    <message>
-        <location filename="../lib/tools.cpp" line="61"/>
+        <location filename="../lib/tools.cpp" line="62"/>
        <source>No error occurred.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="62"/>
+        <location filename="../lib/tools.cpp" line="63"/>
        <source>An error occurred while reading from the file.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="63"/>
+        <location filename="../lib/tools.cpp" line="64"/>
        <source>An error occurred while writing to the file.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="64"/>
+        <location filename="../lib/tools.cpp" line="65"/>
        <source>A fatal error occurred.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="65"/>
+        <location filename="../lib/tools.cpp" line="66"/>
        <source>An resource error occurred.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="66"/>
+        <location filename="../lib/tools.cpp" line="67"/>
        <source>The file could not be opened.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="67"/>
+        <location filename="../lib/tools.cpp" line="68"/>
        <source>The operation was aborted.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="68"/>
+        <location filename="../lib/tools.cpp" line="69"/>
        <source>A timeout occurred.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="69"/>
+        <location filename="../lib/tools.cpp" line="70"/>
        <source>An unspecified error occurred.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="70"/>
+        <location filename="../lib/tools.cpp" line="71"/>
        <source>The file could not be removed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="71"/>
+        <location filename="../lib/tools.cpp" line="72"/>
        <source>The file could not be renamed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="72"/>
+        <location filename="../lib/tools.cpp" line="73"/>
        <source>The position in the file could not be changed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="73"/>
+        <location filename="../lib/tools.cpp" line="74"/>
        <source>The file could not be resized.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="74"/>
+        <location filename="../lib/tools.cpp" line="75"/>
        <source>The file could not be accessed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="75"/>
+        <location filename="../lib/tools.cpp" line="76"/>
        <source>The file could not be copied.</source>
        <translation type="unfinished"></translation>
    </message>
@ -2092,12 +2097,12 @@ Klíč je chybný nebo je soubor poškozen.</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="934"/>
+        <location filename="../Kdb3Database.cpp" line="933"/>
        <source>Key file is empty.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1314"/>
+        <location filename="../Kdb3Database.cpp" line="1313"/>
        <source>The database must contain at least one group.</source>
        <translation type="unfinished"></translation>
    </message>
@ -2117,7 +2122,7 @@ Klíč je chybný nebo je soubor poškozen.</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1334"/>
+        <location filename="../Kdb3Database.cpp" line="1333"/>
        <source>The database has been opened read-only.</source>
        <translation type="unfinished"></translation>
    </message>
@ -2125,22 +2130,22 @@ Klíč je chybný nebo je soubor poškozen.</translation>
 <context>
    <name>Kdb3Database::EntryHandle</name>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1178"/>
+        <location filename="../Kdb3Database.cpp" line="1177"/>
        <source>Bytes</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1186"/>
+        <location filename="../Kdb3Database.cpp" line="1185"/>
        <source>KiB</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1192"/>
+        <location filename="../Kdb3Database.cpp" line="1191"/>
        <source>MiB</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1197"/>
+        <location filename="../Kdb3Database.cpp" line="1196"/>
        <source>GiB</source>
        <translation type="unfinished"></translation>
    </message>
@ -2148,52 +2153,52 @@ Klíč je chybný nebo je soubor poškozen.</translation>
 <context>
    <name>KeepassEntryView</name>
    <message>
-        <location filename="../lib/EntryView.cpp" line="484"/>
+        <location filename="../lib/EntryView.cpp" line="474"/>
        <source>Title</source>
        <translation>Název</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="486"/>
+        <location filename="../lib/EntryView.cpp" line="476"/>
        <source>Username</source>
        <translation>Uživatelské jméno</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="488"/>
+        <location filename="../lib/EntryView.cpp" line="478"/>
        <source>URL</source>
        <translation>URL</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="490"/>
+        <location filename="../lib/EntryView.cpp" line="480"/>
        <source>Password</source>
        <translation>Heslo</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="492"/>
+        <location filename="../lib/EntryView.cpp" line="482"/>
        <source>Comments</source>
        <translation>Komentáře</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="494"/>
+        <location filename="../lib/EntryView.cpp" line="484"/>
        <source>Expires</source>
        <translation>Vyprší</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="496"/>
+        <location filename="../lib/EntryView.cpp" line="486"/>
        <source>Creation</source>
        <translation>Vytvoření</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="498"/>
+        <location filename="../lib/EntryView.cpp" line="488"/>
        <source>Last Change</source>
        <translation>Poslední změna</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="500"/>
+        <location filename="../lib/EntryView.cpp" line="490"/>
        <source>Last Access</source>
        <translation>Poslední přístup</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="502"/>
+        <location filename="../lib/EntryView.cpp" line="492"/>
        <source>Attachment</source>
        <translation>Příloha</translation>
    </message>
@ -2208,7 +2213,7 @@ Klíč je chybný nebo je soubor poškozen.</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="504"/>
+        <location filename="../lib/EntryView.cpp" line="494"/>
        <source>Group</source>
        <translation type="unfinished"></translation>
    </message>
@ -2664,12 +2669,12 @@ Do you want to save the changes?</source>
 <context>
    <name>Main</name>
    <message>
-        <location filename="../lib/tools.cpp" line="139"/>
+        <location filename="../lib/tools.cpp" line="140"/>
        <source>Error</source>
        <translation type="unfinished">Chyba</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="146"/>
+        <location filename="../lib/tools.cpp" line="147"/>
        <source>File &apos;%1&apos; could not be found.</source>
        <translation type="unfinished">Soubor &apos;%1&apos; nemohl být nalezen.</translation>
    </message>
@ -3223,90 +3228,90 @@ Do you want to save the changes?</source>
 <context>
    <name>PasswordDialog</name>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="31"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="32"/>
        <source>Enter Master Key</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="34"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="35"/>
        <source>Set Master Key</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="37"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="38"/>
        <source>Change Master Key</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="41"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="42"/>
        <source>Database Key</source>
        <translation type="unfinished">Klíč k databázi</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="131"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="132"/>
        <source>Last File</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="177"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="178"/>
        <source>Select a Key File</source>
        <translation type="unfinished">Vyberte soubor s klíčem</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="341"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="342"/>
        <source>All Files (*)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="341"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="342"/>
        <source>Key Files (*.key)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="205"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="206"/>
        <source>Please enter a Password or select a key file.</source>
        <translation type="unfinished">Vložte prosím heslo nebo vyberte soubor s klíčem.</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="210"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="211"/>
        <source>Please enter a Password.</source>
        <translation type="unfinished">Vložte prosím heslo.</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="215"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="216"/>
        <source>Please provide a key file.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="261"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="262"/>
        <source>%1:
 No such file or directory.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="227"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="228"/>
        <source>The selected key file or directory is not readable.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="246"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="247"/>
        <source>The given directory does not contain any key files.</source>
        <translation type="unfinished">Daný adresář neobsahuje žádné soubory s klíči.</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="252"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="253"/>
        <source>The given directory contains more then one key files.
 Please specify the key file directly.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="265"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="266"/>
        <source>%1:
 File is not readable.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="339"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="340"/>
        <source>Create Key File...</source>
        <translation type="unfinished"></translation>
    </message>
@ -3800,7 +3805,7 @@ Ujistěte se, že je možný přístup do  &apos;~/.keepass&apos;.</translation>
        <translation type="obsolete">&amp;Zrušit</translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="981"/>
+        <location filename="../forms/SettingsDlg.ui" line="971"/>
        <source>Clear clipboard after:</source>
        <translation>Smazat schránku po:</translation>
    </message>
@ -3815,7 +3820,7 @@ Ujistěte se, že je možný přístup do  &apos;~/.keepass&apos;.</translation>
        <translation type="obsolete">Zobrazovat &amp;hesla vždy jako obyčejný text</translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="953"/>
+        <location filename="../forms/SettingsDlg.ui" line="943"/>
        <source>Alt+O</source>
        <translation>Alt+O</translation>
    </message>
@ -3885,7 +3890,7 @@ Ujistěte se, že je možný přístup do  &apos;~/.keepass&apos;.</translation>
        <translation>Střídavě barevné podklady řádků</translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1132"/>
+        <location filename="../forms/SettingsDlg.ui" line="1122"/>
        <source>Browse...</source>
        <translation>Projít...</translation>
    </message>
@ -3945,37 +3950,37 @@ Ujistěte se, že je možný přístup do  &apos;~/.keepass&apos;.</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="950"/>
+        <location filename="../forms/SettingsDlg.ui" line="940"/>
        <source>Edit Entry Dialog</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1333"/>
+        <location filename="../forms/SettingsDlg.ui" line="1323"/>
        <source>Plug-Ins</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1342"/>
+        <location filename="../forms/SettingsDlg.ui" line="1332"/>
        <source>None</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1349"/>
+        <location filename="../forms/SettingsDlg.ui" line="1339"/>
        <source>Gnome Desktop Integration (Gtk 2.x)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1356"/>
+        <location filename="../forms/SettingsDlg.ui" line="1346"/>
        <source>KDE 4 Desktop Integration</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1371"/>
+        <location filename="../forms/SettingsDlg.ui" line="1361"/>
        <source>You need to restart the program before the changes take effect.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1391"/>
+        <location filename="../forms/SettingsDlg.ui" line="1381"/>
        <source>Configure...</source>
        <translation type="unfinished"></translation>
    </message>
@ -4000,62 +4005,62 @@ Ujistěte se, že je možný přístup do  &apos;~/.keepass&apos;.</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1285"/>
+        <location filename="../forms/SettingsDlg.ui" line="1275"/>
        <source>You can disable several features of KeePassX here according to your needs in order to keep the user interface slim.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1295"/>
+        <location filename="../forms/SettingsDlg.ui" line="1285"/>
        <source>Bookmarks</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1151"/>
+        <location filename="../forms/SettingsDlg.ui" line="1141"/>
        <source>Auto-Type Fine Tuning</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1160"/>
+        <location filename="../forms/SettingsDlg.ui" line="1150"/>
        <source>Time between the activation of an auto-type action by the user and the first simulated key stroke.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1209"/>
+        <location filename="../forms/SettingsDlg.ui" line="1199"/>
        <source>ms</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1173"/>
+        <location filename="../forms/SettingsDlg.ui" line="1163"/>
        <source>Pre-Gap:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1196"/>
+        <location filename="../forms/SettingsDlg.ui" line="1186"/>
        <source>Key Stroke Delay:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1206"/>
+        <location filename="../forms/SettingsDlg.ui" line="1196"/>
        <source>Delay between two simulated key strokes. Increase this if Auto-Type is randomly skipping characters.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1125"/>
+        <location filename="../forms/SettingsDlg.ui" line="1115"/>
        <source>The directory where storage devices like CDs and memory sticks are normally mounted.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1115"/>
+        <location filename="../forms/SettingsDlg.ui" line="1105"/>
        <source>Media Root:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1141"/>
+        <location filename="../forms/SettingsDlg.ui" line="1131"/>
        <source>Enable this if you want to use your bookmarks and the last opened file independet from their absolute paths. This is especially useful when using KeePassX portably and therefore with changing mount points in the file system.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1144"/>
+        <location filename="../forms/SettingsDlg.ui" line="1134"/>
        <source>Save relative paths (bookmarks and last file)</source>
        <translation type="unfinished"></translation>
    </message>
@ -4075,22 +4080,22 @@ Ujistěte se, že je možný přístup do  &apos;~/.keepass&apos;.</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1019"/>
+        <location filename="../forms/SettingsDlg.ui" line="1009"/>
        <source>Lock workspace when minimizing the main window</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1224"/>
+        <location filename="../forms/SettingsDlg.ui" line="1214"/>
        <source>Global Auto-Type Shortcut:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1091"/>
+        <location filename="../forms/SettingsDlg.ui" line="1081"/>
        <source>Custom Browser Command</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1103"/>
+        <location filename="../forms/SettingsDlg.ui" line="1093"/>
        <source>Browse</source>
        <translation type="unfinished"></translation>
    </message>
@ -4100,27 +4105,27 @@ Ujistěte se, že je možný přístup do  &apos;~/.keepass&apos;.</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="941"/>
+        <location filename="../forms/SettingsDlg.ui" line="931"/>
        <source>Show plain text passwords in:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="960"/>
+        <location filename="../forms/SettingsDlg.ui" line="950"/>
        <source>Database Key Dialog</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1057"/>
+        <location filename="../forms/SettingsDlg.ui" line="1047"/>
        <source>seconds</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1028"/>
+        <location filename="../forms/SettingsDlg.ui" line="1018"/>
        <source>Lock database after inactivity of</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="1253"/>
+        <location filename="../forms/SettingsDlg.ui" line="1243"/>
        <source>Use entries&apos; title to match the window for Global Auto-Type</source>
        <translation type="unfinished"></translation>
    </message>
@ -4165,22 +4170,12 @@ Ujistěte se, že je možný přístup do  &apos;~/.keepass&apos;.</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="837"/>
-        <source>System Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../forms/SettingsDlg.ui" line="842"/>
-        <source>English</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../forms/SettingsDlg.ui" line="867"/>
+        <location filename="../forms/SettingsDlg.ui" line="857"/>
        <source>Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../forms/SettingsDlg.ui" line="874"/>
+        <location filename="../forms/SettingsDlg.ui" line="864"/>
        <source>Author:</source>
        <translation type="unfinished"></translation>
    </message>
@ -4335,7 +4330,7 @@ from the drop-down list, or enter the window title manually:</source>
 <context>
    <name>Translation</name>
    <message>
-        <location filename="../lib/tools.cpp" line="351"/>
+        <location filename="../lib/tools.cpp" line="352"/>
        <source>$TRANSLATION_AUTHOR</source>
        <translation type="unfinished">Marek Straka</translation>
    </message>
@ -4346,7 +4341,7 @@ from the drop-down list, or enter the window title manually:</source>
        <translation type="unfinished">marek@straka.info (&lt;a href=&quot;http://marek.straka.info&quot;&gt;marek.straka.info&lt;/a&gt;)</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="350"/>
+        <location filename="../lib/tools.cpp" line="351"/>
        <source>$LANGUAGE_NAME</source>
        <comment>Insert your language name in the format: English (United States)</comment>
        <translation type="unfinished"></translation>
--- a/src/translations/keepassx-de_DE.ts
+++ b/src/translations/keepassx-de_DE.ts
@ -335,7 +335,7 @@ Erlaubt ist nur eine pro Eintrag.</translation>
        <translation type="obsolete">Abbrechen</translation>
    </message>
    <message>
-        <location filename="../dialogs/AutoTypeDlg.cpp" line="89"/>
+        <location filename="../dialogs/AutoTypeDlg.cpp" line="90"/>
        <source>Auto-Type</source>
        <translation>Auto-Type</translation>
    </message>
@ -947,20 +947,25 @@ Bitter prüfen Sie Ihre Zugriffsrechte.</translation>
 <context>
    <name>CSettingsDlg</name>
    <message>
-        <location filename="../dialogs/SettingsDlg.cpp" line="349"/>
+        <location filename="../dialogs/SettingsDlg.cpp" line="350"/>
        <source>Settings</source>
        <translation>Einstellungen</translation>
    </message>
    <message>
-        <location filename="../dialogs/SettingsDlg.cpp" line="354"/>
+        <location filename="../dialogs/SettingsDlg.cpp" line="355"/>
        <source>Select a directory...</source>
        <translation>Verzeichnis wählen...</translation>
    </message>
    <message>
-        <location filename="../dialogs/SettingsDlg.cpp" line="361"/>
+        <location filename="../dialogs/SettingsDlg.cpp" line="362"/>
        <source>Select an executable...</source>
        <translation>ausführbare Datei auswählen...</translation>
    </message>
+    <message>
+        <location filename="../dialogs/SettingsDlg.cpp" line="424"/>
+        <source>System Language</source>
+        <translation type="unfinished">Systemsprache</translation>
+    </message>
 </context>
 <context>
    <name>CalendarDialog</name>
@ -1596,77 +1601,77 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>FileErrors</name>
    <message>
-        <location filename="../lib/tools.cpp" line="61"/>
+        <location filename="../lib/tools.cpp" line="62"/>
        <source>No error occurred.</source>
        <translation>Kein Fehler aufgetreten.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="62"/>
+        <location filename="../lib/tools.cpp" line="63"/>
        <source>An error occurred while reading from the file.</source>
        <translation>Es ist ein Fehler beim lesen der Datei aufgetreten.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="63"/>
+        <location filename="../lib/tools.cpp" line="64"/>
        <source>An error occurred while writing to the file.</source>
        <translation>Es ist ein Fehler beim schreiben der Datei aufgetreten.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="64"/>
+        <location filename="../lib/tools.cpp" line="65"/>
        <source>A fatal error occurred.</source>
        <translation>Ein fataler Fehler hat sich ereignet.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="65"/>
+        <location filename="../lib/tools.cpp" line="66"/>
        <source>An resource error occurred.</source>
        <translation>Ein Resourcenfehler hat siche ereignet.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="66"/>
+        <location filename="../lib/tools.cpp" line="67"/>
        <source>The file could not be opened.</source>
        <translation>Die Datei konnte nicht geöffnet werden.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="67"/>
+        <location filename="../lib/tools.cpp" line="68"/>
        <source>The operation was aborted.</source>
        <translation>Die Operation wurde abgebrochen.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="68"/>
+        <location filename="../lib/tools.cpp" line="69"/>
        <source>A timeout occurred.</source>
        <translation>Ein Zeitlauffehler hat sich ereignet.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="69"/>
+        <location filename="../lib/tools.cpp" line="70"/>
        <source>An unspecified error occurred.</source>
        <translation>Ein unspezifizierter Fehler hat sich ereignet.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="70"/>
+        <location filename="../lib/tools.cpp" line="71"/>
        <source>The file could not be removed.</source>
        <translation>Die Datei konnte nicht gelöscht werden.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="71"/>
+        <location filename="../lib/tools.cpp" line="72"/>
        <source>The file could not be renamed.</source>
        <translation>Die Datei konnte nicht umbenannt werden.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="72"/>
+        <location filename="../lib/tools.cpp" line="73"/>
        <source>The position in the file could not be changed.</source>
        <translation>Die Position in der Datei konnte nicht geändert werden.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="73"/>
+        <location filename="../lib/tools.cpp" line="74"/>
        <source>The file could not be resized.</source>
        <translation>Die Größe der Datei konnte nicht geändert werden.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="74"/>
+        <location filename="../lib/tools.cpp" line="75"/>
        <source>The file could not be accessed.</source>
        <translation>Auf die Datei konnte nicht zugegriffen werden.</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="75"/>
+        <location filename="../lib/tools.cpp" line="76"/>
        <source>The file could not be copied.</source>
        <translation>Die Datei konnte nicht kopiert werden.</translation>
    </message>
@ -2055,12 +2060,12 @@ Der Schlüssel ist falsch oder die Datei ist beschädigt.</translation>
        <translation>Gruppenbaum ungültig.</translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="934"/>
+        <location filename="../Kdb3Database.cpp" line="933"/>
        <source>Key file is empty.</source>
        <translation>Schlüsseldatei ist leer.</translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1314"/>
+        <location filename="../Kdb3Database.cpp" line="1313"/>
        <source>The database must contain at least one group.</source>
        <translation>Die Datenbank muss mindestens eine Gruppe enthalten.</translation>
    </message>
@ -2080,7 +2085,7 @@ Der Schlüssel ist falsch oder die Datei ist beschädigt.</translation>
        <translation type="unfinished">Der Twofish-Algorithmus ist nicht initialisierbar.</translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1334"/>
+        <location filename="../Kdb3Database.cpp" line="1333"/>
        <source>The database has been opened read-only.</source>
        <translation type="unfinished"></translation>
    </message>
@ -2088,22 +2093,22 @@ Der Schlüssel ist falsch oder die Datei ist beschädigt.</translation>
 <context>
    <name>Kdb3Database::EntryHandle</name>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1178"/>
+        <location filename="../Kdb3Database.cpp" line="1177"/>
        <source>Bytes</source>
        <translation type="unfinished">Bytes</translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1186"/>
+        <location filename="../Kdb3Database.cpp" line="1185"/>
        <source>KiB</source>
        <translation type="unfinished">KiB</translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1192"/>
+        <location filename="../Kdb3Database.cpp" line="1191"/>
        <source>MiB</source>
        <translation type="unfinished">MiB</translation>
    </message>
    <message>
-        <location filename="../Kdb3Database.cpp" line="1197"/>
+        <location filename="../Kdb3Database.cpp" line="1196"/>
        <source>GiB</source>
        <translation type="unfinished">GiB</translation>
    </message>
@ -2111,52 +2116,52 @@ Der Schlüssel ist falsch oder die Datei ist beschädigt.</translation>
 <context>
    <name>KeepassEntryView</name>
    <message>
-        <location filename="../lib/EntryView.cpp" line="484"/>
+        <location filename="../lib/EntryView.cpp" line="474"/>
        <source>Title</source>
        <translation>Titel</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="486"/>
+        <location filename="../lib/EntryView.cpp" line="476"/>
        <source>Username</source>
        <translation>Benutzername</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="488"/>
+        <location filename="../lib/EntryView.cpp" line="478"/>
        <source>URL</source>
        <translation>URL</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="490"/>
+        <location filename="../lib/EntryView.cpp" line="480"/>
        <source>Password</source>
        <translation>Passwort</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="492"/>
+        <location filename="../lib/EntryView.cpp" line="482"/>
        <source>Comments</source>
        <translation>Kommentar</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="494"/>
+        <location filename="../lib/EntryView.cpp" line="484"/>
        <source>Expires</source>
        <translation>Läuft ab</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="496"/>
+        <location filename="../lib/EntryView.cpp" line="486"/>
        <source>Creation</source>
        <translation>Erstellung</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="498"/>
+        <location filename="../lib/EntryView.cpp" line="488"/>
        <source>Last Change</source>
        <translation>Letzte Änderung</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="500"/>
+        <location filename="../lib/EntryView.cpp" line="490"/>
        <source>Last Access</source>
        <translation>Letzter Zugriff</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="502"/>
+        <location filename="../lib/EntryView.cpp" line="492"/>
        <source>Attachment</source>
        <translation>Anhang</translation>
    </message>
@ -2171,7 +2176,7 @@ Der Schlüssel ist falsch oder die Datei ist beschädigt.</translation>
        <translation>löschen?</translation>
    </message>
    <message>
-        <location filename="../lib/EntryView.cpp" line="504"/>
+        <location filename="../lib/EntryView.cpp" line="494"/>
        <source>Group</source>
        <translation>Gruppe</translation>
    </message>
@ -2634,12 +2639,12 @@ Do you want to save the changes?</source>
 <context>
    <name>Main</name>
    <message>
-        <location filename="../lib/tools.cpp" line="139"/>
+        <location filename="../lib/tools.cpp" line="140"/>
        <source>Error</source>
        <translation>Fehler</translation>
    </message>
    <message>
-        <location filename="../lib/tools.cpp" line="146"/>
+        <location filename="../lib/tools.cpp" line="147"/>
        <source>File &apos;%1&apos; could not be found.</source>
        <translation>Datei &apos;%1&apos; konnte nicht geöffnet werden.</translation>
    </message>
@ -3283,94 +3288,94 @@ Do you want to save the changes?</source>
 <context>
    <name>PasswordDialog</name>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="31"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="32"/>
        <source>Enter Master Key</source>
        <translation>Hauptschlüssel eingeben</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="34"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="35"/>
        <source>Set Master Key</source>
        <translation>Hauptschlüssel festlegen</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="37"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="38"/>
        <source>Change Master Key</source>
        <translation>Hauptschlüssel ändern</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="41"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="42"/>
        <source>Database Key</source>
        <translation>Datenbankschlüssel</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="131"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="132"/>
        <source>Last File</source>
        <translation>letzte Datei</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="177"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="178"/>
        <source>Select a Key File</source>
        <translation>Schlüsseldatei wählen</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="341"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="342"/>
        <source>All Files (*)</source>
        <translation>alle Dateien (*)</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="341"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="342"/>
        <source>Key Files (*.key)</source>
        <translation>Schlüsseldateien (*.key)</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="205"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="206"/>
        <source>Please enter a Password or select a key file.</source>
        <translation>Bitte geben Sie ein Passwort ein oder wählen
 Sie eine Schlüsseldatei.</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="210"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="211"/>
        <source>Please enter a Password.</source>
        <translation>Bitte geben Sie ein Passwort ein.</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="215"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="216"/>
        <source>Please provide a key file.</source>
        <translation>Bitte stellen Sie eine Schlüsseldatei zur Verfügung.</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="261"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="262"/>
        <source>%1:
 No such file or directory.</source>
        <translation>%1:
 Datei oder Verzeichnis nicht gefunden.</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="227"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="228"/>
        <source>The selected key file or directory is not readable.</source>
        <translation>Die ausgewählte Schlüsseldatei oder das Verzeichnis konnte nicht gelesen werden.</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="246"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="247"/>
        <source>The given directory does not contain any key files.</source>
        <translation>Das angegebene Verzeichnis enthält keine Schlüsseldatei.</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="252"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="253"/>
        <source>The given directory contains more then one key files.
 Please specify the key file directly.</source>
        <translation>Das angegebene Verzeichnis enthält meher als eine Schlüsseldatei.
 Bitte die Schlüsseldatei direkt auswählen.</translation>
    </message>
    <message>
-        <location filename="../dialogs/PasswordDlg.cpp" line="265"/>
+        <location filename="../dialogs/PasswordDlg.cpp" line="266"/>
        <source>%1:
 File is not readable.</source>
        <translation>%1:
 Datei ist nicht lesbar.</translation>
    </message>
    <message>