Merge branch '2.0'

2025-02-28 10:21:09 -05:00 · 2015-12-15 21:05:00 +01:00 · 2015-12-15 21:05:00 +01:00 · ecfbf72a57
commit ecfbf72a57
parent 0c36c40a5d 24275d8dc4
33 changed files with 9516 additions and 347 deletions
--- a/12
+++ b/12
@ -1,3 +1,15 @@
 2.0 (2015-12-06)
 =========================
 - Improve UI of the search edit.
 - Clear clipboard when locking databases. [#342]
 - Enable Ctrl+M shortcut to minimize the window on all platforms. [#329]
 - Show a better message when trying to open an old database format. [#338]
 - Fix global auto-type behavior with some window managers.
 - Show global auto-type window on the active desktop. [#359]
 - Disable systray on OS X. [#326]
 - Restore main window when clicking on the OS X docker icon. [#326]
 2.0 Beta 2 (2015-09-06)
 =========================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -33,8 +33,8 @@ option(WITH_TESTS "Enable building of unit tests" ON)
 option(WITH_GUI_TESTS "Enable building of GUI tests" OFF)
 option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated methods." OFF)
-set(KEEPASSX_VERSION "2.0 beta 2")
+set(KEEPASSX_VERSION "2.0")
-set(KEEPASSX_VERSION_NUM "1.9.92")
+set(KEEPASSX_VERSION_NUM "2.0")
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
  set(CMAKE_COMPILER_IS_CLANG 1)
--- a/share/translations/keepassx_cs.ts
+++ b/share/translations/keepassx_cs.ts
@ -9,16 +9,20 @@
        <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
        <translation>KeePassX je šířeno za podmínek licence GNU General Public License (GPL) verze 2 a (případně) 3.</translation>
    </message>
    <message>
        <source>Revision</source>
        <translation>Revize</translation>
    </message>
 </context>
 <context>
    <name>AutoType</name>
    <message>
        <source>Auto-Type - KeePassX</source>
-        <translation>Samočinné vyplňování – KeePassX</translation>
+        <translation>Automatické vyplňování – KeePassX</translation>
    </message>
    <message>
        <source>Couldn&apos;t find an entry that matches the window title:</source>
-        <translation>Nelze nalézt položku, která by se shodovala s titulkem okna:</translation>
+        <translation>Nedaří se nalézt položku, která by se shodovala s titulkem okna:</translation>
    </message>
 </context>
 <context>
@ -40,11 +44,11 @@
    <name>AutoTypeSelectDialog</name>
    <message>
        <source>Auto-Type - KeePassX</source>
-        <translation>Samočinné vyplňování – KeePassX</translation>
+        <translation>Automatické vyplňování – KeePassX</translation>
    </message>
    <message>
        <source>Select entry to Auto-Type:</source>
-        <translation>Vyberte položku, kterou se bude samočinně vyplňovat:</translation>
+        <translation>Vyberte položku, kterou se bude automaticky vyplňovat:</translation>
    </message>
 </context>
 <context>
@ -91,7 +95,7 @@
    </message>
    <message>
        <source>Unable to create Key File : </source>
-        <translation>Nelze vytvořit soubor s klíčem :</translation>
+        <translation>Nedaří se vytvořit soubor s klíčem :</translation>
    </message>
    <message>
        <source>Select a key file</source>
@ -107,7 +111,7 @@
    </message>
    <message>
        <source>Different passwords supplied.</source>
-        <translation>Nepodařilo se vám zadat heslo tak, aby jeho znění bylo stejné v obou políčkách.</translation>
+        <translation>Nepodařilo se vám zadat heslo do obou kolonek stejně.</translation>
    </message>
    <message>
        <source>Failed to set key file</source>
@ -144,7 +148,7 @@
    </message>
    <message>
        <source>Unable to open the database.</source>
-        <translation>Databázi nebylo možné otevřít.</translation>
+        <translation>Databázi se nepodařilo otevřít.</translation>
    </message>
    <message>
        <source>Can&apos;t open key file</source>
@ -183,7 +187,7 @@
    </message>
    <message>
        <source>Use recycle bin:</source>
-        <translation>Mazat do Koše:</translation>
+        <translation>Namísto mazání přesouvat do Koše:</translation>
    </message>
    <message>
        <source> MiB</source>
@ -210,7 +214,7 @@
    </message>
    <message>
        <source>KeePass 2 Database</source>
-        <translation>Databáze aplikace KeePass 2</translation>
+        <translation>Databáze aplikace KeePass verze 2</translation>
    </message>
    <message>
        <source>All files</source>
@ -230,11 +234,11 @@
    </message>
    <message>
        <source>Open KeePass 1 database</source>
-        <translation>Otevřít databázi aplikace KeePass 1</translation>
+        <translation>Otevřít databázi aplikace KeePass verze 1</translation>
    </message>
    <message>
        <source>KeePass 1 database</source>
-        <translation>Databáze aplikace KeePass 1</translation>
+        <translation>Databáze aplikace KeePass verze 1</translation>
    </message>
    <message>
        <source>All files (*)</source>
@ -298,7 +302,7 @@ Pokud chcete změny dokončit, klikněte na Zrušit. V opačném případě změ
        <source>This database has never been saved.
 You can save the database or stop locking it.</source>
        <translation>Tato databáze doposud ještě nebyla uložena.
-Buď ji můžete uložit, nebo neuzamknout.</translation>
+Buď ji můžete uložit, nebo neuzamykat.</translation>
    </message>
    <message>
        <source>This database has been modified.
@ -306,24 +310,31 @@ Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
        <translation>Tato databáze byla upravena.
 Chcete ji před uzamčením uložit?
-Pokud ne, změny budou ztraceny.</translation>
+Pokud ne, provedené změny budou ztraceny.</translation>
    </message>
    <message>
        <source>&quot;%1&quot; is in edit mode.
 Discard changes and close anyway?</source>
-        <translation type="unfinished"/>
+        <translation>%1 je právě upravováno.
 Přesto zavřít a zahodit změny?</translation>
    </message>
    <message>
        <source>Export database to CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Exportovat databázi do CSV souboru</translation>
    </message>
    <message>
        <source>CSV file</source>
-        <translation type="unfinished"/>
+        <translation>CSV soubor</translation>
    </message>
    <message>
        <source>Writing the CSV file failed.</source>
-        <translation type="unfinished"/>
+        <translation>Zápis do CSV souboru se nezdařil.</translation>
    </message>
    <message>
        <source>The database you are trying to save as is locked by another instance of KeePassX.
 Do you want to save it anyway?</source>
        <translation>Databáze, kterou se pokoušíte uložit, je uzamčena jinou instancí KeePassX.
 Přesto uložit?</translation>
    </message>
 </context>
 <context>
@ -374,7 +385,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation>Nebylo možné vypočítat hlavní klíč</translation>
+        <translation>Nepodařilo se spočítat hlavní klíč</translation>
    </message>
 </context>
 <context>
@ -393,7 +404,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Auto-Type</source>
-        <translation>Samočinné vyplňování</translation>
+        <translation>Automatické vyplňování</translation>
    </message>
    <message>
        <source>Properties</source>
@ -433,7 +444,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unable to open file</source>
-        <translation>Soubor nelze otevřít</translation>
+        <translation>Soubor se nedaří otevřít</translation>
    </message>
    <message>
        <source>Save attachment</source>
@ -442,7 +453,7 @@ Discard changes and close anyway?</source>
    <message>
        <source>Unable to save the attachment:
 </source>
-        <translation>Přílohu nelze uložit:
+        <translation>Přílohu se nedaří uložit:
 </translation>
    </message>
    <message>
@ -497,15 +508,15 @@ Discard changes and close anyway?</source>
    <name>EditEntryWidgetAutoType</name>
    <message>
        <source>Enable Auto-Type for this entry</source>
-        <translation>Zapnout samočinné vyplňování této položky</translation>
+        <translation>Zapnout automatické vyplňování této položky</translation>
    </message>
    <message>
        <source>Inherit default Auto-Type sequence from the group</source>
-        <translation>Převzít výchozí posloupnost samočinného vyplňování ze skupiny</translation>
+        <translation>Převzít výchozí posloupnost automatického vyplňování od skupiny</translation>
    </message>
    <message>
        <source>Use custom Auto-Type sequence:</source>
-        <translation>Použít vlastní posloupnost samočinného vyplňování:</translation>
+        <translation>Použít vlastní posloupnost automatického vyplňování:</translation>
    </message>
    <message>
        <source>+</source>
@ -618,7 +629,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Inherit from parent group (%1)</source>
-        <translation>Převzít z nadřazené skupiny (%1)</translation>
+        <translation>Převzít od nadřazené skupiny (%1)</translation>
    </message>
 </context>
 <context>
@ -641,15 +652,15 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Auto-type</source>
-        <translation>Samočinné vyplňování</translation>
+        <translation>Automatické vyplňování</translation>
    </message>
    <message>
        <source>Use default auto-type sequence of parent group</source>
-        <translation>Použít výchozí posloupnost samočinného vyplňování z nadřazené skupiny</translation>
+        <translation>Použít výchozí posloupnost automatického vyplňování z nadřazené skupiny</translation>
    </message>
    <message>
        <source>Set default auto-type sequence</source>
-        <translation>Nastavit výchozí posloupnost samočinného vyplňování</translation>
+        <translation>Nastavit výchozí posloupnost automatického vyplňování</translation>
    </message>
 </context>
 <context>
@ -660,15 +671,15 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Use custom icon</source>
-        <translation>Použít vlastní ikonu</translation>
+        <translation>Použít svou vlastní ikonu</translation>
    </message>
    <message>
        <source>Add custom icon</source>
-        <translation>Přidat vlastní ikonu</translation>
+        <translation>Přidat svou vlastní ikonu</translation>
    </message>
    <message>
        <source>Delete custom icon</source>
-        <translation>Smazat vlastní ikonu</translation>
+        <translation>Smazat svou vlastní ikonu</translation>
    </message>
    <message>
        <source>Images</source>
@ -688,7 +699,7 @@ Discard changes and close anyway?</source>
    </message>
    <message numerus="yes">
        <source>Can&apos;t delete icon. Still used by %n item(s).</source>
-        <translation><numerusform>Ikonu není možné smazat. Je používána %n položkou.</numerusform><numerusform>Ikonu není možné smazat. Je používána %n položkami.</numerusform><numerusform>Ikonu není možné smazat. Je používána %n položek</numerusform></translation>
+        <translation><numerusform>Ikonu není možné smazat. Je používána %n položkou.</numerusform><numerusform>Ikonu není možné smazat. Je používána %n položkami.</numerusform><numerusform>Ikonu není možné smazat. Používá ji %n položek</numerusform></translation>
    </message>
 </context>
 <context>
@ -699,15 +710,15 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Modified:</source>
-        <translation>Okamžik poslední úpravy:</translation>
+        <translation>Okamžik minulé úpravy:</translation>
    </message>
    <message>
        <source>Accessed:</source>
-        <translation>Okamžik posledního přístupu:</translation>
+        <translation>Okamžik minulého přístupu:</translation>
    </message>
    <message>
        <source>Uuid:</source>
-        <translation>Jedinečný identifikátor uživatele:</translation>
+        <translation>Univerzálně jedinečný identifikátor:</translation>
    </message>
 </context>
 <context>
@ -721,7 +732,7 @@ Discard changes and close anyway?</source>
    <name>EntryHistoryModel</name>
    <message>
        <source>Last modified</source>
-        <translation>Okamžik poslední změny</translation>
+        <translation>Okamžik minulé změny</translation>
    </message>
    <message>
        <source>Title</source>
@ -766,7 +777,7 @@ Discard changes and close anyway?</source>
    <name>KeePass1OpenWidget</name>
    <message>
        <source>Import KeePass1 database</source>
-        <translation>Importovat databázi aplikace KeePass 1</translation>
+        <translation>Importovat databázi aplikace KeePass verze 1</translation>
    </message>
    <message>
        <source>Error</source>
@ -801,7 +812,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation>Nelze spočítat hlavní klíč</translation>
+        <translation>Nedaří se spočítat hlavní klíč</translation>
    </message>
 </context>
 <context>
@ -820,7 +831,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation>Nelze spočítat hlavní klíč</translation>
+        <translation>Nedaří se spočítat hlavní klíč</translation>
    </message>
 </context>
 <context>
@ -926,7 +937,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Import KeePass 1 database</source>
-        <translation>Importovat databázi aplikace KeePass 1</translation>
+        <translation>Importovat databázi aplikace KeePass verze 1</translation>
    </message>
    <message>
        <source>Clone entry</source>
@ -950,7 +961,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Perform Auto-Type</source>
-        <translation>Provést samočinné vyplnění</translation>
+        <translation>Provést automatické vyplnění</translation>
    </message>
    <message>
        <source>Open URL</source>
@ -990,15 +1001,15 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Copy username</source>
-        <translation type="unfinished"/>
+        <translation>Zkopírovat uživatelské jméno</translation>
    </message>
    <message>
        <source>Copy password</source>
-        <translation type="unfinished"/>
+        <translation>Zkopírovat heslo</translation>
    </message>
    <message>
        <source>Export to CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Exportovat do CSV souboru</translation>
    </message>
 </context>
 <context>
@ -1056,11 +1067,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unknown option &apos;%1&apos;.</source>
-        <translation>Neznámá volba %1.</translation>
+        <translation>Neznámá předvolba %1.</translation>
    </message>
    <message>
        <source>Unknown options: %1.</source>
-        <translation>Neznámé volby: %1.</translation>
+        <translation>Neznámé předvolby: %1.</translation>
    </message>
    <message>
        <source>Missing value after &apos;%1&apos;.</source>
@ -1072,7 +1083,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>[options]</source>
-        <translation>[volby]</translation>
+        <translation>[předvolby]</translation>
    </message>
    <message>
        <source>Usage: %1</source>
@ -1080,7 +1091,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Options:</source>
-        <translation>Volby:</translation>
+        <translation>Předvolby:</translation>
    </message>
    <message>
        <source>Arguments:</source>
@ -1110,15 +1121,15 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Error writing to underlying device: </source>
-        <translation>Při zápisu na zařízení, na kterém se nachází, došlo k chybě:</translation>
+        <translation>Došlo k chybě při zápisu na zařízení, na kterém se nachází:</translation>
    </message>
    <message>
        <source>Error opening underlying device: </source>
-        <translation>Při otevírání zařízení, na kterém se nachází, došlo k chybě:</translation>
+        <translation>Došlo k chybě při otevírání zařízení, na kterém se nachází:</translation>
    </message>
    <message>
        <source>Error reading data from underlying device: </source>
-        <translation>Při čtení dat ze zařízení, na kterém se nachází, došlo k chybě:</translation>
+        <translation>Došlo k chybě při čtení dat ze zařízení, na kterém se nachází:</translation>
    </message>
    <message>
        <source>Internal zlib error when decompressing: </source>
@ -1182,27 +1193,27 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Automatically save on exit</source>
-        <translation>Před ukončením aplikace provést samočinné uložení případných změn v otevřených databázích</translation>
+        <translation>Před ukončením aplikace automaticky uložit případné změny</translation>
    </message>
    <message>
        <source>Automatically save after every change</source>
-        <translation>Po každé změně okamžitě samočinně uložit</translation>
+        <translation>Po každé změně hned automaticky uložit</translation>
    </message>
    <message>
        <source>Minimize when copying to clipboard</source>
-        <translation>Po zkopírování atributu do schránky samočinně minimalizovat okno KeePassX (do popředí se tak dostane okno, do kterého se zkopírovaný atribut bude vkládat)</translation>
+        <translation>Po zkopírování údaje do schránky automaticky minimalizovat okno KeePassX (do popředí se tak dostane okno, do kterého se zkopírovaný údaj bude vkládat)</translation>
    </message>
    <message>
        <source>Use group icon on entry creation</source>
-        <translation>Při vytváření položky použít ikonu skupiny</translation>
+        <translation>Pro vytvářenou položku použít ikonu skupiny, do které spadá</translation>
    </message>
    <message>
        <source>Global Auto-Type shortcut</source>
-        <translation>Klávesová zkratka pro všeobecné samočinné vyplňování</translation>
+        <translation>Klávesová zkratka pro všeobecné automatické vyplňování</translation>
    </message>
    <message>
        <source>Use entry title to match windows for global auto-type</source>
-        <translation>Použít titulek položky pro porovnání s okny pro všeobecné samočinné vyplňování</translation>
+        <translation>Všeobecné automatické vyplňování provádět na základě shody titulku položky s titulkem okna.</translation>
    </message>
    <message>
        <source>Language</source>
@ -1210,11 +1221,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Show a system tray icon</source>
-        <translation>Zobrazit ikonu v oznamovací oblasti hlavního panelu prostředí</translation>
+        <translation>Zobrazit ikonu v oznamovací oblasti systémového panelu</translation>
    </message>
    <message>
        <source>Hide window to system tray when minimized</source>
-        <translation>Minimalizovat okno aplikace do oznamovací oblasti hlavního panelu prostředí</translation>
+        <translation>Minimalizovat okno aplikace do oznamovací oblasti systémového panelu</translation>
    </message>
    <message>
        <source>Remember last key files</source>
@ -1225,7 +1236,7 @@ Discard changes and close anyway?</source>
    <name>SettingsWidgetSecurity</name>
    <message>
        <source>Clear clipboard after</source>
-        <translation>Vyčistit schránku po uplynutí</translation>
+        <translation>Vymazat obsah schránky po uplynutí</translation>
    </message>
    <message>
        <source> sec</source>
@ -1241,7 +1252,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Always ask before performing auto-type</source>
-        <translation>Před provedením samočinného vyplnění se vždy dotázat</translation>
+        <translation>Před provedením automatického vyplnění se vždy dotázat</translation>
    </message>
 </context>
 <context>
@ -1272,10 +1283,6 @@ Discard changes and close anyway?</source>
        <source>path to a custom config file</source>
        <translation>umístění souboru s vlastními nastaveními</translation>
    </message>
    <message>
        <source>password of the database (DANGEROUS!)</source>
        <translation>heslo k databázi (NEBEZPEČNÉ!)</translation>
    </message>
    <message>
        <source>key file of the database</source>
        <translation>soubor s klíčem k databázi</translation>
--- a/share/translations/keepassx_da.ts
+++ b/share/translations/keepassx_da.ts
@ -9,12 +9,16 @@
        <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
        <translation>KeePassX distribueres under betingelserne i GNU General Public License (GPL) version 2 eller (efter eget valg) version 3.</translation>
    </message>
    <message>
        <source>Revision</source>
        <translation>Revision</translation>
    </message>
 </context>
 <context>
    <name>AutoType</name>
    <message>
        <source>Auto-Type - KeePassX</source>
-        <translation type="unfinished"/>
+        <translation>Auto-indsæt - KeePassX</translation>
    </message>
    <message>
        <source>Couldn&apos;t find an entry that matches the window title:</source>
@ -40,26 +44,26 @@
    <name>AutoTypeSelectDialog</name>
    <message>
        <source>Auto-Type - KeePassX</source>
-        <translation type="unfinished"/>
+        <translation>Auto-indsæt - KeePassX</translation>
    </message>
    <message>
        <source>Select entry to Auto-Type:</source>
-        <translation type="unfinished"/>
+        <translation>Vælg post til Auto-Indsæt:</translation>
    </message>
 </context>
 <context>
    <name>ChangeMasterKeyWidget</name>
    <message>
        <source>Password</source>
-        <translation>Adgangskode</translation>
+        <translation>Kodeord</translation>
    </message>
    <message>
        <source>Enter password:</source>
-        <translation>Indtast adgangskode</translation>
+        <translation>Indtast kodeord</translation>
    </message>
    <message>
        <source>Repeat password:</source>
-        <translation>Gentag adgangskode</translation>
+        <translation>Gentag kodeord</translation>
    </message>
    <message>
        <source>Key file</source>
@ -103,11 +107,11 @@
    </message>
    <message>
        <source>Do you really want to use an empty string as password?</source>
-        <translation>Vil du virkelig bruge en tom streng som adgangskode?</translation>
+        <translation>Vil du virkelig bruge en tom streng som kodeord?</translation>
    </message>
    <message>
        <source>Different passwords supplied.</source>
-        <translation>Andre adgangskoder leveret.</translation>
+        <translation>Andre kodeord leveret.</translation>
    </message>
    <message>
        <source>Failed to set key file</source>
@ -132,7 +136,7 @@
    </message>
    <message>
        <source>Password:</source>
-        <translation>Adgangskode:</translation>
+        <translation>Kodeord:</translation>
    </message>
    <message>
        <source>Browse</source>
@ -175,7 +179,7 @@
    </message>
    <message>
        <source>Transform rounds:</source>
-        <translation type="unfinished"/>
+        <translation>Transformationsrunder:</translation>
    </message>
    <message>
        <source>Default username:</source>
@ -195,7 +199,7 @@
    </message>
    <message>
        <source>Max. history items:</source>
-        <translation type="unfinished"/>
+        <translation>Maks. posthistorik:</translation>
    </message>
    <message>
        <source>Max. history size:</source>
@ -307,7 +311,8 @@ Ellers mister du dine ændringer.</translation>
    <message>
        <source>&quot;%1&quot; is in edit mode.
 Discard changes and close anyway?</source>
-        <translation type="unfinished"/>
+        <translation>&quot;%1&quot; er i redigeringstilstand.
 Kassér ændringer og luk alligevel?</translation>
    </message>
    <message>
        <source>Export database to CSV file</source>
@ -321,6 +326,12 @@ Discard changes and close anyway?</source>
        <source>Writing the CSV file failed.</source>
        <translation>Kan ikke skrive til CSV-fil.</translation>
    </message>
    <message>
        <source>The database you are trying to save as is locked by another instance of KeePassX.
 Do you want to save it anyway?</source>
        <translation>Databasen som du prøver at gemme er låst af en anden instans af KeePassX.
 Vil du alligevel gemme?</translation>
    </message>
 </context>
 <context>
    <name>DatabaseWidget</name>
@ -389,7 +400,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Auto-Type</source>
-        <translation type="unfinished"/>
+        <translation>Auto-Indsæt</translation>
    </message>
    <message>
        <source>Properties</source>
@ -401,7 +412,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Entry history</source>
-        <translation type="unfinished"/>
+        <translation>Indtastningshistorik</translation>
    </message>
    <message>
        <source>Add entry</source>
@ -417,7 +428,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Different passwords supplied.</source>
-        <translation>Andre adgangskoder leveret.</translation>
+        <translation>Andre kodeord leveret.</translation>
    </message>
    <message>
        <source>New attribute</source>
@ -492,15 +503,15 @@ Discard changes and close anyway?</source>
    <name>EditEntryWidgetAutoType</name>
    <message>
        <source>Enable Auto-Type for this entry</source>
-        <translation type="unfinished"/>
+        <translation>Aktivér Auto-Indsæt for denne post</translation>
    </message>
    <message>
        <source>Inherit default Auto-Type sequence from the group</source>
-        <translation type="unfinished"/>
+        <translation>Nedarv standard Auto-Indsæt sekvens fra gruppe</translation>
    </message>
    <message>
        <source>Use custom Auto-Type sequence:</source>
-        <translation type="unfinished"/>
+        <translation>Brug brugerdefineret Auto-indsæt sekvens:</translation>
    </message>
    <message>
        <source>+</source>
@ -554,7 +565,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Password:</source>
-        <translation>Adgangskode:</translation>
+        <translation>Kodeord:</translation>
    </message>
    <message>
        <source>Repeat:</source>
@ -562,7 +573,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Gen.</source>
-        <translation type="unfinished"/>
+        <translation>Generer</translation>
    </message>
    <message>
        <source>URL:</source>
@ -636,15 +647,15 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Auto-type</source>
-        <translation type="unfinished"/>
+        <translation>Auto-indsæt</translation>
    </message>
    <message>
        <source>Use default auto-type sequence of parent group</source>
-        <translation type="unfinished"/>
+        <translation>Brug standard Auto-Indsæt sekvens fra forældregruppe</translation>
    </message>
    <message>
        <source>Set default auto-type sequence</source>
-        <translation type="unfinished"/>
+        <translation>Definér standard auto-indsæt sekvens</translation>
    </message>
 </context>
 <context>
@ -803,7 +814,7 @@ Discard changes and close anyway?</source>
    <name>KeePass2Reader</name>
    <message>
        <source>Not a KeePass database.</source>
-        <translation>Det er ikke en KeePass database.</translation>
+        <translation>Dette er ikke en KeePass database.</translation>
    </message>
    <message>
        <source>Unsupported KeePass database version.</source>
@ -937,7 +948,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Copy password to clipboard</source>
-        <translation>Kopiér adgangskode til udklipsholder</translation>
+        <translation>Kopiér kodeord til udklipsholder</translation>
    </message>
    <message>
        <source>Settings</source>
@ -945,7 +956,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Perform Auto-Type</source>
-        <translation type="unfinished"/>
+        <translation>Udfør Auto-indsæt</translation>
    </message>
    <message>
        <source>Open URL</source>
@ -985,11 +996,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Copy username</source>
-        <translation>Kopiér adgangskode</translation>
+        <translation>Kopiér brugernavn</translation>
    </message>
    <message>
        <source>Copy password</source>
-        <translation>Kopiér adgangskode</translation>
+        <translation>Kopiér kodeord</translation>
    </message>
    <message>
        <source>Export to CSV file</source>
@ -1000,7 +1011,7 @@ Discard changes and close anyway?</source>
    <name>PasswordGeneratorWidget</name>
    <message>
        <source>Password:</source>
-        <translation>Adgangskode:</translation>
+        <translation>Kodeord:</translation>
    </message>
    <message>
        <source>Length:</source>
@ -1008,7 +1019,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Character Types</source>
-        <translation type="unfinished"/>
+        <translation>Tegntyper</translation>
    </message>
    <message>
        <source>Upper Case Letters</source>
@ -1032,7 +1043,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Ensure that the password contains characters from every group</source>
-        <translation>Vær sikker på at din adgangskode indeholder tegn fra alle grupper</translation>
+        <translation>Vær sikker på at dit kodeord indeholder tegn fra alle grupper</translation>
    </message>
    <message>
        <source>Accept</source>
@ -1193,11 +1204,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Global Auto-Type shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Global Auto-Indsæt genvej</translation>
    </message>
    <message>
        <source>Use entry title to match windows for global auto-type</source>
-        <translation type="unfinished"/>
+        <translation>Brug titel på post til at matche global aito-indsæt</translation>
    </message>
    <message>
        <source>Language</source>
@ -1232,11 +1243,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Show passwords in cleartext by default</source>
-        <translation>Vis adgangskoder i klartekst som standard</translation>
+        <translation>Vis kodeord i klartekst som standard</translation>
    </message>
    <message>
        <source>Always ask before performing auto-type</source>
-        <translation type="unfinished"/>
+        <translation>Spørg altid før auto-indsæt</translation>
    </message>
 </context>
 <context>
@ -1257,7 +1268,7 @@ Discard changes and close anyway?</source>
    <name>main</name>
    <message>
        <source>KeePassX - cross-platform password manager</source>
-        <translation type="unfinished"/>
+        <translation>KeePassX - cross-platform password manager</translation>
    </message>
    <message>
        <source>filename of the password database to open (*.kdbx)</source>
@ -1267,10 +1278,6 @@ Discard changes and close anyway?</source>
        <source>path to a custom config file</source>
        <translation>sti til brugerdefineret indstillingsfil</translation>
    </message>
    <message>
        <source>password of the database (DANGEROUS!)</source>
        <translation>adgangskode til databasen (FAARLIGT!)</translation>
    </message>
    <message>
        <source>key file of the database</source>
        <translation>databasens nøglefil</translation>
--- a/share/translations/keepassx_de.ts
+++ b/share/translations/keepassx_de.ts
@ -9,6 +9,10 @@
        <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
        <translation>KeePassX steht unter der GNU General Public License (GPL) version 2 (version 3).</translation>
    </message>
    <message>
        <source>Revision</source>
        <translation>Überarbeitung</translation>
    </message>
 </context>
 <context>
    <name>AutoType</name>
@ -320,6 +324,12 @@ Discard changes and close anyway?</source>
        <source>Writing the CSV file failed.</source>
        <translation>Die CSV Datei konnte nicht gespeichert werden.</translation>
    </message>
    <message>
        <source>The database you are trying to save as is locked by another instance of KeePassX.
 Do you want to save it anyway?</source>
        <translation>Die Datenbank, die gespeichert werden soll, ist von einer anderen Instanz von KeePassX blockiert. 
 Soll sie dennoch gespeichert werden? </translation>
    </message>
 </context>
 <context>
    <name>DatabaseWidget</name>
@ -1231,7 +1241,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Show passwords in cleartext by default</source>
-        <translation>Passwort standartmäßig in Klartext anzeigen</translation>
+        <translation>Passwörter standardmäßig in Klartext anzeigen</translation>
    </message>
    <message>
        <source>Always ask before performing auto-type</source>
@ -1266,10 +1276,6 @@ Discard changes and close anyway?</source>
        <source>path to a custom config file</source>
        <translation>Pfad zu einer benutzerdefinierten Konfigurationsdatei</translation>
    </message>
    <message>
        <source>password of the database (DANGEROUS!)</source>
        <translation>Passwort der Datenbank (GEFÄHRLICH!)</translation>
    </message>
    <message>
        <source>key file of the database</source>
        <translation>Schlüsseldatei der Datenbank</translation>
--- a/share/translations/keepassx_el.ts
+++ b/share/translations/keepassx_el.ts
--- a/share/translations/keepassx_en.ts
+++ b/share/translations/keepassx_en.ts
@ -15,6 +15,10 @@
        <source>Revision</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Using:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
    <name>AutoType</name>
@ -833,6 +837,13 @@ Do you want to save it anyway?</source>
        <source>Unable to calculate master key</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>The selected file is an old KeePass 1 database (.kdb).
 You can import it by clicking on Database &gt; &apos;Import KeePass 1 database&apos;.
 This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
    <name>Main</name>
--- a/share/translations/keepassx_fr.ts
+++ b/share/translations/keepassx_fr.ts
@ -9,6 +9,10 @@
        <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
        <translation>KeePassX est distribué selon les conditions de la GNU General Public License (GPL) version 2 ou (à votre choix) version 3.</translation>
    </message>
    <message>
        <source>Revision</source>
        <translation>Version</translation>
    </message>
 </context>
 <context>
    <name>AutoType</name>
@ -25,7 +29,7 @@
    <name>AutoTypeAssociationsModel</name>
    <message>
        <source>Window</source>
-        <translation>Fenêtre </translation>
+        <translation>Fenêtre</translation>
    </message>
    <message>
        <source>Sequence</source>
@ -187,7 +191,7 @@
    </message>
    <message>
        <source> MiB</source>
-        <translation>MiB</translation>
+        <translation> MiB</translation>
    </message>
    <message>
        <source>Benchmark</source>
@ -226,7 +230,7 @@
    </message>
    <message>
        <source>File not found!</source>
-        <translation>Fichier introuvable!</translation>
+        <translation>Fichier introuvable !</translation>
    </message>
    <message>
        <source>Open KeePass 1 database</source>
@ -260,7 +264,7 @@ Enregistrer les modifications ?</translation>
    </message>
    <message>
        <source>Writing the database failed.</source>
-        <translation>Une erreur s&apos;est produite lors de l&apos;écriture de la base de données. </translation>
+        <translation>Une erreur s&apos;est produite lors de l&apos;écriture de la base de données.</translation>
    </message>
    <message>
        <source>Save database as</source>
@ -322,6 +326,12 @@ Ignorer les changements et fermer ?</translation>
        <source>Writing the CSV file failed.</source>
        <translation>Échec de l&apos;écriture du fichier CSV.</translation>
    </message>
    <message>
        <source>The database you are trying to save as is locked by another instance of KeePassX.
 Do you want to save it anyway?</source>
        <translation>La base de données que vous essayez de sauvegarder a été verrouillée par une autre instance de KeePassX.
 Voulez-vous quand même la sauvegarder ?</translation>
    </message>
 </context>
 <context>
    <name>DatabaseWidget</name>
@ -394,7 +404,7 @@ Ignorer les changements et fermer ?</translation>
    </message>
    <message>
        <source>Properties</source>
-        <translation>Propriétés </translation>
+        <translation>Propriétés</translation>
    </message>
    <message>
        <source>History</source>
@ -463,7 +473,7 @@ Ignorer les changements et fermer ?</translation>
    <name>EditEntryWidgetAdvanced</name>
    <message>
        <source>Additional attributes</source>
-        <translation>Attributs supplémentaires </translation>
+        <translation>Attributs supplémentaires</translation>
    </message>
    <message>
        <source>Add</source>
@ -483,7 +493,7 @@ Ignorer les changements et fermer ?</translation>
    </message>
    <message>
        <source>Save</source>
-        <translation>Enregistrer le fichier </translation>
+        <translation>Enregistrer le fichier</translation>
    </message>
    <message>
        <source>Open</source>
@ -595,11 +605,11 @@ Ignorer les changements et fermer ?</translation>
    </message>
    <message>
        <source>Properties</source>
-        <translation>Propriétés </translation>
+        <translation>Propriétés</translation>
    </message>
    <message>
        <source>Add group</source>
-        <translation>Ajouter un groupe. </translation>
+        <translation>Ajouter un groupe</translation>
    </message>
    <message>
        <source>Edit group</source>
@ -1226,7 +1236,7 @@ Ignorer les changements et fermer ?</translation>
    </message>
    <message>
        <source> sec</source>
-        <translation>s</translation>
+        <translation> s</translation>
    </message>
    <message>
        <source>Lock databases after inactivity of</source>
@ -1269,10 +1279,6 @@ Ignorer les changements et fermer ?</translation>
        <source>path to a custom config file</source>
        <translation>Chemin vers un fichier de configuration personnalisé</translation>
    </message>
    <message>
        <source>password of the database (DANGEROUS!)</source>
        <translation>Mot de passe de la base de donnée (DANGEREUX !)</translation>
    </message>
    <message>
        <source>key file of the database</source>
        <translation>Fichier-clé de la base de données</translation>
--- a/share/translations/keepassx_id.ts
+++ b/share/translations/keepassx_id.ts
@ -7,7 +7,11 @@
    </message>
    <message>
        <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassX disebarluaskan dibawah ketentuan dari Lisensi Publik Umum GNU (GPL) versi 2 atau (sesuai pilihan Anda) versi 3.</translation>
    </message>
    <message>
        <source>Revision</source>
        <translation>Revisi</translation>
    </message>
 </context>
 <context>
@ -18,7 +22,7 @@
    </message>
    <message>
        <source>Couldn&apos;t find an entry that matches the window title:</source>
-        <translation>Tidak dapat menemukan entri yang cocok dengan judul jendela</translation>
+        <translation>Tidak bisa menemukan entri yang cocok dengan judul jendela:</translation>
    </message>
 </context>
 <context>
@ -51,15 +55,15 @@
    <name>ChangeMasterKeyWidget</name>
    <message>
        <source>Password</source>
-        <translation>Kata Sandi</translation>
+        <translation>Sandi</translation>
    </message>
    <message>
        <source>Enter password:</source>
-        <translation>Masukan kata sandi:</translation>
+        <translation>Masukkan sandi:</translation>
    </message>
    <message>
        <source>Repeat password:</source>
-        <translation>Ulangi kata sandi:</translation>
+        <translation>Ulangi sandi:</translation>
    </message>
    <message>
        <source>Key file</source>
@ -91,7 +95,7 @@
    </message>
    <message>
        <source>Unable to create Key File : </source>
-        <translation>Tidak dapat membuat Berkas Kunci :</translation>
+        <translation>Tidak bisa membuat Berkas Kunci :</translation>
    </message>
    <message>
        <source>Select a key file</source>
@ -103,27 +107,28 @@
    </message>
    <message>
        <source>Do you really want to use an empty string as password?</source>
-        <translation>Apakah anda ingin menggunakan string kosong sebagai kata sandi?</translation>
+        <translation>Apakah Anda benar-benar ingin menggunakan lema kosong sebagai sandi?</translation>
    </message>
    <message>
        <source>Different passwords supplied.</source>
-        <translation>Kata sandi yang berbeda diberikan.</translation>
+        <translation>Sandi yang berbeda diberikan.</translation>
    </message>
    <message>
        <source>Failed to set key file</source>
-        <translation type="unfinished"/>
+        <translation>Gagal menetapkan berkas kunci</translation>
    </message>
    <message>
        <source>Failed to set %1 as the Key file:
 %2</source>
-        <translation type="unfinished"/>
+        <translation>Gagal menetapkan %1 sebagai berkas Kunci:
 %2</translation>
    </message>
 </context>
 <context>
    <name>DatabaseOpenWidget</name>
    <message>
        <source>Enter master key</source>
-        <translation>Masukan kunci utama</translation>
+        <translation>Masukkan kunci utama</translation>
    </message>
    <message>
        <source>Key File:</source>
@ -131,7 +136,7 @@
    </message>
    <message>
        <source>Password:</source>
-        <translation>Kata sandi:</translation>
+        <translation>Sandi:</translation>
    </message>
    <message>
        <source>Browse</source>
@ -143,11 +148,11 @@
    </message>
    <message>
        <source>Unable to open the database.</source>
-        <translation>Tidak dapat membuka basis data</translation>
+        <translation>Tidak bisa membuka basis data.</translation>
    </message>
    <message>
        <source>Can&apos;t open key file</source>
-        <translation>Tidak dapat membuka berkas kunci</translation>
+        <translation>Tidak bisa membuka berkas kunci</translation>
    </message>
    <message>
        <source>All files</source>
@ -182,7 +187,7 @@
    </message>
    <message>
        <source>Use recycle bin:</source>
-        <translation type="unfinished"/>
+        <translation>Gunakan tong sampah:</translation>
    </message>
    <message>
        <source> MiB</source>
@ -205,7 +210,7 @@
    <name>DatabaseTabWidget</name>
    <message>
        <source>Root</source>
-        <translation type="unfinished"/>
+        <translation>Root</translation>
    </message>
    <message>
        <source>KeePass 2 Database</source>
@ -259,7 +264,7 @@ Simpan perubahan?</translation>
    </message>
    <message>
        <source>Writing the database failed.</source>
-        <translation>Menulis basis data gagal.</translation>
+        <translation>Gagal membuat basis data.</translation>
    </message>
    <message>
        <source>Save database as</source>
@ -276,44 +281,56 @@ Simpan perubahan?</translation>
    <message>
        <source>The database you are trying to open is locked by another instance of KeePassX.
 Do you want to open it anyway? Alternatively the database is opened read-only.</source>
-        <translation type="unfinished"/>
+        <translation>Basis data yang Anda coba buka terkunci oleh KeePassX lain yang sedang berjalan.
 Apakah Anda tetap ingin membukanya? Alternatif lain buka basis data baca-saja.</translation>
    </message>
    <message>
        <source>Lock database</source>
-        <translation type="unfinished"/>
+        <translation>Kunci basis data</translation>
    </message>
    <message>
        <source>Can't lock the database as you are currently editing it.
 Please press cancel to finish your changes or discard them.</source>
-        <translation type="unfinished"/>
+        <translation>Tidak bisa mengunci basis data karena Anda sedang menyuntingnya.
 Harap tekan batal untuk menyelesaikan ubahan Anda atau membuangnya.</translation>
    </message>
    <message>
        <source>This database has never been saved.
 You can save the database or stop locking it.</source>
-        <translation type="unfinished"/>
+        <translation>Basis data ini belum pernah disimpan.
 Anda bisa menyimpan basis data atau berhenti menguncinya.</translation>
    </message>
    <message>
        <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
-        <translation type="unfinished"/>
+        <translation>Basis data ini telah dimodifikasi.
 Apakah Anda ingin menyimpan basis data sebelum menguncinya?
 Kalau tidak, ubahan Anda akan hilang.</translation>
    </message>
    <message>
        <source>&quot;%1&quot; is in edit mode.
 Discard changes and close anyway?</source>
-        <translation type="unfinished"/>
+        <translation>&quot;%1&quot; dalam mode penyuntingan.
 Tetap buang ubahan dan tutup?</translation>
    </message>
    <message>
        <source>Export database to CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Ekspor basis data ke berkas CSV</translation>
    </message>
    <message>
        <source>CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Berkas CSV</translation>
    </message>
    <message>
        <source>Writing the CSV file failed.</source>
-        <translation type="unfinished"/>
+        <translation>Gagal membuat berkas CSV.</translation>
    </message>
    <message>
        <source>The database you are trying to save as is locked by another instance of KeePassX.
 Do you want to save it anyway?</source>
        <translation>Basis data yang Anda coba buka terkunci oleh KeePassX lain yang sedang berjalan.
 Apakah Anda tetap ingin menyimpannya?</translation>
    </message>
 </context>
 <context>
@ -328,7 +345,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
-        <translation>Apakah anda ingin menghapus entri &quot;%1&quot; untuk selamanya?</translation>
+        <translation>Apakah Anda benar-benar ingin menghapus entri &quot;%1&quot; untuk selamanya?</translation>
    </message>
    <message>
        <source>Delete entries?</source>
@ -336,15 +353,15 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Apakah anda ingin menghapus entri %1 untuk selamanya?</translation>
+        <translation>Apakah Anda benar-benar ingin menghapus entri %1 untuk selamanya?</translation>
    </message>
    <message>
        <source>Move entries to recycle bin?</source>
-        <translation type="unfinished"/>
+        <translation>Pindah entri ke tong sampah?</translation>
    </message>
    <message numerus="yes">
        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
+        <translation><numerusform>Apakah Anda benar-benar ingin memindahkan %n entri ke tong sampah?</numerusform></translation>
    </message>
    <message>
        <source>Delete group?</source>
@ -352,7 +369,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Apakah anda ingin menghapus grup &quot;%1&quot; untuk selamanya?</translation>
+        <translation>Apakah Anda benar-benar ingin menghapus grup &quot;%1&quot; untuk selamanya?</translation>
    </message>
    <message>
        <source>Current group</source>
@ -360,11 +377,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Galat</translation>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation type="unfinished"/>
+        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
    </message>
 </context>
 <context>
@ -395,7 +412,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Entry history</source>
-        <translation>Entri riwayat</translation>
+        <translation>Riwayat entri</translation>
    </message>
    <message>
        <source>Add entry</source>
@ -423,7 +440,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unable to open file</source>
-        <translation>Tidak dapat membuka berkas</translation>
+        <translation>Tidak bisa membuka berkas</translation>
    </message>
    <message>
        <source>Save attachment</source>
@ -432,7 +449,7 @@ Discard changes and close anyway?</source>
    <message>
        <source>Unable to save the attachment:
 </source>
-        <translation>Tidak dapat menyimpan lampiran:
+        <translation>Tidak bisa menyimpan lampiran:
 </translation>
    </message>
    <message>
@ -441,11 +458,11 @@ Discard changes and close anyway?</source>
    </message>
    <message numerus="yes">
        <source>%n week(s)</source>
-        <translation><numerusform>%n minggu(s)</numerusform></translation>
+        <translation><numerusform>%n minggu</numerusform></translation>
    </message>
    <message numerus="yes">
        <source>%n month(s)</source>
-        <translation><numerusform>%n bulan(s)</numerusform></translation>
+        <translation><numerusform>%n bulan</numerusform></translation>
    </message>
    <message>
        <source>1 year</source>
@ -468,7 +485,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Remove</source>
-        <translation>Hapus</translation>
+        <translation>Buang</translation>
    </message>
    <message>
        <source>Attachments</source>
@ -480,7 +497,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Open</source>
-        <translation type="unfinished"/>
+        <translation>Buka</translation>
    </message>
 </context>
 <context>
@ -491,11 +508,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Inherit default Auto-Type sequence from the group</source>
-        <translation type="unfinished"/>
+        <translation>Mengikuti urutan Ketik-Otomatis baku grup</translation>
    </message>
    <message>
        <source>Use custom Auto-Type sequence:</source>
-        <translation type="unfinished"/>
+        <translation>Gunakan urutan Ketik-Otomatis ubahsuai:</translation>
    </message>
    <message>
        <source>+</source>
@ -515,7 +532,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Set custom sequence:</source>
-        <translation>Tetapkan urutan kustom:</translation>
+        <translation>Tetapkan urutan ubahsuai:</translation>
    </message>
 </context>
 <context>
@ -549,7 +566,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Password:</source>
-        <translation>Kata sandi:</translation>
+        <translation>Sandi:</translation>
    </message>
    <message>
        <source>Repeat:</source>
@ -565,7 +582,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Expires</source>
-        <translation>Kadaluarsa</translation>
+        <translation>Kedaluwarsa</translation>
    </message>
    <message>
        <source>Presets</source>
@ -608,7 +625,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Inherit from parent group (%1)</source>
-        <translation type="unfinished"/>
+        <translation>Mengikuti grup induk (%1)</translation>
    </message>
 </context>
 <context>
@ -623,7 +640,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Expires</source>
-        <translation>Kadaluarsa</translation>
+        <translation>Kedaluwarsa</translation>
    </message>
    <message>
        <source>Search</source>
@ -635,11 +652,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Use default auto-type sequence of parent group</source>
-        <translation type="unfinished"/>
+        <translation>Gunakan urutan ketik-otomatis baku grup induk</translation>
    </message>
    <message>
        <source>Set default auto-type sequence</source>
-        <translation type="unfinished"/>
+        <translation>Tetapkan urutan ketik-otomatis baku</translation>
    </message>
 </context>
 <context>
@ -650,15 +667,15 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Use custom icon</source>
-        <translation>Gunakan ikon kustom</translation>
+        <translation>Gunakan ikon ubahsuai</translation>
    </message>
    <message>
        <source>Add custom icon</source>
-        <translation>Tambah ikon kustom</translation>
+        <translation>Tambah ikon ubahsuai</translation>
    </message>
    <message>
        <source>Delete custom icon</source>
-        <translation>Hapus ikon kustom</translation>
+        <translation>Hapus ikon ubahsuai</translation>
    </message>
    <message>
        <source>Images</source>
@ -674,11 +691,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Can&apos;t delete icon!</source>
-        <translation>Tidak dapat menghapus ikon!</translation>
+        <translation>Tidak bisa menghapus ikon!</translation>
    </message>
    <message numerus="yes">
        <source>Can&apos;t delete icon. Still used by %n item(s).</source>
-        <translation><numerusform>Can&apos;t delete icon. Still used by %n item(s).</numerusform></translation>
+        <translation><numerusform>Tidak bisa menghapus ikon. Masih digunakan oleh %n item.</numerusform></translation>
    </message>
 </context>
 <context>
@ -749,7 +766,7 @@ Discard changes and close anyway?</source>
    <name>Group</name>
    <message>
        <source>Recycle Bin</source>
-        <translation type="unfinished"/>
+        <translation>Tong Sampah</translation>
    </message>
 </context>
 <context>
@ -764,60 +781,60 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unable to open the database.</source>
-        <translation>Tidak dapat membuka basis data</translation>
+        <translation>Tidak bisa membuka basis data.</translation>
    </message>
 </context>
 <context>
    <name>KeePass1Reader</name>
    <message>
        <source>Unable to read keyfile.</source>
-        <translation>Tidak dapat membaca berkas kunci.</translation>
+        <translation>Tidak bisa membaca berkas kunci.</translation>
    </message>
    <message>
        <source>Not a KeePass database.</source>
-        <translation>Bukan basis data KeePass</translation>
+        <translation>Bukan basis data KeePass.</translation>
    </message>
    <message>
        <source>Unsupported encryption algorithm.</source>
-        <translation>Algoritma enkripsi tidak didukung</translation>
+        <translation>Algoritma enkripsi tidak didukung.</translation>
    </message>
    <message>
        <source>Unsupported KeePass database version.</source>
-        <translation>Versi Basis data KeePass tidak didukung</translation>
+        <translation>Versi basis data KeePass tidak didukung.</translation>
    </message>
    <message>
        <source>Root</source>
-        <translation type="unfinished"/>
+        <translation>Root</translation>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation type="unfinished"/>
+        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
    </message>
 </context>
 <context>
    <name>KeePass2Reader</name>
    <message>
        <source>Not a KeePass database.</source>
-        <translation>Bukan basis data KeePass</translation>
+        <translation>Bukan basis data KeePass.</translation>
    </message>
    <message>
        <source>Unsupported KeePass database version.</source>
-        <translation>Versi basis data KeePass tidak didukung</translation>
+        <translation>Versi basis data KeePass tidak didukung.</translation>
    </message>
    <message>
        <source>Wrong key or database file is corrupt.</source>
-        <translation>Kunci salah atau berkas basis data korup.</translation>
+        <translation>Kunci salah atau berkas basis data rusak.</translation>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation type="unfinished"/>
+        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
    </message>
 </context>
 <context>
    <name>Main</name>
    <message>
        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation type="unfinished"/>
+        <translation>Galat saat menguji fungsi kriptografi.</translation>
    </message>
    <message>
        <source>KeePassX - Error</source>
@ -832,7 +849,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Recent databases</source>
-        <translation type="unfinished"/>
+        <translation>Basis data baru-baru ini</translation>
    </message>
    <message>
        <source>Help</source>
@ -852,7 +869,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>View</source>
-        <translation type="unfinished"/>
+        <translation>Lihat</translation>
    </message>
    <message>
        <source>Quit</source>
@ -884,7 +901,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>View/Edit entry</source>
-        <translation>Tampil/Sunting entri</translation>
+        <translation>Lihat/Sunting entri</translation>
    </message>
    <message>
        <source>Delete entry</source>
@ -920,7 +937,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Clone entry</source>
-        <translation type="unfinished"/>
+        <translation>Duplikat entri</translation>
    </message>
    <message>
        <source>Find</source>
@ -932,7 +949,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Copy password to clipboard</source>
-        <translation>Salin kata sandi ke papan klip</translation>
+        <translation>Salin sandi ke papan klip</translation>
    </message>
    <message>
        <source>Settings</source>
@ -940,7 +957,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Perform Auto-Type</source>
-        <translation>Melakukan Ketik-Otomatis</translation>
+        <translation>Lakukan Ketik-Otomatis</translation>
    </message>
    <message>
        <source>Open URL</source>
@ -968,34 +985,34 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>read-only</source>
-        <translation>hanya-baca</translation>
+        <translation>baca-saja</translation>
    </message>
    <message>
        <source>Toggle window</source>
-        <translation type="unfinished"/>
+        <translation>Jungkit jendela</translation>
    </message>
    <message>
        <source>Tools</source>
-        <translation type="unfinished"/>
+        <translation>Perkakas</translation>
    </message>
    <message>
        <source>Copy username</source>
-        <translation type="unfinished"/>
+        <translation>Salin nama pengguna</translation>
    </message>
    <message>
        <source>Copy password</source>
-        <translation type="unfinished"/>
+        <translation>Salin sandi</translation>
    </message>
    <message>
        <source>Export to CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Ekspor ke berkas CSV</translation>
    </message>
 </context>
 <context>
    <name>PasswordGeneratorWidget</name>
    <message>
        <source>Password:</source>
-        <translation>Kata sandi:</translation>
+        <translation>Sandi:</translation>
    </message>
    <message>
        <source>Length:</source>
@ -1003,15 +1020,15 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Character Types</source>
-        <translation>Tipe karakter</translation>
+        <translation>Tipe Karakter</translation>
    </message>
    <message>
        <source>Upper Case Letters</source>
-        <translation type="unfinished"/>
+        <translation>Huruf Besar</translation>
    </message>
    <message>
        <source>Lower Case Letters</source>
-        <translation type="unfinished"/>
+        <translation>Huruf Kecil</translation>
    </message>
    <message>
        <source>Numbers</source>
@ -1023,11 +1040,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Exclude look-alike characters</source>
-        <translation type="unfinished"/>
+        <translation>Kecualikan karakter mirip</translation>
    </message>
    <message>
        <source>Ensure that the password contains characters from every group</source>
-        <translation>Pastikan kata sandi berisi karakter dari setiap grup</translation>
+        <translation>Pastikan sandi berisi karakter dari setiap grup</translation>
    </message>
    <message>
        <source>Accept</source>
@ -1038,11 +1055,11 @@ Discard changes and close anyway?</source>
    <name>QCommandLineParser</name>
    <message>
        <source>Displays version information.</source>
-        <translation>Tampilkan informasi versi</translation>
+        <translation>Tampilkan informasi versi.</translation>
    </message>
    <message>
        <source>Displays this help.</source>
-        <translation>Tampilkan bantuan ini</translation>
+        <translation>Tampilkan bantuan ini.</translation>
    </message>
    <message>
        <source>Unknown option &apos;%1&apos;.</source>
@ -1074,29 +1091,29 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Arguments:</source>
-        <translation>Argumen</translation>
+        <translation>Argumen:</translation>
    </message>
 </context>
 <context>
    <name>QSaveFile</name>
    <message>
        <source>Existing file %1 is not writable</source>
-        <translation>Berkas yang ada %1 tidak dapat ditulis</translation>
+        <translation>Berkas yang ada %1 tidak bisa ditulis</translation>
    </message>
    <message>
        <source>Writing canceled by application</source>
-        <translation>Menulis dibatalkan oleh aplikasi</translation>
+        <translation>Penulisan dibatalkan oleh aplikasi</translation>
    </message>
    <message>
        <source>Partial write. Partition full?</source>
-        <translation type="unfinished"/>
+        <translation>Penulisan parsial. Partisi penuh?</translation>
    </message>
 </context>
 <context>
    <name>QtIOCompressor</name>
    <message>
        <source>Internal zlib error when compressing: </source>
-        <translation>Galat zlib internal ketika mengkompress: </translation>
+        <translation>Galat zlib internal ketika memampatkan:</translation>
    </message>
    <message>
        <source>Error writing to underlying device: </source>
@ -1112,7 +1129,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Internal zlib error when decompressing: </source>
-        <translation>Galat zlib internal ketika dekompress</translation>
+        <translation>Galat zlib internal ketika dekompres:</translation>
    </message>
 </context>
 <context>
@ -1134,15 +1151,15 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Case sensitive</source>
-        <translation type="unfinished"/>
+        <translation>Sensitif besar kecil huruf</translation>
    </message>
    <message>
        <source>Current group</source>
-        <translation type="unfinished"/>
+        <translation>Grup saat ini</translation>
    </message>
    <message>
        <source>Root group</source>
-        <translation type="unfinished"/>
+        <translation>Grup root</translation>
    </message>
 </context>
 <context>
@ -1180,7 +1197,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Minimize when copying to clipboard</source>
-        <translation>Kecilkan ketika menyalin ke papan klip</translation>
+        <translation>Minimalkan ketika menyalin ke papan klip</translation>
    </message>
    <message>
        <source>Use group icon on entry creation</source>
@ -1188,11 +1205,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Global Auto-Type shortcut</source>
-        <translation>Jalan pintas global Ketik-Otomatis</translation>
+        <translation>Pintasan global Ketik-Otomatis</translation>
    </message>
    <message>
        <source>Use entry title to match windows for global auto-type</source>
-        <translation type="unfinished"/>
+        <translation>Gunakan judul entri untuk mencocokkan jendela untuk ketik-otomatis global</translation>
    </message>
    <message>
        <source>Language</source>
@ -1200,22 +1217,22 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Show a system tray icon</source>
-        <translation>Tampilkan sebuah ikon baki sistem</translation>
+        <translation>Tampilkan ikon baki sistem</translation>
    </message>
    <message>
        <source>Hide window to system tray when minimized</source>
-        <translation>Sembunyikan jendela ke baki sistem ketika dikecilkan</translation>
+        <translation>Sembunyikan jendela ke baki sistem ketika diminimalkan</translation>
    </message>
    <message>
        <source>Remember last key files</source>
-        <translation type="unfinished"/>
+        <translation>Ingat berkas kunci terakhir</translation>
    </message>
 </context>
 <context>
    <name>SettingsWidgetSecurity</name>
    <message>
        <source>Clear clipboard after</source>
-        <translation>Bersihkan papan klip setelaj</translation>
+        <translation>Kosongkan papan klip setelah</translation>
    </message>
    <message>
        <source> sec</source>
@ -1223,48 +1240,44 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Lock databases after inactivity of</source>
-        <translation type="unfinished"/>
+        <translation>Kunci basis data setelah tidak aktif selama</translation>
    </message>
    <message>
        <source>Show passwords in cleartext by default</source>
-        <translation type="unfinished"/>
+        <translation>Tampilkan teks sandi secara baku</translation>
    </message>
    <message>
        <source>Always ask before performing auto-type</source>
-        <translation type="unfinished"/>
+        <translation>Selalu tanya sebelum melakukan ketik-otomatis</translation>
    </message>
 </context>
 <context>
    <name>UnlockDatabaseWidget</name>
    <message>
        <source>Unlock database</source>
-        <translation type="unfinished"/>
+        <translation>Buka kunci basis data</translation>
    </message>
 </context>
 <context>
    <name>WelcomeWidget</name>
    <message>
        <source>Welcome!</source>
-        <translation>Selamat Datang.</translation>
+        <translation>Selamat datang!</translation>
    </message>
 </context>
 <context>
    <name>main</name>
    <message>
        <source>KeePassX - cross-platform password manager</source>
-        <translation>KeePassX - manajer kata sandi cross-platform</translation>
+        <translation>KeePassX - pengelola sandi lintas platform</translation>
    </message>
    <message>
        <source>filename of the password database to open (*.kdbx)</source>
-        <translation>nama berkasi dari basis data kata sandi untuk dibuka (*.kdbx)</translation>
+        <translation>nama berkas dari basis data sandi untuk dibuka (*.kdbx)</translation>
    </message>
    <message>
        <source>path to a custom config file</source>
-        <translation type="unfinished"/>
+        <translation>jalur ke berkas konfig ubahsuai</translation>
    </message>
    <message>
        <source>password of the database (DANGEROUS!)</source>
        <translation>kata sandi dari basis data (BERBAHAYA!)</translation>
    </message>
    <message>
        <source>key file of the database</source>
--- a/share/translations/keepassx_it.ts
+++ b/share/translations/keepassx_it.ts
@ -3,12 +3,15 @@
    <name>AboutDialog</name>
    <message>
        <source>About KeePassX</source>
-        <translation>A proposito di KeePassX</translation>
+        <translation>Informazioni su KeePassX</translation>
    </message>
    <message>
        <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassX è distribuito sotto i termini della licenza 
+        <translation>KeePassX è distribuito sotto i termini della licenza GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</translation>
-GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</translation>
+    </message>
    <message>
        <source>Revision</source>
        <translation>Revisione</translation>
    </message>
 </context>
 <context>
@ -68,7 +71,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
    </message>
    <message>
        <source>Browse</source>
-        <translation>Sfogliare</translation>
+        <translation>Sfoglia</translation>
    </message>
    <message>
        <source>Create</source>
@ -96,7 +99,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
    </message>
    <message>
        <source>Select a key file</source>
-        <translation>Selezionare file chiave</translation>
+        <translation>Seleziona il file chiave</translation>
    </message>
    <message>
        <source>Question</source>
@ -112,12 +115,12 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
    </message>
    <message>
        <source>Failed to set key file</source>
-        <translation>Impossibile impostare il file della chiave</translation>
+        <translation>Impossibile impostare il file chiave</translation>
    </message>
    <message>
        <source>Failed to set %1 as the Key file:
 %2</source>
-        <translation>Impossibile impostare %1 come file della Chiave: %2</translation>
+        <translation>Impossibile impostare %1 come file Chiave: %2</translation>
    </message>
 </context>
 <context>
@ -156,11 +159,11 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
    </message>
    <message>
        <source>Key files</source>
-        <translation>File chiave</translation>
+        <translation>Files chiave</translation>
    </message>
    <message>
        <source>Select key file</source>
-        <translation>Selezionare file chiave</translation>
+        <translation>Seleziona file chiave</translation>
    </message>
 </context>
 <context>
@ -171,11 +174,11 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
    </message>
    <message>
        <source>Database description:</source>
-        <translation>Descrizione database:</translation>
+        <translation>Descrizione del database:</translation>
    </message>
    <message>
        <source>Transform rounds:</source>
-        <translation>Round di trasformazione:</translation>
+        <translation>Rounds di trasformazione:</translation>
    </message>
    <message>
        <source>Default username:</source>
@ -191,7 +194,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
    </message>
    <message>
        <source>Benchmark</source>
-        <translation>Benchmark</translation>
+        <translation>Prestazione</translation>
    </message>
    <message>
        <source>Max. history items:</source>
@ -218,7 +221,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
    </message>
    <message>
        <source>Open database</source>
-        <translation>Aprire database</translation>
+        <translation>Apri database</translation>
    </message>
    <message>
        <source>Warning</source>
@ -230,7 +233,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
    </message>
    <message>
        <source>Open KeePass 1 database</source>
-        <translation>Aprire database KeePass 1</translation>
+        <translation>Apri database KeePass 1</translation>
    </message>
    <message>
        <source>KeePass 1 database</source>
@ -278,7 +281,7 @@ Salvare le modifiche?</translation>
        <source>The database you are trying to open is locked by another instance of KeePassX.
 Do you want to open it anyway? Alternatively the database is opened read-only.</source>
        <translation>Il Database che stai tentando di aprire è bloccato da un&apos;altra esecuzione di KeePassX.
-Vuoi aprire comunque il database? In alternativa, il database è aperto in sola lettura.</translation>
+Vuoi aprirlo comunque? In alternativa, il database verrà aperto in sola lettura.</translation>
    </message>
    <message>
        <source>Lock database</source>
@ -287,14 +290,14 @@ Vuoi aprire comunque il database? In alternativa, il database è aperto in sola
    <message>
        <source>Can't lock the database as you are currently editing it.
 Please press cancel to finish your changes or discard them.</source>
-        <translation>Non è possibile bloccare il database ne modo in cui lo stai modificando.
+        <translation>Non è possibile bloccare il database nel modo in cui lo stai modificando.
 Premere annulla per terminare le modifiche o scartarle .</translation>
    </message>
    <message>
        <source>This database has never been saved.
 You can save the database or stop locking it.</source>
-        <translation>Questo database non è ancora stato salvato.
+        <translation>Questo database non è mai stato salvato.
-È possibile salvare il database o interrompere bloccandolo.</translation>
+È possibile salvare il database o interrompere il blocco.</translation>
    </message>
    <message>
        <source>This database has been modified.
@ -307,7 +310,8 @@ Altrimenti le modifiche verranno perse.</translation>
    <message>
        <source>&quot;%1&quot; is in edit mode.
 Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; è in modalità modifica. Annullare le modifiche e chiudere comunque?</translation>
+        <translation>&quot;%1&quot; è in modalità modifica.
 Annullare le modifiche e chiudere comunque?</translation>
    </message>
    <message>
        <source>Export database to CSV file</source>
@ -321,12 +325,18 @@ Discard changes and close anyway?</source>
        <source>Writing the CSV file failed.</source>
        <translation>Scrittura del file CSV fallita.</translation>
    </message>
    <message>
        <source>The database you are trying to save as is locked by another instance of KeePassX.
 Do you want to save it anyway?</source>
        <translation>Il database che si sta tentando di salvare è bloccato da un&apos;altra istanza di KeePassX.
 Vuoi salvare comunque?</translation>
    </message>
 </context>
 <context>
    <name>DatabaseWidget</name>
    <message>
        <source>Change master key</source>
-        <translation>Cambiare password principale</translation>
+        <translation>Cambia password principale</translation>
    </message>
    <message>
        <source>Delete entry?</source>
@ -370,7 +380,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation>Impossibile calcolare la chiave master</translation>
+        <translation>Impossibile calcolare la chiave principale</translation>
    </message>
 </context>
 <context>
@ -425,7 +435,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Select file</source>
-        <translation>Selezionare file</translation>
+        <translation>Seleziona file</translation>
    </message>
    <message>
        <source>Unable to open file</source>
@ -438,7 +448,7 @@ Discard changes and close anyway?</source>
    <message>
        <source>Unable to save the attachment:
 </source>
-        <translation>Impossibile salvare l&apos;allegato
+        <translation>Impossibile salvare l&apos;allegato:
 </translation>
    </message>
    <message>
@ -486,7 +496,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Open</source>
-        <translation>Apri</translation>
+        <translation>Aprire</translation>
    </message>
 </context>
 <context>
@ -575,7 +585,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Presets</source>
-        <translation>Programmare</translation>
+        <translation>Presets</translation>
    </message>
    <message>
        <source>Notes:</source>
@ -598,19 +608,19 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Add group</source>
-        <translation>Aggiungere gruppo</translation>
+        <translation>Aggiungi gruppo</translation>
    </message>
    <message>
        <source>Edit group</source>
-        <translation>Modificare gruppo</translation>
+        <translation>Modifica gruppo</translation>
    </message>
    <message>
        <source>Enable</source>
-        <translation>Abilitare</translation>
+        <translation>Abilita</translation>
    </message>
    <message>
        <source>Disable</source>
-        <translation>Disabilitare</translation>
+        <translation>Disabilita</translation>
    </message>
    <message>
        <source>Inherit from parent group (%1)</source>
@ -645,7 +655,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Set default auto-type sequence</source>
-        <translation>Usare sequenza predefinita</translation>
+        <translation>Usare sequenza auto-type predefinita</translation>
    </message>
 </context>
 <context>
@ -676,11 +686,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Select Image</source>
-        <translation>Selezionare Immagine</translation>
+        <translation>Seleziona Immagine</translation>
    </message>
    <message>
        <source>Can&apos;t delete icon!</source>
-        <translation>Impossibile eliminare icona!</translation>
+        <translation>Impossibile eliminare l&apos;icona!</translation>
    </message>
    <message numerus="yes">
        <source>Can&apos;t delete icon. Still used by %n item(s).</source>
@ -755,7 +765,7 @@ Discard changes and close anyway?</source>
    <name>Group</name>
    <message>
        <source>Recycle Bin</source>
-        <translation>Cestino (Gruppo)</translation>
+        <translation>Cestino</translation>
    </message>
 </context>
 <context>
@ -789,11 +799,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unsupported KeePass database version.</source>
-        <translation>Versione database non supportata</translation>
+        <translation>Versione database KeePass non supportata.</translation>
    </message>
    <message>
        <source>Root</source>
-        <translation>Root (KeePass1Reader)</translation>
+        <translation>Root</translation>
    </message>
    <message>
        <source>Unable to calculate master key</source>
@ -808,11 +818,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unsupported KeePass database version.</source>
-        <translation>Versione database non supportata</translation>
+        <translation>Versione database KeePass non supportata.</translation>
    </message>
    <message>
        <source>Wrong key or database file is corrupt.</source>
-        <translation>Password errata o database corrotto.</translation>
+        <translation>Password errata o file database corrotto.</translation>
    </message>
    <message>
        <source>Unable to calculate master key</source>
@ -850,7 +860,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Copy attribute to clipboard</source>
-        <translation>Copiare attributi negli appunti</translation>
+        <translation>Copia attributi negli appunti</translation>
    </message>
    <message>
        <source>Groups</source>
@ -858,7 +868,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>View</source>
-        <translation>Visualizzare</translation>
+        <translation>Visualizza</translation>
    </message>
    <message>
        <source>Quit</source>
@ -970,7 +980,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Show toolbar</source>
-        <translation>Mostrare barra degli strumenti</translation>
+        <translation>Mostra barra degli strumenti</translation>
    </message>
    <message>
        <source>read-only</source>
@ -1140,7 +1150,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Case sensitive</source>
-        <translation>Case sensitive</translation>
+        <translation>Riconoscimento di maiuscole e minuscole</translation>
    </message>
    <message>
        <source>Current group</source>
@ -1170,7 +1180,7 @@ Discard changes and close anyway?</source>
    <name>SettingsWidgetGeneral</name>
    <message>
        <source>Remember last databases</source>
-        <translation>Ricordare ultimo database</translation>
+        <translation>Ricorda ultimo database</translation>
    </message>
    <message>
        <source>Open previous databases on startup</source>
@ -1210,11 +1220,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Hide window to system tray when minimized</source>
-        <translation>Nascondi la finestra nell&apos;area di notifica del sistema quando viene minimizzatala finestra</translation>
+        <translation>Nascondi la finestra nell&apos;area di notifica del sistema quando viene minimizzata</translation>
    </message>
    <message>
        <source>Remember last key files</source>
-        <translation>Ricorda gli ultimi files di chiave</translation>
+        <translation>Ricorda gli ultimi files chiave</translation>
    </message>
 </context>
 <context>
@ -1229,7 +1239,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Lock databases after inactivity of</source>
-        <translation>Bloccare database dopo un&apos;inattività di</translation>
+        <translation>Bloccare i database dopo un&apos;inattività di</translation>
    </message>
    <message>
        <source>Show passwords in cleartext by default</source>
@ -1268,10 +1278,6 @@ Discard changes and close anyway?</source>
        <source>path to a custom config file</source>
        <translation>percorso ad un file di configurazione personalizzato</translation>
    </message>
    <message>
        <source>password of the database (DANGEROUS!)</source>
        <translation>password del database (PERICOLOSO!)</translation>
    </message>
    <message>
        <source>key file of the database</source>
        <translation>file chiave del database</translation>
--- a/share/translations/keepassx_ko.ts
+++ b/share/translations/keepassx_ko.ts
--- a/share/translations/keepassx_lt.ts
+++ b/share/translations/keepassx_lt.ts
--- a/share/translations/keepassx_nl_NL.ts
+++ b/share/translations/keepassx_nl_NL.ts
@ -9,6 +9,10 @@
        <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
        <translation>KeePassX wordt verspreid onder de bepalingen van de GNU General Public License (GPL) versie 2 of (als u wenst) versie 3.</translation>
    </message>
    <message>
        <source>Revision</source>
        <translation>Revisie</translation>
    </message>
 </context>
 <context>
    <name>AutoType</name>
@ -322,6 +326,12 @@ Wijzigingen ongedaan maken en doorgaan met sluiten?</translation>
        <source>Writing the CSV file failed.</source>
        <translation>Schrijven van het CSV-bestand mislukt.</translation>
    </message>
    <message>
        <source>The database you are trying to save as is locked by another instance of KeePassX.
 Do you want to save it anyway?</source>
        <translation>De database die u op probeert te slaan is vergrendeld door een andere instantie van KeePassX.
 Wilt u toch doorgaan met opslaan?</translation>
    </message>
 </context>
 <context>
    <name>DatabaseWidget</name>
@ -1269,10 +1279,6 @@ Wijzigingen ongedaan maken en doorgaan met sluiten?</translation>
        <source>path to a custom config file</source>
        <translation>pad naar een configuratiebestand</translation>
    </message>
    <message>
        <source>password of the database (DANGEROUS!)</source>
        <translation>wachtwoord van de database (GEVAARLIJK!)</translation>
    </message>
    <message>
        <source>key file of the database</source>
        <translation>sleutelbestand van de database</translation>
--- a/share/translations/keepassx_pl.ts
+++ b/share/translations/keepassx_pl.ts
--- a/share/translations/keepassx_pt_BR.ts
+++ b/share/translations/keepassx_pt_BR.ts
--- a/share/translations/keepassx_ru.ts
+++ b/share/translations/keepassx_ru.ts
@ -9,6 +9,10 @@
        <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
        <translation>KeePassX распространяется на условиях Стандартной общественной лицензии GNU (GPL) версии 2 или (на ваше усмотрение) версии 3.</translation>
    </message>
    <message>
        <source>Revision</source>
        <translation>Ревизия</translation>
    </message>
 </context>
 <context>
    <name>AutoType</name>
@ -277,7 +281,7 @@ Save changes?</source>
    <message>
        <source>The database you are trying to open is locked by another instance of KeePassX.
 Do you want to open it anyway? Alternatively the database is opened read-only.</source>
-        <translation type="unfinished"/>
+        <translation>Хранилище, которое Вы хотите открыть, заблокировано другой запущенной копией KeePassX. Всё равно открыть? В качестве альтернативы хранилище будет открыто в режиме для чтения.</translation>
    </message>
    <message>
        <source>Lock database</source>
@ -297,12 +301,15 @@ You can save the database or stop locking it.</source>
        <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
-        <translation type="unfinished"/>
+        <translation>Хранилище было изменено.
 Вы хотите сохранить его перед тем, как заблокировать?
 В противном случае все изменения будут потеряны.</translation>
    </message>
    <message>
        <source>&quot;%1&quot; is in edit mode.
 Discard changes and close anyway?</source>
-        <translation type="unfinished"/>
+        <translation>&quot;%1&quot; в режиме редактирования.
 Отменить изменения и всё равно закрыть?</translation>
    </message>
    <message>
        <source>Export database to CSV file</source>
@ -314,7 +321,13 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Writing the CSV file failed.</source>
-        <translation type="unfinished"/>
+        <translation>Не удалось записать CSV файл.</translation>
    </message>
    <message>
        <source>The database you are trying to save as is locked by another instance of KeePassX.
 Do you want to save it anyway?</source>
        <translation>Данное хранилище заблокировано другой запущенной копией KeePassX.
 Вы уверены, что хотите продолжить сохранение?</translation>
    </message>
 </context>
 <context>
@ -1263,10 +1276,6 @@ Discard changes and close anyway?</source>
        <source>path to a custom config file</source>
        <translation>путь к своему файлу настроек</translation>
    </message>
    <message>
        <source>password of the database (DANGEROUS!)</source>
        <translation>пароль от хранилища (ОПАСНО!)</translation>
    </message>
    <message>
        <source>key file of the database</source>
        <translation>файл-ключ хранилища</translation>
--- a/share/translations/keepassx_sl_SI.ts
+++ b/share/translations/keepassx_sl_SI.ts
--- a/share/translations/keepassx_sv.ts
+++ b/share/translations/keepassx_sv.ts
@ -9,6 +9,10 @@
        <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
        <translation>Keepassx distribueras enligt villkoren i GNU General Public License (GPL) version 2 eller (om du vill) version 3.</translation>
    </message>
    <message>
        <source>Revision</source>
        <translation>Revision</translation>
    </message>
 </context>
 <context>
    <name>AutoType</name>
@ -111,12 +115,13 @@
    </message>
    <message>
        <source>Failed to set key file</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte sätta nyckel-fil</translation>
    </message>
    <message>
        <source>Failed to set %1 as the Key file:
 %2</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte sätta %1 som nyckel-fil:
 %2</translation>
    </message>
 </context>
 <context>
@ -276,44 +281,56 @@ Spara ändringarna?</translation>
    <message>
        <source>The database you are trying to open is locked by another instance of KeePassX.
 Do you want to open it anyway? Alternatively the database is opened read-only.</source>
-        <translation type="unfinished"/>
+        <translation>Databasen som du försöker öppna är låst av en annan instans av KeePassX.
 Vill du öppna den ändå? Databasen kommer då att öppnas skrivskyddad.</translation>
    </message>
    <message>
        <source>Lock database</source>
-        <translation type="unfinished"/>
+        <translation>Lås databasen</translation>
    </message>
    <message>
        <source>Can't lock the database as you are currently editing it.
 Please press cancel to finish your changes or discard them.</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte låsa databasen eftersom du håller på  att redigera den.
 Tryck avbryt för att ansluta dina ändringar alternativt kasta dem.</translation>
    </message>
    <message>
        <source>This database has never been saved.
 You can save the database or stop locking it.</source>
-        <translation type="unfinished"/>
+        <translation>Databasen has aldrig sparats.
 Spara databasen eller sluta lås den.</translation>
    </message>
    <message>
        <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
-        <translation type="unfinished"/>
+        <translation>Databasen har ändrats.
 Vill du spara databasen innen du låser den?
 I annat fall försvinner ändringarna.</translation>
    </message>
    <message>
        <source>&quot;%1&quot; is in edit mode.
 Discard changes and close anyway?</source>
-        <translation type="unfinished"/>
+        <translation>&quot;%1&quot; är i redigeringsläge.
 Kasta ändringarna och stäng endå?</translation>
    </message>
    <message>
        <source>Export database to CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Exportera databasen till en CSV-fil</translation>
    </message>
    <message>
        <source>CSV file</source>
-        <translation type="unfinished"/>
+        <translation>CSV-fil</translation>
    </message>
    <message>
        <source>Writing the CSV file failed.</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte skriva till CSV-filen</translation>
    </message>
    <message>
        <source>The database you are trying to save as is locked by another instance of KeePassX.
 Do you want to save it anyway?</source>
        <translation>Databasen du försöker spara som är låst av en annan instans av KeePassX.
 Vill du spara endå?</translation>
    </message>
 </context>
 <context>
@ -360,11 +377,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Fel</translation>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte räkna nu master-nyckeln</translation>
    </message>
 </context>
 <context>
@ -480,7 +497,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Open</source>
-        <translation type="unfinished"/>
+        <translation>Öppna</translation>
    </message>
 </context>
 <context>
@ -635,11 +652,11 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Use default auto-type sequence of parent group</source>
-        <translation type="unfinished"/>
+        <translation>Använd standard auto-skriv sekvensen från föräldergruppen</translation>
    </message>
    <message>
        <source>Set default auto-type sequence</source>
-        <translation type="unfinished"/>
+        <translation>Ange standard auto-skriv sekvens</translation>
    </message>
 </context>
 <context>
@ -791,7 +808,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte räkna nu master-nyckeln</translation>
    </message>
 </context>
 <context>
@ -810,7 +827,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte räkna nu master-nyckeln</translation>
    </message>
 </context>
 <context>
@ -976,19 +993,19 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Tools</source>
-        <translation type="unfinished"/>
+        <translation>Verktyg</translation>
    </message>
    <message>
        <source>Copy username</source>
-        <translation type="unfinished"/>
+        <translation>Kopiera användarnamn</translation>
    </message>
    <message>
        <source>Copy password</source>
-        <translation type="unfinished"/>
+        <translation>Kopiera lösenord</translation>
    </message>
    <message>
        <source>Export to CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Exportera till CSV-fil</translation>
    </message>
 </context>
 <context>
@ -1208,7 +1225,7 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Remember last key files</source>
-        <translation type="unfinished"/>
+        <translation>Komihåg senaste nyckel-filen</translation>
    </message>
 </context>
 <context>
@ -1262,10 +1279,6 @@ Discard changes and close anyway?</source>
        <source>path to a custom config file</source>
        <translation>Sökväg till egen konfigurations-fil</translation>
    </message>
    <message>
        <source>password of the database (DANGEROUS!)</source>
        <translation>lösenord för databasen (FARLIGT!)</translation>
    </message>
    <message>
        <source>key file of the database</source>
        <translation>nyckel-fil för databas</translation>
--- a/share/translations/keepassx_uk.ts
+++ b/share/translations/keepassx_uk.ts
--- a/share/translations/keepassx_zh_TW.ts
+++ b/share/translations/keepassx_zh_TW.ts
@ -9,6 +9,10 @@
        <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
        <translation>KeePassX 是使用第 2 版 GNU 通用公共授權條款所發佈的 (或者，可根據你的選擇選用第 3 版)</translation>
    </message>
    <message>
        <source>Revision</source>
        <translation>修改紀錄</translation>
    </message>
 </context>
 <context>
    <name>AutoType</name>
@ -306,19 +310,26 @@ Otherwise your changes are lost.</source>
    <message>
        <source>&quot;%1&quot; is in edit mode.
 Discard changes and close anyway?</source>
-        <translation type="unfinished"/>
+        <translation>&quot;%1&quot; 正在編輯模式。
 是否要放棄編輯及關閉？</translation>
    </message>
    <message>
        <source>Export database to CSV file</source>
-        <translation type="unfinished"/>
+        <translation>將資料庫輸出成 CSV 檔案</translation>
    </message>
    <message>
        <source>CSV file</source>
-        <translation type="unfinished"/>
+        <translation>CSV 檔案</translation>
    </message>
    <message>
        <source>Writing the CSV file failed.</source>
-        <translation type="unfinished"/>
+        <translation>寫入 CSV 檔案失敗</translation>
    </message>
    <message>
        <source>The database you are trying to save as is locked by another instance of KeePassX.
 Do you want to save it anyway?</source>
        <translation>你嘗試要打開的資料庫已經被另一個正在執行的 KeePassX 鎖定
 還要儲存嗎？</translation>
    </message>
 </context>
 <context>
@ -985,15 +996,15 @@ Discard changes and close anyway?</source>
    </message>
    <message>
        <source>Copy username</source>
-        <translation type="unfinished"/>
+        <translation>複製使用者名稱</translation>
    </message>
    <message>
        <source>Copy password</source>
-        <translation type="unfinished"/>
+        <translation>複製密碼</translation>
    </message>
    <message>
        <source>Export to CSV file</source>
-        <translation type="unfinished"/>
+        <translation>輸出成 CSV 檔案</translation>
    </message>
 </context>
 <context>
@ -1267,10 +1278,6 @@ Discard changes and close anyway?</source>
        <source>path to a custom config file</source>
        <translation>自定設定檔的路徑</translation>
    </message>
    <message>
        <source>password of the database (DANGEROUS!)</source>
        <translation>資料庫的密碼(危險！)</translation>
    </message>
    <message>
        <source>key file of the database</source>
        <translation>資料庫的金鑰</translation>
--- a/src/autotype/AutoTypeSelectDialog.cpp
+++ b/src/autotype/AutoTypeSelectDialog.cpp
@ -33,6 +33,8 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
    , m_entryActivatedEmitted(false)
 {
    setAttribute(Qt::WA_DeleteOnClose);
    // Places the window on the active (virtual) desktop instead of where the main window is.
    setAttribute(Qt::WA_X11BypassTransientForHint);
    setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
    setWindowTitle(tr("Auto-Type - KeePassX"));
    setWindowIcon(filePath()->applicationIcon());
@ -41,7 +43,7 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
    resize(size);
    // move dialog to the center of the screen
-    QPoint screenCenter = QApplication::desktop()->screenGeometry(QCursor::pos()).center();
+    QPoint screenCenter = QApplication::desktop()->availableGeometry(QCursor::pos()).center();
    move(screenCenter.x() - (size.width() / 2), screenCenter.y() - (size.height() / 2));
    QVBoxLayout* layout = new QVBoxLayout(this);
--- a/src/core/FilePath.cpp
+++ b/src/core/FilePath.cpp
@ -113,7 +113,7 @@ QIcon FilePath::icon(const QString& category, const QString& name, bool fromThem
                icon.addFile(filename, QSize(size, size));
            }
        }
-        filename = QString("%1/icons/application/scalable/%3.svgz").arg(m_dataPath, combinedName);
+        filename = QString("%1/icons/application/scalable/%2.svgz").arg(m_dataPath, combinedName);
        if (QFile::exists(filename)) {
            icon.addFile(filename);
        }
@ -158,7 +158,7 @@ QIcon FilePath::onOffIcon(const QString& category, const QString& name)
                icon.addFile(filename, QSize(size, size), QIcon::Normal, state);
            }
        }
-        filename = QString("%1/icons/application/scalable/%3-%4.svgz").arg(m_dataPath, combinedName, stateName);
+        filename = QString("%1/icons/application/scalable/%2-%3.svgz").arg(m_dataPath, combinedName, stateName);
        if (QFile::exists(filename)) {
            icon.addFile(filename, QSize(), QIcon::Normal, state);
        }
--- a/src/core/Tools.cpp
+++ b/src/core/Tools.cpp
@ -26,7 +26,7 @@
 #include <QElapsedTimer>
 #ifdef Q_OS_WIN
-#include <windows.h> // for Sleep()
+#include <windows.h> // for Sleep(), SetDllDirectoryA() and SetSearchPathMode()
 #endif
 #ifdef Q_OS_UNIX
@ -147,6 +147,16 @@ bool isHex(const QByteArray& ba)
    return true;
 }
 bool isBase64(const QByteArray& ba)
 {
    QRegExp regexp("^(?:[a-z0-9+/]{4})*(?:[a-z0-9+/]{3}=|[a-z0-9+/]{2}==)?$",
                   Qt::CaseInsensitive, QRegExp::RegExp2);
    QString base64 = QString::fromLatin1(ba.constData(), ba.size());
    return regexp.exactMatch(base64);
 }
 void sleep(int ms)
 {
    Q_ASSERT(ms >= 0);
@ -219,4 +229,13 @@ void disableCoreDumps()
    }
 }
 void setupSearchPaths()
 {
 #ifdef Q_OS_WIN
    // Make sure Windows doesn't load DLLs from the current working directory
    SetDllDirectoryA("");
    SetSearchPathMode(BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE);
 #endif
 }
 } // namespace Tools
--- a/src/core/Tools.h
+++ b/src/core/Tools.h
@ -36,9 +36,11 @@ bool readFromDevice(QIODevice* device, QByteArray& data, int size = 16384);
 bool readAllFromDevice(QIODevice* device, QByteArray& data);
 QString imageReaderFilter();
 bool isHex(const QByteArray& ba);
 bool isBase64(const QByteArray& ba);
 void sleep(int ms);
 void wait(int ms);
 void disableCoreDumps();
 void setupSearchPaths();
 template <typename RandomAccessIterator, typename T>
 KEEPASSX_EXPORT RandomAccessIterator binaryFind(RandomAccessIterator begin, RandomAccessIterator end, const T& value)
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@ -23,6 +23,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
 #include <QKeyEvent>
 #include <QSplitter>
 #include <QTimer>
 #include <QProcess>
@ -88,6 +89,7 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
    m_searchUi->closeSearchButton->setShortcut(Qt::Key_Escape);
    m_searchWidget->hide();
    m_searchUi->caseSensitiveCheckBox->setVisible(false);
    m_searchUi->searchEdit->installEventFilter(this);
    QVBoxLayout* vLayout = new QVBoxLayout(rightHandSideWidget);
    vLayout->setMargin(0);
@ -982,3 +984,34 @@ bool DatabaseWidget::currentEntryHasNotes()
    }
    return !currentEntry->notes().isEmpty();
 }
 bool DatabaseWidget::eventFilter(QObject* object, QEvent* event)
 {
    if (object == m_searchUi->searchEdit) {
        if (event->type() == QEvent::KeyPress) {
            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
            if (keyEvent->matches(QKeySequence::Copy)) {
                // If Control+C is pressed in the search edit when no
                // text is selected, copy the password of the current
                // entry.
                Entry* currentEntry = m_entryView->currentEntry();
                if (currentEntry && !m_searchUi->searchEdit->hasSelectedText()) {
                    setClipboardTextAndMinimize(currentEntry->password());
                    return true;
                }
            }
            else if (keyEvent->matches(QKeySequence::MoveToNextLine)) {
                // If Down is pressed at EOL in the search edit, move
                // the focus to the entry view.
                if (!m_searchUi->searchEdit->hasSelectedText()
                        && m_searchUi->searchEdit->cursorPosition() == m_searchUi->searchEdit->text().size()) {
                    m_entryView->setFocus();
                    return true;
                }
            }
        }
    }
    return false;
 }
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@ -101,6 +101,9 @@ Q_SIGNALS:
    void splitterSizesChanged();
    void entryColumnSizesChanged();
 protected:
    bool eventFilter(QObject* object, QEvent* event) Q_DECL_OVERRIDE;
 public Q_SLOTS:
    void createEntry();
    void cloneEntry();
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@ -447,7 +447,8 @@ void MainWindow::closeEvent(QCloseEvent* event)
 void MainWindow::changeEvent(QEvent* event)
 {
    if ((event->type() == QEvent::WindowStateChange) && isMinimized()
-            && isTrayIconEnabled() && config()->get("GUI/MinimizeToTray").toBool())
+            && isTrayIconEnabled() && m_trayIcon && m_trayIcon->isVisible()
            && config()->get("GUI/MinimizeToTray").toBool())
    {
        event->ignore();
        QTimer::singleShot(0, this, SLOT(hide()));
--- a/src/keys/FileKey.cpp
+++ b/src/keys/FileKey.cpp
@ -211,7 +211,10 @@ QByteArray FileKey::loadXmlKey(QXmlStreamReader& xmlReader)
    while (!xmlReader.error() && xmlReader.readNextStartElement()) {
        if (xmlReader.name() == "Data") {
            // TODO: do we need to enforce a specific data.size()?
-            data = QByteArray::fromBase64(xmlReader.readElementText().toLatin1());
+            QByteArray rawData = xmlReader.readElementText().toLatin1();
            if (Tools::isBase64(rawData)) {
                data = QByteArray::fromBase64(rawData);
            }
        }
    }
--- a/src/main.cpp
+++ b/src/main.cpp
@ -32,6 +32,7 @@ int main(int argc, char** argv)
 #ifdef QT_NO_DEBUG
    Tools::disableCoreDumps();
 #endif
    Tools::setupSearchPaths();
    Application app(argc, argv);
    Application::setApplicationName("keepassx");
--- a/tests/TestKeys.cpp
+++ b/tests/TestKeys.cpp
@ -112,6 +112,7 @@ void TestKeys::testFileKey_data()
 {
    QTest::addColumn<QString>("type");
    QTest::newRow("Xml") << QString("Xml");
    QTest::newRow("XmlBrokenBase64") << QString("XmlBrokenBase64");
    QTest::newRow("Binary") << QString("Binary");
    QTest::newRow("Hex") << QString("Hex");
    QTest::newRow("Hashed") << QString("Hashed");
--- a/tests/data/FileKeyXmlBrokenBase64.kdbx
+++ b/tests/data/FileKeyXmlBrokenBase64.kdbx
--- a/tests/data/FileKeyXmlBrokenBase64.key
+++ b/tests/data/FileKeyXmlBrokenBase64.key
@ -0,0 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <KeyFile>
 	<Meta>
 		<Version>1.00</Version>
 	</Meta>
 	<Key>
 		<Data>yy</Data>
 	</Key>
 </KeyFile>
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@ -211,6 +211,10 @@ void TestGui::testSearch()
    // Search for "some"
    QTest::keyClicks(searchEdit, "some");
    QTRY_COMPARE(entryView->model()->rowCount(), 4);
    // Press Down to focus on the entry view
    QVERIFY(!entryView->hasFocus());
    QTest::keyClick(searchEdit, Qt::Key_Down);
    QVERIFY(entryView->hasFocus());
    clickIndex(entryView->model()->index(0, 1), entryView, Qt::LeftButton);
    QAction* entryEditAction = m_mainWindow->findChild<QAction*>("actionEntryEdit");