Release 2.1.4

Update translations
Bumped version to 2.1.4, updated CHANGELOG
2025-12-04 15:39:34 +01:00 · 2017-04-09 10:20:52 -04:00 · 2017-04-09 10:20:52 -04:00 · 2017-04-09 09:54:55 -04:00 · 2017-04-08 17:40:43 -04:00 · 2017-04-04 22:58:33 -04:00
36 changed files with 5649 additions and 2519 deletions
--- a/18
+++ b/18
@@ -1,3 +1,21 @@
+2.1.4 (2017-04-09)
+=========================
+
+- Bumped KeePassHTTP version to 1.8.4.2
+- KeePassHTTP confirmation window comes to foreground [#466]
+
+2.1.3 (2017-03-03)
+=========================
+
+- Fix possible overflow in zxcvbn library [#363]
+- Revert HiDPI setting to avoid problems on laptop screens [#332]
+- Set file meta properties in Windows executable [#330]
+- Suppress error message when auto-reloading a locked database [#345]
+- Improve usability of question dialog when database is already locked by a different instance [#346]
+- Fix compiler warnings in QHttp library [#351]
+- Use unified toolbar on Mac OS X [#361]
+- Fix an issue on X11 where the main window would be raised instead of closed on Alt+F4 [#362]
+
 2.1.2 (2017-02-17)
 =========================

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,8 +38,8 @@ option(WITH_XC_AUTOTYPE "Include Autotype." OFF)
 option(WITH_XC_HTTP "Include KeePassHTTP." OFF)
 option(WITH_XC_YUBIKEY "Include Yubikey support." OFF)

-set(KEEPASSXC_VERSION "2.1.2")
-set(KEEPASSXC_VERSION_NUM "2.1.2")
+set(KEEPASSXC_VERSION "2.1.4")
+set(KEEPASSXC_VERSION_NUM "2.1.4")

 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
  set(CMAKE_COMPILER_IS_CLANG 1)
--- a/cmake/GenerateProductVersion.cmake
+++ b/cmake/GenerateProductVersion.cmake
@@ -0,0 +1,118 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2015, by [halex2005](mailto:akharlov@gmail.com)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+include (CMakeParseArguments)
+
+set (GenerateProductVersionCurrentDir ${CMAKE_CURRENT_LIST_DIR})
+
+# generate_product_version() function
+#
+# This function uses VersionInfo.in template file and VersionResource.rc file
+# to generate WIN32 resource with version information and general resource strings.
+#
+# Usage:
+#   generate_product_version(
+#     SomeOutputResourceVariable
+#     NAME MyGreatProject
+#     ICON ${PATH_TO_APP_ICON}
+#     VERSION_MAJOR 2
+#     VERSION_MINOR 3
+#     VERSION_PATH ${BUILD_COUNTER}
+#     VERSION_REVISION ${BUILD_REVISION}
+#   )
+# where BUILD_COUNTER and BUILD_REVISION could be values from your CI server.
+#
+# You can use generated resource for your executable targets:
+#   add_executable(target-name ${target-files} ${SomeOutputResourceVariable})
+#
+# You can specify resource strings in arguments:
+#   NAME               - name of executable (no defaults, ex: Microsoft Word)
+#   BUNDLE             - bundle (${NAME} is default, ex: Microsoft Office)
+#   VERSION_MAJOR      - 1 is default
+#   VERSION_MINOR      - 0 is default
+#   VERSION_PATCH      - 0 is default
+#   COMPANY_NAME       - your company name (no defaults)
+#   COMPANY_COPYRIGHT  - ${COMPANY_NAME} (C) Copyright ${CURRENT_YEAR} is default
+#   COMMENTS           - ${NAME} v${VERSION_MAJOR}.${VERSION_MINOR} is default
+#   ORIGINAL_FILENAME  - ${NAME} is default
+#   INTERNAL_NAME      - ${NAME} is default
+#   FILE_DESCRIPTION   - ${NAME} is default
+function(generate_product_version outfiles)
+    set (options)
+    set (oneValueArgs
+        NAME
+        BUNDLE
+        VERSION_MAJOR
+        VERSION_MINOR
+        VERSION_PATCH
+        COMPANY_NAME
+        COMPANY_COPYRIGHT
+        COMMENTS
+        ORIGINAL_FILENAME
+        INTERNAL_NAME
+        FILE_DESCRIPTION)
+    set (multiValueArgs)
+    cmake_parse_arguments(PRODUCT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if (NOT PRODUCT_BUNDLE OR "${PRODUCT_BUNDLE}" STREQUAL "")
+        set(PRODUCT_BUNDLE "${PRODUCT_NAME}")
+    endif()
+    if (NOT PRODUCT_VERSION_MAJOR OR "${PRODUCT_VERSION_MAJOR}" STREQUAL "")
+        set(PRODUCT_VERSION_MAJOR 1)
+    endif()
+    if (NOT PRODUCT_VERSION_MINOR OR "${PRODUCT_VERSION_MINOR}" STREQUAL "")
+        set(PRODUCT_VERSION_MINOR 0)
+    endif()
+    if (NOT PRODUCT_VERSION_PATCH OR "${PRODUCT_VERSION_PATCH}" STREQUAL "")
+        set(PRODUCT_VERSION_PATCH 0)
+    endif()
+
+    if (NOT PRODUCT_COMPANY_COPYRIGHT OR "${PRODUCT_COMPANY_COPYRIGHT}" STREQUAL "")
+        string(TIMESTAMP PRODUCT_CURRENT_YEAR "%Y")
+        set(PRODUCT_COMPANY_COPYRIGHT "Copyright (C) ${PRODUCT_CURRENT_YEAR} ${PRODUCT_COMPANY_NAME}")
+    endif()
+    if (NOT PRODUCT_COMMENTS OR "${PRODUCT_COMMENTS}" STREQUAL "")
+        set(PRODUCT_COMMENTS "${PRODUCT_NAME} v${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}")
+    endif()
+    if (NOT PRODUCT_ORIGINAL_FILENAME OR "${PRODUCT_ORIGINAL_FILENAME}" STREQUAL "")
+        set(PRODUCT_ORIGINAL_FILENAME "${PRODUCT_NAME}")
+    endif()
+    if (NOT PRODUCT_INTERNAL_NAME OR "${PRODUCT_INTERNAL_NAME}" STREQUAL "")
+        set(PRODUCT_INTERNAL_NAME "${PRODUCT_NAME}")
+    endif()
+    if (NOT PRODUCT_FILE_DESCRIPTION OR "${PRODUCT_FILE_DESCRIPTION}" STREQUAL "")
+        set(PRODUCT_FILE_DESCRIPTION "${PRODUCT_NAME}")
+    endif()
+
+    set (_VersionInfoFile ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.h)
+    set (_VersionResourceFile ${CMAKE_CURRENT_BINARY_DIR}/VersionResource.rc)
+    configure_file(
+        ${GenerateProductVersionCurrentDir}/VersionInfo.in
+        ${_VersionInfoFile}
+        @ONLY)
+    configure_file(
+        ${GenerateProductVersionCurrentDir}/VersionResource.rc
+        ${_VersionResourceFile}
+        COPYONLY)
+    list(APPEND ${outfiles} ${_VersionInfoFile} ${_VersionResourceFile})
+    set (${outfiles} ${${outfiles}} PARENT_SCOPE)
+endfunction()
--- a/cmake/VersionInfo.in
+++ b/cmake/VersionInfo.in
@@ -0,0 +1,68 @@
+#pragma once
+
+#ifndef PRODUCT_VERSION_MAJOR
+#define PRODUCT_VERSION_MAJOR @PRODUCT_VERSION_MAJOR@
+#endif
+
+#ifndef PRODUCT_VERSION_MINOR
+#define PRODUCT_VERSION_MINOR @PRODUCT_VERSION_MINOR@
+#endif
+
+#ifndef PRODUCT_VERSION_PATCH
+#define PRODUCT_VERSION_PATCH @PRODUCT_VERSION_PATCH@
+#endif
+
+#ifndef FILE_VERSION_MAJOR
+#define FILE_VERSION_MAJOR @PRODUCT_VERSION_MAJOR@
+#endif
+
+#ifndef FILE_VERSION_MINOR
+#define FILE_VERSION_MINOR @PRODUCT_VERSION_MINOR@
+#endif
+
+#ifndef FILE_VERSION_PATCH
+#define FILE_VERSION_PATCH @PRODUCT_VERSION_PATCH@
+#endif
+
+#ifndef __TO_STRING
+#define __TO_STRING_IMPL(x) #x
+#define __TO_STRING(x) __TO_STRING_IMPL(x)
+#endif
+
+#define PRODUCT_VERSION_MAJOR_MINOR_STR        __TO_STRING(PRODUCT_VERSION_MAJOR) "." __TO_STRING(PRODUCT_VERSION_MINOR)
+#define PRODUCT_VERSION_MAJOR_MINOR_PATCH_STR  PRODUCT_VERSION_MAJOR_MINOR_STR "." __TO_STRING(PRODUCT_VERSION_PATCH)
+#define PRODUCT_VERSION_RESOURCE               PRODUCT_VERSION_MAJOR,PRODUCT_VERSION_MINOR,PRODUCT_VERSION_PATCH,0
+#define PRODUCT_VERSION_RESOURCE_STR           PRODUCT_VERSION_MAJOR_MINOR_PATCH_STR "\0"
+
+#define FILE_VERSION_MAJOR_MINOR_STR        __TO_STRING(FILE_VERSION_MAJOR) "." __TO_STRING(FILE_VERSION_MINOR)
+#define FILE_VERSION_MAJOR_MINOR_PATCH_STR  FILE_VERSION_MAJOR_MINOR_STR "." __TO_STRING(FILE_VERSION_PATCH)
+#define FILE_VERSION_RESOURCE               FILE_VERSION_MAJOR,FILE_VERSION_MINOR,FILE_VERSION_PATCH,0
+#define FILE_VERSION_RESOURCE_STR           FILE_VERSION_MAJOR_MINOR_PATCH_STR "\0"
+
+#ifndef PRODUCT_COMMENTS
+#define PRODUCT_COMMENTS           "@PRODUCT_COMMENTS@\0"
+#endif
+
+#ifndef PRODUCT_COMPANY_NAME
+#define PRODUCT_COMPANY_NAME       "@PRODUCT_COMPANY_NAME@\0"
+#endif
+
+#ifndef PRODUCT_COMPANY_COPYRIGHT
+#define PRODUCT_COMPANY_COPYRIGHT  "@PRODUCT_COMPANY_COPYRIGHT@\0"
+#endif
+
+#ifndef PRODUCT_FILE_DESCRIPTION
+#define PRODUCT_FILE_DESCRIPTION   "@PRODUCT_FILE_DESCRIPTION@\0"
+#endif
+
+#ifndef PRODUCT_INTERNAL_NAME
+#define PRODUCT_INTERNAL_NAME      "@PRODUCT_NAME@\0"
+#endif
+
+#ifndef PRODUCT_ORIGINAL_FILENAME
+#define PRODUCT_ORIGINAL_FILENAME  "@PRODUCT_ORIGINAL_FILENAME@\0"
+#endif
+
+#ifndef PRODUCT_BUNDLE
+#define PRODUCT_BUNDLE             "@PRODUCT_BUNDLE@\0"
+#endif
--- a/cmake/VersionResource.rc
+++ b/cmake/VersionResource.rc
@@ -0,0 +1,36 @@
+#include "VersionInfo.h"
+#include "winresrc.h"
+
+VS_VERSION_INFO VERSIONINFO
+    FILEVERSION FILE_VERSION_RESOURCE
+    PRODUCTVERSION PRODUCT_VERSION_RESOURCE
+    FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+    FILEFLAGS 0x1L
+#else
+    FILEFLAGS 0x0L
+#endif
+    FILEOS 0x4L
+    FILETYPE 0x1L
+    FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", PRODUCT_COMMENTS
+            VALUE "CompanyName", PRODUCT_COMPANY_NAME
+            VALUE "FileDescription", PRODUCT_FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_RESOURCE_STR
+            VALUE "InternalName", PRODUCT_INTERNAL_NAME
+            VALUE "LegalCopyright", PRODUCT_COMPANY_COPYRIGHT
+            VALUE "OriginalFilename", PRODUCT_ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_BUNDLE
+            VALUE "ProductVersion", PRODUCT_VERSION_RESOURCE_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
--- a/share/translations/keepassx_cs.ts
+++ b/share/translations/keepassx_cs.ts
@@ -13,16 +13,16 @@
        <source>About KeePassXC</source>
        <translation>O aplikaci KeePassXC</translation>
    </message>
-    <message>
-        <source>KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC je šířeno pod GNU obecnou veřejnou licencí (GPL) verze 2 a (případně) 3.</translation>
-    </message>
    <message>
        <source>Extensions:
 </source>
        <translation>Rozšíření:
 </translation>
    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC je šířeno pod GNU obecnou veřejnou licencí (GPL) verze 2 a (případně) 3.</translation>
+    </message>
 </context>
 <context>
    <name>AccessControlDialog</name>
@@ -32,28 +32,28 @@
    </message>
    <message>
        <source>Allow</source>
-        <translation>Povolit</translation>
+        <translation>Umožnit</translation>
    </message>
    <message>
        <source>Deny</source>
-        <translation>Zamítnout</translation>
+        <translation>Odepřít</translation>
    </message>
    <message>
        <source>%1 has requested access to passwords for the following item(s).
 Please select whether you want to allow access.</source>
-        <translation>%1 si vyžádalo přístup k heslům u následujících položek.
-Umožnit přístup? ()</translation>
+        <translation>%1 si vyžádalo přístup k heslům u následujících záznamů.
+Umožnit přístup?</translation>
    </message>
    <message>
        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Potvrzení přístupu KeePassXC HTTP</translation>
+        <translation>Schválení přístupu KeePassXC HTTP</translation>
    </message>
 </context>
 <context>
    <name>AutoType</name>
    <message>
        <source>Couldn&apos;t find an entry that matches the window title:</source>
-        <translation>Nedaří se nalézt položku, která by se shodovala s titulkem okna:</translation>
+        <translation>Nedaří se nalézt záznam který by se shodoval s titulkem okna:</translation>
    </message>
    <message>
        <source>Auto-Type - KeePassXC</source>
@@ -79,7 +79,7 @@ Umožnit přístup? ()</translation>
    <name>AutoTypeSelectDialog</name>
    <message>
        <source>Select entry to Auto-Type:</source>
-        <translation>Vyberte položku, kterou se bude automaticky vyplňovat:</translation>
+        <translation>Vyberte záznam, kterým se bude automaticky vyplňovat:</translation>
    </message>
    <message>
        <source>Auto-Type - KeePassXC</source>
@@ -100,10 +100,6 @@ Umožnit přístup? ()</translation>
        <source>Repeat password:</source>
        <translation>Zopakujte heslo:</translation>
    </message>
-    <message>
-        <source>Key file</source>
-        <translation>Soubor s klíčem</translation>
-    </message>
    <message>
        <source>Browse</source>
        <translation>Procházet</translation>
@@ -142,22 +138,26 @@ Umožnit přístup? ()</translation>
    </message>
    <message>
        <source>Do you really want to use an empty string as password?</source>
-        <translation>Opravdu chcete ponechat bez hesla, tedy nechráněné?</translation>
+        <translation>Opravdu ponechat bez hesla, tedy nechráněné?</translation>
    </message>
    <message>
        <source>Different passwords supplied.</source>
-        <translation>Nepodařilo se vám zadat heslo do obou kolonek stejně.</translation>
+        <translation>Nepodařilo se vám zadat heslo stejně do obou kolonek.</translation>
    </message>
    <message>
        <source>Failed to set key file</source>
-        <translation>Nezdařilo se nastavit soubor s klíčem</translation>
+        <translation>Nepodařilo se nastavit soubor s klíčem</translation>
    </message>
    <message>
        <source>Failed to set %1 as the Key file:
 %2</source>
-        <translation>Nezdařilo se nastavit %1 jako soubor s klíčem:
+        <translation>Nepodařilo se nastavit %1 jako soubor s klíčem:
 %2</translation>
    </message>
+    <message>
+        <source>&amp;Key file</source>
+        <translation>Soubor s &amp;klíčem</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseOpenWidget</name>
@@ -231,8 +231,8 @@ Umožnit přístup? ()</translation>
    <message>
        <source>The database has been successfully repaired
 You can now save it.</source>
-        <translation>Databáze je úspěšně opravená
-Nyní jí můžete uložit.</translation>
+        <translation>Databáze je úspěšně opravená.
+Nyní je možné ji uložit.</translation>
    </message>
    <message>
        <source>Unable to repair the database.</source>
@@ -257,10 +257,6 @@ Nyní jí můžete uložit.</translation>
        <source>Default username:</source>
        <translation>Výchozí uživatelské jméno:</translation>
    </message>
-    <message>
-        <source>Use recycle bin:</source>
-        <translation>Namísto mazání přesouvat do Koše:</translation>
-    </message>
    <message>
        <source> MiB</source>
        <translation> MiB</translation>
@@ -271,11 +267,15 @@ Nyní jí můžete uložit.</translation>
    </message>
    <message>
        <source>Max. history items:</source>
-        <translation>Omezit počet uchovávaných předchozích verzí položky na:</translation>
+        <translation>Omezit počet uchovávaných předchozích verzí záznamů na:</translation>
    </message>
    <message>
        <source>Max. history size:</source>
-        <translation>Omezit datový objem předchozích verzí položek na:</translation>
+        <translation>Omezit datový objem uchovávaných předchozích verzí záznamů na:</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Namísto mazání přesouvat do Koše</translation>
    </message>
 </context>
 <context>
@@ -394,13 +394,7 @@ Přesto zavřít a zahodit změny?</translation>
    </message>
    <message>
        <source>Unable to open the database.</source>
-        <translation>Nepodařilo se otevřít databázi.</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-Do you want to open it anyway? Alternatively the database is opened read-only.</source>
-        <translation>Databáze kterou se pokoušíte otevřít je právě používaná jinou instancí KeePassXC.
-Chcete ji přesto otevřít? Případně je možné databázi otevřít pouze pro čtení.</translation>
+        <translation>Databázi se nedaří otevřít.</translation>
    </message>
    <message>
        <source>Merge database</source>
@@ -412,6 +406,26 @@ Do you want to save it anyway?</source>
        <translation>Databáze kterou se pokoušíte uložit je právě používaná jinou instancí KeePassXC.
 Chcete ji přesto uložit?</translation>
    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Hesla</translation>
+    </message>
+    <message>
+        <source>Database already opened</source>
+        <translation>Tato databáze je už otevřená</translation>
+    </message>
+    <message>
+        <source>The database you are trying to open is locked by another instance of KeePassXC.
+
+Do you want to open it anyway?</source>
+        <translation>Databáze kterou se pokoušíte otevřít je právě používaná jinou instancí KeePassXC.
+
+Chcete ji přesto otevřít?</translation>
+    </message>
+    <message>
+        <source>Open read-only</source>
+        <translation>Otevřít pouze pro čtení</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseWidget</name>
@@ -421,27 +435,27 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>Delete entry?</source>
-        <translation>Smazat položku?</translation>
+        <translation>Smazat záznam?</translation>
    </message>
    <message>
        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
-        <translation>Opravdu chcete nenávratně smazat položku „%1“?</translation>
+        <translation>Opravdu chcete nenávratně smazat záznam „%1“?</translation>
    </message>
    <message>
        <source>Delete entries?</source>
-        <translation>Smazat položky?</translation>
+        <translation>Smazat záznamy?</translation>
    </message>
    <message>
        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Opravdu chcete nenávratně smazat %1 položek?</translation>
+        <translation>Opravdu chcete nenávratně smazat %1 záznamů?</translation>
    </message>
    <message>
        <source>Move entries to recycle bin?</source>
-        <translation>Přesunout položky do Koše?</translation>
+        <translation>Přesunout záznamy do Koše?</translation>
    </message>
    <message numerus="yes">
        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Opravdu chcete přesunout %n položku do Koše?</numerusform><numerusform>Opravdu chcete přesunout %n položky do Koše?</numerusform><numerusform>Opravdu chcete přesunout %n položek do Koše?</numerusform></translation>
+        <translation><numerusform>Opravdu přesunout %n záznam do Koše? ()</numerusform><numerusform>Opravdu přesunout %n záznamy do Koše? ()</numerusform><numerusform>Opravdu přesunout %n záznamů do Koše?</numerusform></translation>
    </message>
    <message>
        <source>Delete group?</source>
@@ -461,11 +475,11 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>Move entry to recycle bin?</source>
-        <translation>Přesunout položku do koše?</translation>
+        <translation>Přesunout záznam do Koše?</translation>
    </message>
    <message>
        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Opravdu si přejete přesunout položku &quot;%1&quot; do koše?</translation>
+        <translation>Opravdu přesunout záznam &quot;%1&quot; do Koše?</translation>
    </message>
    <message>
        <source>Searching...</source>
@@ -485,7 +499,7 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>No Results</source>
-        <translation>Žádné výsledky</translation>
+        <translation>Nic nenalezeno</translation>
    </message>
    <message>
        <source>Execute command?</source>
@@ -493,7 +507,7 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Opravdu chcete spustit následující příkaz?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+        <translation>Opravdu spustit následující příkaz?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
    </message>
    <message>
        <source>Remember my choice</source>
@@ -505,7 +519,7 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>The database file has changed. Do you want to load the changes?</source>
-        <translation>Soubor s databází byl změněn. Přejete si načíst změny?</translation>
+        <translation>Soubor s databází byl změněn. Načíst změny?</translation>
    </message>
    <message>
        <source>Merge Request</source>
@@ -513,26 +527,22 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Soubor s databází byl mezitím změněn a vaše změny nejsou uložené. Přejete si vaše změny sloučit?</translation>
+        <translation>Soubor s databází byl změněn a vaše změny do něj nejsou uloženy. Přejete si své změny začlenit?</translation>
    </message>
    <message>
        <source>Autoreload Failed</source>
        <translation>Automatické opětovné načtení se nezdařilo</translation>
    </message>
-    <message>
-        <source>Could not parse or unlock the new database file while attempting to autoreload this database.</source>
-        <translation>Nepodařilo se zpracovat nebo odemknout nový soubor s databází během pokusu o její opětovné načtení.</translation>
-    </message>
    <message>
        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Nepodařilo se otevřít nový soubor s databází během pokusu o její opětovné načtení.</translation>
+        <translation>Nepodařilo se otevřít nový soubor s databází během pokusu o opětovné načtení této.</translation>
    </message>
 </context>
 <context>
    <name>EditEntryWidget</name>
    <message>
        <source>Entry</source>
-        <translation>Položka</translation>
+        <translation>Záznam</translation>
    </message>
    <message>
        <source>Advanced</source>
@@ -556,15 +566,15 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>Entry history</source>
-        <translation>Historie položky</translation>
+        <translation>Historie záznamu</translation>
    </message>
    <message>
        <source>Add entry</source>
-        <translation>Přidat položku</translation>
+        <translation>Přidat záznam</translation>
    </message>
    <message>
        <source>Edit entry</source>
-        <translation>Upravit položku</translation>
+        <translation>Upravit záznam</translation>
    </message>
    <message>
        <source>Error</source>
@@ -572,7 +582,7 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>Different passwords supplied.</source>
-        <translation>Zadání hesla se neshodují.</translation>
+        <translation>Nepodařilo se vám zadat heslo stejně do obou kolonek.</translation>
    </message>
    <message>
        <source>New attribute</source>
@@ -648,15 +658,7 @@ Chcete ji přesto uložit?</translation>
    <name>EditEntryWidgetAutoType</name>
    <message>
        <source>Enable Auto-Type for this entry</source>
-        <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 automatického vyplňování od skupiny</translation>
-    </message>
-    <message>
-        <source>Use custom Auto-Type sequence:</source>
-        <translation>Použít vlastní posloupnost automatického vyplňování:</translation>
+        <translation>Zapnout automatické vyplňování tohoto záznamu</translation>
    </message>
    <message>
        <source>+</source>
@@ -671,11 +673,19 @@ Chcete ji přesto uložit?</translation>
        <translation>Titulek okna:</translation>
    </message>
    <message>
-        <source>Use default sequence</source>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Převzít výchozí posloupnost automatického vyplňování od skupiny</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Po&amp;užít vlastní posloupnost automatického vyplňování:</translation>
+    </message>
+    <message>
+        <source>Use default se&amp;quence</source>
        <translation>Použít výchozí posloupnost</translation>
    </message>
    <message>
-        <source>Set custom sequence:</source>
+        <source>Set custo&amp;m sequence:</source>
        <translation>Nastavit vlastní posloupnost:</translation>
    </message>
 </context>
@@ -792,7 +802,7 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>Use default auto-type sequence of parent group</source>
-        <translation>Použít výchozí posloupnost automatického vyplňování z nadřazené skupiny</translation>
+        <translation>Použít výchozí posloupnost automatického vyplňování od nadřazené skupiny</translation>
    </message>
    <message>
        <source>Set default auto-type sequence</source>
@@ -801,14 +811,6 @@ Chcete ji přesto uložit?</translation>
 </context>
 <context>
    <name>EditWidgetIcons</name>
-    <message>
-        <source>Use default icon</source>
-        <translation>Použít výchozí ikonu</translation>
-    </message>
-    <message>
-        <source>Use custom icon</source>
-        <translation>Použít svou vlastní ikonu</translation>
-    </message>
    <message>
        <source>Add custom icon</source>
        <translation>Přidat svou vlastní ikonu</translation>
@@ -839,19 +841,27 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>Download favicon</source>
-        <translation>Stáhnout favicon</translation>
+        <translation>Stáhnout ikonu webu (favicon)</translation>
    </message>
    <message>
        <source>Unable to fetch favicon.</source>
-        <translation>Favicon se nepodařilo stáhnout.</translation>
+        <translation>Ikonu webu (favicon) se nedaří stáhnout.</translation>
    </message>
    <message>
        <source>Can&apos;t read icon</source>
-        <translation>Nepodařilo se načíst ikonu</translation>
+        <translation>Ikonu se nedaří načíst</translation>
    </message>
    <message>
        <source>Can&apos;t delete icon. Still used by %1 items.</source>
-        <translation>Ikonu nelze smazat. Ještě ji používá %1 položek.</translation>
+        <translation>Ikonu nelze smazat, protože je používaná ještě %1 dalšími záznamy.</translation>
+    </message>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation>Po&amp;užít výchozí ikonu</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Použít svou vlastní ikonu</translation>
    </message>
 </context>
 <context>
@@ -862,11 +872,11 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>Modified:</source>
-        <translation>Okamžik minulé úpravy:</translation>
+        <translation>Okamžik nejnovější úpravy:</translation>
    </message>
    <message>
        <source>Accessed:</source>
-        <translation>Okamžik minulého přístupu:</translation>
+        <translation>Okamžik nejnovějšího přístupu:</translation>
    </message>
    <message>
        <source>Uuid:</source>
@@ -891,7 +901,7 @@ Chcete ji přesto uložit?</translation>
    <name>EntryHistoryModel</name>
    <message>
        <source>Last modified</source>
-        <translation>Okamžik minulé změny</translation>
+        <translation>Okamžik nejnovější změny</translation>
    </message>
    <message>
        <source>Title</source>
@@ -960,7 +970,7 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>Numbers</source>
-        <translation>Čísla</translation>
+        <translation>Číslice</translation>
    </message>
    <message>
        <source>0-9</source>
@@ -972,15 +982,15 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
+        <translation>/*_&amp; …</translation>
    </message>
    <message>
        <source>Exclude look-alike characters</source>
-        <translation>Vyloučit podobné znaky</translation>
+        <translation>Vynechat podobně vypadající znaky (předejití záměně)</translation>
    </message>
    <message>
        <source>Ensure that the password contains characters from every group</source>
-        <translation>Heslo musí obsahovat znak z každé skupiny</translation>
+        <translation>Zajistit aby heslo obsahovalo znaky ze všech zvolených skupin znaků</translation>
    </message>
    <message>
        <source>Accept</source>
@@ -1006,7 +1016,7 @@ Chcete ji přesto uložit?</translation>
    <name>KeePass1Reader</name>
    <message>
        <source>Unable to read keyfile.</source>
-        <translation>Nedaří se načíst soubor s klíčem.</translation>
+        <translation>Soubor s klíčem se nedaří načíst.</translation>
    </message>
    <message>
        <source>Not a KeePass database.</source>
@@ -1045,7 +1055,7 @@ Chcete ji přesto uložit?</translation>
    </message>
    <message>
        <source>Wrong key or database file is corrupt.</source>
-        <translation>Chybný klíč nebo je databáze poškozená.</translation>
+        <translation>Byl zadán chybný klíč, nebo je poškozen databázový soubor.</translation>
    </message>
    <message>
        <source>Unable to calculate master key</source>
@@ -1058,7 +1068,7 @@ You can import it by clicking on Database &gt; 'Import KeePass 1 database'.
 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>Zvolený soubor je databáze ve starém formátu KeePass 1 (.kdb).

-Můžete ho importovat pomocí Databáze → Importovat databázi KeePass 1.
+Můžete ho importovat pomocí Databáze → Importovat databázi ve formátu KeePass 1.
 Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otevřít ve staré verzi KeePassX 0.4.</translation>
    </message>
 </context>
@@ -1066,7 +1076,7 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev
    <name>Main</name>
    <message>
        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Při ověřování šifrovacích funkcí byl zjištěn fatální nedostatek.</translation>
+        <translation>Při zkoušení šifrovacích funkcí byl zjištěn fatální nedostatek.</translation>
    </message>
    <message>
        <source>KeePassXC - Error</source>
@@ -1121,7 +1131,7 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev
    </message>
    <message>
        <source>All files</source>
-        <translation>Všechny soubory</translation>
+        <translation>Veškeré soubory</translation>
    </message>
    <message>
        <source>Save repaired database</source>
@@ -1145,7 +1155,7 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev
    </message>
    <message>
        <source>E&amp;ntries</source>
-        <translation>Položky</translation>
+        <translation>Záz&amp;namy</translation>
    </message>
    <message>
        <source>Copy att&amp;ribute to clipboard</source>
@@ -1153,7 +1163,7 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev
    </message>
    <message>
        <source>&amp;Groups</source>
-        <translation>Skupniny</translation>
+        <translation>Skupiny</translation>
    </message>
    <message>
        <source>&amp;View</source>
@@ -1185,19 +1195,19 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev
    </message>
    <message>
        <source>Merge from KeePassX database</source>
-        <translation>Sloučit s databází KeePassX</translation>
+        <translation>Sloučit z databáze KeePassX</translation>
    </message>
    <message>
        <source>&amp;Add new entry</source>
-        <translation>Přid&amp;at novou položku</translation>
+        <translation>Přid&amp;at nový záznam</translation>
    </message>
    <message>
        <source>&amp;View/Edit entry</source>
-        <translation>Zobrazit/Upra&amp;vit položku</translation>
+        <translation>Zobrazit/Upra&amp;vit záznam</translation>
    </message>
    <message>
        <source>&amp;Delete entry</source>
-        <translation>Smazat položku</translation>
+        <translation>Smazat záznam</translation>
    </message>
    <message>
        <source>&amp;Add new group</source>
@@ -1229,7 +1239,7 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev
    </message>
    <message>
        <source>&amp;Clone entry</source>
-        <translation>Klonovat položku</translation>
+        <translation>Klonovat záznam</translation>
    </message>
    <message>
        <source>&amp;Find</source>
@@ -1257,7 +1267,7 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev
    </message>
    <message>
        <source>&amp;Lock databases</source>
-        <translation>Uzamknout databázi</translation>
+        <translation>Uzamknout databáze</translation>
    </message>
    <message>
        <source>&amp;Title</source>
@@ -1298,25 +1308,15 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev
        <source>Sh&amp;ow a notification when credentials are requested</source>
        <translation>Z&amp;obrazit oznámení když jsou požadovány přihlašovací údaje</translation>
    </message>
-    <message>
-        <source>&amp;Return only best matching entries for an URL instead
-of all entries for the whole domain</source>
-        <translation>V%rátit pouze položky, které nejlépe odpovídají dané
-URL adrese namísto položek pro celou doménu</translation>
-    </message>
    <message>
        <source>&amp;Match URL schemes
 Only entries with the same scheme (http://, https://, ftp://, ...) are returned</source>
        <translation>&amp;Odpovídající schémata URL adres
-Jsou vráceny pouze položky se stejným schématem (http://, https://, ftp://, atp.)</translation>
+Je odpovídáno pouze záznamy se stejným schématem (http://, https://, ftp://, atp.)</translation>
    </message>
    <message>
        <source>Sort matching entries by &amp;username</source>
-        <translation>Seřadit odpovídající položky dle &amp;uživatelského jména</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption-keys from active database</source>
-        <translation>Z právě otevřené databáze od&amp;ebrat veškeré sdílené šifrovací klíče</translation>
+        <translation>Seřadit odpovídající záznamy dle &amp;uživatelského jména</translation>
    </message>
    <message>
        <source>Re&amp;move all stored permissions from entries in active database</source>
@@ -1330,34 +1330,22 @@ Jsou vráceny pouze položky se stejným schématem (http://, https://, ftp://,
        <source>Advanced</source>
        <translation>Pokročilé</translation>
    </message>
-    <message>
-        <source>Activate the following only, if you know what you are doing!</source>
-        <translation>Následující zapněte pouze pokud víte, co děláte!</translation>
-    </message>
    <message>
        <source>Always allow &amp;access to entries</source>
-        <translation>Vždy umožnit přístup k veškerým položkám</translation>
+        <translation>Vždy umožnit přístup ke všem zázn&amp;amům</translation>
    </message>
    <message>
        <source>Always allow &amp;updating entries</source>
-        <translation>Vždy umožnit akt&amp;ualizovat položky</translation>
+        <translation>Vždy umožnit akt&amp;ualizovat záznamy</translation>
    </message>
    <message>
        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Vy&amp;hledat odpovídající položky ve všech otevřených databázích</translation>
+        <translation>Vy&amp;hledat odpovídající záznamy ve všech otevřených databázích</translation>
    </message>
    <message>
        <source>Only the selected database has to be connected with a client!</source>
        <translation>Je třeba, aby ke klientovi byly připojené pouze vybrané databáze!</translation>
    </message>
-    <message>
-        <source>&amp;Return also advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>V&amp;rátit také pokročilé textové řetězce které začínají na „KPH:“</translation>
-    </message>
-    <message>
-        <source>Automatic creates or updates are not supported for string fields!</source>
-        <translation>Automatická vytváření nebo aktualizace nejsou u textových kolonek podporované!</translation>
-    </message>
    <message>
        <source>HTTP Port:</source>
        <translation>HTTP port:</translation>
@@ -1372,17 +1360,17 @@ Jsou vráceny pouze položky se stejným schématem (http://, https://, ftp://,
    </message>
    <message>
        <source>Sort &amp;matching entries by title</source>
-        <translation>Seřadit odpovídající položky dle názvu</translation>
+        <translation>Seřadit odpovídající záznamy dle názvu</translation>
    </message>
    <message>
        <source>Enable KeepassXC HTTP protocol
 This is required for accessing your databases from ChromeIPass or PassIFox</source>
        <translation>Zapnout protokol KeePassXC HTTP
-Toto je zapotřebí pro přístup do databáze z ChromeIPass nebo PassIFox</translation>
+Toto je zapotřebí pro přístup do databáze z doplňku ChromeIPass nebo PassIFox pro webové prohlížeče</translation>
    </message>
    <message>
        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>Na tomto portu bude KeePassXC očekávat spojení na adrese 127.0.0.1</translation>
+        <translation>KeePassXC bude očekávat spojení na tomto portu na adrese 127.0.0.1 (localhost)</translation>
    </message>
    <message>
        <source>Cannot bind to privileged ports</source>
@@ -1394,6 +1382,28 @@ Using default port 19455.</source>
        <translation>Není možné navázat na porty s číslem nižším, než 1024!
 Náhradně bude použit port 19455.</translation>
    </message>
+    <message>
+        <source>&amp;Return only best matching entries for a URL instead
+of all entries for the whole domain</source>
+        <translation>Odpovědět pouze záznamy, které nejlépe odpovídají dané
+URL ad&amp;rese namísto záznamů pro celou doménu</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>Z právě otevřené databáze od&amp;ebrat veškeré sdílené šifrovací klíče</translation>
+    </message>
+    <message>
+        <source>The following options can be dangerous. Change them only if you know what you are doing.</source>
+        <translation>Následující předvolby mohou být nebezpečné. Měňte je pouze pokud víte, co děláte!</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Odpovědět také kolonkami pok&amp;ročilých textových řetězců které začínají na „KPH:“</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatická vytváření nebo aktualizace nejsou u textových kolonek podporované!</translation>
+    </message>
 </context>
 <context>
    <name>PasswordGeneratorWidget</name>
@@ -1439,7 +1449,7 @@ Náhradně bude použit port 19455.</translation>
    </message>
    <message>
        <source>entropy</source>
-        <translation>náhodnost</translation>
+        <translation>nahodilost</translation>
    </message>
    <message>
        <source>&amp;Length:</source>
@@ -1447,11 +1457,11 @@ Náhradně bude použit port 19455.</translation>
    </message>
    <message>
        <source>Pick characters from every group</source>
-        <translation>Použít znaky ze všech skupin</translation>
+        <translation>Zajistit přítomnost znaků ze všech zvolených skupin</translation>
    </message>
    <message>
        <source>Generate</source>
-        <translation>Vytvořit</translation>
+        <translation>Tvoř</translation>
    </message>
    <message>
        <source>Close</source>
@@ -1463,27 +1473,27 @@ Náhradně bude použit port 19455.</translation>
    </message>
    <message>
        <source>Entropy: %1 bit</source>
-        <translation>Náhodnost: %1 bit</translation>
+        <translation>Nahodilost: %1 bitů</translation>
    </message>
    <message>
        <source>Password Quality: %1</source>
-        <translation>Odolnost hesla: %1</translation>
+        <translation>Kvalita hesla: %1</translation>
    </message>
    <message>
        <source>Poor</source>
-        <translation>Velmi nízká</translation>
+        <translation>Velmi slabé</translation>
    </message>
    <message>
        <source>Weak</source>
-        <translation>Slabá</translation>
+        <translation>Slabé</translation>
    </message>
    <message>
        <source>Good</source>
-        <translation>Dobrá</translation>
+        <translation>Dobré</translation>
    </message>
    <message>
        <source>Excellent</source>
-        <translation>Skvělá</translation>
+        <translation>Skvělé</translation>
    </message>
 </context>
 <context>
@@ -1513,7 +1523,7 @@ Náhradně bude použit port 19455.</translation>
    </message>
    <message>
        <source>Internal zlib error when decompressing: </source>
-        <translation>Vnitřní chyba knihovny zlib při rozbalování:</translation>
+        <translation>Během rozbalování se vyskytla vnitřní chyba v knihovně zlib:</translation>
    </message>
 </context>
 <context>
@@ -1524,7 +1534,7 @@ Náhradně bude použit port 19455.</translation>
    </message>
    <message>
        <source>Internal zlib error: </source>
-        <translation>Vnitřní chyba knihovny zlib:</translation>
+        <translation>Vnitřní chyba v knihovně zlib:</translation>
    </message>
 </context>
 <context>
@@ -1552,11 +1562,11 @@ Náhradně bude použit port 19455.</translation>
        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
 Do you want to overwrite it?</source>
        <translation>Už existuje sdílený šifrovací klíč s názvem „%1“.
-Přejete si ho přepsat?</translation>
+Chcete ho přepsat?</translation>
    </message>
    <message>
        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Přejete si aktualizovat informaci v %1 – %2?</translation>
+        <translation>Chcete aktualizovat informaci v %1 – %2?</translation>
    </message>
    <message>
        <source>The active database is locked!
@@ -1574,11 +1584,11 @@ Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
    </message>
    <message>
        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Právě otevřená databáze neobsahuje žádnou položku nastavení KeePassHttp.</translation>
+        <translation>Právě otevřená databáze neobsahuje žádný záznam nastavení KeePassHttp.</translation>
    </message>
    <message>
        <source>Removing stored permissions...</source>
-        <translation>Odstraňuji uložená oprávnění...</translation>
+        <translation>Odstraňování uložených oprávnění…</translation>
    </message>
    <message>
        <source>Abort</source>
@@ -1590,7 +1600,7 @@ Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
    </message>
    <message>
        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Právě otevřená databáze neobsahuje položku s oprávněními.</translation>
+        <translation>Právě otevřená databáze neobsahuje záznam s oprávněními.</translation>
    </message>
    <message>
        <source>KeePassXC: New key association request</source>
@@ -1600,9 +1610,9 @@ Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
        <source>You have received an association request for the above key.
 If you would like to allow it access to your KeePassXC database
 give it a unique name to identify and accept it.</source>
-        <translation>Pokud jste obdrželi požadavek na přiřazení pro výše uvedený klíč.
-Pokud chcete umožnit přístup do KeePassXC databáze, dejte jí
-jedinečný název pro její identifikaci a potvrďte ho.</translation>
+        <translation>Obdrželi jste požadavek na přiřazení výše uvedeného klíče.
+Pokud jím chcete umožnit přístup do KeePassXC databáze, zadejte pro něj
+jedinečný název pro identifikaci a potvrďte ho.</translation>
    </message>
    <message>
        <source>KeePassXC: Overwrite existing key?</source>
@@ -1610,7 +1620,7 @@ jedinečný název pro její identifikaci a potvrďte ho.</translation>
    </message>
    <message>
        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Aktualizovat položku</translation>
+        <translation>KeePassXC: Aktualizovat záznam</translation>
    </message>
    <message>
        <source>KeePassXC: Database locked!</source>
@@ -1618,7 +1628,7 @@ jedinečný název pro její identifikaci a potvrďte ho.</translation>
    </message>
    <message>
        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Odebrány klíče z databáze</translation>
+        <translation>KeePassXC: Klíče odebrány z databáze</translation>
    </message>
    <message>
        <source>KeePassXC: No keys found</source>
@@ -1634,7 +1644,7 @@ jedinečný název pro její identifikaci a potvrďte ho.</translation>
    </message>
    <message>
        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nebyla nalezena položka s oprávněními!</translation>
+        <translation>KeePassXC: Nebyl nalezen záznam s oprávněními!</translation>
    </message>
 </context>
 <context>
@@ -1668,11 +1678,11 @@ jedinečný název pro její identifikaci a potvrďte ho.</translation>
    </message>
    <message>
        <source>Minimize when copying to clipboard</source>
-        <translation>Po zkopírování údaje do schránky automaticky minimalizovat</translation>
+        <translation>Po zkopírování údaje do schránky odklidit okno aplikace jeho automatickou minimalizací</translation>
    </message>
    <message>
        <source>Use group icon on entry creation</source>
-        <translation>Pro vytvářenou položku použít ikonu skupiny, do které spadá</translation>
+        <translation>Pro vytvářený záznam použít ikonu skupiny, do které spadá</translation>
    </message>
    <message>
        <source>Global Auto-Type shortcut</source>
@@ -1680,7 +1690,7 @@ jedinečný název pro její identifikaci a potvrďte ho.</translation>
    </message>
    <message>
        <source>Use entry title to match windows for global auto-type</source>
-        <translation>Všeobecné automatické vyplňování provádět na základě shody titulku položky s titulkem okna.</translation>
+        <translation>Všeobecné automatické vyplňování provádět na základě shody titulku záznamu s titulkem okna.</translation>
    </message>
    <message>
        <source>Language</source>
@@ -1700,15 +1710,15 @@ jedinečný název pro její identifikaci a potvrďte ho.</translation>
    </message>
    <message>
        <source>Load previous databases on startup</source>
-        <translation>Při spuštění aplikace načíst minule otevřené databáze</translation>
+        <translation>Při spouštění aplikace načíst minule otevřené databáze</translation>
    </message>
    <message>
        <source>Automatically reload the database when modified externally</source>
-        <translation>V okamžiku zásahu do databáze zvenčí ji načíst znovu</translation>
+        <translation>V případě úpravy zvenčí, automaticky opětovně načíst databázi</translation>
    </message>
    <message>
        <source>Hide window to system tray instead of app exit</source>
-        <translation>Namísto zavření minimalizovat okno aplikace do oznamovací oblasti systémového panelu</translation>
+        <translation>Namísto ukončení aplikace skrýt její okno do oznamovací oblasti systémového panelu</translation>
    </message>
    <message>
        <source>Minimize window at application startup</source>
@@ -1743,7 +1753,7 @@ jedinečný název pro její identifikaci a potvrďte ho.</translation>
    </message>
    <message>
        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Pokud jsou zobrazená, nevyžadovat zopakování hesel</translation>
+        <translation>Pokud je viditelné, nevyžadovat zopakování zadání hesla</translation>
    </message>
 </context>
 <context>
@@ -1764,16 +1774,12 @@ jedinečný název pro její identifikaci a potvrďte ho.</translation>
    <name>main</name>
    <message>
        <source>path to a custom config file</source>
-        <translation>umístění souboru s vlastními nastaveními</translation>
+        <translation>umístění vlastního souboru s nastaveními</translation>
    </message>
    <message>
        <source>key file of the database</source>
        <translation>soubor s klíčem k databázi</translation>
    </message>
-    <message>
-        <source>filename(s) of the password database(s) to open (*.kdbx)</source>
-        <translation>názvy databází s hesly (*.kdbx) které otevřít ()()</translation>
-    </message>
    <message>
        <source>KeePassXC - cross-platform password manager</source>
        <translation>KeePassXC – aplikace pro správu hesel, fungující na vícero operačních systémech</translation>
@@ -1782,5 +1788,9 @@ jedinečný název pro její identifikaci a potvrďte ho.</translation>
        <source>read password of the database from stdin</source>
        <translation>načíst heslo k databázi ze standardního vstupu</translation>
    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>soubory s databázemi hesel k otevření (*.kdbx)</translation>
+    </message>
 </context>
 </TS>
--- a/share/translations/keepassx_de.ts
+++ b/share/translations/keepassx_de.ts
@@ -3,26 +3,26 @@
    <name>AboutDialog</name>
    <message>
        <source>Revision</source>
-        <translation>Überarbeitung</translation>
+        <translation>Revision</translation>
    </message>
    <message>
        <source>Using:</source>
-        <translation>In Benutzung:</translation>
+        <translation>Verwendet:</translation>
    </message>
    <message>
        <source>About KeePassXC</source>
        <translation>Über KeePassXC</translation>
    </message>
-    <message>
-        <source>KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC steht unter der GNU General Public License (GPL) version 2 (version 3).</translation>
-    </message>
    <message>
        <source>Extensions:
 </source>
        <translation>Erweiterungen:
 </translation>
    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC wird unter den Bedingungen der GNU General Public License (GPL) Version 2 oder Version 3 (je nach Ihrer Auswahl) vertrieben.</translation>
+    </message>
 </context>
 <context>
    <name>AccessControlDialog</name>
@@ -46,7 +46,7 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
    </message>
    <message>
        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Erlaube Zugriff</translation>
+        <translation>Erlaube KeePassXC HTTP Zugriff</translation>
    </message>
 </context>
 <context>
@@ -100,10 +100,6 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
        <source>Repeat password:</source>
        <translation>Passwort wiederholen:</translation>
    </message>
-    <message>
-        <source>Key file</source>
-        <translation>Schlüsseldatei</translation>
-    </message>
    <message>
        <source>Browse</source>
        <translation>Durchsuchen</translation>
@@ -157,6 +153,10 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
 %2</source>
        <translation>Festlegen von %1 als Schlüsseldatei nicht möglich: %2</translation>
    </message>
+    <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Schlüsseldatei</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseOpenWidget</name>
@@ -256,10 +256,6 @@ sie kann nun gespeichert werden.</translation>
        <source>Default username:</source>
        <translation>Standardbenutzername:</translation>
    </message>
-    <message>
-        <source>Use recycle bin:</source>
-        <translation>Verwende Papierkorb:</translation>
-    </message>
    <message>
        <source> MiB</source>
        <translation> MiB</translation>
@@ -276,6 +272,10 @@ sie kann nun gespeichert werden.</translation>
        <source>Max. history size:</source>
        <translation>Max. Verlaufsgröße:</translation>
    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Papierkorb verwenden</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseTabWidget</name>
@@ -395,12 +395,6 @@ Discard changes and close anyway?</source>
        <source>Unable to open the database.</source>
        <translation>Öffnen der Datenbank ist nicht möglich.</translation>
    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-Do you want to open it anyway? Alternatively the database is opened read-only.</source>
-        <translation>Die Datenbank, die geöffnet werden soll, ist aktuell von einer anderen Instanz von KeePassXC blockiert.
-Soll sie dennoch geöffnet werden? Alternativ wird die Datenbank schreibgeschützt geöffnet.</translation>
-    </message>
    <message>
        <source>Merge database</source>
        <translation>Datenbank zusammenführen</translation>
@@ -408,9 +402,29 @@ Soll sie dennoch geöffnet werden? Alternativ wird die Datenbank schreibgeschüt
    <message>
        <source>The database you are trying to save as is locked by another instance of KeePassXC.
 Do you want to save it anyway?</source>
-        <translation>Die Datenbank, die gespeichert werden soll, ist von einer anderen Instanz von KeePassXC blockiert.
+        <translation>Die Datenbank, die gespeichert werden soll, wird von einer anderen KeePassXC-Instanz verwendet.
 Soll sie dennoch gespeichert werden? </translation>
    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Passwörter</translation>
+    </message>
+    <message>
+        <source>Database already opened</source>
+        <translation>Datenbank bereits geöffnet</translation>
+    </message>
+    <message>
+        <source>The database you are trying to open is locked by another instance of KeePassXC.
+
+Do you want to open it anyway?</source>
+        <translation>Die Datenbank, die Sie versuchen, zu öffnen, wird bereits von einer anderen KeePassXC-Instanz verwendet.
+
+Möchten Sie diese dennoch öffnen?</translation>
+    </message>
+    <message>
+        <source>Open read-only</source>
+        <translation>Schreibgeschützt öffnen</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseWidget</name>
@@ -464,11 +478,11 @@ Soll sie dennoch gespeichert werden? </translation>
    </message>
    <message>
        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Möchten Sie wirklich Eintrag &quot;%1&quot; in den Papierkorb verschieben?</translation>
+        <translation>Möchten Sie wirklich den Eintrag &quot;%1&quot; in den Papierkorb verschieben?</translation>
    </message>
    <message>
        <source>Searching...</source>
-        <translation>Am suchen...</translation>
+        <translation>Suche…</translation>
    </message>
    <message>
        <source>No current database.</source>
@@ -492,7 +506,7 @@ Soll sie dennoch gespeichert werden? </translation>
    </message>
    <message>
        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Den folgenden Befehl wirklich ausführen?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+        <translation>Folgenden Befehl ausführen? &lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
    </message>
    <message>
        <source>Remember my choice</source>
@@ -500,31 +514,27 @@ Soll sie dennoch gespeichert werden? </translation>
    </message>
    <message>
        <source>Autoreload Request</source>
-        <translation>Autoreload Anfrage</translation>
+        <translation>Automatisches Neuladen angefordert</translation>
    </message>
    <message>
        <source>The database file has changed. Do you want to load the changes?</source>
-        <translation>Die Datenbank wurde verändert. Möchten Sie die Änderungen laden?</translation>
+        <translation>Die Datenbank hat sich geändert. Sollen die Änderungen geladen werden?</translation>
    </message>
    <message>
        <source>Merge Request</source>
-        <translation>Zusammenführ-Anfrage</translation>
+        <translation>Zusammenführung angefragt</translation>
    </message>
    <message>
        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Die Datenbank wurde verändert und Sie haben ungespeicherte Änderungen. Möchten Sie Ihre Änderungen zusammenfügen?</translation>
+        <translation>Die Datenbankdatei wurde geändert und Sie haben noch nicht gespeicherte Änderungen. Wollen Sie Ihre Änderungen zusammenführen?</translation>
    </message>
    <message>
        <source>Autoreload Failed</source>
        <translation>Autoreload fehlgeschlagen</translation>
    </message>
-    <message>
-        <source>Could not parse or unlock the new database file while attempting to autoreload this database.</source>
-        <translation>Kann Datenbank nicht durchsuchen oder entsperren während dem Autoreload-Versuch dieser Datenbank.</translation>
-    </message>
    <message>
        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Kann die Datenbank nicht öffnen während dem Versuch, diese Datenbank automatisch neu zu laden.</translation>
+        <translation>Die neue Datenbankdatei konnte nicht geöffnet werden, während versucht wurde, diese neu zu laden.</translation>
    </message>
 </context>
 <context>
@@ -648,14 +658,6 @@ Soll sie dennoch gespeichert werden? </translation>
        <source>Enable Auto-Type for this entry</source>
        <translation>Auto-Type für diesen Eintrag aktivieren</translation>
    </message>
-    <message>
-        <source>Inherit default Auto-Type sequence from the group</source>
-        <translation>Standard-Auto-Type-Sequenz von der Gruppe erben</translation>
-    </message>
-    <message>
-        <source>Use custom Auto-Type sequence:</source>
-        <translation>Benutzerdefinierte Auto-Type-Sequenz benutzen:</translation>
-    </message>
    <message>
        <source>+</source>
        <translation>+</translation>
@@ -669,12 +671,20 @@ Soll sie dennoch gespeichert werden? </translation>
        <translation>Fenstertitel:</translation>
    </message>
    <message>
-        <source>Use default sequence</source>
-        <translation>Standardsequenz benutzen</translation>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Standard-Auto-Type-Sequenz der &amp;Gruppe erben</translation>
    </message>
    <message>
-        <source>Set custom sequence:</source>
-        <translation>Benutzerdefinierte Sequenz verwenden:</translation>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Ben&amp;utzerdefinierte Auto-Type-Sequenz verwenden:</translation>
+    </message>
+    <message>
+        <source>Use default se&amp;quence</source>
+        <translation>Standardse&amp;quenz verwenden</translation>
+    </message>
+    <message>
+        <source>Set custo&amp;m sequence:</source>
+        <translation>B&amp;enutzerdefinierte Sequenz:</translation>
    </message>
 </context>
 <context>
@@ -786,27 +796,19 @@ Soll sie dennoch gespeichert werden? </translation>
    </message>
    <message>
        <source>Auto-type</source>
-        <translation>Auto-type</translation>
+        <translation>Auto-Type</translation>
    </message>
    <message>
        <source>Use default auto-type sequence of parent group</source>
-        <translation>Auto-Type-Sequenz der übergeordneten Gruppe anwenden.</translation>
+        <translation>Verwende Standard-A&amp;uto-Type-Sequenz der übergeordneten Gruppe</translation>
    </message>
    <message>
        <source>Set default auto-type sequence</source>
-        <translation>Standard Auto-Type-Sequenz setzen</translation>
+        <translation>Standard-Auto-Type-Se&amp;quenz setzen</translation>
    </message>
 </context>
 <context>
    <name>EditWidgetIcons</name>
-    <message>
-        <source>Use default icon</source>
-        <translation>Standardsymbol verwenden</translation>
-    </message>
-    <message>
-        <source>Use custom icon</source>
-        <translation>Benutzerdefiniertes Symbol verwenden</translation>
-    </message>
    <message>
        <source>Add custom icon</source>
        <translation>Benutzerdefiniertes Symbol hinzufügen</translation>
@@ -849,7 +851,15 @@ Soll sie dennoch gespeichert werden? </translation>
    </message>
    <message>
        <source>Can&apos;t delete icon. Still used by %1 items.</source>
-        <translation>Symbol kann nicht gelöscht werden. Es wird noch von %1 Einträgen verwendet.</translation>
+        <translation>Icon kann nicht gelöscht werden. Es wird noch von %1 Einträgen verwendet.</translation>
+    </message>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Standardsymbol verwenden</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>B&amp;enutzerdefiniertes Symbol verwenden</translation>
    </message>
 </context>
 <context>
@@ -875,7 +885,7 @@ Soll sie dennoch gespeichert werden? </translation>
    <name>Entry</name>
    <message>
        <source> - Clone</source>
-        <translation>- Klone</translation>
+        <translation>- Klonen</translation>
    </message>
 </context>
 <context>
@@ -1135,7 +1145,7 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
    </message>
    <message>
        <source>&amp;Recent databases</source>
-        <translation>&amp;Letzte Datenbanken</translation>
+        <translation>&amp;Zuletzt verwendete Datenbanken</translation>
    </message>
    <message>
        <source>He&amp;lp</source>
@@ -1147,7 +1157,7 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
    </message>
    <message>
        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Eigenschaft in &amp;Zwischenablage kopieren</translation>
+        <translation>Feld in &amp;Zwischenablage kopieren</translation>
    </message>
    <message>
        <source>&amp;Groups</source>
@@ -1235,7 +1245,7 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
    </message>
    <message>
        <source>Copy &amp;username</source>
-        <translation>&amp;Benutzername kopieren</translation>
+        <translation>&amp;Benutzernamen kopieren</translation>
    </message>
    <message>
        <source>Cop&amp;y password</source>
@@ -1296,29 +1306,19 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
        <source>Sh&amp;ow a notification when credentials are requested</source>
        <translation>Zeig&amp;e eine Benachrichtigung, wenn Anmeldedaten angefordert werden.</translation>
    </message>
-    <message>
-        <source>&amp;Return only best matching entries for an URL instead
-of all entries for the whole domain</source>
-        <translation>Zeige nur die passendsten Einträge für eine URL, statt
-alle Einträge der ganzen Domäne. </translation>
-    </message>
    <message>
        <source>&amp;Match URL schemes
 Only entries with the same scheme (http://, https://, ftp://, ...) are returned</source>
        <translation>Passendes URL Schema
-Nur Einträge mit dem gleichen Schema (hhtp://, https://, ftp://, ...) werden angezeigt</translation>
+Nur Einträge mit dem gleichen Schema (http://, https://, ftp://, ...) werden angezeigt</translation>
    </message>
    <message>
        <source>Sort matching entries by &amp;username</source>
        <translation>Sortiere gefundene Einträge nach &amp;Benutzername</translation>
    </message>
-    <message>
-        <source>R&amp;emove all shared encryption-keys from active database</source>
-        <translation>Entferne alle freigegebenen Chiffrierschlüssel aus der aktiven Datenbank</translation>
-    </message>
    <message>
        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Entferne alle gespeicherten Berechtigungen von Einträgen in der aktiven Datenbank</translation>
+        <translation>Entferne alle gespeicherten Berechtigungen für Einträge in der aktiven Datenbank</translation>
    </message>
    <message>
        <source>Password generator</source>
@@ -1328,10 +1328,6 @@ Nur Einträge mit dem gleichen Schema (hhtp://, https://, ftp://, ...) werden an
        <source>Advanced</source>
        <translation>Fortgeschritten</translation>
    </message>
-    <message>
-        <source>Activate the following only, if you know what you are doing!</source>
-        <translation>Aktivieren Sie das Nachfolgende nur dann, wenn Sie sich sicher sind, was sie tun! </translation>
-    </message>
    <message>
        <source>Always allow &amp;access to entries</source>
        <translation>&amp;Zugriff auf Einträge immer erlauben</translation>
@@ -1348,21 +1344,13 @@ Nur Einträge mit dem gleichen Schema (hhtp://, https://, ftp://, ...) werden an
        <source>Only the selected database has to be connected with a client!</source>
        <translation>Nur die ausgewählte Datenbank muss mit dem Client verbunden sein.</translation>
    </message>
-    <message>
-        <source>&amp;Return also advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Zeige auch erweiterte Zeichenfelder, welche mit &quot;KPH: &quot; beginnen</translation>
-    </message>
-    <message>
-        <source>Automatic creates or updates are not supported for string fields!</source>
-        <translation>Automatisches Erstellen und Aktualisieren von Zeichenfeldern wird nicht unterstützt!</translation>
-    </message>
    <message>
        <source>HTTP Port:</source>
-        <translation>HTTP Port:</translation>
+        <translation>HTTP-Port:</translation>
    </message>
    <message>
        <source>Default port: 19455</source>
-        <translation>Standard Port:19455</translation>
+        <translation>Standard-Port: 19455</translation>
    </message>
    <message>
        <source>Re&amp;quest to unlock the database if it is locked</source>
@@ -1375,22 +1363,44 @@ Nur Einträge mit dem gleichen Schema (hhtp://, https://, ftp://, ...) werden an
    <message>
        <source>Enable KeepassXC HTTP protocol
 This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Aktiviere KeePassXC HTTP Protokoll
-Dies wird benötigt um von ChromeIPass oder PassIFox auf Deine Datenbank zu zugreifen</translation>
+        <translation>KeepassXC-HTTP-Protokoll aktivieren
+Dies ist für den Zugriff auf Ihre Datenbanken von ChromeIPass oder Passifox notwendig.</translation>
    </message>
    <message>
        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC überwacht diesen Port auf 127.0..0.1</translation>
+        <translation>KeePassXC überwacht diesen Port auf 127.0.0.1</translation>
    </message>
    <message>
        <source>Cannot bind to privileged ports</source>
-        <translation>Kann nicht zu privilegierte Ports verbinden</translation>
+        <translation>Privilegierte Ports können nicht überwacht werden</translation>
    </message>
    <message>
        <source>Cannot bind to privileged ports below 1024!
 Using default port 19455.</source>
-        <translation>Kann nicht zu privilegierten Ports unter 1024 verbinden!
-Benutze Standardport 19455.</translation>
+        <translation>Privilegierte Ports unterhalb von 1024 können nicht überwacht werden.
+Es wird der Standard-Port 19455 verwendet.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best matching entries for a URL instead
+of all entries for the whole domain</source>
+        <translation>Zeige nur die am besten passenden Einträge für eine URL anstatt aller Einträge der ganzen Domäne.</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>&amp;Entferne alle freigegebenen Chiffrierschlüssel aus der aktiven Datenbank</translation>
+    </message>
+    <message>
+        <source>The following options can be dangerous. Change them only if you know what you are doing.</source>
+        <translation>Die folgenden Optionen können gefährlich sein!
+Ändern Sie diese nur, wenn Sie wissen, was Sie tun.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Zeige auch erweiterte Zeichenfelder, welche mit &quot;KPH: &quot; beginnen</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatisches Erstellen und Aktualisieren von Zeichenfeldern wird nicht unterstützt!</translation>
    </message>
 </context>
 <context>
@@ -1449,7 +1459,7 @@ Benutze Standardport 19455.</translation>
    </message>
    <message>
        <source>Generate</source>
-        <translation>Generiere</translation>
+        <translation>Generieren</translation>
    </message>
    <message>
        <source>Close</source>
@@ -1481,7 +1491,7 @@ Benutze Standardport 19455.</translation>
    </message>
    <message>
        <source>Excellent</source>
-        <translation>Exzellent</translation>
+        <translation>Ausgezeichnet</translation>
    </message>
 </context>
 <context>
@@ -1541,7 +1551,7 @@ Benutze Standardport 19455.</translation>
    </message>
    <message>
        <source>Clear</source>
-        <translation>löschen</translation>
+        <translation>Löschen</translation>
    </message>
 </context>
 <context>
@@ -1550,7 +1560,7 @@ Benutze Standardport 19455.</translation>
        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
 Do you want to overwrite it?</source>
        <translation>Ein freigegebener Chiffrierschlüssel mit dem Namen &quot;%1&quot; existiert schon.
-Willst Du ihn überschreiben?</translation>
+Möchten Sie ihn überschreiben?</translation>
    </message>
    <message>
        <source>Do you want to update the information in %1 - %2?</source>
@@ -1560,11 +1570,11 @@ Willst Du ihn überschreiben?</translation>
        <source>The active database is locked!
 Please unlock the selected database or choose another one which is unlocked.</source>
        <translation>Die aktive Datenbank ist gesperrt!
-Bitte entsperren Sie die markierte Datenbank oder wählen Sie eine andere, die entsperrt ist.</translation>
+Bitte entsperren Sie die ausgewählte Datenbank oder wählen Sie eine andere, die entsperrt ist.</translation>
    </message>
    <message>
        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>%1 Verschlüsselungs-%2 erfolgreich von KeePassX/Http Einstellungen entfernt.</translation>
+        <translation>%1 Verschlüsselungs-%2 erfolgreich aus KeePassX/Http Einstellungen entfernt.</translation>
    </message>
    <message>
        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
@@ -1617,7 +1627,7 @@ Namen und akzeptieren Sie.</translation>
    </message>
    <message>
        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Entfernte Schlüssel von der Datenbank</translation>
+        <translation>KeePassXC: Schlüssel aus der Datenbank entfernt</translation>
    </message>
    <message>
        <source>KeePassXC: No keys found</source>
@@ -1629,7 +1639,7 @@ Namen und akzeptieren Sie.</translation>
    </message>
    <message>
        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Entfernte Zugangsdaten</translation>
+        <translation>KeePassXC: Zugangsdaten entfernt</translation>
    </message>
    <message>
        <source>KeePassXC: No entry with permissions found!</source>
@@ -1679,7 +1689,7 @@ Namen und akzeptieren Sie.</translation>
    </message>
    <message>
        <source>Use entry title to match windows for global auto-type</source>
-        <translation>Verwende den Eintragstitel für entsprechende Fenster für den globale Auto-Typ</translation>
+        <translation>Verwende Eintragstitel, um entsprechende Fenster für globales Auto-Type zu finden</translation>
    </message>
    <message>
        <source>Language</source>
@@ -1703,7 +1713,7 @@ Namen und akzeptieren Sie.</translation>
    </message>
    <message>
        <source>Automatically reload the database when modified externally</source>
-        <translation>Datenbank nach externer Modifikation automatisch neu laden.</translation>
+        <translation>Datenbank nach externer Änderung automatisch neu laden.</translation>
    </message>
    <message>
        <source>Hide window to system tray instead of app exit</source>
@@ -1734,7 +1744,7 @@ Namen und akzeptieren Sie.</translation>
    </message>
    <message>
        <source>Always ask before performing auto-type</source>
-        <translation>Immer vor einem Auto-type fragen</translation>
+        <translation>Immer vor einem Auto-Type fragen</translation>
    </message>
    <message>
        <source>Lock databases after minimizing the window</source>
@@ -1742,7 +1752,7 @@ Namen und akzeptieren Sie.</translation>
    </message>
    <message>
        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Keine erneute Eingabe verlangen wenn Passwort sichtbar.</translation>
+        <translation>Keine erneute Passworteingabe verlangen wenn das Passwort sichtbar ist.</translation>
    </message>
 </context>
 <context>
@@ -1769,17 +1779,17 @@ Namen und akzeptieren Sie.</translation>
        <source>key file of the database</source>
        <translation>Schlüsseldatei der Datenbank</translation>
    </message>
-    <message>
-        <source>filename(s) of the password database(s) to open (*.kdbx)</source>
-        <translation>Dateiname(n) der zu öffnenden Passwortdatenbank(en) (*.kdbx)</translation>
-    </message>
    <message>
        <source>KeePassXC - cross-platform password manager</source>
        <translation>KeePassXC - plattformübergreifender Passwortmanager</translation>
    </message>
    <message>
        <source>read password of the database from stdin</source>
-        <translation>passwort der datenbank von stdin lesen</translation>
+        <translation>Passwort der Datenbank von stdin lesen</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>Dateinamen der zu öffnenden Datenbanken (*.kdbx)</translation>
    </message>
 </context>
 </TS>
--- a/share/translations/keepassx_en.ts
+++ b/share/translations/keepassx_en.ts
@@ -388,11 +388,6 @@ Discard changes and close anyway?</source>
        <source>Unable to open the database.</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-Do you want to open it anyway? Alternatively the database is opened read-only.</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Merge database</source>
        <translation type="unfinished"></translation>
@@ -406,6 +401,20 @@ Do you want to save it anyway?</source>
        <source>Passwords</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Database already opened</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database you are trying to open is locked by another instance of KeePassXC.
+
+Do you want to open it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open read-only</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DatabaseWidget</name>
@@ -516,10 +525,6 @@ Do you want to save it anyway?</source>
        <source>Autoreload Failed</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Could not parse or unlock the new database file while attempting to autoreload this database.</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Could not open the new database file while attempting to autoreload this database.</source>
        <translation type="unfinished"></translation>
@@ -1297,11 +1302,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
        <source>Sh&amp;ow a notification when credentials are requested</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>&amp;Return only best matching entries for an URL instead
-of all entries for the whole domain</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>&amp;Match URL schemes
 Only entries with the same scheme (http://, https://, ftp://, ...) are returned</source>
@@ -1311,10 +1311,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
        <source>Sort matching entries by &amp;username</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>R&amp;emove all shared encryption-keys from active database</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Re&amp;move all stored permissions from entries in active database</source>
        <translation type="unfinished"></translation>
@@ -1327,10 +1323,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
        <source>Advanced</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Activate the following only, if you know what you are doing!</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Always allow &amp;access to entries</source>
        <translation type="unfinished"></translation>
@@ -1347,14 +1339,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
        <source>Only the selected database has to be connected with a client!</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>&amp;Return also advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic creates or updates are not supported for string fields!</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>HTTP Port:</source>
        <translation type="unfinished"></translation>
@@ -1389,6 +1373,27 @@ This is required for accessing your databases from ChromeIPass or PassIFox</sour
 Using default port 19455.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>&amp;Return only best matching entries for a URL instead
+of all entries for the whole domain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The following options can be dangerous. Change them only if you know what you are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PasswordGeneratorWidget</name>
@@ -1761,10 +1766,6 @@ give it a unique name to identify and accept it.</source>
        <source>key file of the database</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>filename(s) of the password database(s) to open (*.kdbx)</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>KeePassXC - cross-platform password manager</source>
        <translation type="unfinished"></translation>
@@ -1773,5 +1774,9 @@ give it a unique name to identify and accept it.</source>
        <source>read password of the database from stdin</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--- a/share/translations/keepassx_es.ts
+++ b/share/translations/keepassx_es.ts
--- a/share/translations/keepassx_fr.ts
+++ b/share/translations/keepassx_fr.ts
--- a/share/translations/keepassx_it.ts
+++ b/share/translations/keepassx_it.ts
--- a/share/translations/keepassx_lt.ts
+++ b/share/translations/keepassx_lt.ts
@@ -13,16 +13,16 @@
        <source>About KeePassXC</source>
        <translation>Apie KeePassXC</translation>
    </message>
-    <message>
-        <source>KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC yra platinama GNU Bendrosios Viešosios Licencijos (GPL) versijos 2 arba (jūsų pasirinkimu) versijos 3 sąlygomis.</translation>
-    </message>
    <message>
        <source>Extensions:
 </source>
        <translation>Plėtiniai:
 </translation>
    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC yra platinama GNU Bendrosios Viešosios Licencijos (GPL) versijos 2 arba (jūsų pasirinkimu) versijos 3 sąlygomis.</translation>
+    </message>
 </context>
 <context>
    <name>AccessControlDialog</name>
@@ -100,10 +100,6 @@ Pasirinkite, ar norite leisti prieigą.</translation>
        <source>Repeat password:</source>
        <translation>Pakartokite slaptažodį:</translation>
    </message>
-    <message>
-        <source>Key file</source>
-        <translation>Rakto failas</translation>
-    </message>
    <message>
        <source>Browse</source>
        <translation>Naršyti</translation>
@@ -158,6 +154,10 @@ Pasirinkite, ar norite leisti prieigą.</translation>
        <translation>Nepavyko nustatyti %1 kaip rakto failą:
 %2</translation>
    </message>
+    <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Rakto failas</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseOpenWidget</name>
@@ -257,10 +257,6 @@ Dabar galite ją įrašyti.</translation>
        <source>Default username:</source>
        <translation>Numatytasis naudotojo vardas:</translation>
    </message>
-    <message>
-        <source>Use recycle bin:</source>
-        <translation>Naudoti šiukšlinę:</translation>
-    </message>
    <message>
        <source> MiB</source>
        <translation> MiB</translation>
@@ -277,6 +273,10 @@ Dabar galite ją įrašyti.</translation>
        <source>Max. history size:</source>
        <translation>Didžiausias istorijos dydis:</translation>
    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Naudoti šiukšlinę</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseTabWidget</name>
@@ -396,12 +396,6 @@ Vis tiek atmesti pakeitimus ir užverti?</translation>
        <source>Unable to open the database.</source>
        <translation>Nepavyko atverti duomenų bazės.</translation>
    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-Do you want to open it anyway? Alternatively the database is opened read-only.</source>
-        <translation>Duomenų bazė, kurią bandote atverti, yra užrakinta kito KeePassXC egzemplioriaus.
-Ar vis tiek norite ją atverti? Tokiu atveju duomenų bazė bus atverta tik skaitymui.</translation>
-    </message>
    <message>
        <source>Merge database</source>
        <translation>Sulieti duomenų bazę</translation>
@@ -412,6 +406,25 @@ Do you want to save it anyway?</source>
        <translation>Duomenų bazė, kurią bandote įrašyti yra užrakinta kito KeePassXC programos egzemplioriaus.
 Ar vis tiek norite ją įrašyti?</translation>
    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Slaptažodžiai</translation>
+    </message>
+    <message>
+        <source>Database already opened</source>
+        <translation>Duomenų bazė jau atverta</translation>
+    </message>
+    <message>
+        <source>The database you are trying to open is locked by another instance of KeePassXC.
+
+Do you want to open it anyway?</source>
+        <translation>Duomenų bazė, kurią bandote atverti yra užrakinta kito KeePassXC programos egzemplioriaus.
+Ar vis tiek norite ją atverti?</translation>
+    </message>
+    <message>
+        <source>Open read-only</source>
+        <translation>Atverti tik skaitymui</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseWidget</name>
@@ -519,10 +532,6 @@ Ar vis tiek norite ją įrašyti?</translation>
        <source>Autoreload Failed</source>
        <translation>Automatinis įkėlimas iš naujo nepavyko</translation>
    </message>
-    <message>
-        <source>Could not parse or unlock the new database file while attempting to autoreload this database.</source>
-        <translation>Nepavyko išanalizuoti ar atrakinti naujos duomenų bazės failo, bandant automatiškai iš naujo įkelti šią duomenų bazę.</translation>
-    </message>
    <message>
        <source>Could not open the new database file while attempting to autoreload this database.</source>
        <translation>Nepavyko atverti naujos duomenų bazės failo, bandant automatiškai iš naujo įkelti šią duomenų bazę.</translation>
@@ -650,14 +659,6 @@ Ar vis tiek norite ją įrašyti?</translation>
        <source>Enable Auto-Type for this entry</source>
        <translation>Įjungti šiam įrašui automatinį rinkimą</translation>
    </message>
-    <message>
-        <source>Inherit default Auto-Type sequence from the group</source>
-        <translation>Paveldėti numatytąją automatinio rinkimo seką iš grupės</translation>
-    </message>
-    <message>
-        <source>Use custom Auto-Type sequence:</source>
-        <translation>Naudoti tinkintą automatinio rinkimo seka:</translation>
-    </message>
    <message>
        <source>+</source>
        <translation>+</translation>
@@ -671,12 +672,20 @@ Ar vis tiek norite ją įrašyti?</translation>
        <translation>Lango antraštė:</translation>
    </message>
    <message>
-        <source>Use default sequence</source>
-        <translation>Naudoti numatytąją seką</translation>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Paveldėti numatytąją automatinio rinkimo seką iš &amp;grupės</translation>
    </message>
    <message>
-        <source>Set custom sequence:</source>
-        <translation>Nustatyti tinkintą seką:</translation>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Na&amp;udoti tinkintą automatinio rinkimo seka:</translation>
+    </message>
+    <message>
+        <source>Use default se&amp;quence</source>
+        <translation>Naudoti numatytąją se&amp;ką</translation>
+    </message>
+    <message>
+        <source>Set custo&amp;m sequence:</source>
+        <translation>Nustatyti tinkintą s&amp;eką:</translation>
    </message>
 </context>
 <context>
@@ -801,14 +810,6 @@ Ar vis tiek norite ją įrašyti?</translation>
 </context>
 <context>
    <name>EditWidgetIcons</name>
-    <message>
-        <source>Use default icon</source>
-        <translation>Naudoti numatytąją piktogramą</translation>
-    </message>
-    <message>
-        <source>Use custom icon</source>
-        <translation>Naudoti tinkintą piktogramą</translation>
-    </message>
    <message>
        <source>Add custom icon</source>
        <translation>Pridėti tinkintą piktogramą</translation>
@@ -853,6 +854,14 @@ Ar vis tiek norite ją įrašyti?</translation>
        <source>Can&apos;t delete icon. Still used by %1 items.</source>
        <translation>Nepavyksta ištrinti piktogramos. Vis dar naudojama %1 elementų.</translation>
    </message>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation>Na&amp;udoti numatytąją piktogramą</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Naudoti tinkintą piktogra&amp;mą</translation>
+    </message>
 </context>
 <context>
    <name>EditWidgetProperties</name>
@@ -1298,12 +1307,6 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
        <source>Sh&amp;ow a notification when credentials are requested</source>
        <translation>R&amp;odyti pranešimą, kai reikalaujama prisijungimo duomenų</translation>
    </message>
-    <message>
-        <source>&amp;Return only best matching entries for an URL instead
-of all entries for the whole domain</source>
-        <translation>&amp;Vietoj visų įrašų, skirtų visai sričiai,
-grąžinti tik geriausiai atitinkančius įrašus, skirtus URL</translation>
-    </message>
    <message>
        <source>&amp;Match URL schemes
 Only entries with the same scheme (http://, https://, ftp://, ...) are returned</source>
@@ -1314,10 +1317,6 @@ Bus grąžinami įrašai tik su ta pačia schema (http://, https://, ftp://, ...
        <source>Sort matching entries by &amp;username</source>
        <translation>Rikiuoti atitinkančius įrašus pagal na&amp;udotojo vardą</translation>
    </message>
-    <message>
-        <source>R&amp;emove all shared encryption-keys from active database</source>
-        <translation>Ša&amp;linti iš aktyvios duomenų bazės visus bendrinamus šifravimo raktus</translation>
-    </message>
    <message>
        <source>Re&amp;move all stored permissions from entries in active database</source>
        <translation>Šal&amp;inti iš įrašų aktyvioje duomenų bazėje visus saugomus leidimus</translation>
@@ -1330,10 +1329,6 @@ Bus grąžinami įrašai tik su ta pačia schema (http://, https://, ftp://, ...
        <source>Advanced</source>
        <translation>Išplėstiniai</translation>
    </message>
-    <message>
-        <source>Activate the following only, if you know what you are doing!</source>
-        <translation>Aktyvuokite tai tik tuo atveju, jeigu žinote ką darote!</translation>
-    </message>
    <message>
        <source>Always allow &amp;access to entries</source>
        <translation>Visada leisti &amp;prieigą prie įrašų</translation>
@@ -1350,14 +1345,6 @@ Bus grąžinami įrašai tik su ta pačia schema (http://, https://, ftp://, ...
        <source>Only the selected database has to be connected with a client!</source>
        <translation>Su klientu turi būti sujungta tik pasirinkta duomenų bazė!</translation>
    </message>
-    <message>
-        <source>&amp;Return also advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Taip pat grąžinti ir išplėstines eilutes, kurios prasideda &quot;KPH: &quot;</translation>
-    </message>
-    <message>
-        <source>Automatic creates or updates are not supported for string fields!</source>
-        <translation>Šiems eilutės laukams automatiniai kūrimai ir atnaujinimai neprieinami!</translation>
-    </message>
    <message>
        <source>HTTP Port:</source>
        <translation>HTTP prievadas:</translation>
@@ -1394,6 +1381,28 @@ Using default port 19455.</source>
        <translation>Nepavyksta susieti su privilegijuotais prievadais žemiau 1024!
 Naudojamas numatytasis prievadas 19455.</translation>
    </message>
+    <message>
+        <source>&amp;Return only best matching entries for a URL instead
+of all entries for the whole domain</source>
+        <translation>&amp;Vietoj visų įrašų, skirtų visai sričiai,
+grąžinti tik geriausiai atitinkančius įrašus, skirtus URL</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>Ša&amp;linti iš aktyvios duomenų bazės visus bendrinamus šifravimo raktus</translation>
+    </message>
+    <message>
+        <source>The following options can be dangerous. Change them only if you know what you are doing.</source>
+        <translation>Šios parinktys gali būti pavojingos. Keiskite jas tik tuo atveju, jeigu žinote ką darote!</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Grąžinti išplėstines eilutes, kurios prasideda &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatinis eilutės laukų kūrimas ar atnaujinimas nėra palaikomas.</translation>
+    </message>
 </context>
 <context>
    <name>PasswordGeneratorWidget</name>
@@ -1463,7 +1472,7 @@ Naudojamas numatytasis prievadas 19455.</translation>
    </message>
    <message>
        <source>Entropy: %1 bit</source>
-        <translation>Entropija: %1 bit</translation>
+        <translation>Entropija: %1 bitų</translation>
    </message>
    <message>
        <source>Password Quality: %1</source>
@@ -1535,7 +1544,7 @@ Naudojamas numatytasis prievadas 19455.</translation>
    </message>
    <message>
        <source>Search</source>
-        <translation>Ieškoti</translation>
+        <translation>Paieška</translation>
    </message>
    <message>
        <source>Find</source>
@@ -1771,10 +1780,6 @@ ir priimtumėte jį.</translation>
        <source>key file of the database</source>
        <translation>duomenų bazės rakto failas</translation>
    </message>
-    <message>
-        <source>filename(s) of the password database(s) to open (*.kdbx)</source>
-        <translation>norimos atverti slaptažodžių duomenų bazės(-ių) failo pavadinimas(-ai) (*.kdbx)</translation>
-    </message>
    <message>
        <source>KeePassXC - cross-platform password manager</source>
        <translation>KeePassXC - daugiaplatformė slaptažodžių tvarkytuvė</translation>
@@ -1783,5 +1788,9 @@ ir priimtumėte jį.</translation>
        <source>read password of the database from stdin</source>
        <translation>nuskaityti duomenų bazės slaptažodį iš stdin</translation>
    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>norimų atverti slaptažodžių duomenų bazių failų pavadinimai (*.kdbx)</translation>
+    </message>
 </context>
 </TS>
--- a/share/translations/keepassx_nl_NL.ts
+++ b/share/translations/keepassx_nl_NL.ts
--- 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
@@ -13,16 +13,16 @@
        <source>About KeePassXC</source>
        <translation>Sobre KeePassXC</translation>
    </message>
-    <message>
-        <source>KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC é distribuído nos termos da Licença Pública Geral (GPL), versão 2 ou (à sua escolha) versão 3, do GNU.</translation>
-    </message>
    <message>
        <source>Extensions:
 </source>
        <translation>Extensões:
 </translation>
    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC é distribuído nos termos da Licença Pública Geral (GPL), versão 2 ou (à sua escolha) versão 3, do GNU.</translation>
+    </message>
 </context>
 <context>
    <name>AccessControlDialog</name>
@@ -100,10 +100,6 @@ Selecione se deseja permitir o acesso.</translation>
        <source>Repeat password:</source>
        <translation>Repita senha:</translation>
    </message>
-    <message>
-        <source>Key file</source>
-        <translation>Arquivo-Chave</translation>
-    </message>
    <message>
        <source>Browse</source>
        <translation>Navegar</translation>
@@ -158,6 +154,10 @@ Selecione se deseja permitir o acesso.</translation>
        <translation>Falha ao definir %1 como o Arquivo-Chave:
 %2</translation>
    </message>
+    <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Arquivo-Chave</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseOpenWidget</name>
@@ -257,10 +257,6 @@ Você pode salvá-lo agora.</translation>
        <source>Default username:</source>
        <translation>Usuário padrão:</translation>
    </message>
-    <message>
-        <source>Use recycle bin:</source>
-        <translation>Usar lixeira:</translation>
-    </message>
    <message>
        <source> MiB</source>
        <translation> MB</translation>
@@ -277,6 +273,10 @@ Você pode salvá-lo agora.</translation>
        <source>Max. history size:</source>
        <translation>Tamanho máx. do histórico:</translation>
    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Usar lixeira</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseTabWidget</name>
@@ -396,12 +396,6 @@ Descartar alterações e fechar mesmo assim?</translation>
        <source>Unable to open the database.</source>
        <translation>Não foi possível abrir o banco de dados.</translation>
    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-Do you want to open it anyway? Alternatively the database is opened read-only.</source>
-        <translation>A base de dados que você está tentando abrir está bloqueada por outra instância de KeePassXC.
-Mesmo assim deseja abrir? Alternativamente, a base de dados é aberta somente para leitura.</translation>
-    </message>
    <message>
        <source>Merge database</source>
        <translation>Juntar banco de dados</translation>
@@ -412,6 +406,26 @@ Do you want to save it anyway?</source>
        <translation>A base de dados que você está tentando abrir está bloqueada por outra instância de KeePassXC.
 Mesmo assim deseja salvá-la?</translation>
    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Senhas</translation>
+    </message>
+    <message>
+        <source>Database already opened</source>
+        <translation>Banco de dados já aberto</translation>
+    </message>
+    <message>
+        <source>The database you are trying to open is locked by another instance of KeePassXC.
+
+Do you want to open it anyway?</source>
+        <translation>O banco de dados que você está tentando abrir está bloqueada por outra instância do KeePassXC.
+
+Mesmo assim deseja salvá-la?</translation>
+    </message>
+    <message>
+        <source>Open read-only</source>
+        <translation>Abrir somente leitura</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseWidget</name>
@@ -519,10 +533,6 @@ Mesmo assim deseja salvá-la?</translation>
        <source>Autoreload Failed</source>
        <translation>Carregamento Automático Falhou</translation>
    </message>
-    <message>
-        <source>Could not parse or unlock the new database file while attempting to autoreload this database.</source>
-        <translation>Não foi possível analisar ou desbloquear o novo arquivo da base de dados ao tentar recarregar automaticamente essa base de dados.</translation>
-    </message>
    <message>
        <source>Could not open the new database file while attempting to autoreload this database.</source>
        <translation>Não foi possível abrir a nova base de dados ao tentar recarregar automaticamente essa base de dados.</translation>
@@ -650,14 +660,6 @@ Mesmo assim deseja salvá-la?</translation>
        <source>Enable Auto-Type for this entry</source>
        <translation>Habilitar Auto-Digitação para esta entrada</translation>
    </message>
-    <message>
-        <source>Inherit default Auto-Type sequence from the group</source>
-        <translation>Herdar sequência pré-definida de Auto-Digitação do grupo</translation>
-    </message>
-    <message>
-        <source>Use custom Auto-Type sequence:</source>
-        <translation>Usar sequência de Auto-Digitação personalizada:</translation>
-    </message>
    <message>
        <source>+</source>
        <translation>+</translation>
@@ -671,12 +673,20 @@ Mesmo assim deseja salvá-la?</translation>
        <translation>Título da Janela:</translation>
    </message>
    <message>
-        <source>Use default sequence</source>
-        <translation>Usar sequência pré-definida</translation>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Herdar sequência pré-definida de Auto-Digitação do &amp;grupo</translation>
    </message>
    <message>
-        <source>Set custom sequence:</source>
-        <translation>Definir sequência personalizada:</translation>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>&amp;Usar sequência de Auto-Digitação personalizada:</translation>
+    </message>
+    <message>
+        <source>Use default se&amp;quence</source>
+        <translation>Usar se&amp;quência pré-definida</translation>
+    </message>
+    <message>
+        <source>Set custo&amp;m sequence:</source>
+        <translation>Definir sequência &amp;personalizada:</translation>
    </message>
 </context>
 <context>
@@ -801,14 +811,6 @@ Mesmo assim deseja salvá-la?</translation>
 </context>
 <context>
    <name>EditWidgetIcons</name>
-    <message>
-        <source>Use default icon</source>
-        <translation>Usar ícone padrão</translation>
-    </message>
-    <message>
-        <source>Use custom icon</source>
-        <translation>Usar ícone personalizado</translation>
-    </message>
    <message>
        <source>Add custom icon</source>
        <translation>Adicionar ícone personalizado</translation>
@@ -853,6 +855,14 @@ Mesmo assim deseja salvá-la?</translation>
        <source>Can&apos;t delete icon. Still used by %1 items.</source>
        <translation>Não é possível apagar ícone. Ainda usado por %1 itens.</translation>
    </message>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Usar ícone padrão</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Usar ícone &amp;personalizado</translation>
+    </message>
 </context>
 <context>
    <name>EditWidgetProperties</name>
@@ -1298,12 +1308,6 @@ Esta é uma migração de uma via. Você não poderá abrir o banco de dados imp
        <source>Sh&amp;ow a notification when credentials are requested</source>
        <translation>M&amp;ostrar uma notificação quando as credenciais forem solicitadas</translation>
    </message>
-    <message>
-        <source>&amp;Return only best matching entries for an URL instead
-of all entries for the whole domain</source>
-        <translation>&amp;Mostrar apenas as melhores entradas correspondentes para um URL em vez de
-todas as entradas para o domínio completo</translation>
-    </message>
    <message>
        <source>&amp;Match URL schemes
 Only entries with the same scheme (http://, https://, ftp://, ...) are returned</source>
@@ -1314,10 +1318,6 @@ Somente entradas com o mesmo esquema (http://, https://, ftp://, ...) são mostr
        <source>Sort matching entries by &amp;username</source>
        <translation>Ordenar entradas coincidentes por nome de &amp;usuário</translation>
    </message>
-    <message>
-        <source>R&amp;emove all shared encryption-keys from active database</source>
-        <translation>R&amp;emover todas as chaves criptografadas compartilhadas da base de dados ativa</translation>
-    </message>
    <message>
        <source>Re&amp;move all stored permissions from entries in active database</source>
        <translation>R&amp;emover todas as permissões armazenadas de entradas na base de dados ativa</translation>
@@ -1330,10 +1330,6 @@ Somente entradas com o mesmo esquema (http://, https://, ftp://, ...) são mostr
        <source>Advanced</source>
        <translation>Avançado</translation>
    </message>
-    <message>
-        <source>Activate the following only, if you know what you are doing!</source>
-        <translation>Ativar apenas os seguintes, se souber o que está fazendo!</translation>
-    </message>
    <message>
        <source>Always allow &amp;access to entries</source>
        <translation>Permitir sempre &amp;acesso as entradas</translation>
@@ -1350,14 +1346,6 @@ Somente entradas com o mesmo esquema (http://, https://, ftp://, ...) são mostr
        <source>Only the selected database has to be connected with a client!</source>
        <translation>Somente a base de dados selecionada tem que ser conectada com um cliente!</translation>
    </message>
-    <message>
-        <source>&amp;Return also advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Mostrar também campos avançados que começam com &quot;KPH: &quot;</translation>
-    </message>
-    <message>
-        <source>Automatic creates or updates are not supported for string fields!</source>
-        <translation>Criação automática ou atualizações não são suportadas para os valores dos campos!</translation>
-    </message>
    <message>
        <source>HTTP Port:</source>
        <translation>Porta HTTP:</translation>
@@ -1377,8 +1365,8 @@ Somente entradas com o mesmo esquema (http://, https://, ftp://, ...) são mostr
    <message>
        <source>Enable KeepassXC HTTP protocol
 This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Habilitar KeepassXC protocolo HTTP
-Isso é necessário para acessar os seus bancos de dados de ChromeIPass ou de PassIFox</translation>
+        <translation>Habilitar o protocolo KeepassXC HTTP
+Isso é necessário para acessar os seus bancos de dados usando o ChromeIPass ou PassIFox</translation>
    </message>
    <message>
        <source>KeePassXC will listen to this port on 127.0.0.1</source>
@@ -1394,6 +1382,28 @@ Using default port 19455.</source>
        <translation>Não é possível ligar a portas privilegiadas abaixo de 1024!
 Usando porta padrão 19455.</translation>
    </message>
+    <message>
+        <source>&amp;Return only best matching entries for a URL instead
+of all entries for the whole domain</source>
+        <translation>&amp;Mostrar apenas as melhores entradas correspondentes para um URL em vez de
+todas as entradas para o domínio completo</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>R&amp;emover todas as chaves criptografadas compartilhadas da base de dados ativa</translation>
+    </message>
+    <message>
+        <source>The following options can be dangerous. Change them only if you know what you are doing.</source>
+        <translation>As configurações abaixo podem ser perigosas. Altere-as somente se souber o que está fazendo.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Mostrar também campos avançados que começam com &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Criação automática ou atualizações não são suportadas para os valores dos campos.</translation>
+    </message>
 </context>
 <context>
    <name>PasswordGeneratorWidget</name>
@@ -1700,7 +1710,7 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
    </message>
    <message>
        <source>Load previous databases on startup</source>
-        <translation>Abrir bancos de dados anteriores na inicialização</translation>
+        <translation>Carregar bancos de dados anteriores na inicialização</translation>
    </message>
    <message>
        <source>Automatically reload the database when modified externally</source>
@@ -1770,10 +1780,6 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
        <source>key file of the database</source>
        <translation>arquivo-chave do banco de dados</translation>
    </message>
-    <message>
-        <source>filename(s) of the password database(s) to open (*.kdbx)</source>
-        <translation>nome(s) de arquivo(s) do banco de dados de senhas a ser aberto (*.kdbx)</translation>
-    </message>
    <message>
        <source>KeePassXC - cross-platform password manager</source>
        <translation>KeePassXC - gerenciador de senhas multiplataforma</translation>
@@ -1782,5 +1788,9 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
        <source>read password of the database from stdin</source>
        <translation>ler a senha do banco de dados da entrada padrão</translation>
    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>nome de arquivo do banco de dados de senhas a ser aberto (*.kdbx)</translation>
+    </message>
 </context>
 </TS>
--- a/share/translations/keepassx_pt_PT.ts
+++ b/share/translations/keepassx_pt_PT.ts
--- a/share/translations/keepassx_ru.ts
+++ b/share/translations/keepassx_ru.ts
@@ -13,16 +13,16 @@
        <source>About KeePassXC</source>
        <translation>О KeePassXC</translation>
    </message>
-    <message>
-        <source>KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC распространяется на условиях Стандартной общественной лицензии GNU (GPL) версии 2 или (на ваше усмотрение) версии 3.</translation>
-    </message>
    <message>
        <source>Extensions:
 </source>
        <translation>Расширения:
 </translation>
    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC распространяется на условиях Стандартной общественной лицензии GNU (GPL) версии 2 или (на ваше усмотрение) версии 3.</translation>
+    </message>
 </context>
 <context>
    <name>AccessControlDialog</name>
@@ -99,10 +99,6 @@ Please select whether you want to allow access.</source>
        <source>Repeat password:</source>
        <translation>Повторите пароль:</translation>
    </message>
-    <message>
-        <source>Key file</source>
-        <translation>Файл-ключ</translation>
-    </message>
    <message>
        <source>Browse</source>
        <translation>Обзор</translation>
@@ -157,6 +153,10 @@ Please select whether you want to allow access.</source>
        <translation>Не удалось установить %1 как файл-ключ:
 %2</translation>
    </message>
+    <message>
+        <source>&amp;Key file</source>
+        <translation>Файл—&amp;ключ</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseOpenWidget</name>
@@ -256,10 +256,6 @@ You can now save it.</source>
        <source>Default username:</source>
        <translation>Имя пользователя по умолчанию:</translation>
    </message>
-    <message>
-        <source>Use recycle bin:</source>
-        <translation>Использовать корзину:</translation>
-    </message>
    <message>
        <source> MiB</source>
        <translation>МиБ</translation>
@@ -276,6 +272,10 @@ You can now save it.</source>
        <source>Max. history size:</source>
        <translation>Максимальный размер истории:</translation>
    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Использовать корзину</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseTabWidget</name>
@@ -395,12 +395,6 @@ Discard changes and close anyway?</source>
        <source>Unable to open the database.</source>
        <translation>Не удаётся открыть хранилище.</translation>
    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-Do you want to open it anyway? Alternatively the database is opened read-only.</source>
-        <translation>Хранилище, которое Вы хотите открыть, заблокировано другой запущенной копией KeePassXC.
-Всё равно открыть? В качестве альтернативы хранилище будет открыто в режиме для чтения.</translation>
-    </message>
    <message>
        <source>Merge database</source>
        <translation>Объединить хранилище</translation>
@@ -411,6 +405,25 @@ Do you want to save it anyway?</source>
        <translation>Хранилище, которые вы пытаетесь сохранить, заблокировано другим экземпляром KeePassXC.
 Хотите сохранить во всех случаях?</translation>
    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Пароли</translation>
+    </message>
+    <message>
+        <source>Database already opened</source>
+        <translation>Хранилище уже открыто </translation>
+    </message>
+    <message>
+        <source>The database you are trying to open is locked by another instance of KeePassXC.
+
+Do you want to open it anyway?</source>
+        <translation>Хранилище, которые вы пытаетесь открыть, заблокировано другим экземпляром KeePassXC.
+Хотите открыть во всех случаях?</translation>
+    </message>
+    <message>
+        <source>Open read-only</source>
+        <translation>Открыть в режиме &quot;только чтение&quot;</translation>
+    </message>
 </context>
 <context>
    <name>DatabaseWidget</name>
@@ -518,10 +531,6 @@ Do you want to save it anyway?</source>
        <source>Autoreload Failed</source>
        <translation>Ошибка автоматической загрузки</translation>
    </message>
-    <message>
-        <source>Could not parse or unlock the new database file while attempting to autoreload this database.</source>
-        <translation>Не удаётся разобрать или разблокировать новый файл хранилища при попытке автоматической загрузки этого хранилища.</translation>
-    </message>
    <message>
        <source>Could not open the new database file while attempting to autoreload this database.</source>
        <translation>Не удаётся открыть новый файл хранилища при попытке автоматической загрузки этого файла.</translation>
@@ -649,14 +658,6 @@ Do you want to save it anyway?</source>
        <source>Enable Auto-Type for this entry</source>
        <translation>Включить автоввод для этой записи</translation>
    </message>
-    <message>
-        <source>Inherit default Auto-Type sequence from the group</source>
-        <translation>Унаследовать стандартную последовательность автоввода от группы</translation>
-    </message>
-    <message>
-        <source>Use custom Auto-Type sequence:</source>
-        <translation>Использовать свою последовательность автоввода:</translation>
-    </message>
    <message>
        <source>+</source>
        <translation>+</translation>
@@ -670,12 +671,20 @@ Do you want to save it anyway?</source>
        <translation>Заголовок окна:</translation>
    </message>
    <message>
-        <source>Use default sequence</source>
-        <translation>Использовать стандартную последовательность</translation>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Унаследовать стандартную последовательность автоввода от &amp;группы</translation>
    </message>
    <message>
-        <source>Set custom sequence:</source>
-        <translation>Установить свою последовательность:</translation>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Использовать сво&amp;ю последовательность автоввода:</translation>
+    </message>
+    <message>
+        <source>Use default se&amp;quence</source>
+        <translation>Использовать стан&amp;дартную последовательность</translation>
+    </message>
+    <message>
+        <source>Set custo&amp;m sequence:</source>
+        <translation>Установить сво&amp;ю последовательность:</translation>
    </message>
 </context>
 <context>
@@ -800,14 +809,6 @@ Do you want to save it anyway?</source>
 </context>
 <context>
    <name>EditWidgetIcons</name>
-    <message>
-        <source>Use default icon</source>
-        <translation>Использовать стандартный значок</translation>
-    </message>
-    <message>
-        <source>Use custom icon</source>
-        <translation>Использовать свой значок</translation>
-    </message>
    <message>
        <source>Add custom icon</source>
        <translation>Добавить свой значок</translation>
@@ -852,6 +853,14 @@ Do you want to save it anyway?</source>
        <source>Can&apos;t delete icon. Still used by %1 items.</source>
        <translation>Не удается удалить значок, она продолжает использоваться %1 записями.</translation>
    </message>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation>Использовать с&amp;тандартный значок</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Использовать св&amp;ой значок</translation>
+    </message>
 </context>
 <context>
    <name>EditWidgetProperties</name>
@@ -1297,25 +1306,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
        <source>Sh&amp;ow a notification when credentials are requested</source>
        <translation>Показывать уведомление при запросе данных для входа</translation>
    </message>
-    <message>
-        <source>&amp;Return only best matching entries for an URL instead
-of all entries for the whole domain</source>
-        <translation>Возвращать только наиболее совпавшие с URL записи, а не все записи для домена</translation>
-    </message>
    <message>
        <source>&amp;Match URL schemes
 Only entries with the same scheme (http://, https://, ftp://, ...) are returned</source>
        <translation>Совпадение со схемой URL
-Возвращать только записи с соответствующей схемой (http://, https://, ftp://, ...) </translation>
+Возвращат&amp;ь только записи с соответствующей схемой (http://, https://, ftp://, ...) </translation>
    </message>
    <message>
        <source>Sort matching entries by &amp;username</source>
        <translation>Сортировать совпавшие записи по &amp;имени пользователя</translation>
    </message>
-    <message>
-        <source>R&amp;emove all shared encryption-keys from active database</source>
-        <translation>Удалить все общие ключи шифрования из активного хранилища</translation>
-    </message>
    <message>
        <source>Re&amp;move all stored permissions from entries in active database</source>
        <translation>Удалить все сохраненные права доступа из активного хранилища </translation>
@@ -1328,10 +1328,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
        <source>Advanced</source>
        <translation>Расширенные</translation>
    </message>
-    <message>
-        <source>Activate the following only, if you know what you are doing!</source>
-        <translation>Включайте эти настройки только если знаете что делаете!</translation>
-    </message>
    <message>
        <source>Always allow &amp;access to entries</source>
        <translation>Всегда разрешать доступ к записям</translation>
@@ -1348,14 +1344,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
        <source>Only the selected database has to be connected with a client!</source>
        <translation>Только выбранное хранилище должно быть соединено с клиентом!</translation>
    </message>
-    <message>
-        <source>&amp;Return also advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Возвращать дополнительные строковые поля, начинающиеся с  &quot;KPH: &quot;</translation>
-    </message>
-    <message>
-        <source>Automatic creates or updates are not supported for string fields!</source>
-        <translation>Автоматическое создание или обновление не поддерживается строковыми полями!</translation>
-    </message>
    <message>
        <source>HTTP Port:</source>
        <translation>Порт HTTP:</translation>
@@ -1389,8 +1377,29 @@ This is required for accessing your databases from ChromeIPass or PassIFox</sour
    <message>
        <source>Cannot bind to privileged ports below 1024!
 Using default port 19455.</source>
-        <translation>Не удается привязать к привилегированные порты ниже 1024!
-Используется порт по умолчанию 19455.</translation>
+        <translation>Не удается привязать к привилегированным портам с номерами меньше 1024!
+Используется порт по умолчанию: 19455.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best matching entries for a URL instead
+of all entries for the whole domain</source>
+        <translation>Возвращать толь&amp;ко наиболее совпавшие с URL записи, а не все записи для домена</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>&amp;Удалить все общие ключи шифрования из активного хранилища</translation>
+    </message>
+    <message>
+        <source>The following options can be dangerous. Change them only if you know what you are doing.</source>
+        <translation>Используйте эти настройки только если знаете, что делаете!</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Возвращать дополнительные стро&amp;ковые поля, начинающиеся с  &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Автоматическое создание или обновление полей, содержащих строки, не поддерживается.</translation>
    </message>
 </context>
 <context>
@@ -1767,10 +1776,6 @@ give it a unique name to identify and accept it.</source>
        <source>key file of the database</source>
        <translation>файл-ключ хранилища</translation>
    </message>
-    <message>
-        <source>filename(s) of the password database(s) to open (*.kdbx)</source>
-        <translation>имена(имя) файлов хранилищ(а) для открытия (*.kdbx)</translation>
-    </message>
    <message>
        <source>KeePassXC - cross-platform password manager</source>
        <translation>KeePassXC — кросс-платформенный менеджер паролей</translation>
@@ -1779,5 +1784,9 @@ give it a unique name to identify and accept it.</source>
        <source>read password of the database from stdin</source>
        <translation>читать пароли хранилища из стандартного ввода &quot;stdin&quot;</translation>
    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>имена файлов открываемого хранилища паролей (*.kdbx)</translation>
+    </message>
 </context>
 </TS>
--- a/share/translations/keepassx_zh_CN.ts
+++ b/share/translations/keepassx_zh_CN.ts
--- a/setup/gui/keepassxc.desktop
+++ b/setup/gui/keepassxc.desktop
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.1.0
+version: 2.1.3
 grade: stable
 summary: community driven port of the windows application “Keepass Password Safe”
 description: |
@@ -11,7 +11,7 @@ confinement: strict
 apps:
  keepassxc:
    command: desktop-launch keepassxc
-    plugs: [unity7, opengl, gsettings, home]
+    plugs: [unity7, opengl, gsettings, home, network, network-bind]

 parts:
  keepassxc:
@@ -21,6 +21,7 @@ parts:
      - -DCMAKE_BUILD_TYPE=Release
      - -DWITH_TESTS=OFF
      - -DWITH_XC_AUTOTYPE=ON
+      - -DWITH_XC_HTTP=ON
    build-packages:
      - g++
      - libgcrypt20-dev
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -204,7 +204,24 @@ if (UNIX AND NOT APPLE)
    target_link_libraries(keepassx_core Qt5::DBus)
 endif()

-add_executable(${PROGNAME} WIN32 MACOSX_BUNDLE ${keepassx_SOURCES_MAINEXE})
+if(MINGW)
+  string(REPLACE "." ";" VERSION_LIST ${KEEPASSXC_VERSION})
+  list(GET VERSION_LIST 0 KEEPASSXC_VERSION_MAJOR)
+  list(GET VERSION_LIST 1 KEEPASSXC_VERSION_MINOR)
+  list(GET VERSION_LIST 2 KEEPASSXC_VERSION_PATCH)
+
+  include(GenerateProductVersion)
+  generate_product_version(
+    WIN32_ProductVersionFiles
+    NAME "KeePassXC"
+    COMPANY_NAME "KeePassXC Team"
+    VERSION_MAJOR ${KEEPASSXC_VERSION_MAJOR}
+    VERSION_MINOR ${KEEPASSXC_VERSION_MINOR}
+    VERSION_PATCH ${KEEPASSXC_VERSION_PATCH}
+  )
+endif()
+
+add_executable(${PROGNAME} WIN32 MACOSX_BUNDLE ${keepassx_SOURCES_MAINEXE} ${WIN32_ProductVersionFiles})
 target_link_libraries(${PROGNAME} keepassx_core)

 set_target_properties(${PROGNAME} PROPERTIES ENABLE_EXPORTS ON)
--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@@ -21,6 +21,7 @@
 #include <QLockFile>
 #include <QSaveFile>
 #include <QTabWidget>
+#include <QPushButton>

 #include "autotype/AutoType.h"
 #include "core/Config.h"
@@ -157,21 +158,29 @@ void DatabaseTabWidget::openDatabase(const QString& fileName, const QString& pw,
        // for now silently ignore if we can't create a lock file
        // due to lack of permissions
        if (lockFile->error() != QLockFile::PermissionError) {
-            QMessageBox::StandardButton result = MessageBox::question(this, tr("Open database"),
-                tr("The database you are trying to open is locked by another instance of KeePassXC.\n"
-                   "Do you want to open it anyway? Alternatively the database is opened read-only."),
-                QMessageBox::Yes | QMessageBox::No);
+            QMessageBox msgBox;
+            msgBox.setWindowTitle(tr("Database already opened"));
+            msgBox.setText(tr("The database you are trying to open is locked by another instance of KeePassXC.\n\n"
+                              "Do you want to open it anyway?"));
+            msgBox.setIcon(QMessageBox::Question);
+            msgBox.addButton(QMessageBox::Yes);
+            msgBox.addButton(QMessageBox::No);
+            auto readOnlyButton = msgBox.addButton(tr("Open read-only"), QMessageBox::NoRole);
+            msgBox.setDefaultButton(readOnlyButton);
+            msgBox.setEscapeButton(QMessageBox::No);
+            auto result = msgBox.exec();

-            if (result == QMessageBox::No) {
+            if (msgBox.clickedButton() == readOnlyButton) {
                dbStruct.readOnly = true;
                delete lockFile;
                lockFile = nullptr;
-            }
-            else {
+            } else if (result == QMessageBox::Yes) {
                // take over the lock file if possible
                if (lockFile->removeStaleLockFile()) {
                    lockFile->tryLock();
                }
+            } else {
+                return;
            }
        }
    }
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -1061,8 +1061,7 @@ void DatabaseWidget::reloadDatabaseFile()
                    // Merge the old database into the new one
                    m_db->setEmitModified(false);
                    db->merge(m_db);
-                }
-                else {
+                } else {
                    // Since we are accepting the new file as-is, internally mark as unmodified
                    // TODO: when saving is moved out of DatabaseTabWidget, this should be replaced
                    m_databaseModified = false;
@@ -1086,16 +1085,9 @@ void DatabaseWidget::reloadDatabaseFile()
            restoreGroupEntryFocus(groupBeforeReload, entryBeforeReload);

        }
-        else {
-            MessageBox::critical(this, tr("Autoreload Failed"),
-                                 tr("Could not parse or unlock the new database file while attempting"
-                                    " to autoreload this database."));
-        }
-    }
-    else {
+    } else {
        MessageBox::critical(this, tr("Autoreload Failed"),
-                             tr("Could not open the new database file while attempting to autoreload"
-                                " this database."));
+                             tr("Could not open the new database file while attempting to autoreload this database."));
    }

    // Rewatch the database file
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -282,6 +282,10 @@ MainWindow::MainWindow()

    connect(m_ui->actionAbout, SIGNAL(triggered()), SLOT(showAboutDialog()));

+#ifdef Q_OS_MAC
+    setUnifiedTitleAndToolBarOnMac(true);
+#endif
+
    updateTrayIcon();
 }

@@ -559,7 +563,7 @@ void MainWindow::closeEvent(QCloseEvent* event)
    if (minimizeOnClose && !appExitCalled)
    {
        event->ignore();
-        toggleWindow();
+        hideWindow();

        if (config()->get("security/lockdatabaseminimize").toBool()) {
            m_ui->tabWidget->lockDatabases();
@@ -724,22 +728,27 @@ void MainWindow::trayIconTriggered(QSystemTrayIcon::ActivationReason reason)
    }
 }

+void MainWindow::hideWindow()
+{
+    setWindowState(windowState() | Qt::WindowMinimized);
+    QTimer::singleShot(0, this, SLOT(hide()));
+
+    if (config()->get("security/lockdatabaseminimize").toBool()) {
+        m_ui->tabWidget->lockDatabases();
+    }
+}
+
 void MainWindow::toggleWindow()
 {
    if ((QApplication::activeWindow() == this) && isVisible() && !isMinimized()) {
-        setWindowState(windowState() | Qt::WindowMinimized);
-        QTimer::singleShot(0, this, SLOT(hide()));
-        
-        if (config()->get("security/lockdatabaseminimize").toBool()) {
-            m_ui->tabWidget->lockDatabases();
-        }
+        hideWindow();
    } else {
        ensurePolished();
        setWindowState(windowState() & ~Qt::WindowMinimized);
        show();
        raise();
        activateWindow();
-        
+
 #if defined(Q_OS_LINUX) && ! defined(QT_NO_DBUS)
        // re-register global D-Bus menu (needed on Ubuntu with Unity)
        // see https://github.com/keepassxreboot/keepassxc/issues/271
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -68,6 +68,7 @@ private Q_SLOTS:
    void rememberOpenDatabases(const QString& filePath);
    void applySettingsChanges();
    void trayIconTriggered(QSystemTrayIcon::ActivationReason reason);
+    void hideWindow();
    void toggleWindow();
    void lockDatabasesAfterInactivity();
    void repairDatabase();
--- a/src/http/AccessControlDialog.cpp
+++ b/src/http/AccessControlDialog.cpp
@@ -19,6 +19,8 @@ AccessControlDialog::AccessControlDialog(QWidget *parent) :
    QDialog(parent),
    ui(new Ui::AccessControlDialog())
 {
+    this->setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+
    ui->setupUi(this);
    connect(ui->allowButton, SIGNAL(clicked()), this, SLOT(accept()));
    connect(ui->denyButton, SIGNAL(clicked()), this, SLOT(reject()));
--- a/src/http/OptionDialog.ui
+++ b/src/http/OptionDialog.ui
@@ -45,7 +45,7 @@ This is required for accessing your databases from ChromeIPass or PassIFox</stri
       <item>
        <widget class="QCheckBox" name="bestMatchOnly">
         <property name="text">
-          <string>&amp;Return only best matching entries for an URL instead
+          <string>&amp;Return only best matching entries for a URL instead
 of all entries for the whole domain</string>
         </property>
        </widget>
@@ -82,7 +82,7 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
       <item>
        <widget class="QPushButton" name="removeSharedEncryptionKeys">
         <property name="text">
-          <string>R&amp;emove all shared encryption-keys from active database</string>
+          <string>R&amp;emove all shared encryption keys from active database</string>
         </property>
        </widget>
       </item>
@@ -148,7 +148,7 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
          <string notr="true">color: rgb(255, 0, 0);</string>
         </property>
         <property name="text">
-          <string>Activate the following only, if you know what you are doing!</string>
+          <string>The following options can be dangerous. Change them only if you know what you are doing.</string>
         </property>
        </widget>
       </item>
@@ -186,14 +186,14 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
       <item>
        <widget class="QCheckBox" name="supportKphFields">
         <property name="text">
-          <string>&amp;Return also advanced string fields which start with &quot;KPH: &quot;</string>
+          <string>&amp;Return advanced string fields which start with &quot;KPH: &quot;</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLabel" name="label_2">
         <property name="text">
-          <string>Automatic creates or updates are not supported for string fields!</string>
+          <string>Automatically creating or updating string fields is not supported.</string>
         </property>
         <property name="indent">
          <number>30</number>
--- a/src/http/Protocol.cpp
+++ b/src/http/Protocol.cpp
@@ -27,7 +27,7 @@ static const char * const STR_SET_LOGIN = "set-login";
 static const char * const STR_ASSOCIATE = "associate";
 static const char * const STR_TEST_ASSOCIATE = "test-associate";
 static const char * const STR_GENERATE_PASSWORD = "generate-password";
-static const char * const STR_VERSION = "1.8.4.1";
+static const char * const STR_VERSION = "1.8.4.2";

 }/*namespace KeepassHttpProtocol*/

@@ -110,7 +110,7 @@ static QByteArray encrypt2(const QByteArray & data, SymmetricCipherGcrypt & ciph
    //Encrypt
    QByteArray buffer = data + QByteArray(paddingSize, paddingSize);
    cipher.reset();
-    cipher.processInPlace(buffer);
+    Q_UNUSED(cipher.processInPlace(buffer));
    return buffer;
 }

--- a/src/http/qhttp/http-parser/http_parser.h
+++ b/src/http/qhttp/http-parser/http_parser.h
@@ -91,7 +91,7 @@ typedef int (*http_cb) (http_parser*);


 /* Status Codes */
-#define HTTP_STATUS_MAP(XX)                                                 \
+#define HTTPPARSER_HTTP_STATUS_MAP(XX)                                      \
  XX(100, CONTINUE,                        Continue)                        \
  XX(101, SWITCHING_PROTOCOLS,             Switching Protocols)             \
  XX(102, PROCESSING,                      Processing)                      \
@@ -150,12 +150,12 @@ typedef int (*http_cb) (http_parser*);
  XX(507, INSUFFICIENT_STORAGE,            Insufficient Storage)            \
  XX(508, LOOP_DETECTED,                   Loop Detected)                   \
  XX(510, NOT_EXTENDED,                    Not Extended)                    \
-  XX(511, NETWORK_AUTHENTICATION_REQUIRED, Network Authentication Required) \
+  XX(511, NETWORK_AUTHENTICATION_REQUIRED, Network Authentication Required)

 enum http_status
  {
 #define XX(num, name, string) HTTP_STATUS_##name = num,
-  HTTP_STATUS_MAP(XX)
+  HTTPPARSER_HTTP_STATUS_MAP(XX)
 #undef XX
  };

--- a/src/http/qhttp/private/httpreader.hxx
+++ b/src/http/qhttp/private/httpreader.hxx
@@ -41,7 +41,7 @@ public:
        if ( !icollectRequired ) // not allowed to collect data
            return false;

-        int newLength = icollectedData.length() + (int) length;
+        int newLength = icollectedData.length() + static_cast<int>(length);

        if ( icollectCapacity > 0    &&    newLength > icollectCapacity )
            return false; // the capacity is full
--- a/src/http/qhttp/private/qhttpclient_private.hpp
+++ b/src/http/qhttp/private/qhttpclient_private.hpp
@@ -112,7 +112,7 @@ protected:
    void onReadyRead() {
        while ( isocket.bytesAvailable() > 0 ) {
            char buffer[4097] = {0};
-            size_t readLength = (size_t) isocket.readRaw(buffer, 4096);
+            size_t readLength = static_cast<size_t>(isocket.readRaw(buffer, 4096));
            
            parse(buffer, readLength);
        }
--- a/src/http/qhttp/private/qhttpserver_private.hpp
+++ b/src/http/qhttp/private/qhttpserver_private.hpp
@@ -42,7 +42,7 @@ public:

        // if it's a QLocalServer
        virtual void    incomingConnection(quintptr socketDescriptor) {
-            iserver->incomingConnection((qintptr) socketDescriptor);
+            iserver->incomingConnection(static_cast<qintptr>(socketDescriptor));
        }
    };

--- a/src/http/qhttp/private/qhttpserverconnection_private.hpp
+++ b/src/http/qhttp/private/qhttpserverconnection_private.hpp
@@ -83,7 +83,7 @@ public:
    void onReadyRead() {
        while ( isocket.bytesAvailable() > 0 ) {
            char buffer[4097] = {0};
-            size_t readLength = (size_t) isocket.readRaw(buffer, 4096);
+            size_t readLength = static_cast<size_t>(isocket.readRaw(buffer, 4096));

            parse(buffer, readLength);
        }
--- a/src/http/qhttp/qhttpabstracts.cpp
+++ b/src/http/qhttp/qhttpabstracts.cpp
@@ -8,7 +8,7 @@ namespace qhttp {
 #   error "to compile QHttp classes, Qt 5.0 or later is needed."
 #endif

-#define HTTP_STATUS_MAP(XX)                    \
+#define QHTTPABSTRACTS_HTTP_STATUS_MAP(XX)     \
    XX(100, "Continue")                        \
    XX(101, "Switching Protocols")             \
    /* RFC 2518) obsoleted by RFC 4918 */      \
@@ -78,7 +78,7 @@ static struct {
    int         code;
    const char* message;
 } g_status_codes[] {
-    HTTP_STATUS_MAP(PATCH_STATUS_CODES)
+    QHTTPABSTRACTS_HTTP_STATUS_MAP(PATCH_STATUS_CODES)
 };
 #undef PATCH_STATUS_CODES

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,6 @@
 #include <QCommandLineParser>
 #include <QFile>
 #include <QTextStream>
-#include <QtGlobal>

 #include "config-keepassx.h"
 #include "core/Config.h"
@@ -45,10 +44,7 @@ int main(int argc, char** argv)
    Tools::disableCoreDumps();
 #endif
    Tools::setupSearchPaths();
-    
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
+
    Application app(argc, argv);
    Application::setApplicationName("keepassxc");
    Application::setApplicationVersion(KEEPASSX_VERSION);
@@ -68,7 +64,7 @@ int main(int argc, char** argv)

    QCommandLineParser parser;
    parser.setApplicationDescription(QCoreApplication::translate("main", "KeePassXC - cross-platform password manager"));
-    parser.addPositionalArgument("filename", QCoreApplication::translate("main", "filename(s) of the password database(s) to open (*.kdbx)"), "[filename(s)]");
+    parser.addPositionalArgument("filename", QCoreApplication::translate("main", "filenames of the password databases to open (*.kdbx)"), "[filename(s)]");

    QCommandLineOption configOption("config",
                                    QCoreApplication::translate("main", "path to a custom config file"),
--- a/src/zxcvbn/zxcvbn.cpp
+++ b/src/zxcvbn/zxcvbn.cpp
@@ -496,7 +496,7 @@ typedef struct
    uint8_t LeetCnv[sizeof L33TCnv / LEET_NORM_MAP_SIZE + 1];
 /*   uint8_t LeetChr[3]; */
    uint8_t First;
-    uint8_t PossChars[48];
+    uint8_t PossChars[49];
 } DictWork_t;

 /**********************************************************************************
Author	SHA1	Message	Date
Jonathan White	cb283bb95a	Release 2.1.4	2017-04-09 10:20:52 -04:00
Jonathan White	b81d8bf97a	Update translations	2017-04-09 10:20:52 -04:00
Jonathan White	918db68c52	Bumped version to 2.1.4, updated CHANGELOG	2017-04-09 09:54:55 -04:00
Weslly	aba0633a78	Bring HTTP Confirmation window to the front	2017-04-08 17:40:43 -04:00
Jonathan White	e684e230a6	Bumped up version of KeePassHTTP to 1.8.4.2 * No protocol changes required * Fixes #439	2017-04-04 22:58:33 -04:00
Janek Bevendorff	76dcfb5ed0	Release 2.1.3 - Fix possible overflow in zxcvbn library [#363] - Revert HiDPI setting to avoid problems on laptop screens [#332] - Set file meta properties in Windows executable [#330] - Suppress error message when auto-reloading a locked database [#345] - Improve usability of question dialog when database is already locked by a different instance [#346] - Fix compiler warnings in QHttp library [#351] - Use unified toolbar on Mac OS X [#361] - Fix an issue on X11 where the main window would be raised instead of closed on Alt+F4 [#362]	2017-03-02 21:56:54 +01:00
Janek Bevendorff	8a69421dc9	Update translations	2017-03-02 21:56:51 +01:00
Janek Bevendorff	e2d098dd9b	Bump version to 2.1.3, update CHANGELOG	2017-03-02 21:56:22 +01:00
John Lindgren	d45c2cf0f2	closeEvent() should always hide the window, never raise it. This fixes an issue on X11 where Alt-F4 would not close the window, due to toggleWindow() believing the window is inactive and trying to raise it. Avoid the problem by closing the window unconditionally.	2017-03-02 13:52:57 +01:00
Hanno	3e76f7af0f	Fix stack buffer overflow in zxcvbn. The array PossChars is filled with a 48 byte string plus a trailing zero byte. Therefore it needs to be 49 bytes long.	2017-03-02 13:38:14 +01:00
Janek Bevendorff	52ab7b8865	Use unified toolbar on OS X	2017-03-01 23:36:27 +01:00
Janek Bevendorff	a31c423d9e	Fix compiler warnings in QHttp library	2017-02-26 22:13:22 -05:00
Janek Bevendorff	04b3b3dbc5	Assign role 'NoRole' instead of 'Accept' to not mess with button order	2017-02-26 13:33:28 -05:00
Janek Bevendorff	4ec2fe556a	Fix impossible dialog by providing a proper question with approriate answers, resolves #202	2017-02-24 22:10:19 -05:00
Janek Bevendorff	311e7802e5	Don't show error message when trying to reload a locked database	2017-02-25 03:15:32 +01:00
Edward Jones	873871a42c	Update text in HTTP settings and a hard-to-translate command line hint	2017-02-21 22:36:11 +01:00
Jonathan White	070ad695ec	Updated snapcraft build to include networking	2017-02-20 14:16:04 +01:00
Janek Bevendorff	a56bcc8903	Set windows EXE resource properties, resolves #329	2017-02-20 00:33:11 +01:00
TheZ3ro	7613f1b726	Merge pull request #332 from keepassxreboot/hotfix/323-revert-hidpi-scaling Revert "Enable High DPI scaling", resolves #323	2017-02-20 00:18:11 +01:00
Janek Bevendorff	cc44a833d5	Revert "Enable High DPI scaling", resolves #323 This reverts commit `188cac34ce`.	2017-02-19 23:42:05 +01:00