Update translations

* Fix creating output directory on power shell release tool

.clang-format

@@ -19,7 +19,7 @@ AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: false
 BinPackArguments: false
 BinPackParameters: false
-BraceWrapping:   
+BraceWrapping:
   AfterClass:      true
   AfterFunction:   true
   AfterControlStatement: false
@@ -44,7 +44,7 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories: 
+IncludeCategories:
   - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
     Priority:        2
   - Regex:           '^(<|"(gtest|isl|json)/)'
@@ -85,4 +85,3 @@ Standard:        Cpp11
 TabWidth:        4
 UseTab:          Never
 ...
-

.gitattributes

@@ -14,3 +14,6 @@ AppImage-Recipe.sh export-ignore
 
 # binary files
 *.ai binary
+
+# Line endings harmony
+* text=auto

.github/CONTRIBUTING.md

@@ -63,7 +63,7 @@ Before submitting a bug report, check if the problem has already been reported.
 
 ### Discuss with the team
 
-As with feature requests, you can talk to the KeePassXC team about bugs, new features, other issues and pull requests on the dedicated issue tracker, or in the IRC channel on Freenode (`#keepassxc-dev` on `irc.freenode.net`, or use a [webchat link](https://webchat.freenode.net/?channels=%23keepassxc-dev)).
+As with feature requests, you can talk to the KeePassXC team about bugs, new features, other issues and pull requests on the dedicated issue tracker, on the [Matrix development channel](https://matrix.to/#/!RhJPJPGwQIFVQeXqZa:matrix.org?via=matrix.org), or in the IRC channel on Libera.Chat (`#keepassxc-dev` on `irc.libera.chat`, or use a [webchat link](https://web.libera.chat/#keepassxc-dev)).
 
 ### Your first code contribution
 

.gitignore

@@ -21,3 +21,8 @@ desktop.ini
 /*.snap
 /*_source.tar.bz2
 
+# MSVC Files
+CMakeSettings.json
+CMakePresets.json
+.vs/
+out/

.tx/config

@@ -1,8 +1,14 @@
 [main]
 host = https://www.transifex.com
 
-[keepassxc.keepassxc]
-source_file = share/translations/keepassx_en.ts
-file_filter = share/translations/keepassx_<lang>.ts
+[keepassxc.share-translations-keepassxc-en-ts--develop]
+source_file = share/translations/keepassxc_en.ts
+file_filter = share/translations/keepassxc_<lang>.ts
+source_lang = en
+type = QT
+
+[keepassxc.share-translations-keepassxc-en-ts--master]
+source_file = share/translations/keepassxc_en.ts
+file_filter = share/translations/keepassxc_<lang>.ts
 source_lang = en
 type = QT

CHANGELOG.md

@@ -1,5 +1,135 @@
 # Changelog
 
+## Release 2.7.0 (2022-02-26)
+
+### Major Additions
+- Implement KDBX 4.1 [#7114]
+- Add direct write save option for cloud storage and GVFS [#6594]
+- Prevent screen capture on Windows and macOS [#6030]
+- Support quick unlock using Windows Hello [#7384]
+- Support quick unlock using Apple Watch [#5526]
+- Allow specifying database backup paths [#7035]
+- Add tag functionality [#6487][#7436][#7446]
+- Add password rating column to entry view [#4797]
+- Add group clone action [#6124]
+- Show modifications between entry history items [#6789]
+- Ability to bulk-delete and purge unused custom icons [#5970]
+- Support adding custom passphrase wordlists [#6799]
+- Support passphrase wordlists in numbered and PGP-signed formats [#6791]
+- Implement support for hardware keys via wireless NFC [#6895]
+- SSH Agent: Add support for OpenSSH 8.2 FIDO/U2F keys [#6371]
+- CLI: Implement attachment handling [#5538]
+- CLI: Add support for okon in offline HIBP checks [#5478]
+- CLI: Implement `search` command and remove `locate` [#6805]
+- CLI: Add db statistic output to `db-info` command [#7032]
+- CLI: Add -i/--include option to `generate` command. [#7112]
+- CLI: Add a -n (--notes) option to `add` and `edit` commands [#4646]
+- CLI: Add keyfile option to `import` command [#5402]
+- CLI: Adding a best option to clip to copy a password of the best match [#4489]
+- Browser: Add Microsoft Edge support on Linux [#7100]
+- Browser: Support native password generator from the extension [#6529]
+- Browser: Add group settings [#4180]
+- Browser: Add feature to ignore entries for HTTP-Auth Logins [#5394]
+- Browser: Support triggering Auto-Type from browser extension [#6272]
+- Browser: Add delete-entry command to API [#6899]
+- Browser: Add search 'by-path' url to API [#5535]
+- Browser: search for entries by UUID to API [#4763]
+- Browser: Support auto-download of favicon on entry addition [#7179]
+- Auto-Type: Major improvements to Auto-Type [#5864][#7463][#7435][#7391][#7129][#6400][#6364][#6361][#5283]
+- Auto-Type: Fix typing to virtual machines on Windows [#7366]
+- Auto-Type: Re-implement X11 keysym emulation [#7098]
+- Auto-Type: Support multiple Xkb layouts [#6247]
+- Auto-Type: Abort keystroke if modifiers held on X11 [#6351][#6357]
+- Auto-Type: Add TOTP option to entry level Auto-Type menu [#6675]
+- FdoSecrets: Major Refactor and Code Consolidation [#5747][#5660][#7043][#6915]
+- FdoSecrets: Implement unlock before search [#6943]
+- Reports: Add browser statistics report [#7197]
+
+### Major Changes
+- Port crypto backend to [Botan](https://github.com/randombit/botan) [#6209]
+- Improve attachment handling and security [#6606][#5034][#7083]
+- Allow selecting any open database in unlock dialog [#5427]
+- KeeShare: Remove checking signed container and QuaZip dependency [#7223]
+- Introduce security option to enable copy on double click (default off) [#6433]
+- Add 'delete entry without confirm' functionality [#5812]
+- Improve macOS and Windows platform integration [#5851]
+- Lock only the current database by default [#6652]
+- Show expired entries on DB unlock [#7290]
+
+### Other Changes and Fixes
+- Add countdown progress bar to TOTP preview [#6930]
+- Enter favicon url directly on icons page [#6614]
+- Set C++17 as standard in the build system [#7180]
+- Internalize ykcore into code base [#6654]
+- Transition to Visual Studio builds on Windows [#5874]
+- Ability to delete entries from health check reports [#6537]
+- Enhance remembering last-used directories [#6711]
+- Implement org.freedesktop.appearance.color-scheme support on Linux [#7422]
+- Support sorting HTML export [#7011]
+- Add display number of characters in passphrases [#5449]
+- Use Alt+Tab on macOS to switch between databases [#5407]
+- Add feature to sort groups using shortcut keys [#6999]
+- Add CTRL+Enter to apply password generator changes [#6414]
+- Display `Database created` timestamp on statistics report [#6876]
+- Browser: Improve best matching credentials setting [#6893]
+- SSH Agent: Use both Pageant and OpenSSH agent simultaneously on Windows [#6288]
+- SSH Agent: Allow using database path to resolve keys [#6365]
+- SSH Agent: Show correct error messages in main window [#7166]
+- Multiple fixes for MSI installer [#6630]
+- Fix tab order for CSV import dialog to match screen order [#7315]
+- Don't mark kdbx:// urls as invalid [#7221]
+- Make selected text copyable instead of copying password [#7209]
+- Detect timestamp resolution for CSV files [#7196]
+- Fix crash while downloading favicon [#7104]
+- Correct naming of newly generated keyx files [#7010]
+- Place the 'Recycle Bin' at the bottom of the list when groups are sorted [#7004]
+- Handle tilde with custom browser paths [#6659]
+- Don't scroll up when deleting an entry [#6833]
+- Set the MIME-Type to text/plain when using wl-copy on wayland [#6832]
+- Fix adaptive icon painting [#5989][#6033]
+- Fix favicon download from URL with non-standard port [#5509]
+- Ignore recycle bin on KeePassHTTP migration [#5481]
+
+## 2.6.6 (2021-06-12)
+
+### Fixed
+
+- Fix focusing search when pressing hotkey [#6603]
+- Trim whitespace from TOTP key input prior to processing [#6604]
+- Fix building on macOS [#6598]
+- Resolve compiler warnings for unused return values [#6607]
+
+## 2.6.5 (2021-06-08)
+
+### Added
+
+- Show search bar when toolbar is hidden or in overflow [#6279]
+- Show countdown for clipboard clearing in status bar [#6333]
+- Command line option to lock all open databases [#6511]
+- Allow CSV import of bare TOTP secrets [#6211]
+- Retain file creation time when saving database [#6576]
+- Set permissions of saved attachments to be private to the current user [#6363]
+- OPVault: Use Text instead of Name for attribute names [#6334]
+
+### Changed
+
+- Reports: Allow resizing of reports columns [#6435]
+- Reports: Toggle showing expired entries [#6534]
+- Save Always on Top setting [#6236]
+- Password generator can exclude additional lookalike characters (6/G, 8/B) [#6196]
+
+### Fixed
+
+- Allow setting MSI properties in unattended install [#6196]
+- Update MainWindow minimum size to enable smaller verticle space [#6196]
+- Use application font size when setting default or monospace fonts [#6332]
+- Fix notes not clearing in entry preview panel in some cases [#6481]
+- macOS: Correct window activation when restoring from tray [#6575]
+- macOS: Better handling of minimize after unlock when using browser integration [#6338]
+- Linux: Start after the system tray is available on LXQt [#6216]
+- Linux: Allow selection of modal dialogs on X11 in Auto-Type [#6204]
+- KeeShare: prevent crash when file extension is missing [#6174]
+
 ## 2.6.4 (2021-01-31)
 
 ### Added
@@ -223,7 +353,7 @@
 - Return keyboard focus after saving database edits [#4287]
 - Windows: Use bare minimum settings in portable version [#4131]
 - Windows: Use SHA256 code signing [#4129]
-- macOS: Fix code signing incompatibility in latest macOS release [#4564] 
+- macOS: Fix code signing incompatibility in latest macOS release [#4564]
 
 ## 2.5.3 (2020-01-19)
 
@@ -355,8 +485,8 @@
 - Redesign database unlock dialog [ #3287]
 - Rework the entry preview panel [ #3306]
 - Move notes to General tab on Group Preview Panel [#3336]
-- Enable entry actions when editing an entry and cleanup entry context menu  [#3641]
-- Improve detection of external database changes  [#2389]
+- Enable entry actions when editing an entry and cleanup entry context menu [#3641]
+- Improve detection of external database changes [#2389]
 - Warn if user is trying to use a KDBX file as a key file [#3625]
 - Add option to disable KeePassHTTP settings migrations prompt [#3349, #3344]
 - Re-enabled Wayland support (no Auto-Type yet) [#3520, #3341]

CMakeLists.txt

@@ -24,6 +24,9 @@ if(NOT CMAKE_BUILD_TYPE)
             FORCE)
 endif()
 string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug" OR CMAKE_BUILD_TYPE_LOWER STREQUAL "relwithdebinfo")
+    set(IS_DEBUG_BUILD TRUE)
+endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
@@ -50,14 +53,11 @@ option(WITH_XC_NETWORKING "Include networking code (e.g. for downloading website
 option(WITH_XC_BROWSER "Include browser integration with keepassxc-browser." OFF)
 option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
 option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
-option(WITH_XC_KEESHARE "Sharing integration with KeeShare (requires quazip5 for secure containers)" OFF)
+option(WITH_XC_KEESHARE "Sharing integration with KeeShare" OFF)
 option(WITH_XC_UPDATECHECK "Include automatic update checks; disable for controlled distributions" ON)
 if(UNIX AND NOT APPLE)
     option(WITH_XC_FDOSECRETS "Implement freedesktop.org Secret Storage Spec server side API." OFF)
 endif()
-if(APPLE)
-    option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
-endif()
 option(WITH_XC_DOCS "Enable building of documentation" ON)
 
 if(WITH_CCACHE)
@@ -78,9 +78,6 @@ if(WITH_XC_ALL)
     set(WITH_XC_YUBIKEY ON)
     set(WITH_XC_SSHAGENT ON)
     set(WITH_XC_KEESHARE ON)
-    if(APPLE)
-        set(WITH_XC_TOUCHID ON)
-    endif()
     if(UNIX AND NOT APPLE)
         set(WITH_XC_FDOSECRETS ON)
     endif()
@@ -169,6 +166,15 @@ elseif(KEEPASSXC_DIST_TYPE STREQUAL "Other")
     unset(KEEPASSXC_DIST)
 endif()
 
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14.0")
+    cmake_policy(SET CMP0083 NEW)
+    include(CheckPIESupported)
+    check_pie_supported()
+endif()
+
+# Create position independent code for shared libraries and executables
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
     set(IS_32BIT TRUE)
 endif()
@@ -244,7 +250,11 @@ if(WITH_APP_BUNDLE)
 endif()
 
 add_gcc_compiler_flags("-fno-common")
-check_add_gcc_compiler_flag("-fopenmp")
+find_package(OpenMP)
+if(OpenMP_FOUND)
+    add_gcc_compiler_cflags(${OpenMP_C_FLAGS})
+    add_gcc_compiler_cxxflags(${OpenMP_CXX_FLAGS})
+endif()
 add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long")
 add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute")
 add_gcc_compiler_flags("-fvisibility=hidden")
@@ -257,11 +267,11 @@ if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
 endif()
 
 if (NOT HAIKU)
-if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR CMAKE_COMPILER_IS_CLANGXX)
-    add_gcc_compiler_flags("-fstack-protector-strong")
-else()
-    add_gcc_compiler_flags("-fstack-protector --param=ssp-buffer-size=4")
-endif()
+    if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR CMAKE_COMPILER_IS_CLANGXX)
+        add_gcc_compiler_flags("-fstack-protector-strong")
+    else()
+        add_gcc_compiler_flags("-fstack-protector --param=ssp-buffer-size=4")
+    endif()
 endif()
 
 add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")
@@ -290,28 +300,30 @@ check_add_gcc_compiler_flag("-Werror=format-security")
 check_add_gcc_compiler_flag("-Werror=implicit-function-declaration" C)
 check_add_gcc_compiler_flag("-Wcast-align")
 
-if(WITH_COVERAGE AND CMAKE_COMPILER_IS_CLANGXX)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
-  # then:
-  # $ llvm-profdata merge -sparse default.profraw -o default.profdata
-  # $ llvm-cov show ./tests/${the_test_binary} \
-  #      -format=html -instr-profile=default.profdata -output-dir=./coverages \
-  #      `find src -iname '*.h' -or -iname '*.cpp'`
-endif()
-
 if(UNIX AND NOT APPLE)
     check_add_gcc_compiler_flag("-Qunused-arguments")
-    check_add_gcc_compiler_flag("-fPIC")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed -Wl,--no-undefined")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now -pie")
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed")
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
 endif()
 
-add_gcc_compiler_cflags("-std=c99")
-add_gcc_compiler_cxxflags("-std=c++11")
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-check_add_gcc_compiler_flag("-fsized-deallocation" CXX)
+check_cxx_compiler_flag("-fsized-deallocation" CXX_HAS_fsized_deallocation)
+if(CXX_HAS_fsized_deallocation)
+    # Do additional check: the deallocation functions must be there too.
+    set(CMAKE_REQUIRED_FLAGS "-fsized-deallocation")
+    check_cxx_source_compiles("#include <new>
+        int main() { void * ptr = nullptr; std::size_t size = 1; ::operator delete(ptr, size); }"
+        HAVE_DEALLOCATION_FUNCTIONS)
+    if(HAVE_DEALLOCATION_FUNCTIONS)
+        check_add_gcc_compiler_flag("-fsized-deallocation" CXX)
+    endif()
+    unset(CMAKE_REQUIRED_FLAGS)
+endif()
 
 if(APPLE AND CMAKE_COMPILER_IS_CLANGXX)
     add_gcc_compiler_cxxflags("-stdlib=libc++")
@@ -324,29 +336,50 @@ else()
     add_gcc_compiler_cxxflags("-Wno-deprecated-declarations")
 endif()
 
-if(MINGW)
-    set(CMAKE_RC_COMPILER_INIT windres)
-    enable_language(RC)
-    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
-    if(NOT (CMAKE_BUILD_TYPE_LOWER STREQUAL "debug" OR CMAKE_BUILD_TYPE_LOWER STREQUAL "relwithdebinfo"))
-        # Enable DEP and ASLR
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
-        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
-        # Enable high entropy ASLR for 64-bit builds
-        if(NOT IS_32BIT)
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--high-entropy-va")
-            set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--high-entropy-va")
+# MSVC specific options
+if (MSVC)
+    if(MSVC_TOOLSET_VERSION LESS 141)
+        message(FATAL_ERROR "Only Microsoft Visual Studio 17 and newer are supported!")
+    endif()
+    add_compile_options(/permissive- /utf-8)
+    if(IS_DEBUG_BUILD)
+        add_compile_options(/Zf)
+        if(MSVC_TOOLSET_VERSION GREATER 141)
+            add_compile_definitions(/fsanitize=address)
         endif()
     endif()
 endif()
 
-if(APPLE AND WITH_APP_BUNDLE OR MINGW)
+if(WIN32)
+    set(CMAKE_RC_COMPILER_INIT windres)
+    enable_language(RC)
+    if(MINGW)
+        set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+    endif()
+    if(NOT IS_DEBUG_BUILD)
+        if(MSVC)
+            # By default MSVC enables NXCOMPAT
+            add_compile_options(/guard:cf)
+            add_link_options(/DYNAMICBASE /HIGHENTROPYVA /GUARD:CF)
+        else(MINGW)
+            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+            set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+            # Enable high entropy ASLR for 64-bit builds
+            if(NOT IS_32BIT)
+                set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--high-entropy-va")
+                set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--high-entropy-va")
+            endif()
+        endif()
+    endif()
+endif()
+
+if(APPLE AND WITH_APP_BUNDLE OR WIN32)
     set(PROGNAME KeePassXC)
 else()
     set(PROGNAME keepassxc)
 endif()
 
-if(MINGW)
+if(WIN32)
     set(CLI_INSTALL_DIR ".")
     set(PROXY_INSTALL_DIR ".")
     set(BIN_INSTALL_DIR ".")
@@ -377,16 +410,29 @@ endif(WITH_TESTS)
 if(WITH_COVERAGE)
     # Include code coverage, use with -DCMAKE_BUILD_TYPE=Debug
     include(CodeCoverage)
-    set(COVERAGE_GCOVR_EXCLUDES
-            "\\(.+/\\)?tests/.\\*"
-            ".\\*/moc_\\[^/\\]+\\.cpp"
-            ".\\*/ui_\\[^/\\]+\\.h"
-            "\\(.+/\\)?zxcvbn/.\\*")
     append_coverage_compiler_flags()
-    setup_target_for_coverage_gcovr_html(
-            NAME coverage
-            EXECUTABLE $(MAKE) && $(MAKE) test
-    )
+
+    set(COVERAGE_EXCLUDES
+            "'^(.+/)?(thirdparty|zxcvbn)/.*'"
+            "'^(.+/)?main\\.cpp$$'"
+            "'^(.+/)?cli/keepassxc-cli\\.cpp$$'"
+            "'^(.+/)?proxy/keepassxc-proxy\\.cpp$$'")
+    if(WITH_COVERAGE AND CMAKE_COMPILER_IS_CLANGXX)
+        set(MAIN_BINARIES
+                "$<TARGET_FILE:${PROGNAME}>"
+                "$<TARGET_FILE:keepassxc-cli>"
+                "$<TARGET_FILE:keepassxc-proxy>")
+        setup_target_for_coverage_llvm(
+                NAME coverage
+                BINARY ${MAIN_BINARIES}
+                SOURCES_ROOT ${CMAKE_SOURCE_DIR}/src
+        )
+    else()
+        setup_target_for_coverage_gcovr(
+                NAME coverage
+                SOURCES_ROOT ${CMAKE_SOURCE_DIR}/src
+        )
+    endif()
 endif()
 
 include(CLangFormat)
@@ -424,20 +470,20 @@ set(CMAKE_AUTORCC ON)
 
 if(APPLE)
     set(CMAKE_MACOSX_RPATH TRUE)
-    find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
+    find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
     if(NOT MACDEPLOYQT_EXE)
         message(FATAL_ERROR "macdeployqt is required to build on macOS")
     endif()
     message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
-elseif(MINGW)
-    find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
+elseif(WIN32)
+    find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
     if(NOT WINDEPLOYQT_EXE)
         message(FATAL_ERROR "windeployqt is required to build on Windows")
     endif()
     message(STATUS "Using windeployqt: ${WINDEPLOYQT_EXE}")
 endif()
 
-# Debian sets the the build type to None for package builds.
+# Debian sets the build type to None for package builds.
 # Make sure we don't enable asserts there.
 set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_NONE QT_NO_DEBUG)
 
@@ -455,14 +501,9 @@ if(ZLIB_VERSION_STRING VERSION_LESS "1.2.0")
 endif()
 include_directories(SYSTEM ${ZLIB_INCLUDE_DIR})
 
-# QREncode required for TOTP
-find_package(QREncode REQUIRED)
-
-# Optional
 if(WITH_XC_YUBIKEY)
-    find_package(YubiKey REQUIRED)
-
-    include_directories(SYSTEM ${YUBIKEY_INCLUDE_DIRS})
+    find_package(PCSC REQUIRED)
+    include_directories(SYSTEM ${PCSC_INCLUDE_DIRS})
 endif()
 
 if(UNIX)

COPYING

@@ -141,11 +141,13 @@ Files: share/icons/badges/2_Expired.svg
        share/icons/database/C46_Help.svg
        share/icons/database/C53_Apply.svg
        share/icons/database/C61_Services.svg
-Copyright: 2020 KeePassXC Team <team@keepassxc.org>
+Copyright: 2022 KeePassXC Team <team@keepassxc.org>
 License: MIT
 
 Files: share/icons/application/scalable/actions/chevron-double-down.svg
        share/icons/application/scalable/actions/chevron-double-right.svg
+       share/icons/application/scalable/actions/database-lock.svg
+       share/icons/application/scalable/actions/database-lock-all.svg
        share/icons/application/scalable/actions/document-close.svg
        share/icons/application/scalable/actions/document-edit.svg
        share/icons/application/scalable/actions/document-export.svg
@@ -164,6 +166,8 @@ Files: share/icons/application/scalable/actions/chevron-double-down.svg
        share/icons/application/scalable/actions/entry-edit.svg
        share/icons/application/scalable/actions/entry-new.svg
        share/icons/application/scalable/actions/favicon-download.svg
+       share/icons/application/scalable/actions/fingerprint.svg
+       share/icons/application/scalable/actions/group-clone.svg
        share/icons/application/scalable/actions/group-delete.svg
        share/icons/application/scalable/actions/group-edit.svg
        share/icons/application/scalable/actions/group-empty-trash.svg
@@ -188,6 +192,9 @@ Files: share/icons/application/scalable/actions/chevron-double-down.svg
        share/icons/application/scalable/actions/statistics.svg
        share/icons/application/scalable/actions/system-help.svg
        share/icons/application/scalable/actions/system-search.svg
+       share/icons/application/scalable/actions/tag.svg
+       share/icons/application/scalable/actions/tag-search.svg
+       share/icons/application/scalable/actions/trash.svg
        share/icons/application/scalable/actions/url-copy.svg
        share/icons/application/scalable/actions/username-copy.svg
        share/icons/application/scalable/actions/view-history.svg
@@ -237,3 +244,9 @@ Files: share/icons/application/scalable/actions/hibp.svg
        share/icons/database/C64_Apple.svg
 Copyright: GPL-2+
 Comment: from the Simple Icons repo (https://github.com/simple-icons/simple-icons/)
+
+Files: src/thirdparty/ykcore/yk*
+       src/thirdparty/ykcore/yubikey.h
+Copyright: 2006-2015, Yubico AB
+License: BSD-2-Clause
+Comment: from the yubikey-personalization repo (https://github.com/Yubico/yubikey-personalization)

INSTALL.md

@@ -12,21 +12,20 @@ Build Dependencies
 The following tools must exist within your PATH:
 
 * make
-* cmake (>= 2.8.12)
-* g++ (>= 4.7) or clang++ (>= 3.0)
-* asciidoctor (on Linux/MacOS)
+* cmake (>= 3.3.0)
+* g++ (>= 4.7) or clang++ (>= 6.0)
+* asciidoctor
 
 The following libraries are required:
 
-* Qt 5 (>= 5.2): qtbase and qttools5
-* libgcrypt (>= 1.6)
+* Qt 5 (>= 5.9.5): qtbase5, qtbase5-private, libqt5svg5, qttools5, qt5-image-formats-plugins
+* botan (>= 2.12)
 * zlib
-* libmicrohttpd
-* libxi, libxtst, qtx11extras (optional for auto-type on X11)
-* libsodium (>= 1.0.12)
-* libargon2
+* minizip
+* readline (for completion in cli)
+* libqt5x11extras5, libxi, and libxtst (for auto-type on X11)
 * qrencode
-* yubikey ykpers (optional to support YubiKey)
+* libusb-1.0, pcsclite (optional to support YubiKey on Linux)
 
 Prepare the Building Environment
 ================================
@@ -40,7 +39,7 @@ Build Steps
 We recommend using the release tool to perform builds, please read up-to-date instructions [on our wiki](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#building-using-the-release-tool).
 
 To compile from source, open a **Terminal (on Linux/MacOS)** or a **MSYS2-MinGW shell (on Windows)**<br/>
-**Note:** on Windows make sure you are using a **MINGW shell** by checking the label before the current path
+**Note:** on Windows you can also use MSVC to build natively, we recommend Visual Studio 2019
 
 First, download the KeePassXC [source tarball](https://keepassxc.org/download#source)
 or check out the latest version from our [Git repository](https://github.com/keepassxreboot/keepassxc).
@@ -65,6 +64,8 @@ For a stable build, it is recommended to checkout the master branch.
 git checkout master
 ```
 
+NOTE: See the [Windows Build Instructions](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#windows) for building with MSVC.
+
 Navigate to the directory where you have downloaded KeePassXC and type these commands:
 
 ```
@@ -74,7 +75,7 @@ cmake -DWITH_XC_ALL=ON ..
 make
 ```
 
-If you are on Windows, you may have to add ```-G "MSYS Makefiles"``` to the beginning of the cmake command. See the [Windows Build Instructions](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#windows) for more information.
+NOTE: If you are using MSYS2, you may have to add ```-G "MSYS Makefiles"``` to the beginning of the cmake command.
 
 These steps place the compiled KeePassXC binary inside the `./build/src/` directory.
 (Note the cmake notes/options below.)
@@ -98,12 +99,10 @@ These steps place the compiled KeePassXC binary inside the `./build/src/` direct
 	  -DWITH_XC_BROWSER=[ON|OFF] Enable/Disable KeePassXC-Browser extension support (default: OFF)
 	  -DWITH_XC_NETWORKING=[ON|OFF] Enable/Disable Networking support (e.g., favicon downloading) (default: OFF)
 	  -DWITH_XC_SSHAGENT=[ON|OFF] Enable/Disable SSHAgent support (default: OFF)
-	  -DWITH_XC_TOUCHID=[ON|OFF] (macOS Only) Enable/Disable Touch ID unlock (default:OFF)
 	  -DWITH_XC_FDOSECRETS=[ON|OFF] (Linux Only) Enable/Disable Freedesktop.org Secrets Service support (default:OFF)
 	  -DWITH_XC_KEESHARE=[ON|OFF] Enable/Disable KeeShare group synchronization extension (default: OFF)
-	  -DWITH_XC_KEESHARE_SECURE=[ON|OFF] Enable/Disable KeeShare signed containers, requires libquazip5 (default: OFF)
 	  -DWITH_XC_ALL=[ON|OFF] Enable/Disable compiling all plugins above (default: OFF)
-	  
+
 	  -DWITH_XC_UPDATECHECK=[ON|OFF] Enable/Disable automatic updating checking (requires WITH_XC_NETWORKING) (default: ON)
 
 	  -DWITH_TESTS=[ON|OFF] Enable/Disable building of unit tests (default: ON)

LICENSE.GPL-2

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it

LICENSE.GPL-3

@@ -1,12 +1,11 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
@@ -69,7 +68,7 @@ patents cannot be used to render the program non-free.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		       TERMS AND CONDITIONS
+                       TERMS AND CONDITIONS
 
   0. Definitions.
 
@@ -77,7 +76,7 @@ modification follow.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
- 
+
   "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
@@ -510,7 +509,7 @@ actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
-  
+
   If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
@@ -619,9 +618,9 @@ an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -646,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -665,12 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

LICENSE.LGPL-2.1

@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -111,7 +111,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
+
                   GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -158,7 +158,7 @@ Library.
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-
+
            How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest

LICENSE.LGPL-3

@@ -1,7 +1,7 @@
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

README.md

@@ -3,10 +3,10 @@
 [![codecov](https://codecov.io/gh/keepassxreboot/keepassxc/branch/develop/graph/badge.svg)](https://codecov.io/gh/keepassxreboot/keepassxc)
 [![GitHub release](https://img.shields.io/github/release/keepassxreboot/keepassxc)](https://github.com/keepassxreboot/keepassxc/releases/)
 
-[![Matrix community channel](https://img.shields.io/matrix/keepassxc:matrix.org?label=Community%20channel&style=for-the-badge)](https://matrix.to/#/!zUxwGnFkUyycpxeHeM:matrix.org?via=matrix.org)
-[![Matrix development channel](https://img.shields.io/matrix/keepassxc-dev:matrix.org?label=Development%20channel&style=for-the-badge)](https://matrix.to/#/!RhJPJPGwQIFVQeXqZa:matrix.org?via=matrix.org)
+[![Matrix community channel](https://img.shields.io/matrix/keepassxc:matrix.org?label=Community%20channel)](https://app.element.io/#/room/#keepassxc:mozilla.org)
+[![Matrix development channel](https://img.shields.io/matrix/keepassxc-dev:matrix.org?label=Development%20channel)](https://app.element.io/#/room/#keepassxc-dev:mozilla.org)
 
-[KeePassXC](https://keepassxc.org) is a modern, secure, and open-source password manager that stores and manages your most sensitive information. You can run KeePassXC on Windows, macOS, and Linux systems. KeePassXC is for people with extremely high demands of secure personal data management. It saves many different types of information, such as usernames, passwords, URLs, attachments, and notes in an offline, encrypted file that can be stored in any location, including private and public cloud solutions. For easy identification and management, user-defined titles and icons can be specified for entries. In addition, entries are sorted in customizable groups. An integrated search function allows you to use advanced patterns to easily find any entry in your database. A customizable, fast, and easy-to-use password generator utility allows you to create passwords with any combination of characters or easy to remember passphrases.
+[KeePassXC](https://keepassxc.org) is a modern, secure, and open-source password manager that stores and manages your most sensitive information. You can run KeePassXC on Windows, macOS, and Linux systems. KeePassXC is for people with extremely high demands of secure personal data management. It saves many different types of information, such as usernames, passwords, URLs, attachments, and notes in an offline, encrypted file that can be stored in any location, including private and public cloud solutions. For easy identification and management, user-defined titles and icons can be specified for entries. In addition, entries are sorted into customizable groups. An integrated search function allows you to use advanced patterns to easily find any entry in your database. A customizable, fast, and easy-to-use password generator utility allows you to create passwords with any combination of characters or easy to remember passphrases.
 
 ## Quick Start
 The [QuickStart Guide](https://keepassxc.org/docs/KeePassXC_GettingStarted.html) gets you started using KeePassXC on your Windows, macOS, or Linux computer using pre-compiled binaries from the [downloads page](https://keepassxc.org/download). Additionally, individual Linux distributions may ship their own versions, so please check your distribution's package list to see if KeePassXC is available. Detailed documentation is available in the [User Guide](https://keepassxc.org/docs/KeePassXC_UserGuide.html).
@@ -15,7 +15,7 @@ The [QuickStart Guide](https://keepassxc.org/docs/KeePassXC_GettingStarted.html)
 KeePassXC has numerous features for novice and power users alike. Our goal is to create an application that can be used by anyone while still offering advanced features to those that need them.
 
 ### Basic
-* Create, open, and save databases in the KDBX format (KeePass compatible to KDBX4 and KDBX3)
+* Create, open, and save databases in the KDBX format (KeePass-compatible with KDBX4 and KDBX3)
 * Store sensitive information in entries that are organized by groups
 * Search for entries
 * Password generator
@@ -48,7 +48,7 @@ Detailed instructions are available in the [Build and Install](./INSTALL.md) pag
 
 ## Contributing
 
-We are always looking for suggestions on how to improve KeePassXC. If you find any bugs or have an idea for a new feature, please let us know by opening a report in the [issue tracker](https://github.com/keepassxreboot/keepassxc/issues) on GitHub or join us on IRC in [freenode](https://webchat.freenode.net/) channels #keepassxc and #keepassxc-dev.
+We are always looking for suggestions on how to improve KeePassXC. If you find any bugs or have an idea for a new feature, please let us know by opening a report in the [issue tracker](https://github.com/keepassxreboot/keepassxc/issues) on GitHub, or join us on [Matrix community channel](https://matrix.to/#/!zUxwGnFkUyycpxeHeM:matrix.org?via=matrix.org) or [Matrix development channel](https://matrix.to/#/!RhJPJPGwQIFVQeXqZa:matrix.org?via=matrix.org), or on IRC in [Libera.Chat](https://web.libera.chat/) channels #keepassxc and #keepassxc-dev.
 
 You may directly contribute your own code by submitting a pull request. Please read the [CONTRIBUTING](.github/CONTRIBUTING.md) document for further information.
 

cmake/CLangFormat.cmake

@@ -15,50 +15,46 @@
 
 set(EXCLUDED_DIRS
         # third-party directories
-        src/zxcvbn/
+        src/thirdparty
+        src/zxcvbn
         # objective-c directories
-        src/touchid/
-        src/autotype/mac/
-        src/gui/osutils/macutils/)
+        src/touchid
+        src/autotype/mac
+        src/gui/osutils/macutils)
 
 set(EXCLUDED_FILES
         # third-party files
-        streams/qtiocompressor.cpp
-        streams/qtiocompressor.h
-        gui/KMessageWidget.h
-        gui/KMessageWidget.cpp
-        gui/MainWindowAdaptor.h
-        gui/MainWindowAdaptor.cpp
-        crypto/ssh/bcrypt_pbkdf.cpp
-        crypto/ssh/blf.h
-        crypto/ssh/blowfish.c
-        tests/modeltest.cpp
-        tests/modeltest.h
+        src/streams/qtiocompressor.\\*
+        src/gui/KMessageWidget.\\*
+        src/gui/MainWindowAdaptor.\\*
+        src/gui/tag/TagsEdit.\\*
+        tests/modeltest.\\*
         # objective-c files
-        core/ScreenLockListenerMac.h
-        core/ScreenLockListenerMac.cpp)
+        src/core/ScreenLockListenerMac.\\*)
 
-file(GLOB_RECURSE ALL_SOURCE_FILES RELATIVE ${CMAKE_SOURCE_DIR} src/*.cpp src/*.h tests/*.cpp tests/*.h)
-foreach(SOURCE_FILE ${ALL_SOURCE_FILES})
-    foreach(EXCLUDED_DIR ${EXCLUDED_DIRS})
-        string(FIND ${SOURCE_FILE} ${EXCLUDED_DIR} SOURCE_FILE_EXCLUDED)
-        if(NOT ${SOURCE_FILE_EXCLUDED} EQUAL -1)
-            list(REMOVE_ITEM ALL_SOURCE_FILES ${SOURCE_FILE})
-        endif()
-    endforeach()
-    foreach(EXCLUDED_FILE ${EXCLUDED_FILES})
-        if(${SOURCE_FILE} MATCHES ".*${EXCLUDED_FILE}$")
-            list(REMOVE_ITEM ALL_SOURCE_FILES ${SOURCE_FILE})
-        endif()
-    endforeach()
+set(FIND_EXCLUDE_DIR_EXPR "")
+foreach(EXCLUDE ${EXCLUDED_DIRS})
+    list(APPEND FIND_EXCLUDE_DIR_EXPR -o -path "${EXCLUDE}" -prune)
 endforeach()
 
+set(FIND_EXCLUDE_FILE_EXPR "")
+foreach(EXCLUDE ${EXCLUDED_FILES})
+    if(FIND_EXCLUDE_FILE_EXPR)
+        list(APPEND FIND_EXCLUDE_FILE_EXPR -o)
+    endif()
+    list(APPEND FIND_EXCLUDE_FILE_EXPR -path "${EXCLUDE}")
+endforeach()
+if(FIND_EXCLUDE_FILE_EXPR)
+    set(FIND_EXCLUDE_FILE_EXPR -a -not "\\(" ${FIND_EXCLUDE_FILE_EXPR} "\\)")
+endif()
+
 add_custom_target(format)
-foreach(SOURCE_FILE ${ALL_SOURCE_FILES})
-    add_custom_command(
-            TARGET format
-            PRE_BUILD
-            COMMAND echo Formatting ${SOURCE_FILE}
-            COMMAND clang-format -style=file -i \"${SOURCE_FILE}\"
-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-endforeach()
+
+add_custom_command(
+        TARGET format
+        PRE_BUILD
+        COMMAND find src tests "\\(" -name "\\*.h" -o -name "\\*.cpp" ${FIND_EXCLUDE_DIR_EXPR} "\\)"
+            ${FIND_EXCLUDE_FILE_EXPR} -type f -print0 | xargs -0 -P0 -n10 clang-format -style=file -i
+
+        COMMENT "Formatting source files..."
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})

cmake/CodeCoverage.cmake

@@ -1,4 +1,5 @@
 # Copyright (c) 2012 - 2017, Lars Bilke
+# Copyright (c) 2021 KeePassXC Team
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -25,279 +26,218 @@
 # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# CHANGES:
-#
-# 2012-01-31, Lars Bilke
-# - Enable Code Coverage
-#
-# 2013-09-17, Joakim Söderberg
-# - Added support for Clang.
-# - Some additional usage instructions.
-#
-# 2016-02-03, Lars Bilke
-# - Refactored functions to use named parameters
-#
-# 2017-06-02, Lars Bilke
-# - Merged with modified version from github.com/ufz/ogs
-#
-#
-# USAGE:
-#
-# 1. Copy this file into your cmake modules path.
-#
-# 2. Add the following line to your CMakeLists.txt:
-#      include(CodeCoverage)
-#
-# 3. Append necessary compiler flags:
-#      APPEND_COVERAGE_COMPILER_FLAGS()
-#
-# 4. If you need to exclude additional directories from the report, specify them
-#    using the COVERAGE_LCOV_EXCLUDES variable before calling SETUP_TARGET_FOR_COVERAGE_LCOV.
-#    Example:
-#      set(COVERAGE_LCOV_EXCLUDES 'dir1/*' 'dir2/*')
-#
-# 5. Use the functions described below to create a custom make target which
-#    runs your test executable and produces a code coverage report.
-#
-# 6. Build a Debug build:
-#      cmake -DCMAKE_BUILD_TYPE=Debug ..
-#      make
-#      make my_coverage_target
-#
 
 include(CMakeParseArguments)
 
 # Check prereqs
-find_program( GCOV_PATH gcov )
-find_program( LCOV_PATH  NAMES lcov lcov.bat lcov.exe lcov.perl)
-find_program( GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat )
-find_program( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
-find_program( SIMPLE_PYTHON_EXECUTABLE python )
+find_program(GCOV_PATH gcov)
+find_program(LLVM_COV_PATH llvm-cov)
+find_program(LLVM_PROFDATA_PATH llvm-profdata)
+find_program(XCRUN_PATH xcrun)
+find_program(GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat)
+find_program(GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
 
-if(NOT GCOV_PATH)
-    message(FATAL_ERROR "gcov not found! Aborting...")
-endif() # NOT GCOV_PATH
-
-if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
-    if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 3)
-        message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
-    endif()
-elseif(NOT CMAKE_COMPILER_IS_GNUCXX)
-    message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
+set(COVERAGE_COMPILER_FLAGS "-g -O0" CACHE INTERNAL "")
+if(CMAKE_COMPILER_IS_GNUCXX)
+    set(COVERAGE_COMPILER_FLAGS "${COVERAGE_COMPILER_FLAGS} --coverage -fprofile-arcs -ftest-coverage")
+elseif(CMAKE_COMPILER_IS_CLANGXX)
+    set(COVERAGE_COMPILER_FLAGS "${COVERAGE_COMPILER_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
 endif()
 
-set(COVERAGE_COMPILER_FLAGS "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
-    CACHE INTERNAL "")
+set(CMAKE_COVERAGE_FORMAT
+    "html" "xml"
+    CACHE STRING "Coverage report output format.")
+set_property(CACHE CMAKE_COVERAGE_FORMAT PROPERTY STRINGS "html" "txt")
 
 set(CMAKE_CXX_FLAGS_COVERAGE
     ${COVERAGE_COMPILER_FLAGS}
-    CACHE STRING "Flags used by the C++ compiler during coverage builds."
-    FORCE )
+    CACHE STRING "Flags used by the C++ compiler during coverage builds.")
 set(CMAKE_C_FLAGS_COVERAGE
     ${COVERAGE_COMPILER_FLAGS}
-    CACHE STRING "Flags used by the C compiler during coverage builds."
-    FORCE )
+    CACHE STRING "Flags used by the C compiler during coverage builds.")
 set(CMAKE_EXE_LINKER_FLAGS_COVERAGE
     ""
-    CACHE STRING "Flags used for linking binaries during coverage builds."
-    FORCE )
+    CACHE STRING "Flags used for linking binaries during coverage builds.")
 set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
     ""
-    CACHE STRING "Flags used by the shared libraries linker during coverage builds."
-    FORCE )
+    CACHE STRING "Flags used by the shared libraries linker during coverage builds.")
 mark_as_advanced(
+    CMAKE_COVERAGE_FORMAT
     CMAKE_CXX_FLAGS_COVERAGE
     CMAKE_C_FLAGS_COVERAGE
     CMAKE_EXE_LINKER_FLAGS_COVERAGE
-    CMAKE_SHARED_LINKER_FLAGS_COVERAGE )
+    CMAKE_SHARED_LINKER_FLAGS_COVERAGE)
 
 if(NOT CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
     message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading")
 endif() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
 
-if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+if(CMAKE_COMPILER_IS_GNUCXX)
+    if(NOT GCOV_PATH)
+        message(FATAL_ERROR "gcov not found! Aborting...")
+    endif() # NOT GCOV_PATH
     link_libraries(gcov)
-else()
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
 endif()
 
-# Defines a target for running and collection code coverage information
-# Builds dependencies, runs the given executable and outputs reports.
-# NOTE! The executable should always have a ZERO as exit code otherwise
-# the coverage generation will not complete.
-#
-# SETUP_TARGET_FOR_COVERAGE_LCOV(
-#     NAME testrunner_coverage                    # New target name
-#     EXECUTABLE testrunner -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
-#     DEPENDENCIES testrunner                     # Dependencies to build first
-# )
-function(SETUP_TARGET_FOR_COVERAGE_LCOV)
-
-    set(options NONE)
-    set(oneValueArgs NAME)
-    set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
-    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    if(NOT LCOV_PATH)
-        message(FATAL_ERROR "lcov not found! Aborting...")
-    endif() # NOT LCOV_PATH
-
-    if(NOT GENHTML_PATH)
-        message(FATAL_ERROR "genhtml not found! Aborting...")
-    endif() # NOT GENHTML_PATH
-
-    # Setup target
-    add_custom_target(${Coverage_NAME}
-
-        # Cleanup lcov
-        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} -directory . --zerocounters
-        # Create baseline to make sure untouched files show up in the report
-        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} -c -i -d . -o ${Coverage_NAME}.base
-
-        # Run tests
-        COMMAND ${Coverage_EXECUTABLE}
-
-        # Capturing lcov counters and generating report
-        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} --directory . --capture --output-file ${Coverage_NAME}.info
-        # add baseline counters
-        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} -a ${Coverage_NAME}.base -a ${Coverage_NAME}.info --output-file ${Coverage_NAME}.total
-        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} --remove ${Coverage_NAME}.total ${COVERAGE_LCOV_EXCLUDES} --output-file ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
-        COMMAND ${GENHTML_PATH} -o ${Coverage_NAME} ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
-        COMMAND ${CMAKE_COMMAND} -E remove ${Coverage_NAME}.base ${Coverage_NAME}.total ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
-
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        DEPENDS ${Coverage_DEPENDENCIES}
-        COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
-    )
-
-    # Show where to find the lcov info report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
-        COMMENT "Lcov code coverage info report saved in ${Coverage_NAME}.info."
-    )
-
-    # Show info where to find the report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
-        COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
-    )
-
-endfunction() # SETUP_TARGET_FOR_COVERAGE_LCOV
 
 # Defines a target for running and collection code coverage information
 # Builds dependencies, runs the given executable and outputs reports.
 # NOTE! The executable should always have a ZERO as exit code otherwise
 # the coverage generation will not complete.
 #
-# SETUP_TARGET_FOR_COVERAGE_GCOVR_XML(
+# SETUP_TARGET_FOR_COVERAGE_GCOVR(
 #     NAME ctest_coverage                    # New target name
 #     EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
 #     DEPENDENCIES executable_target         # Dependencies to build first
 # )
-function(SETUP_TARGET_FOR_COVERAGE_GCOVR_XML)
+function(SETUP_TARGET_FOR_COVERAGE_GCOVR)
 
     set(options NONE)
-    set(oneValueArgs NAME)
+    set(oneValueArgs NAME SOURCES_ROOT)
     set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
     cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-    if(NOT SIMPLE_PYTHON_EXECUTABLE)
-        message(FATAL_ERROR "python not found! Aborting...")
-    endif() # NOT SIMPLE_PYTHON_EXECUTABLE
-
     if(NOT GCOVR_PATH)
         message(FATAL_ERROR "gcovr not found! Aborting...")
     endif() # NOT GCOVR_PATH
 
     # Combine excludes to several -e arguments
     set(GCOVR_EXCLUDES "")
-    foreach(EXCLUDE ${COVERAGE_GCOVR_EXCLUDES})
+    foreach(EXCLUDE ${COVERAGE_EXCLUDES})
         list(APPEND GCOVR_EXCLUDES "-e")
         list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
     endforeach()
 
     add_custom_target(${Coverage_NAME}
         # Run tests
-        ${Coverage_EXECUTABLE}
+        COMMAND ctest -C $<CONFIG> $ENV{ARGS} $$ARGS
 
-        # Running gcovr
-        COMMAND ${GCOVR_PATH} --xml
-            -r ${PROJECT_SOURCE_DIR} ${GCOVR_EXCLUDES}
-            --object-directory=${PROJECT_BINARY_DIR}
-            -o ${Coverage_NAME}.xml
         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
         DEPENDS ${Coverage_DEPENDENCIES}
-        COMMENT "Running gcovr to produce Cobertura code coverage report."
     )
 
-    # Show info where to find the report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
-        COMMENT "Cobertura code coverage report saved in ${Coverage_NAME}.xml."
-    )
+    if("html" IN_LIST CMAKE_COVERAGE_FORMAT)
+        add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+            # Create folder
+            COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${Coverage_NAME}-html
 
-endfunction() # SETUP_TARGET_FOR_COVERAGE_GCOVR_XML
+            # Running gcovr HTML
+            COMMAND ${GCOVR_PATH} --html --html-details
+                -r ${Coverage_SOURCES_ROOT} ${GCOVR_EXCLUDES}
+                --object-directory=${PROJECT_BINARY_DIR}
+                --exclude-unreachable-branches --exclude-throw-branches
+                -o ${Coverage_NAME}-html/index.html
+            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+            COMMENT "Running gcovr to produce HTML code coverage report ${Coverage_NAME}-html."
+        )
+    endif()
+
+    if("xml" IN_LIST CMAKE_COVERAGE_FORMAT)
+        add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+            # Running gcovr TXT
+            COMMAND ${GCOVR_PATH} --xml
+                -r ${Coverage_SOURCES_ROOT} ${GCOVR_EXCLUDES}
+                --object-directory=${PROJECT_BINARY_DIR}
+                --exclude-unreachable-branches --exclude-throw-branches
+                -o ${Coverage_NAME}.xml
+            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+            COMMENT "Running gcovr to produce XML code coverage report ${Coverage_NAME}.xml."
+        )
+    endif()
+
+    if("txt" IN_LIST CMAKE_COVERAGE_FORMAT)
+        add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+            # Running gcovr TXT
+            COMMAND ${GCOVR_PATH}
+                -r ${Coverage_SOURCES_ROOT} ${GCOVR_EXCLUDES}
+                --object-directory=${PROJECT_BINARY_DIR}
+                --exclude-unreachable-branches --exclude-throw-branches
+                -o ${Coverage_NAME}.txt
+            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+            COMMENT "Running gcovr to produce TXT code coverage report ${Coverage_NAME}.txt."
+        )
+    endif()
+
+endfunction() # SETUP_TARGET_FOR_COVERAGE_GCOVR
 
 # Defines a target for running and collection code coverage information
 # Builds dependencies, runs the given executable and outputs reports.
 # NOTE! The executable should always have a ZERO as exit code otherwise
 # the coverage generation will not complete.
 #
-# SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML(
+# SETUP_TARGET_FOR_COVERAGE_LLVM(
 #     NAME ctest_coverage                    # New target name
 #     EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
 #     DEPENDENCIES executable_target         # Dependencies to build first
 # )
-function(SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML)
+function(SETUP_TARGET_FOR_COVERAGE_LLVM)
 
     set(options NONE)
-    set(oneValueArgs NAME)
-    set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+    set(oneValueArgs NAME SOURCES_ROOT PROF_FILE)
+    set(multiValueArgs EXECUTABLE BINARY EXECUTABLE_ARGS DEPENDENCIES)
     cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-    if(NOT SIMPLE_PYTHON_EXECUTABLE)
-        message(FATAL_ERROR "python not found! Aborting...")
-    endif() # NOT SIMPLE_PYTHON_EXECUTABLE
+    if(XCRUN_PATH)
+        set(LLVM_COV_PATH ${XCRUN_PATH} llvm-cov)
+        set(LLVM_PROFDATA_PATH ${XCRUN_PATH} llvm-profdata)
+    else()
+        if(NOT LLVM_COV_PATH)
+            message(FATAL_ERROR "llvm-cov not found! Aborting...")
+        endif() # NOT LLVM_COV_PATH
+        if(NOT LLVM_PROFDATA_PATH)
+            message(FATAL_ERROR "llvm-profdata not found! Aborting...")
+        endif() # NOT LLVM_PROFDATA_PATH
+    endif() # XCRUN_PATH
 
-    if(NOT GCOVR_PATH)
-        message(FATAL_ERROR "gcovr not found! Aborting...")
-    endif() # NOT GCOVR_PATH
+    set(LLVM_PROFILE_DIR ${PROJECT_BINARY_DIR}/llvm_profile)
+    file(REMOVE_RECURSE ${LLVM_PROFILE_DIR})
 
-    # Combine excludes to several -e arguments
-    set(GCOVR_EXCLUDES "")
-    foreach(EXCLUDE ${COVERAGE_GCOVR_EXCLUDES})
-        list(APPEND GCOVR_EXCLUDES "-e")
-        list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
+    set(COV_EXCLUDES "")
+    foreach(EXCLUDE ${COVERAGE_EXCLUDES})
+        list(APPEND COV_EXCLUDES "-ignore-filename-regex=${EXCLUDE}")
     endforeach()
 
+    list(GET Coverage_BINARY 0 COV_BINARY)
+    if(Coverage_BINARY)
+        list(REMOVE_AT Coverage_BINARY 0)
+        foreach(BIN ${Coverage_BINARY})
+            list(APPEND COV_BINARY -object ${BIN})
+        endforeach()
+    endif()
+
     add_custom_target(${Coverage_NAME}
-        # Run tests
-        ${Coverage_EXECUTABLE}
+        COMMAND ${CMAKE_COMMAND} -E env LLVM_PROFILE_FILE=${LLVM_PROFILE_DIR}/profile-%p.profraw ctest -C $<CONFIG> $$ARGS
 
-        # Create folder
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${Coverage_NAME}
+        COMMAND ${LLVM_PROFDATA_PATH} merge -sparse ${LLVM_PROFILE_DIR}/* -o coverage.profdata
+            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+            DEPENDS ${Coverage_DEPENDENCIES})
 
-        # Running gcovr
-        COMMAND ${GCOVR_PATH} --html --html-details
-            -r ${PROJECT_SOURCE_DIR} ${GCOVR_EXCLUDES}
-            --object-directory=${PROJECT_BINARY_DIR}
-            -o ${Coverage_NAME}/index.html
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        DEPENDS ${Coverage_DEPENDENCIES}
-        COMMENT "Running gcovr to produce HTML code coverage report."
-    )
+    if("html" IN_LIST CMAKE_COVERAGE_FORMAT)
+        add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+            COMMAND ${LLVM_COV_PATH} show -instr-profile=coverage.profdata ${COV_BINARY}
+                --format=html --output-dir=${Coverage_NAME}-html ${COV_EXCLUDES} ${Coverage_SOURCES_ROOT}
+            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+            COMMENT "Running llvm-cov to produce HTML code coverage report ${Coverage_NAME}-html")
+    endif()
 
-    # Show info where to find the report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
-        COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
-    )
+    if("xml" IN_LIST CMAKE_COVERAGE_FORMAT)
+        message(WARNING "XML coverage report format not supported for llvm-cov")
+    endif()
+
+    if("txt" IN_LIST CMAKE_COVERAGE_FORMAT)
+        add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+            COMMAND ${LLVM_COV_PATH} show -instr-profile=coverage.profdata ${COV_BINARY}
+                --format=text ${COV_EXCLUDES} ${Coverage_SOURCES_ROOT} > ${Coverage_NAME}.txt
+
+            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+            COMMENT "Running llvm-cov to produce TXT code coverage report ${Coverage_NAME}.txt.")
+    endif()
+
+endfunction() # SETUP_TARGET_FOR_COVERAGE_LLVM
 
-endfunction() # SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML
 
 function(APPEND_COVERAGE_COMPILER_FLAGS)
+    message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
-    message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
-endfunction() # APPEND_COVERAGE_COMPILER_FLAGS
+endfunction() # APPEND_COVERAGE_COMPILER_FLAGS

cmake/FindBotan2.cmake

@@ -48,32 +48,17 @@
 #   BOTAN2_LIBRARIES      - list of libraries to link
 #   BOTAN2_VERSION        - library version that was found, if any
 
-# use pkg-config to get the directories and then use these values
-# in the find_path() and find_library() calls
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_BOTAN2 QUIET botan-2)
-
 # find the headers
 find_path(BOTAN2_INCLUDE_DIR
   NAMES botan/version.h
-  HINTS
-    ${PC_BOTAN2_INCLUDEDIR}
-    ${PC_BOTAN2_INCLUDE_DIRS}
   PATH_SUFFIXES botan-2
 )
 
 # find the library
-find_library(BOTAN2_LIBRARY
-  NAMES botan-2 libbotan-2
-  HINTS
-    ${PC_BOTAN2_LIBDIR}
-    ${PC_BOTAN2_LIBRARY_DIRS}
-)
+find_library(BOTAN2_LIBRARY NAMES botan-2 libbotan-2 botan)
 
 # determine the version
-if(PC_BOTAN2_VERSION)
-    set(BOTAN2_VERSION ${PC_BOTAN2_VERSION})
-elseif(BOTAN2_INCLUDE_DIR AND EXISTS "${BOTAN2_INCLUDE_DIR}/botan/build.h")
+if(BOTAN2_INCLUDE_DIR AND EXISTS "${BOTAN2_INCLUDE_DIR}/botan/build.h")
     file(STRINGS "${BOTAN2_INCLUDE_DIR}/botan/build.h" botan2_version_str
       REGEX "^#define[\t ]+(BOTAN_VERSION_[A-Z]+)[\t ]+[0-9]+")
 
@@ -93,23 +78,23 @@ find_package_handle_standard_args(Botan2
   VERSION_VAR BOTAN2_VERSION
 )
 
-if (BOTAN2_FOUND)
+if(BOTAN2_FOUND)
   set(BOTAN2_INCLUDE_DIRS ${BOTAN2_INCLUDE_DIR} ${PC_BOTAN2_INCLUDE_DIRS})
   set(BOTAN2_LIBRARIES ${BOTAN2_LIBRARY})
 endif()
 
-if (BOTAN2_FOUND AND NOT TARGET Botan2::Botan2)
+if(BOTAN2_FOUND AND NOT TARGET Botan2::Botan2)
   # create the new library target
   add_library(Botan2::Botan2 UNKNOWN IMPORTED)
   # set the required include dirs for the target
-  if (BOTAN2_INCLUDE_DIRS)
+  if(BOTAN2_INCLUDE_DIRS)
     set_target_properties(Botan2::Botan2
       PROPERTIES
         INTERFACE_INCLUDE_DIRECTORIES "${BOTAN2_INCLUDE_DIRS}"
     )
   endif()
   # set the required libraries for the target
-  if (EXISTS "${BOTAN2_LIBRARY}")
+  if(EXISTS "${BOTAN2_LIBRARY}")
     set_target_properties(Botan2::Botan2
       PROPERTIES
         IMPORTED_LINK_INTERFACE_LANGUAGES "C"

cmake/FindMinizip.cmake

@@ -0,0 +1,9 @@
+# MINIZIP_FOUND                   - Minizip library was found
+# MINIZIP_INCLUDE_DIR             - Path to Minizip include dir
+# MINIZIP_LIBRARIES               - List of Minizip libraries
+
+find_library(MINIZIP_LIBRARIES NAMES minizip libminizip)
+find_path(MINIZIP_INCLUDE_DIR zip.h PATH_SUFFIXES minizip)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Minizip DEFAULT_MSG MINIZIP_LIBRARIES MINIZIP_INCLUDE_DIR)

cmake/FindPCSC.cmake

@@ -0,0 +1,39 @@
+#  Copyright (C) 2021 KeePassXC Team <team@keepassxc.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Use pkgconfig on Linux
+if(NOT WIN32)
+   find_package(PkgConfig QUIET)
+   pkg_check_modules(PCSC libpcsclite)
+endif()
+
+if(NOT PCSC_FOUND)
+   # Search for PC/SC headers on Mac and Windows
+   find_path(PCSC_INCLUDE_DIRS winscard.h
+      HINTS
+      ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}
+      /usr/include/PCSC
+      PATH_SUFFIXES PCSC)
+
+   # MAC library is PCSC, Windows library is WinSCard
+   find_library(PCSC_LIBRARIES NAMES pcsclite libpcsclite WinSCard PCSC
+      HINTS   
+      ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PCSC DEFAULT_MSG PCSC_LIBRARIES PCSC_INCLUDE_DIRS)
+
+mark_as_advanced(PCSC_LIBRARIES PCSC_INCLUDE_DIRS)

cmake/FindQREncode.cmake

@@ -13,8 +13,15 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-find_path(QRENCODE_INCLUDE_DIR qrencode.h)
-find_library(QRENCODE_LIBRARY qrencode)
+find_path(QRENCODE_INCLUDE_DIR NAMES qrencode.h)
+
+if (VCPKG_INSTALLED_DIR)
+    find_library(QRENCODE_LIBRARY_RELEASE qrencode)
+    find_library(QRENCODE_LIBRARY_DEBUG qrencoded)
+    set(QRENCODE_LIBRARY optimized ${QRENCODE_LIBRARY_RELEASE} debug ${QRENCODE_LIBRARY_DEBUG})
+else()
+    find_library(QRENCODE_LIBRARY qrencode)
+endif()
 
 mark_as_advanced(QRENCODE_LIBRARY QRENCODE_INCLUDE_DIR)
 

cmake/FindQuaZip.cmake

@@ -1,24 +0,0 @@
-# QUAZIP_FOUND                   - QuaZip library was found
-# QUAZIP_INCLUDE_DIR             - Path to QuaZip include dir
-# QUAZIP_INCLUDE_DIRS            - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
-# QUAZIP_LIBRARIES               - List of QuaZip libraries
-# QUAZIP_ZLIB_INCLUDE_DIR        - The include dir of zlib headers
-
-if(MINGW)
-    find_library(QUAZIP_LIBRARIES libquazip5)
-    find_path(QUAZIP_INCLUDE_DIR quazip.h PATH_SUFFIXES quazip5)
-    find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h)
-else()
-    find_library(QUAZIP_LIBRARIES
-        NAMES quazip5 quazip
-	PATHS /usr/lib /usr/lib64 /usr/local/lib
-    )
-    find_path(QUAZIP_INCLUDE_DIR quazip.h
-	PATHS /usr/include /usr/local/include
-        PATH_SUFFIXES quazip5 quazip
-    )
-    find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include)
-endif()
-include(FindPackageHandleStandardArgs)
-set(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
-find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)

cmake/FindReadline.cmake

@@ -47,4 +47,3 @@ mark_as_advanced(
     Readline_INCLUDE_DIR
     Readline_LIBRARY
 )
-

cmake/FindYubiKey.cmake

@@ -1,27 +0,0 @@
-#  Copyright (C) 2014 Kyle Manna <kyle@kylemanna.com>
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 or (at your option)
-#  version 3 of the License.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-find_path(YUBIKEY_CORE_INCLUDE_DIR yubikey.h)
-find_path(YUBIKEY_PERS_INCLUDE_DIR ykcore.h PATH_SUFFIXES ykpers-1)
-set(YUBIKEY_INCLUDE_DIRS ${YUBIKEY_CORE_INCLUDE_DIR} ${YUBIKEY_PERS_INCLUDE_DIR})
-
-find_library(YUBIKEY_CORE_LIBRARY NAMES yubikey.dll libyubikey.so yubikey)
-find_library(YUBIKEY_PERS_LIBRARY NAMES ykpers-1.dll libykpers-1.so ykpers-1)
-set(YUBIKEY_LIBRARIES ${YUBIKEY_CORE_LIBRARY} ${YUBIKEY_PERS_LIBRARY})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(YubiKey DEFAULT_MSG YUBIKEY_LIBRARIES YUBIKEY_INCLUDE_DIRS)
-
-mark_as_advanced(YUBIKEY_LIBRARIES YUBIKEY_INCLUDE_DIRS)

cmake/MakePortableZip.cmake

@@ -0,0 +1,3 @@
+if (CMAKE_INSTALL_PREFIX MATCHES "/ZIP/")
+  file(TOUCH "${CMAKE_INSTALL_PREFIX}/.portable")
+endif()

codecov.yaml

@@ -0,0 +1,8 @@
+coverage:
+  range: 60..80
+  round: nearest
+  precision: 2
+fixes:
+  - "*/src/::"
+comment:
+  require_changes: true

docs/CMakeLists.txt

@@ -24,43 +24,36 @@ set(OUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(REV -a revnumber=${KEEPASSXC_VERSION})
 
 # Build html documentation on all platforms
-file(GLOB html_depends ${DOC_DIR}/topics/* ${DOC_DIR}/styles/* ${DOC_DIR}/images/*)
-add_custom_command(OUTPUT KeePassXC_GettingStarted.html
-    COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_GettingStarted.html ${REV} ${DOC_DIR}/GettingStarted.adoc
-    DEPENDS ${html_depends} ${DOC_DIR}/GettingStarted.adoc
-    VERBATIM)
-add_custom_command(OUTPUT KeePassXC_UserGuide.html
-    COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_UserGuide.html ${REV} ${DOC_DIR}/UserGuide.adoc
-    DEPENDS ${html_depends} ${DOC_DIR}/UserGuide.adoc
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    VERBATIM)
-file(GLOB styles_depends ${DOC_DIR}/styles/*)
-add_custom_command(OUTPUT KeePassXC_KeyboardShortcuts.html
-    COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_KeyboardShortcuts.html ${REV} ${DOC_DIR}/topics/KeyboardShortcuts.adoc
-    DEPENDS ${DOC_DIR}/topics/KeyboardShortcuts.adoc ${styles_depends}
+# NOTE: Combine into one long command to prevent MSVC from failing to build all docs
+file(GLOB doc_depends ${DOC_DIR}/*.adoc ${DOC_DIR}/topics/* ${DOC_DIR}/styles/* ${DOC_DIR}/images/*)
+add_custom_command(
+    OUTPUT KeePassXC_GettingStarted.html KeePassXC_UserGuide.html KeePassXC_KeyboardShortcuts.html
+    COMMAND
+        ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_GettingStarted.html ${REV} ${DOC_DIR}/GettingStarted.adoc &&
+        ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_UserGuide.html ${REV} ${DOC_DIR}/UserGuide.adoc &&
+        ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_KeyboardShortcuts.html ${REV} ${DOC_DIR}/topics/KeyboardShortcuts.adoc
+    DEPENDS ${doc_depends}
     VERBATIM)
 
 add_custom_target(docs ALL DEPENDS KeePassXC_GettingStarted.html KeePassXC_UserGuide.html KeePassXC_KeyboardShortcuts.html)
 
 install(FILES
-    ${OUT_DIR}/KeePassXC_GettingStarted.html
-    ${OUT_DIR}/KeePassXC_UserGuide.html
-    ${OUT_DIR}/KeePassXC_KeyboardShortcuts.html
-    DESTINATION ${DATA_INSTALL_DIR}/docs)
+        ${OUT_DIR}/KeePassXC_GettingStarted.html
+        ${OUT_DIR}/KeePassXC_UserGuide.html
+        ${OUT_DIR}/KeePassXC_KeyboardShortcuts.html
+        DESTINATION ${DATA_INSTALL_DIR}/docs)
 
 # Build Man Pages on Linux and macOS
 if(UNIX)
-    add_custom_command(OUTPUT keepassxc.1
-        COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${REV} ${DOC_DIR}/man/keepassxc.1.adoc
-        DEPENDS ${DOC_DIR}/man/keepassxc.1.adoc
-        VERBATIM)
-    add_custom_command(OUTPUT keepassxc-cli.1
-        COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${REV} ${DOC_DIR}/man/keepassxc-cli.1.adoc
-        DEPENDS ${DOC_DIR}/man/keepassxc-cli.1.adoc
+    add_custom_command(OUTPUT keepassxc.1 keepassxc-cli.1
+        COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${REV} ./man/keepassxc.1.adoc
+        COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${REV} ./man/keepassxc-cli.1.adoc
+        DEPENDS ${DOC_DIR}/man/keepassxc.1.adoc ${DOC_DIR}/man/keepassxc-cli.1.adoc
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         VERBATIM)
     add_custom_target(manpages ALL DEPENDS keepassxc.1 keepassxc-cli.1)
 
-    install(FILES 
+    install(FILES
         ${OUT_DIR}/keepassxc.1
         ${OUT_DIR}/keepassxc-cli.1
         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)

docs/man/keepassxc-cli.1.adoc

@@ -40,6 +40,17 @@ It provides the ability to query and modify the entries of a KeePass database, d
 *analyze* [_options_] <__database__>::
   Analyzes passwords in a database for weaknesses using offline HIBP SHA-1 hash lookup.
 
+*attachment-export* [_options_] <__database__> <__entry__> <__attachment_name__> <__export_file__>::
+  Exports the content of an attachment to a specified file.
+  Use *--stdout* option to instead output the contents of the attachment to stdout.
+
+*attachment-import* [_options_] <__database__> <__entry__> <__attachment_name__> <__import_file__>::
+  Imports the attachment into an entry.
+  An existing attachment with the same name may be overwritten if the *-f* option is specified.
+
+*attachment-rm* <__database__> <__entry__> <__attachment_name__>::
+  Removes the named attachment from an entry.
+
 *clip* [_options_] <__database__> <__entry__> [_timeout_]::
   Copies an attribute or the current TOTP (if the *-t* option is specified) of a database entry to the clipboard.
   If no attribute name is specified using the *-a* option, the password is copied.
@@ -90,10 +101,6 @@ It provides the ability to query and modify the entries of a KeePass database, d
   If both the key file and password are empty, no database will be created.
   The new database will be in kdbx 4 format.
 
-
-*locate* [_options_] <__database__> <__term__>::
-  Locates all the entries that match a specific search term in a database.
-
 *ls* [_options_] <__database__> [_group_]::
   Lists the contents of a group in a database.
   If no group is specified, it will default to the root group.
@@ -127,6 +134,9 @@ It provides the ability to query and modify the entries of a KeePass database, d
   If the database has a recycle bin, the group will be moved there.
   If the group is already in the recycle bin, it will be removed permanently.
 
+*search* [_options_] <__database__> <__term__>::
+  Searches all entries that match a specific search term in a database.
+
 *show* [_options_] <__database__> <__entry__>::
   Shows the title, username, password, URL and notes of a database entry.
   Can also show the current TOTP.
@@ -221,7 +231,7 @@ The same password generation options as documented for the generate command can
   Will report an error if no TOTP is configured for the entry.
 
 *-b*, *--best*::
-  Try to find and copy to clipboard a unique entry matching the input (similar to *-locate*)
+  Try to find and copy to clipboard a unique entry matching the input
   If a unique matching entry is found it will be copied to the clipboard.
   If multiple entries are found they will be listed to refine the search. (no clip performed)
 
@@ -245,6 +255,9 @@ The same password generation options as documented for the generate command can
 *-s*, *--show-protected*::
   Shows the protected attributes in clear text.
 
+*--show-attachments*::
+  Shows the attachment names along with the size of the attachments.
+
 *-t*, *--totp*::
   Also shows the current TOTP, reporting an error if no TOTP is configured for the entry.
 
@@ -257,6 +270,7 @@ The same password generation options as documented for the generate command can
   Sets the Path of the wordlist for the diceware generator.
   The wordlist must have > 1000 words, otherwise the program will fail.
   If the wordlist has < 4000 words a warning will be printed to STDERR.
+  Any *diceware*-compatible wordlist can used. Note however that *KeePassXC* will NOT verify the PGP signature of signed wordlists.
 
 === Export options
 *-f*, *--format*::

docs/topics/AutoType.adoc

@@ -65,7 +65,7 @@ image::autotype_entry_sequences.png[]
 === Performing Global Auto-Type
 The global Auto-Type keyboard shortcut is used when you have focus on the window you want to type into. To make use of this feature, you must have previously configured an Auto-Type hotkey.
 
-When you press the global Auto-Type hotkey, KeePassXC searches all unlocked databases for entries that match the focused window title. The Auto-Type selection dialog will appear in the following circumstances: there are no matches found, there are multiple matches found, or the setting "Always ask before performing Auto-Type" is enabled.
+When you press the global Auto-Type hotkey, KeePassXC searches all unlocked databases for entries that match the focused window title. The Auto-Type selection dialog will appear in the following circumstances: there are no matches found, there are multiple matches found, or the setting "Always ask before performing Auto-Type" is enabled. The selection is remembered for a short while to help retype with the same entry in quick succession.
 
 .Auto-Type sequence selection
 image::autotype_selection_dialog.png[,70%]
@@ -80,7 +80,7 @@ Search the unlocked databases by activating Search Database radio button. Use th
 .Additional Auto-Type choices
 image::autotype_selection_dialog_type_menu.png[,70%]
 
-The option to type just the username, password, or current TOTP value is available by right clicking the desired row or expanding the Type Sequence button options. 
+The option to type just the username, password, or current TOTP value is available by right clicking the desired row or expanding the Type Sequence button options.
 
 === Performing Entry-Level Auto-Type
 You can quickly activate the default Auto-Type sequence for a particular entry using Entry-Level Auto-Type. For this operation, the KeePassXC window will be minimized and the Auto-Type sequence occurs in the previously selected window. You can perform Entry-Level Auto-Type from the toolbar icon *(A)*, entry context menu *(B)*, or by pressing `Ctrl+Shift+V`.
@@ -89,4 +89,4 @@ WARNING: Be careful when using Entry-Level Auto-Type as you can inadvertently ty
 
 .Entry-Level Auto-Type
 image::autotype_entrylevel.png[]
-// end::content[]
+// end::content[]

docs/topics/BrowserPlugin.adoc

@@ -48,7 +48,7 @@ image::browser_settings.png[]
 .Connect Extension to KeePassXC
 image::browser_extension_connect.png[,80%]
 
-6. Click the _Connect_ button *(B)* in the pop-up window to complete integrating the KeePassXC-Browser extension with your KeePassXC desktop application. 
+6. Click the _Connect_ button *(B)* in the pop-up window to complete integrating the KeePassXC-Browser extension with your KeePassXC desktop application.
 
 7. You are now prompted to enter a unique name to identify the connection between this browser and your database. Enter a unique name in the field (e.g., firefox-laptop) and click the _Save and allow access_ button.
 +
@@ -62,7 +62,7 @@ The KeePassXC-Browser extension lets you automatically populate the entries from
 
 1. Open your KeePassXC desktop application and unlock your database.
 
-2. Open your web browser. The KeePassXC-Browser extension icon in your browser window will change based on its connection state. The figure below shows the different states. 
+2. Open your web browser. The KeePassXC-Browser extension icon in your browser window will change based on its connection state. The figure below shows the different states.
 +
 *(A)* KeePassXC is not running or is disconnected +
 *(B)* Connected to KeePassXC, but database is locked +
@@ -81,7 +81,7 @@ image::browser_extension_reload.png[,80%]
 .Confirm Access Dialog
 image::browser_confirm_access_dialog.png[,80%]
 
-5. Ensure the credentials you want use are checked, then click *(A)* Remember _(optional)_, then click _Allow Selected_ *(B)*.
+5. Ensure the credentials you want to use are checked, then click *(A)* Remember _(optional)_, then click _Allow Selected_ *(B)*.
 
 6. In your website, the KeePassXC icon will appear in the username field of the login form *(A)*. Click the icon to populate the field with your stored credentials. If you have more than one credential for this website, a dropdown will appear to choose the one to use.
 +

docs/topics/DatabaseOperations.adoc

@@ -178,7 +178,7 @@ The following tables lists a few samples search queries for your reference:
 
 == Advanced Entry Options
 === Additional Attributes
-A lot of applications and web sites now require to provide additional information when you create accounts. The additional information is used to block hackers if any suspicious activity is detected. In addition, the additional information you provide can be used to reset passwords if you forget them. You can also store arbitrary information here that can be copied to the clipboard or Auto-Typed using the `{S:<ATTR_NAME}` action code.
+A lot of applications and web sites now require to provide additional information when you create accounts. The additional information is used to block hackers if any suspicious activity is detected. In addition, the additional information you provide can be used to reset passwords if you forget them. You can also store arbitrary information here that can be copied to the clipboard or Auto-Typed using the `{S:<ATTR_NAME>}` action code.
 
 To protect an attribute from being displayed by default, activate the _Protect_ checkbox *(A)*. To show the contents of the attribute while keeping it protected, press the _Reveal_ button *(B)*.
 
@@ -231,7 +231,7 @@ NOTE: Restoring an old history item will store the current entry settings as a n
 == Automatic Database Opening
 You can setup one or more databases to open automatically when you unlock a single database. This is done by *(1)* defining a special group named `AutoOpen` with *(2)* entries that contain the file path and credentials for each database that should be opened. There is no limit to the number of databases that can be opened.
 
-TIP: Case matters with auto open, the group name must be exactly `AutoOpen`.
+TIP: Case matters with auto open, the group name must be exactly `AutoOpen` and it must be a child of the root group.
 
 .AutoOpen Group and Entries
 image::autoopen.png[]

docs/topics/Reference.adoc

@@ -48,7 +48,7 @@ This section contains full details on advanced features available in KeePassXC.
 |===
 
 === Entry Cross-Reference
-A reference to another entry's field is possible using the short-hand syntax:  
+A reference to another entry's field is possible using the short-hand syntax:
 `{REF:<FIELD>@<SEARCH_IN>:<SEARCH_TEXT>}`
 
 `<FIELD>` and `<SEARCH_IN>` can be one of following:

docs/topics/SSHAgent.adoc

@@ -4,7 +4,7 @@ include::.sharedheader[]
 
 // tag::content[]
 == SSH Agent
-SSH (Secure Shell) is a widely used remote secure shell protocol and is considered an industry standard for secure remote access to UNIX-like systems including Linux, BSDs, MacOS and more recently even Windows received native support. SSH supports multiple types of authentication and the most widely used ones are either interactive keyboard input with a password or a public-key cryptography pair of keys.
+SSH (Secure Shell) is a widely used remote secure shell protocol and is considered an industry standard for secure remote access to UNIX-like systems including Linux, BSDs, macOS and more recently even Windows received native support. SSH supports multiple types of authentication and the most widely used ones are either interactive keyboard input with a password or a public-key cryptography pair of keys.
 
 KeePassXC SSH Agent integration is built to manage SSH keys in a secure manner by either storing them completely within your KeePassXC database or by having only the decryption key of a key file that is stored elsewhere. SSH Agent integration _does not_ provide an agent itself but works as a client for any agent implementation that is OpenSSH compatible.
 
@@ -32,18 +32,35 @@ WARNING: _GNOME Keyring_ prior to release 3.27.92 had its own custom implementat
 It does not support any constraints you may want to configure for an added key.
 If you are running a modern distribution the custom agent has been removed and replaced with the stock OpenSSH agent which is feature complete.
 
-=== OpenSSH agent on MacOS
-Apple has made OpenSSH an integrated part of MacOS with automatic agent startup when it is first used. No further configuration is needed.
+=== OpenSSH agent on macOS
+Apple has made OpenSSH an integrated part of macOS with automatic agent startup when it is first used. No further configuration is needed.
 
-=== Pageant agent on Windows
+=== OpenSSH agent and Pageant on Windows
 The SSH Agent integration on Windows supports both _PuTTY Pageant_ and _OpenSSH for Windows 10_.
-Since Pageant is currently still the most widely used implementation and is easily installable on any version of Windows we focus on that.
-It is also the default on KeePassXC.
+Since Pageant is currently still the most widely used implementation and is easily installable on any version of Windows, it is the default on KeePassXC.
+However, Microsoft includes a native OpenSSH client implementation with Windows 10 since autumn 2018 that can be used instead. If you would like to self-manage your OpenSSH version you can use the builds offered via their official https://github.com/powershell/Win32-OpenSSH[GitHub repository].
 
+==== Pageant
 Download Pageant from the official PuTTY home page at https://www.chiark.greenend.org.uk/~sgtatham/putty/
 
 To use Pageant with KeePassXC, simply start it and it will minimize into the system tray and is ready to use. PuTTY and compatible tools will use Pageant automatically.
 
+==== OpenSSH
+Make sure your Windows version has at least update 1809 installed. For more details consult the https://docs.microsoft.com/en-us/windows-server/administration/openssh/openssh_overview[official documentation].
+
+To use Windows OpenSSH the _OpenSSH Authentication Agent_ service has to be enabled first:
+
+ 1. Open the Services application via the _Start Menu_, it is located in the _Windows Administrative Tools_ section
+ 2. Select the _OpenSSH Authentication Agent_ and open its _Properties_
+ 3. Set the _Startup type_ to _Automatic_ and start the service
+
+Alternatively, you can use a _Windows PowerShell_ running as _Administrator_ to enable and start the service:
+
+    PS C:\Users\user> Get-Service ssh-agent | Set-Service -StartupType Automatic
+    PS C:\Users\user> Start-Service ssh-agent
+
+KeePassXC and other compatible tools can now use the Windows OpenSSH agent. To use it with KeePassXC, update the settings explained in <<Setting up SSH Agent integration>>.
+
 === Setting up SSH Agent integration
 By default the SSH Agent integration plugin is disabled.
 To enable integration, follow the steps below to access the settings:
@@ -64,14 +81,13 @@ If the value of _SSH_AUTH_SOCK_ is empty it means the agent is not properly conf
 === Generating a key to use with KeePassXC
 KeePassXC only supports keys in the _OpenSSH_ format. On Windows, _PuTTYgen_ saves keys in its own format by default and you will need to convert them to OpenSSH format before being used. In this guide we are going to generate a standard RSA key in the default size.
 
-==== Generating a key on Linux or MacOS with _ssh-keygen_
-
+==== Generating a key on Linux or macOS with _ssh-keygen_
 Open a terminal window and type the following command to generate a key:
 
     $ ssh-keygen -o -f keepassxc -C johndoe@example
     Generating public/private rsa key pair.
-    Enter passphrase (empty for no passphrase): 
-    Enter same passphrase again: 
+    Enter passphrase (empty for no passphrase):
+    Enter same passphrase again:
     Your identification has been saved in keepassxc
     Your public key has been saved in keepassxc.pub
     The key fingerprint is:
@@ -89,7 +105,6 @@ Open a terminal window and type the following command to generate a key:
     |. ..++ooo        |
     +----[SHA256]-----+
 
-
 Now we can see two files were generated:
 
     $ ls -l keepassxc*
@@ -98,19 +113,59 @@ Now we can see two files were generated:
 
 With KeePassXC you only need the first file listed.
 
-==== Generating a key on Windows with PuTTYgen
-Please read the manual on how to use PuTTYgen for details on generate a key: https://the.earth.li/~sgtatham/putty/0.74/htmldoc/Chapter8.html#pubkey-puttygen. Once generated, you must save the key in OpenSSH format, follow the image below.
+==== Generating a key on Windows
+On Windows you can generate key pairs with _PuTTYgen_ and with _ssh-keygen_, depending on whether you installed PuTTY and your Windows version.
 
-.Generating a key with PuTTYgen
+===== Using _PuTTYgen_
+Please read the manual on how to use _PuTTYgen_ for details on generate a key: https://the.earth.li/~sgtatham/putty/0.74/htmldoc/Chapter8.html#pubkey-puttygen. Once generated, you must save the key in the new OpenSSH format, see image below.
+
+.Generating a key with _PuTTYgen_
 image::sshagent_puttygen.png[,70%]
 
+===== Using _ssh-keygen_
+Open _Command Prompt_ or _Windows PowerShell_ and type the following command to generate a key:
+
+    PS C:\Users\user> ssh-keygen.exe -o -f keepassxc -C johndoe@example
+    Generating public/private rsa key pair.
+    Enter passphrase (empty for no passphrase):
+    Enter same passphrase again:
+    Your identification has been saved in keepassxc
+    Your public key has been saved in keepassxc.pub
+    The key fingerprint is:
+    SHA256:pN+o5AqUmijYBDUrFV/caMus9oIR61+MiWLa8fcsVYI johndoe@example
+    The key's randomart image is:
+    +---[RSA 3072]----+
+    |  =. ..o         |
+    | o + .+ .        |
+    |o . .+ o.        |
+    | o..  Eo. .      |
+    |  +o .. So       |
+    |o*o.o+ ..o       |
+    |Bo=+o.+.o .      |
+    |+oo+.++o         |
+    |. ..++ooo        |
+    +----[SHA256]-----+
+
+Now we can see two files were generated:
+
+    PS C:\Users\user> dir keepassxc*
+
+    Directory C:\Users\user
+
+    Mode                 LastWriteTime         Length Name
+    ----                 -------------         ------ ----
+    -a----         9/19/2021  12:08 PM           2655 keepassxc
+    -a----         9/19/2021  12:08 PM            570 keepassxc.pub
+
+With KeePassXC you only need the first file listed.
+
 === Configuring an entry to use SSH Agent
 The last step is to setup an entry to contain the SSH Agent settings and key file you generated.
 
 1. Create a new entry, or open an existing entry in edit mode.
 2. Set the password you used for the key file in the password field.
 3. Go to the advanced category and attach the key file you generated previously.
-4. Go to the SSH Agent category *(1)* and select the attachment from the list *(2)*. 
+4. Go to the SSH Agent category *(1)* and select the attachment from the list *(2)*.
 5. Alternatively, you can load an external file dynamically using the file selection.
 6. Choose the options for this key.
 7. Press *OK* to accept the entry. Depending on the options you chose, KeePassXC will load the key and present it for use.

release-tool

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
 # KeePassXC Release Preparation Helper
-# Copyright (C) 2017 KeePassXC team <https://keepassxc.org/>
+# Copyright (C) 2021 KeePassXC team <https://keepassxc.org/>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,8 +17,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 printf "\e[1m\e[32mKeePassXC\e[0m Release Preparation Helper\n"
-printf "Copyright (C) 2017 KeePassXC Team <https://keepassxc.org/>\n\n"
+printf "Copyright (C) 2021 KeePassXC Team <https://keepassxc.org/>\n\n"
 
+set -eE -o pipefail
 
 # -----------------------------------------------------------------------
 #                        global default values
@@ -34,6 +35,7 @@ TARGET_BRANCH="master"
 TAG_NAME=""
 DOCKER_IMAGE=""
 DOCKER_CONTAINER_NAME="keepassxc-build-container"
+CMAKE_GENERATOR="Ninja"
 CMAKE_OPTIONS=""
 CPACK_GENERATORS="WIX;ZIP"
 COMPILER="g++"
@@ -51,17 +53,17 @@ TIMESTAMP_SERVER="http://timestamp.sectigo.com"
 # -----------------------------------------------------------------------
 printUsage() {
     local cmd
-    if [ "" == "$1" ] || [ "help" == "$1" ]; then
+    if [ -z "$1" ] || [ "help" == "$1" ]; then
         cmd="COMMAND"
-    elif [ "check" == "$1" ] || [ "merge" == "$1" ] || [ "build" == "$1" ] \
-        || [ "gpgsign" == "$1" ] || [ "appsign" == "$1" ] || [ "notarize" == "$1" ] || [ "appimage" == "$1" ]; then
+    elif [ "check" == "$1" ] || [ "merge" == "$1" ] || [ "build" == "$1" ] || [ "gpgsign" == "$1" ] || \
+        [ "appsign" == "$1" ] || [ "notarize" == "$1" ] || [ "appimage" == "$1" ] || [ "i18n" == "$1" ]; then
         cmd="$1"
     else
         logError "Unknown command: '$1'\n"
         cmd="COMMAND"
     fi
 
-    printf "\e[1mUsage:\e[0m $(basename $0) $cmd [options]\n"
+    printf "\e[1mUsage:\e[0m $(basename "$0") $cmd [OPTIONS, ...]\n"
 
     if [ "COMMAND" == "$cmd" ]; then
         cat << EOF
@@ -74,6 +76,7 @@ Commands:
   appsign    Sign binaries with code signing certificates on Windows and macOS
   notarize   Submit macOS application DMG for notarization
   help       Show help for the given command
+  i18n       Update translation files and pull from or push to Transifex
 EOF
     elif [ "merge" == "$cmd" ]; then
         cat << EOF
@@ -116,7 +119,9 @@ Options:
                           If this option is set, --install-prefix has no effect
       --appsign           Perform platform specific App Signing before packaging
       --timestamp         Explicitly set the timestamp server to use for appsign (default: '${TIMESTAMP_SERVER}')
+      --vcpkg             Specify VCPKG toolchain file (example: ~/vcpkg/scripts/buildsystems/vcpkg.cmake)
   -k, --key               Specify the App Signing Key/Identity
+      --cmake-generator   Override the default CMake generator (Default: Ninja)
   -c, --cmake-options     Additional CMake options for compiling the sources
       --compiler          Compiler to use (default: '${COMPILER}')
   -m, --make-options      Make options for compiling sources (default: '${MAKE_OPTIONS}')
@@ -181,6 +186,16 @@ Options:
   -k, --key            The PGP Signing Key
       --verbosity      linuxdeploy verbosity (default: 3)
   -h, --help           Show this help
+EOF
+    elif [ "i18n" == "$cmd" ]; then
+        cat << EOF
+
+Update translation files and pull from or push to Transifex
+
+Subcommands:
+  tx-push      Push source translation file to Transifex
+  tx-pull      Pull updated translations from Transifex
+  lupdate      Update source translation file from C++ sources
 EOF
     fi
 }
@@ -198,17 +213,17 @@ logError() {
 }
 
 init() {
-    if [ "" == "$RELEASE_NAME" ]; then
+    if [ -z "$RELEASE_NAME" ]; then
         logError "Missing arguments, --version is required!\n"
         printUsage "check"
         exit 1
     fi
 
-    if [ "" == "$TAG_NAME" ]; then
+    if [ -z "$TAG_NAME" ]; then
         TAG_NAME="$RELEASE_NAME"
     fi
 
-    if [ "" == "$SOURCE_BRANCH" ]; then
+    if [ -z "$SOURCE_BRANCH" ]; then
         SOURCE_BRANCH="release/${RELEASE_NAME}"
     fi
 
@@ -271,29 +286,25 @@ checkGitRepository() {
 }
 
 checkReleaseDoesNotExist() {
-    git tag | $GREP -q "^$TAG_NAME$"
-    if [ $? -eq 0 ]; then
+    if ! git tag | $GREP -q "^$TAG_NAME$"; then
         exitError "Release '$RELEASE_NAME' (tag: '$TAG_NAME') already exists!"
     fi
 }
 
 checkWorkingTreeClean() {
-    git diff-index --quiet HEAD --
-    if [ $? -ne 0 ]; then
+    if ! git diff-index --quiet HEAD --; then
         exitError "Current working tree is not clean! Please commit or unstage any changes."
     fi
 }
 
 checkSourceBranchExists() {
-    git rev-parse "$SOURCE_BRANCH" > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
+    if ! git rev-parse "$SOURCE_BRANCH" > /dev/null 2>&1; then
         exitError "Source branch '$SOURCE_BRANCH' does not exist!"
     fi
 }
 
 checkTargetBranchExists() {
-    git rev-parse "$TARGET_BRANCH" > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
+    if ! git rev-parse "$TARGET_BRANCH" > /dev/null 2>&1; then
         exitError "Target branch '$TARGET_BRANCH' does not exist!"
     fi
 }
@@ -304,18 +315,15 @@ checkVersionInCMake() {
     local minor_num="$(echo ${RELEASE_NAME} | cut -f2 -d.)"
     local patch_num="$(echo ${RELEASE_NAME} | cut -f3 -d. | cut -f1 -d-)"
 
-    $GREP -q "${app_name_upper}_VERSION_MAJOR \"${major_num}\"" CMakeLists.txt
-    if [ $? -ne 0 ]; then
+    if ! $GREP -q "${app_name_upper}_VERSION_MAJOR \"${major_num}\"" CMakeLists.txt; then
         exitError "${app_name_upper}_VERSION_MAJOR not updated to '${major_num}' in CMakeLists.txt!"
     fi
 
-    $GREP -q "${app_name_upper}_VERSION_MINOR \"${minor_num}\"" CMakeLists.txt
-    if [ $? -ne 0 ]; then
+    if ! $GREP -q "${app_name_upper}_VERSION_MINOR \"${minor_num}\"" CMakeLists.txt; then
         exitError "${app_name_upper}_VERSION_MINOR not updated to '${minor_num}' in CMakeLists.txt!"
     fi
 
-    $GREP -q "${app_name_upper}_VERSION_PATCH \"${patch_num}\"" CMakeLists.txt
-    if [ $? -ne 0 ]; then
+    if ! $GREP -q "${app_name_upper}_VERSION_PATCH \"${patch_num}\"" CMakeLists.txt; then
         exitError "${app_name_upper}_VERSION_PATCH not updated to '${patch_num}' in CMakeLists.txt!"
     fi
 }
@@ -325,8 +333,7 @@ checkChangeLog() {
         exitError "No CHANGELOG file found!"
     fi
 
-    $GREP -qPzo "## ${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n" CHANGELOG.md
-    if [ $? -ne 0 ]; then
+    if ! $GREP -qPzo "## ${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n" CHANGELOG.md; then
         exitError "'CHANGELOG.md' has not been updated to the '${RELEASE_NAME}' release!"
     fi
 }
@@ -336,8 +343,7 @@ checkAppStreamInfo() {
         exitError "No AppStream info file found!"
     fi
 
-    $GREP -qPzo "<release version=\"${RELEASE_NAME}\" date=\"\d{4}-\d{2}-\d{2}\">" share/linux/org.keepassxc.KeePassXC.appdata.xml
-    if [ $? -ne 0 ]; then
+    if ! $GREP -qPzo "<release version=\"${RELEASE_NAME}\" date=\"\d{4}-\d{2}-\d{2}\">" share/linux/org.keepassxc.KeePassXC.appdata.xml; then
         exitError "'share/linux/org.keepassxc.KeePassXC.appdata.xml' has not been updated to the '${RELEASE_NAME}' release!"
     fi
 }
@@ -348,13 +354,7 @@ checkSnapcraft() {
         return
     fi
 
-    $GREP -qPzo "version: ${RELEASE_NAME}" snap/snapcraft.yaml
-    if [ $? -ne 0 ]; then
-        exitError "'snapcraft.yaml' has not been updated to the '${RELEASE_NAME}' release!"
-    fi
-
-    $GREP -qPzo "KEEPASSXC_BUILD_TYPE=Release" snap/snapcraft.yaml
-    if [ $? -ne 0 ]; then
+    if ! $GREP -qPzo "KEEPASSXC_BUILD_TYPE=Release" snap/snapcraft.yaml; then
         exitError "'snapcraft.yaml' is not set for a release build!"
     fi
 }
@@ -450,7 +450,7 @@ if ! cmdExists realpath; then
 fi
 
 
-trap exitTrap SIGINT SIGTERM
+trap exitTrap SIGINT SIGTERM ERR
 
 # -----------------------------------------------------------------------
 #                             check command
@@ -530,17 +530,17 @@ merge() {
 
     performChecks
 
-    logInfo "Updating language files..."
-    ./share/translations/update.sh update
-    ./share/translations/update.sh pull
+    # Update translations
+    i18n lupdate
+    i18n tx-pull
+
     if [ 0 -ne $? ]; then
         exitError "Updating translations failed!"
     fi
-    git diff-index --quiet HEAD --
-    if [ $? -ne 0 ]; then
+    if ! git diff-index --quiet HEAD --; then
         git add -A ./share/translations/
         logInfo "Committing changes..."
-        if [ "" == "$GPG_GIT_KEY" ]; then
+        if [ -z "$GPG_GIT_KEY" ]; then
             git commit -m "Update translations"
         else
             git commit -m "Update translations" -S"$GPG_GIT_KEY"
@@ -559,7 +559,7 @@ merge() {
     git merge "$SOURCE_BRANCH" --no-ff -m "$COMMIT_MSG" -m "${CHANGELOG}" "$SOURCE_BRANCH" -S"$GPG_GIT_KEY"
 
     logInfo "Creating tag '${TAG_NAME}'..."
-    if [ "" == "$GPG_GIT_KEY" ]; then
+    if [ -z  "$GPG_GIT_KEY" ]; then
         git tag -a "$TAG_NAME" -m "$COMMIT_MSG" -m "${CHANGELOG}" -s
     else
         git tag -a "$TAG_NAME" -m "$COMMIT_MSG" -m "${CHANGELOG}" -s -u "$GPG_GIT_KEY"
@@ -642,7 +642,7 @@ appimage() {
     appdir="$(realpath "$appdir")"
 
     local out="${OUTPUT_DIR}"
-    if [ "" == "$out" ]; then
+    if [ -z "$out" ]; then
         out="."
     fi
     mkdir -p "$out"
@@ -659,12 +659,12 @@ appimage() {
     logInfo "Testing for AppImage tools..."
     local docker_test_cmd
     if [ "" != "$DOCKER_IMAGE" ]; then
-        docker_test_cmd="docker run --rm ${DOCKER_IMAGE}"
+        docker_test_cmd="docker run -it --user $(id -u):$(id -g) --rm ${DOCKER_IMAGE}"
     fi
 
     # Test if linuxdeploy and linuxdeploy-plugin-qt are installed
     # on the system or inside the Docker container
-    if ! ${docker_test_cmd} which ${linuxdeploy} &> /dev/null; then
+    if ! ${docker_test_cmd} which ${linuxdeploy} > /dev/null; then
         logInfo "Downloading linuxdeploy..."
         linuxdeploy="./linuxdeploy"
         linuxdeploy_cleanup="rm -f ${linuxdeploy}"
@@ -673,7 +673,7 @@ appimage() {
         fi
         chmod +x "$linuxdeploy"
     fi
-    if ! ${docker_test_cmd} which ${linuxdeploy_plugin_qt} &> /dev/null; then
+    if ! ${docker_test_cmd} which ${linuxdeploy_plugin_qt} > /dev/null; then
         logInfo "Downloading linuxdeploy-plugin-qt..."
         linuxdeploy_plugin_qt="./linuxdeploy-plugin-qt"
         linuxdeploy_plugin_qt_cleanup="rm -f ${linuxdeploy_plugin_qt}"
@@ -695,49 +695,46 @@ appimage() {
     fi
 
     # Create custom AppRun wrapper
-    cat << EOF > "${out_real}/KeePassXC-AppRun"
+    cat << 'EOF' > "${out_real}/KeePassXC-AppRun"
 #!/usr/bin/env bash
 
-export PATH="\$(dirname \$0)/usr/bin:\${PATH}"
-export LD_LIBRARY_PATH="\$(dirname \$0)/usr/lib:\${LD_LIBRARY_PATH}"
+export PATH="$(dirname $0)/usr/bin:${PATH}"
+export LD_LIBRARY_PATH="$(dirname $0)/usr/lib:${LD_LIBRARY_PATH}"
 
-if [ "\${1}" == "cli" ]; then
+if [ "$1" == "cli" ]; then
     shift
-    exec keepassxc-cli "\$@"
-elif [ "\${1}" == "proxy" ]; then
+    exec keepassxc-cli "$@"
+elif [ "$1" == "proxy" ]; then
     shift
-    exec keepassxc-proxy "\$@"
+    exec keepassxc-proxy "$@"
 elif [ -v CHROME_WRAPPER ] || [ -v MOZ_LAUNCHED_CHILD ]; then
-    exec keepassxc-proxy "\$@"
+    exec keepassxc-proxy "$@"
 else
-    exec keepassxc "\$@"
+    exec keepassxc "$@"
 fi
 EOF
     chmod +x "${out_real}/KeePassXC-AppRun"
 
     # Find .desktop files, icons, and binaries to deploy
     local desktop_file="$(find "$appdir" -name "org.keepassxc.KeePassXC.desktop" | head -n1)"
-    local icon="$(find "$appdir" -name 'keepassxc.png' | $GREP -P 'application/256x256/apps/keepassxc.png$' | head -n1)"
-    local executables="$(IFS=$'\n' find "$appdir" | $GREP -P '/usr/bin/keepassxc[^/]*$' | xargs -i printf " --executable={}")"
+    local icon="$(find "$appdir" -path '*/application/256x256/apps/keepassxc.png' | head -n1)"
+    local executables="$(find "$appdir" -type f -executable -path '*/bin/keepassxc*' -print0 | xargs -0 -i printf " --executable={}")"
 
     logInfo "Collecting libs and patching binaries..."
-    if [ "" == "$DOCKER_IMAGE" ]; then
+    if [ -z "$DOCKER_IMAGE" ]; then
         "$linuxdeploy" --verbosity=${verbosity} --plugin=qt --appdir="$appdir" --desktop-file="$desktop_file" \
-        --custom-apprun="${out_real}/KeePassXC-AppRun" --icon-file="$icon" ${executables} \
-        --library=$(ldconfig -p | $GREP x86-64 | $GREP -oP '/[^\s]+/libgpg-error\.so\.\d+$' | head -n1)
+        --custom-apprun="${out_real}/KeePassXC-AppRun" --icon-file="$icon" ${executables}
     else
-        desktop_file="${desktop_file//${appdir}/\/keepassxc\/AppDir}"
-        icon="${icon//${appdir}/\/keepassxc\/AppDir}"
-        executables="${executables//${appdir}/\/keepassxc\/AppDir}"
-
         docker run --name "$DOCKER_CONTAINER_NAME" --rm \
-            --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse \
-            -v "${appdir}:/keepassxc/AppDir:rw" \
-            -v "${out_real}:/keepassxc/out:rw" \
+            --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse -it \
+            -v "${out_real}:${out_real}:rw" \
+            -v "${appdir}:${appdir}:rw" \
+            -w "$out_real" \
+            --user $(id -u):$(id -g) \
             "$DOCKER_IMAGE" \
-            bash -c "cd /keepassxc/out && ${linuxdeploy} --verbosity=${verbosity} --plugin=qt --appdir=/keepassxc/AppDir \
-            --custom-apprun="/keepassxc/out/KeePassXC-AppRun" --desktop-file=${desktop_file} --icon-file=${icon} ${executables} \
-            --library=\$(ldconfig -p | grep x86-64 | grep -oP '/[^\s]+/libgpg-error\.so\.\d+$' | head -n1)"
+            bash -c "${linuxdeploy} --verbosity=${verbosity} --plugin=qt \
+            --appdir='${appdir}' --custom-apprun='${out_real}/KeePassXC-AppRun' \
+            --desktop-file='${desktop_file}' --icon-file='${icon}' ${executables}"
     fi
 
     if [ $? -ne 0 ]; then
@@ -783,6 +780,7 @@ build() {
     local build_generators=""
     local build_appsign=false
     local build_key=""
+    local build_vcpkg=""
 
     while [ $# -ge 1 ]; do
         local arg="$1"
@@ -832,6 +830,10 @@ build() {
             --appimage)
                 build_appimage=true ;;
 
+            --cmake-generator)
+                CMAKE_GENERATOR="$2"
+                shift ;;
+
             -c|--cmake-options)
                 CMAKE_OPTIONS="$2"
                 shift ;;
@@ -840,6 +842,10 @@ build() {
                 COMPILER="$2"
                 shift ;;
 
+            --vcpkg)
+                build_vcpkg="$2"
+                shift ;;
+
             -m|--make-options)
                 MAKE_OPTIONS="$2"
                 shift ;;
@@ -876,12 +882,15 @@ build() {
 
     init
 
-    OUTPUT_DIR="$(realpath "$OUTPUT_DIR")"
     # Resolve appsign key to absolute path if under Windows
     if [[ "${build_key}" && "$(uname -o)" == "Msys" ]]; then
         build_key="$(realpath "${build_key}")"
     fi
 
+    if [[ -f ${build_vcpkg} ]]; then
+        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_TOOLCHAIN_FILE=${build_vcpkg} -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON"
+    fi
+
     if ${build_snapshot}; then
         TAG_NAME="HEAD"
         local branch=`git rev-parse --abbrev-ref HEAD`
@@ -902,10 +911,13 @@ build() {
         git checkout "$TAG_NAME" > /dev/null 2>&1
     fi
 
-    logInfo "Creating output directory..."
-    mkdir -p "$OUTPUT_DIR"
+    OUTPUT_DIR="$(realpath "$OUTPUT_DIR")"
+    if  ! ${build_snapshot} && [ -d "$OUTPUT_DIR" ]; then
+        exitError "Output dir '${OUTPUT_DIR}' already exists."
+    fi
 
-    if [ $? -ne 0 ]; then
+    logInfo "Creating output directory..."
+    if ! mkdir -p "$OUTPUT_DIR"; then
         exitError "Failed to create output directory!"
     fi
 
@@ -933,14 +945,6 @@ build() {
         $xz -6 "${OUTPUT_DIR}/${tarball_name}"
     fi
 
-    if ! ${build_snapshot} && [ -e "${OUTPUT_DIR}/build-release" ]; then
-        logInfo "Cleaning existing build directory..."
-        rm -rf "${OUTPUT_DIR}/build-release" 2> /dev/null
-        if [ $? -ne 0 ]; then
-            exitError "Failed to clean existing build directory, please do it manually."
-        fi
-    fi
-
     logInfo "Creating build directory..."
     mkdir -p "${OUTPUT_DIR}/build-release"
     cd "${OUTPUT_DIR}/build-release"
@@ -961,22 +965,23 @@ build() {
         export CC=gcc
     elif [ "$COMPILER" == "clang++" ]; then
         export CC=clang
+    else
+        export CC="$COMPILER"
     fi
     export CXX="$COMPILER"
 
-    if [ "" == "$DOCKER_IMAGE" ]; then
+    if [ -z "$DOCKER_IMAGE" ]; then
         if [ "$(uname -s)" == "Darwin" ]; then
             # Building on macOS
             export MACOSX_DEPLOYMENT_TARGET
 
             logInfo "Configuring build..."
-            cmake -DCMAKE_BUILD_TYPE=Release \
-              -DCMAKE_OSX_ARCHITECTURES="$(uname -m)" -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
-              -DCMAKE_PREFIX_PATH="/opt/homebrew/opt/qt/lib/cmake;/usr/local/opt/qt/lib/cmake" \
-              ${CMAKE_OPTIONS} "$SRC_DIR"
+            cmake -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="$(uname -m)" \
+            -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" ${CMAKE_OPTIONS} "$SRC_DIR"
 
             logInfo "Compiling and packaging sources..."
-            make ${MAKE_OPTIONS} package
+            cmake --build . -- ${MAKE_OPTIONS}
+            cpack -G "DragNDrop"
 
             # Appsign the executables if desired
             if ${build_appsign}; then
@@ -988,16 +993,16 @@ build() {
         elif [ "$(uname -o)" == "Msys" ]; then
             # Building on Windows with Msys2
             logInfo "Configuring build..."
-            cmake -DCMAKE_BUILD_TYPE=Release -G"MSYS Makefiles" \
-                -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" ${CMAKE_OPTIONS} "$SRC_DIR"
+            cmake -DCMAKE_BUILD_TYPE=Release -G "${CMAKE_GENERATOR}" -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
+                ${CMAKE_OPTIONS} "$SRC_DIR"
 
             logInfo "Compiling and packaging sources..."
-            mingw32-make ${MAKE_OPTIONS} preinstall
+            cmake --build . --config "Release" -- ${MAKE_OPTIONS}
 
             # Appsign the executables if desired
             if ${build_appsign} && [ -f "${build_key}" ]; then
                 logInfo "Signing executable files"
-                appsign "-f" $(find src | $GREP -P '\.exe$|\.dll$') "-k" "${build_key}"
+                appsign "-f" $(find src | $GREP -Pi 'keepassxc.*(.exe$|.dll$)') "-k" "${build_key}"
             fi
 
             # Call cpack directly instead of calling make package.
@@ -1005,17 +1010,6 @@ build() {
             # release.
             cpack -G "${CPACK_GENERATORS};${build_generators}"
 
-            # Inject the portable config into the zip build and rename
-            touch .portable
-            for filename in ${APP_NAME}-*.zip; do
-                logInfo "Creating portable zip file"
-                local folder=$(echo ${filename} | sed -r 's/(.*)\.zip/\1/')
-                python -c 'import zipfile,sys ; zipfile.ZipFile(sys.argv[1],"a").write(sys.argv[2],sys.argv[3])' \
-                    ${filename} .portable ${folder}/.portable
-                mv ${filename} ${folder}-portable.zip
-            done
-            rm .portable
-
             mv "${APP_NAME}-"*.* ../
         else
             mkdir -p "${OUTPUT_DIR}/KeePassXC.AppDir"
@@ -1039,7 +1033,7 @@ build() {
 
             logInfo "Launching Docker contain to compile snapcraft..."
 
-            sudo docker run --name "$DOCKER_CONTAINER_NAME" --rm \
+            sudo docker run --name "$DOCKER_CONTAINER_NAME" --rm -it --user $(id -u):$(id -g) \
                 -v "$(realpath "$SRC_DIR"):/keepassxc" -w "/keepassxc" \
                 "$DOCKER_IMAGE" snapcraft
         else
@@ -1049,7 +1043,8 @@ build() {
 
             docker run --name "$DOCKER_CONTAINER_NAME" --rm \
                 --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse \
-                -e "CC=${CC}" -e "CXX=${CXX}" \
+                --user $(id -u):$(id -g) \
+                -e "CC=${CC}" -e "CXX=${CXX}" -it  \
                 -v "$(realpath "$SRC_DIR"):/keepassxc/src:ro" \
                 -v "$(realpath "$OUTPUT_DIR"):/keepassxc/out:rw" \
                 "$DOCKER_IMAGE" \
@@ -1079,7 +1074,7 @@ build() {
             docker_image_flag="-d ${DOCKER_IMAGE}"
             docker_container_name_flag="--container-name ${DOCKER_CONTAINER_NAME}"
         fi
-        appimage "-a" "${OUTPUT_DIR}/KeePassXC.AppDir" "-o" "${OUTPUT_DIR}" \
+        appimage -a "${OUTPUT_DIR}/KeePassXC.AppDir" -o "${OUTPUT_DIR}" \
             ${appsign_flag} ${appsign_key_flag} ${docker_image_flag} ${docker_container_name_flag}
     fi
 
@@ -1266,10 +1261,11 @@ appsign() {
 
     elif [ "$(uname -o)" == "Msys" ]; then
         if [[ ! -f "${key}" ]]; then
-            exitError "Key file was not found!"
+            exitError "Appsign key file was not found! (${key})"
         fi
 
-        read -s -p "Key password: " password
+        logInfo "Using appsign key ${key}."
+        IFS=$'\n' read -s -r -p "Key password: " password
         echo
 
         for f in "${sign_files[@]}"; do
@@ -1346,7 +1342,7 @@ notarize() {
         exit 1
     fi
 
-    if [ "$ac_username" == "" ]; then
+    if [ -z "$ac_username" ]; then
         logError "Missing arguments, --username is required!"
         printUsage "notarize"
         exit 1
@@ -1404,12 +1400,84 @@ notarize() {
     done
 }
 
+
+# -----------------------------------------------------------------------
+#                              i18n command
+# -----------------------------------------------------------------------
+
+i18n() {
+    local cmd="$1"
+    if [ -z "$cmd" ]; then
+        logError "No subcommand specified.\n"
+        printUsage i18n
+        exit 1
+    elif [ "$cmd" != "tx-push" ] && [ "$cmd" != "tx-pull" ] && [ "$cmd" != "lupdate" ]; then
+        logError "Unknown subcommand: '${cmd}'\n"
+        printUsage i18n
+        exit 1
+    fi
+    shift
+
+    checkGitRepository
+
+    if [ "$cmd" == "lupdate" ]; then
+        if [ ! -d share/translations ]; then
+            logError "Command must be called from repository root directory."
+            exit 1
+        fi
+
+        checkQt5LUpdateExists
+
+        logInfo "Updating source translation file..."
+        LUPDATE=lupdate-qt5
+        if ! command -v $LUPDATE > /dev/null; then
+            LUPDATE=lupdate
+        fi
+        $LUPDATE -no-ui-lines -disable-heuristic similartext -locations none -no-obsolete src \
+            -ts share/translations/keepassxc_en.ts $@
+
+        return 0
+    fi
+
+    checkTransifexCommandExists
+
+    local branch="$(git branch --show-current 2>&1)"
+    local real_branch="$branch"
+    if [[ "$branch" =~ ^release/ ]]; then
+        logInfo "Release branch, setting language resource to master branch."
+        branch="master"
+    elif [ "$branch" != "develop" ] && [ "$branch" != "master" ]; then
+        logError "Must be on master or develop branch!"
+        exit 1
+    fi
+    local resource="keepassxc.share-translations-keepassxc-en-ts--${branch}"
+
+    if [ "$cmd" == "tx-push" ]; then
+        echo -e "This will push the \e[1m'en'\e[0m source file from the current branch to Transifex:\n" >&2
+        echo -e "   \e[1m${real_branch}\e[0m -> \e[1m${resource}\e[0m\n" >&2
+        echo -n "Continue? [y/N] " >&2
+        read -r yesno
+        if [ "$yesno" != "y" ] && [ "$yesno" != "Y" ]; then
+            logError "Push aborted."
+            exit 1
+        fi
+
+        logInfo "Pushing source translation file to Transifex..."
+        tx push -s --use-git-timestamps -r "$resource" $@
+
+    elif [ "$cmd" == "tx-pull" ]; then
+        logInfo "Pulling updated translations from Transifex..."
+        tx pull -af --minimum-perc=60 --parallel -r "$resource" $@
+    fi
+}
+
+
 # -----------------------------------------------------------------------
 #                       parse global command line
 # -----------------------------------------------------------------------
 MODE="$1"
-shift
-if [ "" == "$MODE" ]; then
+shift || true
+if [ -z "$MODE" ]; then
     logError "Missing arguments!\n"
     printUsage
     exit 1
@@ -1418,7 +1486,7 @@ elif [ "help" == "$MODE" ]; then
     exit
 elif [ "check" == "$MODE" ] || [ "merge" == "$MODE" ] || [ "build" == "$MODE" ] \
     || [ "gpgsign" == "$MODE" ] || [ "appsign" == "$MODE" ]|| [ "notarize" == "$MODE" ] \
-    || [ "appimage" == "$MODE" ]; then
+    || [ "appimage" == "$MODE" ]|| [ "i18n" == "$MODE" ]; then
     ${MODE} "$@"
 else
     printUsage "$MODE"

release-tool.ps1

@@ -0,0 +1,538 @@
+<#
+.SYNOPSIS
+KeePassXC Release Tool
+
+.DESCRIPTION
+Commands:
+  merge      Merge release branch into main branch and create release tags
+  build      Build and package binary release from sources
+  sign       Sign previously compiled release packages
+
+.NOTES
+The following are descriptions of certain parameters:
+  -Vcpkg           Specify VCPKG toolchain file (example: C:\vcpkg\scripts\buildsystems\vcpkg.cmake)
+  -Tag             Release tag to check out (defaults to version number)
+  -Snapshot        Build current HEAD without checkout out Tag
+  -CMakeGenerator  Override the default CMake generator
+  -CMakeOptions    Additional CMake options for compiling the sources
+  -CPackGenerators Set CPack generators (default: WIX;ZIP)
+  -Compiler        Compiler to use (example: g++, clang, msbuild)
+  -MakeOptions     Options to pass to the make program
+  -SignBuild       Perform platform specific App Signing before packaging
+  -SignKey         Specify the App Signing Key/Identity
+  -TimeStamp       Explicitly set the timestamp server to use for appsign
+  -SourceBranch    Source branch to merge from (default: 'release/$Version')
+  -TargetBranch    Target branch to merge to (default: master)
+  -VSToolChain     Specify Visual Studio Toolchain by name if more than one is available
+#>
+
+param(
+    [Parameter(ParameterSetName = "merge", Mandatory, Position = 0)]
+    [switch] $Merge,
+    [Parameter(ParameterSetName = "build", Mandatory, Position = 0)]
+    [switch] $Build,
+    [Parameter(ParameterSetName = "sign", Mandatory, Position = 0)]
+    [switch] $Sign,
+
+    [Parameter(ParameterSetName = "merge", Mandatory, Position = 1)]
+    [Parameter(ParameterSetName = "build", Mandatory, Position = 1)]
+    [Parameter(ParameterSetName = "sign", Mandatory, Position = 1)]
+    [ValidatePattern("^[0-9]\.[0-9]\.[0-9]$")]
+    [string] $Version,
+
+    [Parameter(ParameterSetName = "build", Mandatory)]
+    [string] $Vcpkg,
+
+    [Parameter(ParameterSetName = "sign", Mandatory)]
+    [SupportsWildcards()]
+    [string[]] $SignFiles,
+
+    # [Parameter(ParameterSetName = "build")]
+    # [switch] $DryRun,
+    [Parameter(ParameterSetName = "build")]
+    [switch] $Snapshot,
+    [Parameter(ParameterSetName = "build")]
+    [switch] $SignBuild,
+    
+    [Parameter(ParameterSetName = "build")]
+    [string] $CMakeGenerator = "Ninja",
+    [Parameter(ParameterSetName = "build")]
+    [string] $CMakeOptions,
+    [Parameter(ParameterSetName = "build")]
+    [string] $CPackGenerators = "WIX;ZIP",
+    [Parameter(ParameterSetName = "build")]
+    [string] $Compiler,
+    [Parameter(ParameterSetName = "build")]
+    [string] $MakeOptions,
+    [Parameter(ParameterSetName = "build")]
+    [Parameter(ParameterSetName = "sign")]
+    [string] $SignKey,
+    [Parameter(ParameterSetName = "build")]
+    [Parameter(ParameterSetName = "sign")]
+    [string] $Timestamp = "http://timestamp.sectigo.com",
+    [Parameter(ParameterSetName = "merge")]
+    [Parameter(ParameterSetName = "build")]
+    [Parameter(ParameterSetName = "sign")]
+    [string] $GpgKey = "CFB4C2166397D0D2",
+    [Parameter(ParameterSetName = "merge")]
+    [Parameter(ParameterSetName = "build")]
+    [string] $SourceDir = ".",
+    [Parameter(ParameterSetName = "build")]
+    [string] $OutDir = ".\release",
+    [Parameter(ParameterSetName = "merge")]
+    [Parameter(ParameterSetName = "build")]
+    [string] $Tag,
+    [Parameter(ParameterSetName = "merge")]
+    [string] $SourceBranch,
+    [Parameter(ParameterSetName = "merge")]
+    [string] $TargetBranch = "master",
+    [Parameter(ParameterSetName = "build")]
+    [string] $VSToolChain,
+    [Parameter(ParameterSetName = "merge")]
+    [Parameter(ParameterSetName = "build")]
+    [Parameter(ParameterSetName = "sign")]
+    [string] $ExtraPath
+)
+
+# Helper function definitions
+function Test-RequiredPrograms {
+    # If any of these fail they will throw an exception terminating the script
+    if ($Build) {
+        Get-Command git | Out-Null
+        Get-Command cmake | Out-Null
+    }
+    if ($Merge) {
+        Get-Command git | Out-Null
+        Get-Command tx | Out-Null
+        Get-Command lupdate | Out-Null
+    }
+    if ($Sign -or $SignBuild) {
+        if ($SignKey.Length) {
+            Get-Command signtool | Out-Null
+        }
+        Get-Command gpg | Out-Null
+    }
+}
+
+function Test-VersionInFiles {
+    # Check CMakeLists.txt
+    $Major, $Minor, $Patch = $Version.split(".", 3)
+    if (!(Select-String "$SourceDir\CMakeLists.txt" -pattern "KEEPASSXC_VERSION_MAJOR `"$Major`"" -Quiet) `
+            -or !(Select-String "$SourceDir\CMakeLists.txt" -pattern "KEEPASSXC_VERSION_MINOR `"$Minor`"" -Quiet) `
+            -or !(Select-String "$SourceDir\CMakeLists.txt" -pattern "KEEPASSXC_VERSION_PATCH `"$Patch`"" -Quiet)) {
+        throw "CMakeLists.txt has not been updated to $Version."
+    }
+
+    # Check Changelog
+    if (!(Select-String "$SourceDir\CHANGELOG.md" -pattern "^## $Version \(\d{4}-\d{2}-\d{2}\)$" -Quiet)) {
+        throw "CHANGELOG.md does not contain a section for $Version."
+    }
+
+    # Check AppStreamInfo
+    if (!(Select-String "$SourceDir\share\linux\org.keepassxc.KeePassXC.appdata.xml" `
+                -pattern "<release version=`"$Version`" date=`"\d{4}-\d{2}-\d{2}`">" -Quiet)) {
+        throw "share/linux/org.keepassxc.KeePassXC.appdata.xml does not contain a section for $Version."
+    }
+}
+
+function Test-WorkingTreeClean {
+    & git diff-index --quiet HEAD --
+    if ($LASTEXITCODE) {
+        throw "Current working tree is not clean! Please commit or unstage any changes."
+    }
+}
+
+function Invoke-VSToolchain([String] $Toolchain, [String] $Path, [String] $Arch) {
+    # Find Visual Studio installations
+    $vs = Get-CimInstance MSFT_VSInstance
+    if ($vs.count -eq 0) {
+        $err = "No Visual Studio installations found, download one from https://visualstudio.com/downloads."
+        $err = "$err`nIf Visual Studio is installed, you may need to repair the install then restart."
+        throw $err
+    }
+
+    $VSBaseDir = $vs[0].InstallLocation
+    if ($Toolchain) {
+        # Try to find the specified toolchain by name
+        foreach ($_ in $vs) {
+            if ($_.Name -eq $Toolchain) {
+                $VSBaseDir = $_.InstallLocation
+                break
+            }
+        }
+    } elseif ($vs.count -gt 1) {
+        # Ask the user which install to use
+        $i = 0
+        foreach ($_ in $vs) {
+            $i = $i + 1
+            $i.ToString() + ") " + $_.Name | Write-Host
+        }
+        $i = Read-Host -Prompt "Which Visual Studio installation do you want to use?"
+        $i = [Convert]::ToInt32($i, 10) - 1
+        if ($i -lt 0 -or $i -ge $vs.count) {
+            throw "Invalid selection made"
+        }
+        $VSBaseDir = $vs[$i].InstallLocation
+    }
+    
+    # Bootstrap the specified VS Toolchain
+    Import-Module "$VSBaseDir\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
+    Enter-VsDevShell -VsInstallPath $VSBaseDir -Arch $Arch -StartInPath $Path | Write-Host
+    Write-Host # Newline after command output
+}
+
+function Invoke-Cmd([string] $command, [string[]] $options = @(), [switch] $maskargs, [switch] $quiet) {
+    $call = ('{0} {1}' -f $command, ($options -Join ' '))
+    if ($maskargs) {
+        Write-Host "$command <masked>" -ForegroundColor DarkGray
+    }
+    else {
+        Write-Host $call -ForegroundColor DarkGray
+    }
+    if ($quiet) {
+        Invoke-Expression $call > $null
+    } else {
+        Invoke-Expression $call
+    }
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed to run command: {0}" -f $command
+    }
+    Write-Host #insert newline after command output
+}
+
+function Invoke-SignFiles([string[]] $files, [string] $key, [string] $time) {
+    if (!(Test-Path -Path "$key" -PathType leaf)) {
+        throw "Appsign key file was not found! ($key)"
+    }
+    if ($files.Length -eq 0) {
+        return
+    }
+
+    Write-Host "Signing files using $key" -ForegroundColor Cyan
+    $KeyPassword = Read-Host "Key password: " -MaskInput
+
+    foreach ($_ in $files) {
+        Write-Host "Signing file '$_' using Microsoft signtool..."
+        Invoke-Cmd "signtool" "sign -f `"$key`" -p `"$KeyPassword`" -d `"KeePassXC`" -td sha256 -fd sha256 -tr `"$time`" `"$_`"" -maskargs
+    }
+}
+
+function Invoke-GpgSignFiles([string[]] $files, [string] $key) {
+    if ($files.Length -eq 0) {
+        return
+    }
+
+    Write-Host "Signing files using GPG key $key" -ForegroundColor Cyan
+
+    foreach ($_ in $files) {
+        Write-Host "Signing file '$_' and creating DIGEST..."
+        if (Test-Path "$_.sig") {
+            Remove-Item "$_.sig"
+        }
+        Invoke-Cmd "gpg" "--output `"$_.sig`" --armor --local-user `"$key`" --detach-sig `"$_`""
+        $FileName = (Get-Item $_).Name
+        (Get-FileHash "$_" SHA256).Hash + " *$FileName" | Out-File "$_.DIGEST" -NoNewline
+    }
+}
+
+
+# Handle errors and restore state
+$OrigDir = (Get-Location).Path
+$OrigBranch = & git rev-parse --abbrev-ref HEAD
+$ErrorActionPreference = 'Stop'
+trap {
+    Write-Host "Restoring state..." -ForegroundColor Yellow
+    & git checkout $OrigBranch
+    Set-Location "$OrigDir"
+}
+
+Write-Host "KeePassXC Release Preparation Helper" -ForegroundColor Green
+Write-Host "Copyright (C) 2022 KeePassXC Team <https://keepassxc.org/>`n" -ForegroundColor Green
+
+# Prepend extra PATH locations as specified
+if ($ExtraPath) {
+    $env:Path = "$ExtraPath;$env:Path"
+}
+
+# Resolve absolute directory for paths
+$SourceDir = (Resolve-Path $SourceDir).Path
+
+# Check format of -Version
+if ($Version -notmatch "^\d+\.\d+\.\d+$") {
+    throw "Invalid format for -Version input"
+}
+
+# Check platform
+if (!$IsWindows) {
+    throw "The PowerShell release tool is not available for Linux or macOS at this time."
+}
+
+if ($Merge) {
+    Test-RequiredPrograms
+
+    # Change to SourceDir
+    Set-Location "$SourceDir"
+
+    Test-VersionInFiles
+    Test-WorkingTreeClean
+
+    if (!$SourceBranch.Length) {
+        $SourceBranch = & git branch --show-current
+    }
+
+    if ($SourceBranch -notmatch "^release/.*|develop$") {
+        throw "Must be on develop or a release/* branch to continue merging."
+    }
+
+    # Update translation files
+    Write-Host "Updating source translation file..."
+    Invoke-Cmd "lupdate" "-no-ui-lines -disable-heuristic similartext -locations none", `
+        "-no-obsolete ./src -ts share/translations/keepassxc_en.ts"
+
+    Write-Host "Pulling updated translations from Transifex..."
+    Invoke-Cmd "tx" "pull -af --minimum-perc=60 --parallel -r keepassxc.share-translations-keepassxc-en-ts--develop"
+
+    # Only commit if there are changes
+    & git diff-index --quiet HEAD --
+    if ($LASTEXITCODE) {
+        Write-Host "Committing translation updates..."
+        Invoke-Cmd "git" "add -A ./share/translations/" -quiet
+        Invoke-Cmd "git" "commit -m `"Update translations`"" -quiet
+    }
+
+    # Read the version release notes from CHANGELOG
+    $Changelog = ""
+    $ReadLine = $false
+    Get-Content "CHANGELOG.md" | ForEach-Object {
+        if ($ReadLine) {
+            if ($_ -match "^## ") {
+                $ReadLine = $false
+            } else {
+                $Changelog += $_ + "`n"
+            }
+        } elseif ($_ -match "$Version \(\d{4}-\d{2}-\d{2}\)") {
+            $ReadLine = $true
+        }
+    }
+
+    Write-Host "Checking out target branch '$TargetBranch'..."
+    Invoke-Cmd "git" "checkout `"$TargetBranch`"" -quiet
+
+    Write-Host "Merging '$SourceBranch' into '$TargetBranch'..."
+    Invoke-Cmd "git" "merge `"$SourceBranch`" --no-ff -m `"Release $Version`" -m `"$Changelog`" `"$SourceBranch`" -S" -quiet
+
+    Write-Host "Creating tag for '$Version'..."
+    Invoke-Cmd "git" "tag -a `"$Version`" -m `"Release $Version`" -m `"$Changelog`" -s" -quiet
+
+    Write-Host "All done!"
+    Write-Host "Please merge the release branch back into the develop branch now and then push your changes."
+    Write-Host "Don't forget to also push the tags using 'git push --tags'."
+} elseif ($Build) {
+    $Vcpkg = (Resolve-Path $Vcpkg).Path
+
+    # Find Visual Studio and establish build environment
+    Invoke-VSToolchain $VSToolChain $SourceDir -Arch "amd64"
+
+    Test-RequiredPrograms
+
+    if ($Snapshot) {
+        $Tag = "HEAD"
+        $SourceBranch = & git rev-parse --abbrev-ref HEAD
+        $ReleaseName = "$Version-snapshot"
+        $CMakeOptions = "$CMakeOptions -DKEEPASSXC_BUILD_TYPE=Snapshot -DOVERRIDE_VERSION=`"$ReleaseName`""
+        Write-Host "Using current branch '$SourceBranch' to build." -ForegroundColor Cyan
+    } else {
+        Test-WorkingTreeClean
+
+        # Clear output directory
+        if (Test-Path $OutDir) {
+            Remove-Item $OutDir -Recurse
+        }
+        
+        if ($Version -match "-beta\\d+$") {
+            $CMakeOptions = "$CMakeOptions -DKEEPASSXC_BUILD_TYPE=PreRelease"
+        } else {
+            $CMakeOptions = "$CMakeOptions -DKEEPASSXC_BUILD_TYPE=Release"
+        }
+
+        # Setup Tag if not defined then checkout tag
+        if ($Tag -eq "" -or $Tag -eq $null) {
+            $Tag = $Version
+        }
+        Write-Host "Checking out tag 'tags/$Tag' to build." -ForegroundColor Cyan
+        Invoke-Cmd "git" "checkout `"tags/$Tag`""
+    }
+
+    # Create directories
+    New-Item "$OutDir" -ItemType Directory -Force | Out-Null
+    $OutDir = (Resolve-Path $OutDir).Path
+
+    $BuildDir = "$OutDir\build-release"
+    New-Item "$BuildDir" -ItemType Directory -Force | Out-Null
+
+    # Enter build directory
+    Set-Location "$BuildDir"
+
+    # Setup CMake options
+    $CMakeOptions = "$CMakeOptions -DWITH_XC_ALL=ON -DWITH_TESTS=OFF -DCMAKE_BUILD_TYPE=Release"
+    $CMakeOptions = "$CMakeOptions -DCMAKE_TOOLCHAIN_FILE:FILEPATH=`"$Vcpkg`" -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON"
+
+    Write-Host "Configuring build..." -ForegroundColor Cyan
+    Invoke-Cmd "cmake" "$CMakeOptions -G `"$CMakeGenerator`" `"$SourceDir`""
+
+    Write-Host "Compiling sources..." -ForegroundColor Cyan
+    Invoke-Cmd "cmake" "--build . --config Release -- $MakeOptions"
+    
+    if ($SignBuild) {
+        $files = Get-ChildItem "$BuildDir\src" -Include "*keepassxc*.exe", "*keepassxc*.dll" -Recurse -File | ForEach-Object { $_.FullName }
+        Invoke-SignFiles $files $SignKey $Timestamp
+    }
+
+    Write-Host "Create deployment packages..." -ForegroundColor Cyan
+    Invoke-Cmd "cpack" "-G `"$CPackGenerators`""
+    Move-Item "$BuildDir\keepassxc-*" -Destination "$OutDir" -Force
+
+    if ($SignBuild) {
+        # Enter output directory
+        Set-Location -Path "$OutDir"
+
+        # Sign MSI files using AppSign key
+        $files = Get-ChildItem $OutDir -Include "*.msi" -Name
+        Invoke-SignFiles $files $SignKey $Timestamp
+
+        # Sign all output files using the GPG key then hash them
+        $files = Get-ChildItem $OutDir -Include "*.msi", "*.zip" -Name
+        Invoke-GpgSignFiles $files $GpgKey
+    }
+
+    # Restore state
+    Invoke-Command {git checkout $OrigBranch}
+    Set-Location "$OrigDir"
+} elseif ($Sign) {
+    if (Test-Path $SignKey) {
+        # Need to include path to signtool program
+        Invoke-VSToolchain $VSToolChain $SourceDir -Arch "amd64"
+    }
+
+    Test-RequiredPrograms
+
+    # Resolve wildcard paths
+    $ResolvedFiles = @()
+    foreach ($_ in $SignFiles) {
+        $ResolvedFiles += (Get-ChildItem $_ -File | ForEach-Object { $_.FullName })
+    }
+
+    $AppSignFiles = $ResolvedFiles.Where({ $_ -match "\.(msi|exe|dll)$" })
+    Invoke-SignFiles $AppSignFiles $SignKey $Timestamp
+
+    $GpgSignFiles = $ResolvedFiles.Where({ $_ -match "\.(msi|zip|gz|xz|dmg|appimage)$" })
+    Invoke-GpgSignFiles $GpgSignFiles $GpgKey
+}
+
+# SIG # Begin signature block
+# MIIThAYJKoZIhvcNAQcCoIITdTCCE3ECAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
+# gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
+# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUyaXWK5K1LP2TD/IgGb5Tfs8v
+# C2GgghC8MIIFOjCCBCKgAwIBAgIQWKLXLYzA/YnM/yHg1O3HSjANBgkqhkiG9w0B
+# AQsFADB8MQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVy
+# MRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxJDAi
+# BgNVBAMTG1NlY3RpZ28gUlNBIENvZGUgU2lnbmluZyBDQTAeFw0yMTAzMTUwMDAw
+# MDBaFw0yNDAzMTQyMzU5NTlaMIGhMQswCQYDVQQGEwJVUzEOMAwGA1UEEQwFMjIz
+# MTUxETAPBgNVBAgMCFZpcmdpbmlhMRIwEAYDVQQHDAlGcmFuY29uaWExGzAZBgNV
+# BAkMEjY2NTMgQXVkcmV5IEtheSBDdDEeMBwGA1UECgwVRHJvaWRNb25rZXkgQXBw
+# cywgTExDMR4wHAYDVQQDDBVEcm9pZE1vbmtleSBBcHBzLCBMTEMwggEiMA0GCSqG
+# SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwB9L/+1zlcXOQLoYvdrYAWS9B5ui+7E9c
+# XCn6wcB4NdmaRbNM3kdWc8nbjOOHeOct2jVzVu/pJR1SagI+V1R1BfzgfzuW55Yy
+# iHrqXQGfL9xhqJAWSvdQRinvlkZ+WY3QxnOhzcQk+BTLYdUwq04O3jMv7vnH6fuL
+# q/HXEsgDObZC7EyKEtVbWVo4nqY0tUTviJXvRI/sFDN8DvULefwZWIvF7G11NFeK
+# It24+hDCzvVBKtEn7DNmFGO1CJAB7Sz4jFewV4MP1gviMAfGbSBqavyRDBOG7eda
+# SVb1Zq482yoHNAs+mpIQK2SGvUKKAJK2wCDbzgpvu5sfzwStpc0hAgMBAAGjggGQ
+# MIIBjDAfBgNVHSMEGDAWgBQO4TqoUzox1Yq+wbutZxoDha00DjAdBgNVHQ4EFgQU
+# 7u2WZ7fqJiaM3u9SlzAwGBhoWH0wDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQC
+# MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwMwEQYJYIZIAYb4QgEBBAQDAgQQMEoGA1Ud
+# IARDMEEwNQYMKwYBBAGyMQECAQMCMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2Vj
+# dGlnby5jb20vQ1BTMAgGBmeBDAEEATBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8v
+# Y3JsLnNlY3RpZ28uY29tL1NlY3RpZ29SU0FDb2RlU2lnbmluZ0NBLmNybDBzBggr
+# BgEFBQcBAQRnMGUwPgYIKwYBBQUHMAKGMmh0dHA6Ly9jcnQuc2VjdGlnby5jb20v
+# U2VjdGlnb1JTQUNvZGVTaWduaW5nQ0EuY3J0MCMGCCsGAQUFBzABhhdodHRwOi8v
+# b2NzcC5zZWN0aWdvLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAD2w/Tt5KyPbX2M+h
+# WVwgqpKm42nk6aN2HvSp+KWlrB2t+ziL+1IRXwq7S0V7p2e1ZK8uXLzBjUDVGjBc
+# ugh5hGG95MGVltxCJrr/bk1He62L7MwVxfH5b5MrE/vC/cHcSxEB1AZwZxYKjDPf
+# R81biDVch++XeKmvUxfT4XGo7McJqT4K/TcLwijSb/AWsXR+r2BXEAqgsoG37kk/
+# fbPKimpJ07hxd/RNYVpE33E93zCQ1Tjc1tP3DaLq8cpS6jGUY5NNOzRgp2mGcGHy
+# lv6Q/xf45qNvHiqFVctdvY9of0QFjg5eYDr4rLDa+mks9f1Jd8aDWKcsfCBnlohT
+# KIffbTCCBYEwggRpoAMCAQICEDlyRDr5IrdR19NsEN0xNZUwDQYJKoZIhvcNAQEM
+# BQAwezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQ
+# MA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAf
+# BgNVBAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0xOTAzMTIwMDAwMDBa
+# Fw0yODEyMzEyMzU5NTlaMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEpl
+# cnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJV
+# U1QgTmV0d29yazEuMCwGA1UEAxMlVVNFUlRydXN0IFJTQSBDZXJ0aWZpY2F0aW9u
+# IEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIASZRc2
+# DsPbCLPQrFcNdu3NJ9NMrVCDYeKqIE0JLWQJ3M6Jn8w9qez2z8Hc8dOx1ns3KBEr
+# R9o5xrw6GbRfpr19naNjQrZ28qk7K5H44m/Q7BYgkAk+4uh0yRi0kdRiZNt/owbx
+# iBhqkCI8vP4T8IcUe/bkH47U5FHGEWdGCFHLhhRUP7wz/n5snP8WnRi9UY41pqdm
+# yHJn2yFmsdSbeAPAUDrozPDcvJ5M/q8FljUfV1q3/875PbcstvZU3cjnEjpNrkyK
+# t1yatLcgPcp/IjSufjtoZgFE5wFORlObM2D3lL5TN5BzQ/Myw1Pv26r+dE5px2uM
+# YJPexMcM3+EyrsyTO1F4lWeL7j1W/gzQaQ8bD/MlJmszbfduR/pzQ+V+DqVmsSl8
+# MoRjVYnEDcGTVDAZE6zTfTen6106bDVc20HXEtqpSQvf2ICKCZNijrVmzyWIzYS4
+# sT+kOQ/ZAp7rEkyVfPNrBaleFoPMuGfi6BOdzFuC00yz7Vv/3uVzrCM7LQC/NVV0
+# CUnYSVgaf5I25lGSDvMmfRxNF7zJ7EMm0L9BX0CpRET0medXh55QH1dUqD79dGMv
+# sVBlCeZYQi5DGky08CVHWfoEHpPUJkZKUIGy3r54t/xnFeHJV4QeD2PW6WK61l9V
+# LupcxigIBCU5uA4rqfJMlxwHPw1S9e3vL4IPAgMBAAGjgfIwge8wHwYDVR0jBBgw
+# FoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQwHQYDVR0OBBYEFFN5v1qqK0rPVIDh2JvA
+# nfKyA2bLMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MBEGA1UdIAQK
+# MAgwBgYEVR0gADBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2Nh
+# LmNvbS9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYw
+# JAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0B
+# AQwFAAOCAQEAGIdR3HQhPZyK4Ce3M9AuzOzw5steEd4ib5t1jp5y/uTW/qofnJYt
+# 7wNKfq70jW9yPEM7wD/ruN9cqqnGrvL82O6je0P2hjZ8FODN9Pc//t64tIrwkZb+
+# /UNkfv3M0gGhfX34GRnJQisTv1iLuqSiZgR2iJFODIkUzqJNyTKzuugUGrxx8Vvw
+# QQuYAAoiAxDlDLH5zZI3Ge078eQ6tvlFEyZ1r7uq7z97dzvSxAKRPRkA0xdcOds/
+# exgNRc2ThZYvXd9ZFk8/Ub3VRRg/7UqO6AZhdCMWtQ1QcydER38QXYkqa4UxFMTo
+# qWpMgLxqeM+4f452cpkMnf7XkQgWoaNflTCCBfUwggPdoAMCAQICEB2iSDBvmyYY
+# 0ILgln0z02owDQYJKoZIhvcNAQEMBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
+# EwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtKZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhl
+# IFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYDVQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRp
+# ZmljYXRpb24gQXV0aG9yaXR5MB4XDTE4MTEwMjAwMDAwMFoXDTMwMTIzMTIzNTk1
+# OVowfDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQ
+# MA4GA1UEBxMHU2FsZm9yZDEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMSQwIgYD
+# VQQDExtTZWN0aWdvIFJTQSBDb2RlIFNpZ25pbmcgQ0EwggEiMA0GCSqGSIb3DQEB
+# AQUAA4IBDwAwggEKAoIBAQCGIo0yhXoYn0nwli9jCB4t3HyfFM/jJrYlZilAhlRG
+# dDFixRDtsocnppnLlTDAVvWkdcapDlBipVGREGrgS2Ku/fD4GKyn/+4uMyD6DBmJ
+# qGx7rQDDYaHcaWVtH24nlteXUYam9CflfGqLlR5bYNV+1xaSnAAvaPeX7Wpyvjg7
+# Y96Pv25MQV0SIAhZ6DnNj9LWzwa0VwW2TqE+V2sfmLzEYtYbC43HZhtKn52BxHJA
+# teJf7wtF/6POF6YtVbC3sLxUap28jVZTxvC6eVBJLPcDuf4vZTXyIuosB69G2flG
+# HNyMfHEo8/6nxhTdVZFuihEN3wYklX0Pp6F8OtqGNWHTAgMBAAGjggFkMIIBYDAf
+# BgNVHSMEGDAWgBRTeb9aqitKz1SA4dibwJ3ysgNmyzAdBgNVHQ4EFgQUDuE6qFM6
+# MdWKvsG7rWcaA4WtNA4wDgYDVR0PAQH/BAQDAgGGMBIGA1UdEwEB/wQIMAYBAf8C
+# AQAwHQYDVR0lBBYwFAYIKwYBBQUHAwMGCCsGAQUFBwMIMBEGA1UdIAQKMAgwBgYE
+# VR0gADBQBgNVHR8ESTBHMEWgQ6BBhj9odHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20v
+# VVNFUlRydXN0UlNBQ2VydGlmaWNhdGlvbkF1dGhvcml0eS5jcmwwdgYIKwYBBQUH
+# AQEEajBoMD8GCCsGAQUFBzAChjNodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vVVNF
+# UlRydXN0UlNBQWRkVHJ1c3RDQS5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3Nw
+# LnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggIBAE1jUO1HNEphpNveaiqM
+# m/EAAB4dYns61zLC9rPgY7P7YQCImhttEAcET7646ol4IusPRuzzRl5ARokS9At3
+# WpwqQTr81vTr5/cVlTPDoYMot94v5JT3hTODLUpASL+awk9KsY8k9LOBN9O3ZLCm
+# I2pZaFJCX/8E6+F0ZXkI9amT3mtxQJmWunjxucjiwwgWsatjWsgVgG10Xkp1fqW4
+# w2y1z99KeYdcx0BNYzX2MNPPtQoOCwR/oEuuu6Ol0IQAkz5TXTSlADVpbL6fICUQ
+# DRn7UJBhvjmPeo5N9p8OHv4HURJmgyYZSJXOSsnBf/M6BZv5b9+If8AjntIeQ3pF
+# McGcTanwWbJZGehqjSkEAnd8S0vNcL46slVaeD68u28DECV3FTSK+TbMQ5Lkuk/x
+# YpMoJVcp+1EZx6ElQGqEV8aynbG8HArafGd+fS7pKEwYfsR7MUFxmksp7As9V1DS
+# yt39ngVR5UR43QHesXWYDVQk/fBO4+L4g71yuss9Ou7wXheSaG3IYfmm8SoKC6W5
+# 9J7umDIFhZ7r+YMp08Ysfb06dy6LN0KgaoLtO0qqlBCk4Q34F8W2WnkzGJLjtXX4
+# oemOCiUe5B7xn1qHI/+fpFGe+zmAEc3btcSnqIBv5VPU4OOiwtJbGvoyJi1qV3Ac
+# PKRYLqPzW0sH3DJZ84enGm1YMYICMjCCAi4CAQEwgZAwfDELMAkGA1UEBhMCR0Ix
+# GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEY
+# MBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMSQwIgYDVQQDExtTZWN0aWdvIFJTQSBD
+# b2RlIFNpZ25pbmcgQ0ECEFii1y2MwP2JzP8h4NTtx0owCQYFKw4DAhoFAKB4MBgG
+# CisGAQQBgjcCAQwxCjAIoAKAAKECgAAwGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcC
+# AQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYE
+# FPvoURlVLtMyc41aoH1W7jNXhNkUMA0GCSqGSIb3DQEBAQUABIIBACa4ISoVYuy4
+# LQD5f2XzRDboWCOwR2ClFczB/vOn7uX+RKpbW+vZwllcL0wk0kA4Iotk12yKLAni
+# K0DkhX8P/Gt5B4hMFaWYKkwTZljITgCEHoAy8vQzpfDUdfJF40R7IIEQLzr2/n5q
+# Iztv/ApXsPX8SkgEGdikFbBA0i/xtzI8+3sI1QINiRig8xEH/1eOZlR54YHwClvS
+# 8QhXueb9NbqNN9oKBwx5gRWcOE4I2E5mYAppDDQyhqitbeeY2Pw4Eo5koLM3zTDy
+# 4/zc+A9lNkAa5eDTavxMHQVqKgO5KomzIYHAdIFnKs85SdntIOr5nSAHnAl6svTh
+# iJXqSEggdX8=
+# SIG # End signature block

share/icons/application/scalable/actions/database-lock-all.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path style="stroke-width:.65502" d="M7.275.645a2.949 2.949 0 0 0-1.404.298c-1.34.571-2.058 2.064-1.918 3.475-.085.269.215.925-.248.816-.77-.119-1.655.327-1.71 1.176-.016 2.092-.004 4.183-.009 6.276-.119.769.329 1.654 1.176 1.712 1.855.012 3.711.006 5.567.004v-1.308H3.297v-6.55h7.861v4.106h1.301c0-1.252.002-2.504.008-3.755.137-.804-.444-1.689-1.309-1.66h-.656c-.021-.693.062-1.395-.09-2.077C10.112 1.7 8.71.688 7.275.645zm-.048 1.314c.465-.001.929.17 1.28.475.869.681.665 1.836.686 2.8H5.32c-.139-.22-.017-.701-.058-1.02-.153-1.14.789-2.292 1.965-2.255zm.097 6.559c-.37-.04-.752.069-1.025.373-.834.75-.195 2.3.928 2.238.736.016 1.37-.659 1.308-1.393-.008-.676-.594-1.153-1.21-1.218z" transform="translate(-.218 .136) scale(1.04251)"/><path style="fill:#000;fill-opacity:1;fill-rule:evenodd;stroke-width:.857645" d="M11.773 18.34c-1.322.064-2.213-1.618-1.424-2.677.676-1.116 2.527-.937 2.994.27.513 1.094-.357 2.434-1.57 2.406zm5.146 2.572v-8.576H6.627v8.576h10.292zm0-10.292c1.038-.032 1.855.99 1.715 1.993-.01 2.84.019 5.68-.014 8.519-.096.979-1.095 1.626-2.034 1.495-3.378-.006-6.757.012-10.135-.009-1.032-.072-1.677-1.125-1.54-2.094.007-2.788-.01-5.577.01-8.365.068-1.003 1.084-1.67 2.038-1.539.432.09.635-.048.526-.498-.025-1.262-.04-2.616.77-3.67 1.263-1.913 4.126-2.424 5.971-1.064 1.326.884 1.959 2.516 1.835 4.071v1.161h.858zm-5.146-4.288c-1.49-.044-2.739 1.385-2.573 2.85v1.438h5.146c-.053-1.126.231-2.4-.575-3.336a2.578 2.578 0 0 0-1.998-.952z" transform="matrix(.99434 0 0 .99434 3.623 .679)"/></svg>

share/icons/application/scalable/actions/database-lock.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-lock-outline" width="24" height="24" viewBox="0 0 24 24"><path d="M12,17C10.89,17 10,16.1 10,15C10,13.89 10.89,13 12,13A2,2 0 0,1 14,15A2,2 0 0,1 12,17M18,20V10H6V20H18M18,8A2,2 0 0,1 20,10V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V10C4,8.89 4.89,8 6,8H7V6A5,5 0 0,1 12,1A5,5 0 0,1 17,6V8H18M12,3A3,3 0 0,0 9,6V8H15V6A3,3 0 0,0 12,3Z" /></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 17a2 2 0 0 1-2-2c0-1.11.89-2 2-2a2 2 0 0 1 2 2 2 2 0 0 1-2 2m6 3V10H6v10h12m0-12a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V10c0-1.11.89-2 2-2h1V6a5 5 0 0 1 5-5 5 5 0 0 1 5 5v2h1m-6-5a3 3 0 0 0-3 3v2h6V6a3 3 0 0 0-3-3z"/></svg>

share/icons/application/scalable/actions/entry-restore.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,3A9,9 0 0,0 3,12H0L4,16L8,12H5A7,7 0 0,1 12,5A7,7 0 0,1 19,12A7,7 0 0,1 12,19C10.5,19 9.09,18.5 7.94,17.7L6.5,19.14C8.04,20.3 9.94,21 12,21A9,9 0 0,0 21,12A9,9 0 0,0 12,3M14,12A2,2 0 0,0 12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12Z" /></svg>

share/icons/application/scalable/actions/fingerprint.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M17.81,4.47C17.73,4.47 17.65,4.45 17.58,4.41C15.66,3.42 14,3 12,3C10.03,3 8.15,3.47 6.44,4.41C6.2,4.54 5.9,4.45 5.76,4.21C5.63,3.97 5.72,3.66 5.96,3.53C7.82,2.5 9.86,2 12,2C14.14,2 16,2.47 18.04,3.5C18.29,3.65 18.38,3.95 18.25,4.19C18.16,4.37 18,4.47 17.81,4.47M3.5,9.72C3.4,9.72 3.3,9.69 3.21,9.63C3,9.47 2.93,9.16 3.09,8.93C4.08,7.53 5.34,6.43 6.84,5.66C10,4.04 14,4.03 17.15,5.65C18.65,6.42 19.91,7.5 20.9,8.9C21.06,9.12 21,9.44 20.78,9.6C20.55,9.76 20.24,9.71 20.08,9.5C19.18,8.22 18.04,7.23 16.69,6.54C13.82,5.07 10.15,5.07 7.29,6.55C5.93,7.25 4.79,8.25 3.89,9.5C3.81,9.65 3.66,9.72 3.5,9.72M9.75,21.79C9.62,21.79 9.5,21.74 9.4,21.64C8.53,20.77 8.06,20.21 7.39,19C6.7,17.77 6.34,16.27 6.34,14.66C6.34,11.69 8.88,9.27 12,9.27C15.12,9.27 17.66,11.69 17.66,14.66A0.5,0.5 0 0,1 17.16,15.16A0.5,0.5 0 0,1 16.66,14.66C16.66,12.24 14.57,10.27 12,10.27C9.43,10.27 7.34,12.24 7.34,14.66C7.34,16.1 7.66,17.43 8.27,18.5C8.91,19.66 9.35,20.15 10.12,20.93C10.31,21.13 10.31,21.44 10.12,21.64C10,21.74 9.88,21.79 9.75,21.79M16.92,19.94C15.73,19.94 14.68,19.64 13.82,19.05C12.33,18.04 11.44,16.4 11.44,14.66A0.5,0.5 0 0,1 11.94,14.16A0.5,0.5 0 0,1 12.44,14.66C12.44,16.07 13.16,17.4 14.38,18.22C15.09,18.7 15.92,18.93 16.92,18.93C17.16,18.93 17.56,18.9 17.96,18.83C18.23,18.78 18.5,18.96 18.54,19.24C18.59,19.5 18.41,19.77 18.13,19.82C17.56,19.93 17.06,19.94 16.92,19.94M14.91,22C14.87,22 14.82,22 14.78,22C13.19,21.54 12.15,20.95 11.06,19.88C9.66,18.5 8.89,16.64 8.89,14.66C8.89,13.04 10.27,11.72 11.97,11.72C13.67,11.72 15.05,13.04 15.05,14.66C15.05,15.73 16,16.6 17.13,16.6C18.28,16.6 19.21,15.73 19.21,14.66C19.21,10.89 15.96,7.83 11.96,7.83C9.12,7.83 6.5,9.41 5.35,11.86C4.96,12.67 4.76,13.62 4.76,14.66C4.76,15.44 4.83,16.67 5.43,18.27C5.53,18.53 5.4,18.82 5.14,18.91C4.88,19 4.59,18.87 4.5,18.62C4,17.31 3.77,16 3.77,14.66C3.77,13.46 4,12.37 4.45,11.42C5.78,8.63 8.73,6.82 11.96,6.82C16.5,6.82 20.21,10.33 20.21,14.65C20.21,16.27 18.83,17.59 17.13,17.59C15.43,17.59 14.05,16.27 14.05,14.65C14.05,13.58 13.12,12.71 11.97,12.71C10.82,12.71 9.89,13.58 9.89,14.65C9.89,16.36 10.55,17.96 11.76,19.16C12.71,20.1 13.62,20.62 15.03,21C15.3,21.08 15.45,21.36 15.38,21.62C15.33,21.85 15.12,22 14.91,22Z" /></svg>

share/icons/application/scalable/actions/group-clone.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M6 2.58c-1.11 0-2 .89-2 2v1.572l-1.951-.007a1.99 1.99 0 0 0-2 2v12c0 1.11.89 2 2 2h16a1.99 1.99 0 0 0 2-2l-.01-1.565H22c1.11 0 2-.89 2-2v-10c0-1.11-.89-2-2-2h-8l-2-2H6zm0 4h16v10H6v-10zm10 2v2h-2v2h2v2h2v-2h2v-2h-2v-2h-2zM2.049 10.145 4 10.158v6.422c0 1.11.89 2 2 2h12.053l-.004 1.565h-16v-10z"/></svg>

share/icons/application/scalable/actions/tag-search.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M22 13C22 13.53 21.79 14.04 21.41 14.41L21 14.83C20.91 11.97 18.84 9.62 16.11 9.11L11 4H4V11L9.11 16.11C9.62 18.84 11.97 20.91 14.83 21L14.41 21.41C14.04 21.79 13.53 22 13 22C12.47 22 11.97 21.79 11.59 21.42L2.59 12.42C2.21 12.04 2 11.53 2 11V4C2 2.9 2.9 2 4 2H11C11.53 2 12.04 2.21 12.41 2.58L21.41 11.58C21.79 11.96 22 12.47 22 13M5 6.5C5 7.33 5.67 8 6.5 8S8 7.33 8 6.5 7.33 5 6.5 5 5 5.67 5 6.5M15.11 10.61C12.61 10.61 10.61 12.61 10.61 15.11S12.61 19.61 15.11 19.61C16 19.61 16.8 19.36 17.5 18.93L20.61 22L22 20.61L18.92 17.5C19.36 16.82 19.61 16 19.61 15.11C19.61 12.61 17.61 10.61 15.11 10.61M15.11 12.61C16.5 12.61 17.61 13.73 17.61 15.11S16.5 17.61 15.11 17.61 12.61 16.5 12.61 15.11 13.73 12.61 15.11 12.61" /></svg>

share/icons/application/scalable/actions/tag.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M21.41 11.58L12.41 2.58A2 2 0 0 0 11 2H4A2 2 0 0 0 2 4V11A2 2 0 0 0 2.59 12.42L11.59 21.42A2 2 0 0 0 13 22A2 2 0 0 0 14.41 21.41L21.41 14.41A2 2 0 0 0 22 13A2 2 0 0 0 21.41 11.58M13 20L4 11V4H11L20 13M6.5 5A1.5 1.5 0 1 1 5 6.5A1.5 1.5 0 0 1 6.5 5Z" /></svg>

share/icons/application/scalable/actions/trash.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19M8,9H16V19H8V9M15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z" /></svg>

share/icons/application/scalable/categories/label.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M17.63,5.84C17.27,5.33 16.67,5 16,5H5A2,2 0 0,0 3,7V17A2,2 0 0,0 5,19H16C16.67,19 17.27,18.66 17.63,18.15L22,12L17.63,5.84Z" /></svg>

share/icons/database/C29_KGPG_Term.svg

@@ -1 +1 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><g><path d="M41 6H7c-.6.0-1 .4-1 1V42H42V7C42 6.4 41.6 6 41 6z" style="fill:#cfd8dc;fill-rule:nonzero"/></g><rect x="8" y="13" width="32" height="27" style="fill:#263238"/><g transform="matrix(1.00639,0,0,1.00639,12.7027,31.2351)"><g><text x="0" y="0" style="font-family:roboto-bold,roboto;font-weight:700;font-size:22px;fill:#76ff03">>_</text></g></g><g><circle cx="13.5" cy="9.5" r="1.5" style="fill:#90a4ae"/><circle cx="9.5" cy="9.5" r="1.5" style="fill:#90a4ae"/></g><g transform="matrix(1,0,0,1,1.02128,-0.291791)"><g id="polygon2" transform="matrix(0.438989,0,0,0.598621,-3.05709,20.013)"><path d="M22 45l-4-4V21H30v8l-2 2 2 2v2l-2 2 2 2v2l-4 4H22z" style="fill:#ffa000;fill-rule:nonzero"/></g><g id="path4" transform="matrix(0.438989,0,0,0.598621,-3.05709,20.013)"><path d="M38 7.8c-.5-1.8-2-3.1-3.7-3.6C31.9 3.7 28.2 3 24 3s-7.9.7-10.3 1.2C12 4.7 10.5 6 10 7.8c-.5 1.7-1 4.1-1 6.7s.5 5 1 6.7c.5 1.8 1.9 3.1 3.7 3.5C16.1 25.3 19.8 26 24 26S31.9 25.3 34.3 24.8C36.1 24.4 37.5 23 38 21.3s1-4.1 1-6.7c0-2.7-.5-5.1-1-6.8zM29 13H19c-1.1.0-2-.9-2-2V9c0-.6 3.1-1 7-1s7 .4 7 1v2C31 12.1 30.1 13 29 13z" style="fill:#ffa000;fill-rule:nonzero"/></g><g id="rect8" transform="matrix(0.598621,0,0,0.598621,-7.50244,20.013)"><rect x="23.559" y="26" width="2" height="19" style="fill:#d68600"/></g></g></svg>
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><path d="M41 6H7c-.6 0-1 .4-1 1v35h36V7c0-.6-.4-1-1-1z" style="fill:#cfd8dc;fill-rule:nonzero"/><path style="fill:#263238" d="M8 13h32v27H8z"/><path d="M.046-.081v-.138l.343-.135-.343-.133v-.138l.492.213v.117l-.492.214z" style="fill:#76ff03;fill-rule:nonzero" transform="translate(12.703 31.235) scale(22.14058)"/><path style="fill:#76ff03;fill-rule:nonzero" d="M-.009.109h.57v.089h-.57z" transform="translate(25.632 31.235) scale(22.14058)"/><circle cx="13.5" cy="9.5" r="1.5" style="fill:#90a4ae"/><circle cx="9.5" cy="9.5" r="1.5" style="fill:#90a4ae"/><g><path d="m22 45-4-4V21h12v8l-2 2 2 2v2l-2 2 2 2v2l-4 4h-4z" style="fill:#ffa000;fill-rule:nonzero" transform="matrix(.43899 0 0 .59862 -2.036 19.721)"/><path d="M38 7.8c-.5-1.8-2-3.1-3.7-3.6C31.9 3.7 28.2 3 24 3c-4.2 0-7.9.7-10.3 1.2C12 4.7 10.5 6 10 7.8c-.5 1.7-1 4.1-1 6.7 0 2.6.5 5 1 6.7.5 1.8 1.9 3.1 3.7 3.5 2.4.6 6.1 1.3 10.3 1.3 4.2 0 7.9-.7 10.3-1.2 1.8-.4 3.2-1.8 3.7-3.5s1-4.1 1-6.7c0-2.7-.5-5.1-1-6.8zM29 13H19c-1.1 0-2-.9-2-2V9c0-.6 3.1-1 7-1s7 .4 7 1v2c0 1.1-.9 2-2 2z" style="fill:#ffa000;fill-rule:nonzero" transform="matrix(.43899 0 0 .59862 -2.036 19.721)"/><path style="fill:#d68600" d="M23.559 26h2v19h-2z" transform="translate(-6.481 19.721) scale(.59862)"/></g></svg>

share/icons/database/C30_Konsole.svg

@@ -1 +1 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><g><path d="M41 6H7c-.6.0-1 .4-1 1V42H42V7C42 6.4 41.6 6 41 6z" style="fill:#cfd8dc;fill-rule:nonzero"/></g><rect x="8" y="13" width="32" height="27" style="fill:#263238"/><g transform="matrix(1.00639,0,0,1.00639,12.7027,31.2351)"><g><text x="0" y="0" style="font-family:roboto-bold,roboto;font-weight:700;font-size:22px;fill:#76ff03">>_</text></g></g><g><circle cx="13.5" cy="9.5" r="1.5" style="fill:#90a4ae"/><circle cx="9.5" cy="9.5" r="1.5" style="fill:#90a4ae"/></g></svg>
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><path d="M41 6H7c-.6 0-1 .4-1 1v35h36V7c0-.6-.4-1-1-1z" style="fill:#cfd8dc;fill-rule:nonzero"/><path style="fill:#263238" d="M8 13h32v27H8z"/><path d="M.046-.081v-.138l.343-.135-.343-.133v-.138l.492.213v.117l-.492.214z" style="fill:#76ff03;fill-rule:nonzero" transform="translate(12.703 31.235) scale(22.14058)"/><path style="fill:#76ff03;fill-rule:nonzero" d="M-.009.109h.57v.089h-.57z" transform="translate(25.632 31.235) scale(22.14058)"/><g><circle cx="13.5" cy="9.5" r="1.5" style="fill:#90a4ae"/><circle cx="9.5" cy="9.5" r="1.5" style="fill:#90a4ae"/></g></svg>

share/icons/icons.qrc

@@ -15,6 +15,7 @@
         <file>application/scalable/actions/configure.svg</file>
         <file>application/scalable/actions/database-change-key.svg</file>
         <file>application/scalable/actions/database-lock.svg</file>
+        <file>application/scalable/actions/database-lock-all.svg</file>
         <file>application/scalable/actions/database-merge.svg</file>
         <file>application/scalable/actions/dialog-close.svg</file>
         <file>application/scalable/actions/dialog-ok.svg</file>
@@ -34,12 +35,15 @@
         <file>application/scalable/actions/edit-clear-locationbar-rtl.svg</file>
         <file>application/scalable/actions/entry-clone.svg</file>
         <file>application/scalable/actions/entry-delete.svg</file>
+        <file>application/scalable/actions/entry-restore.svg</file>
         <file>application/scalable/actions/entry-edit.svg</file>
         <file>application/scalable/actions/entry-new.svg</file>
         <file>application/scalable/actions/favicon-download.svg</file>
+        <file>application/scalable/actions/fingerprint.svg</file>
         <file>application/scalable/actions/getting-started.svg</file>
         <file>application/scalable/actions/group-delete.svg</file>
         <file>application/scalable/actions/group-edit.svg</file>
+        <file>application/scalable/actions/group-clone.svg</file>
         <file>application/scalable/actions/group-empty-trash.svg</file>
         <file>application/scalable/actions/group-new.svg</file>
         <file>application/scalable/actions/hammer-wrench.svg</file>
@@ -69,12 +73,14 @@
         <file>application/scalable/actions/system-help.svg</file>
         <file>application/scalable/actions/system-search.svg</file>
         <file>application/scalable/actions/system-software-update.svg</file>
+        <file>application/scalable/actions/tag.svg</file>
+        <file>application/scalable/actions/tag-search.svg</file>
+        <file>application/scalable/actions/trash.svg</file>
         <file>application/scalable/actions/url-copy.svg</file>
         <file>application/scalable/actions/user-guide.svg</file>
         <file>application/scalable/actions/username-copy.svg</file>
         <file>application/scalable/actions/view-history.svg</file>
         <file>application/scalable/actions/web.svg</file>
-
         <file>application/scalable/apps/freedesktop.svg</file>
         <file>application/scalable/apps/internet-web-browser.svg</file>
         <file>application/scalable/apps/keepassxc.svg</file>

share/icons/minify.sh

@@ -18,4 +18,4 @@ minify -o icons/database --match=.svg icons/database
 
 # Crush PNG's
 echo "Crushing PNG's..."
-find "." -iname '*png' -exec pngcrush -ow -brute {} \;
+find . -iname '*.png' -exec pngcrush -ow -brute {} \;

share/linux/org.keepassxc.KeePassXC.appdata.xml

@@ -50,6 +50,42 @@
     </screenshots>
 
     <releases>
+        <release version="2.6.6" date="2021-06-11">
+            <description>
+                <ul>
+                    <li>Fix focusing search when pressing hotkey [#6603]</li>
+                    <li>Trim whitespace from TOTP key input prior to processing [#6604]</li>
+                    <li>Fix building on macOS [#6598]</li>
+                    <li>Resolve compiler warnings for unused return values [#6607]</li>
+                </ul>
+            </description>
+        </release>
+        <release version="2.6.5" date="2021-06-07">
+            <description>
+                <ul>
+                    <li>Show search bar when toolbar is hidden or in overflow [#6279]</li>
+                    <li>Show countdown for clipboard clearing in status bar [#6333]</li>
+                    <li>Command line option to lock all open databases [#6511]</li>
+                    <li>Allow CSV import of bare TOTP secrets [#6211]</li>
+                    <li>Retain file creation time when saving database [#6576]</li>
+                    <li>Set permissions of saved attachments to be private to the current user [#6363]</li>
+                    <li>OPVault: Use Text instead of Name for attribute names [#6334]</li>
+                    <li>Reports: Allow resizing of reports columns [#6435]</li>
+                    <li>Reports: Toggle showing expired entries [#6534]</li>
+                    <li>Save Always on Top setting [#6236]</li>
+                    <li>Password generator can exclude additional lookalike characters (6/G, 8/B) [#6196]</li>
+                    <li>Allow setting MSI properties in unattended install [#6196]</li>
+                    <li>Update MainWindow minimum size to enable smaller verticle space [#6196]</li>
+                    <li>Use application font size when setting default or monospace fonts [#6332]</li>
+                    <li>Fix notes not clearing in entry preview panel in some cases [#6481]</li>
+                    <li>macOS: Correct window activation when restoring from tray [#6575]</li>
+                    <li>macOS: Better handling of minimize after unlock when using browser integration [#6338]</li>
+                    <li>Linux: Start after the system tray is available on LXQt [#6216]</li>
+                    <li>Linux: Allow selection of modal dialogs on X11 in Auto-Type [#6204]</li>
+                    <li>KeeShare: prevent crash when file extension is missing [#6174]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.6.4" date="2021-01-31">
             <description>
                 <ul>

share/linux/org.keepassxc.KeePassXC.desktop

@@ -23,7 +23,7 @@ GenericName[pl]=Menedżer haseł
 GenericName[pt_BR]=Gerenciador de Senhas
 GenericName[pt]=Gestor de palavras-passe
 GenericName[ro]=Manager de parole
-GenericName[ru]=менеджер паролей
+GenericName[ru]=Менеджер паролей
 GenericName[sk]=Správca hesiel
 GenericName[sv]=Lösenordshanterare
 GenericName[th]=แอพจัดการรหัสผ่าน
@@ -34,6 +34,7 @@ GenericName[zh_TW]=密碼管理員
 Comment=Community-driven port of the Windows application “KeePass Password Safe”
 Comment[da]=Fællesskabsdrevet port af Windows-programmet “KeePass Password Safe”
 Comment[et]=Kogukonna arendatav port Windowsi programmist KeePass Password Safe
+Comment[ru]=Разработанный сообществом порт Windows-приложения KeePass Password Safe
 Exec=keepassxc %f
 TryExec=keepassxc
 Icon=keepassxc

share/translations/CMakeLists.txt

@@ -15,14 +15,14 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 file(GLOB TRANSLATION_FILES *.ts)
-get_filename_component(TRANSLATION_EN_ABS keepassx_en.ts ABSOLUTE)
-list(REMOVE_ITEM TRANSLATION_FILES keepassx_en.ts)
+get_filename_component(TRANSLATION_EN_ABS keepassxc_en.ts ABSOLUTE)
+list(REMOVE_ITEM TRANSLATION_FILES keepassxc_en.ts)
 list(REMOVE_ITEM TRANSLATION_FILES ${TRANSLATION_EN_ABS})
 message(STATUS "Including translations...\n")
 
 qt5_add_translation(QM_FILES ${TRANSLATION_FILES})
 
-if(MINGW)
+if(WIN32)
     file(GLOB QTBASE_TRANSLATIONS ${Qt5_PREFIX}/share/qt5/translations/qtbase_*.qm)
 elseif(APPLE OR KEEPASSXC_DIST_APPIMAGE)
     file(GLOB QTBASE_TRANSLATIONS
@@ -35,7 +35,7 @@ set(QM_FILES ${QM_FILES} ${QTBASE_TRANSLATIONS})
 install(FILES ${QM_FILES} DESTINATION ${DATA_INSTALL_DIR}/translations)
 
 # Add keepassx_en.qm as a fallback for uncommon english locales
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/keepassx_en_US.qm DESTINATION ${DATA_INSTALL_DIR}/translations RENAME keepassx_en.qm)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/keepassxc_en_US.qm DESTINATION ${DATA_INSTALL_DIR}/translations RENAME keepassxc_en.qm)
 
 add_custom_target(translations DEPENDS ${QM_FILES})
 add_dependencies(${PROGNAME} translations)

share/translations/keepassxc_ar.ts

@@ -3,78 +3,78 @@
     <name>AboutDialog</name>
     <message>
         <source>About KeePassXC</source>
-        <translation>حول KeePassXC</translation>
+        <translation>حَول KeePassXC</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>حول</translation>
+        <translation>حَول</translation>
     </message>
     <message>
         <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>للإبلاغ عن العلل: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+        <translation>للإبلاغ عن الأخطاء: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</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 موزع وفقًا لشروط رخصة غنو العمومية (GPL) إصدار 2 أو (حسب خيارك) إصدار 3.</translation>
+        <translation>يتم توزيع KeePassXC بمُوجة شُروط رخصة GNU العمومية (GPL) الإصار الثاني (حسب اختيارك) الإصدار الثالث.</translation>
     </message>
     <message>
         <source>Contributors</source>
-        <translation>المساهمون</translation>
+        <translation>المُساهِمون</translation>
     </message>
     <message>
         <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;إستكشاف المساهمين عبر GitHub&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;ألقِ نظرة على المُساهِمون في GitHub&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Debug Info</source>
-        <translation>معلومات تتبع الأخطاء</translation>
+        <translation>معلومات التصحيح</translation>
     </message>
     <message>
         <source>Include the following information whenever you report a bug:</source>
-        <translation>قم بتضمين المعلومات التالية عند الإبلاغ عن علة:</translation>
+        <translation>ََضَمِّن المعلومات التالية عند الإبلاغ عن الأخطاء:</translation>
     </message>
     <message>
         <source>Copy to clipboard</source>
-        <translation>نسخ إلى الحافظة</translation>
+        <translation>النسخ إلى الحافظة</translation>
     </message>
     <message>
         <source>Project Maintainers:</source>
-        <translation>مشرفي المشروع:</translation>
+        <translation>مُشرِّفو المَشروع:</translation>
     </message>
     <message>
         <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
-        <translation>شكر خاص من فريق KeePassXC يذهب إلى debfx لإنشاء KeePassX الأصلي.</translation>
+        <translation>فريق KeePassXC يُوجه شكر خاص إلى debfx لإنشاء KeePassX الأصلي.</translation>
     </message>
 </context>
 <context>
     <name>AgentSettingsWidget</name>
     <message>
         <source>Use OpenSSH for Windows instead of Pageant</source>
-        <translation type="unfinished"/>
+        <translation>استخدام OpenSSH لنظام تشغيل Windows بدلاً من Pageant</translation>
     </message>
     <message>
         <source>Enable SSH Agent integration</source>
-        <translation type="unfinished"/>
+        <translation>تفعِّيل تكامُل SSH Agent</translation>
     </message>
     <message>
         <source>SSH_AUTH_SOCK value</source>
-        <translation type="unfinished"/>
+        <translation>خانة SSH_AUTH_SOCK</translation>
     </message>
     <message>
         <source>SSH_AUTH_SOCK override</source>
-        <translation type="unfinished"/>
+        <translation>تجاوز SSH_AUTH_SOCK</translation>
     </message>
     <message>
         <source>(empty)</source>
-        <translation type="unfinished"/>
+        <translation>(فارِغ)</translation>
     </message>
     <message>
         <source>No SSH Agent socket available. Either make sure SSH_AUTH_SOCK environment variable exists or set an override.</source>
-        <translation type="unfinished"/>
+        <translation>لا يُوجد مِقبَس SSH Agent مُتاح. تأكد مِن وجود مُتغير SSH_AUTH_SOCK في البيئة أو عيّن تجاوز له.</translation>
     </message>
     <message>
         <source>SSH Agent connection is working!</source>
-        <translation type="unfinished"/>
+        <translation>اتِّصال SSH Agent يعمل!</translation>
     </message>
 </context>
 <context>
@@ -85,7 +85,7 @@
     </message>
     <message>
         <source>General</source>
-        <translation>العام</translation>
+        <translation>عام</translation>
     </message>
     <message>
         <source>Security</source>
@@ -93,7 +93,7 @@
     </message>
     <message>
         <source>Access error for config file %1</source>
-        <translation>خطأ في الوصول لملف التكوين %1</translation>
+        <translation>خطأ في الوصول إلى ملف الإعداد %1</translation>
     </message>
     <message>
         <source>Icon only</source>
@@ -101,15 +101,15 @@
     </message>
     <message>
         <source>Text only</source>
-        <translation>الوصف بالكلمات فقط </translation>
+        <translation>النص فقط</translation>
     </message>
     <message>
         <source>Text beside icon</source>
-        <translation>وصف حرفي بجانب الأيقونة</translation>
+        <translation>نص بجانب الأيقونة</translation>
     </message>
     <message>
         <source>Text under icon</source>
-        <translation>الوصف أسفل الأيقونة</translation>
+        <translation>النص أسفل الأيقونة</translation>
     </message>
     <message>
         <source>Follow style</source>
@@ -117,26 +117,30 @@
     </message>
     <message>
         <source>Reset Settings?</source>
-        <translation type="unfinished"/>
+        <translation>إعادة تعيّين الإعدادات؟</translation>
     </message>
     <message>
         <source>Are you sure you want to reset all general and security settings to default?</source>
-        <translation>هل أنت متأكد من رغبتك في إعادة جميع الإعدادات العامة وإعدادات الأمن الى وضعها النمطي الأولي ؟</translation>
+        <translation>هل أنت متأكد من رغبتك في إعادة تعيّين كافة الإعدادات العامة وإعدادات الأمن إلى وضعها الافتراضي؟</translation>
     </message>
     <message>
         <source>Monochrome (light)</source>
-        <translation type="unfinished"/>
+        <translation>أُحادي اللون (فاتح)</translation>
     </message>
     <message>
         <source>Monochrome (dark)</source>
-        <translation type="unfinished"/>
+        <translation>أُُحادي اللون (داكِن)</translation>
     </message>
     <message>
         <source>Colorful</source>
-        <translation type="unfinished"/>
+        <translation>مُلون</translation>
     </message>
     <message>
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
+        <translation>يجب إعادة تشغيل التطبيق لتعيين اللغة الجديدة. هل تريد إعادة التشغيل الآن ؟</translation>
+    </message>
+    <message>
+        <source>Monochrome</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -229,7 +233,7 @@
     </message>
     <message>
         <source>Remember database key files and security dongles</source>
-        <translation type="unfinished"/>
+        <translation>تذكر ملفات مفاتيح قاعدة البيانات وأجهزة الوصول الآمن</translation>
     </message>
     <message>
         <source>Check for updates at application startup once per week</source>
@@ -237,7 +241,7 @@
     </message>
     <message>
         <source>Include beta releases when checking for updates</source>
-        <translation type="unfinished"/>
+        <translation>ضمّن النسخ التجريبية عند البحث عن التحديثات</translation>
     </message>
     <message>
         <source>Language:</source>
@@ -303,19 +307,19 @@
     </message>
     <message>
         <source>Automatically launch KeePassXC at system startup</source>
-        <translation type="unfinished"/>
+        <translation>قم بتشغيل KeePassXC تلقائيًا عند بدء تشغيل النظام</translation>
     </message>
     <message>
         <source>Safely save database files (disable if experiencing problems with Dropbox, etc.)</source>
-        <translation type="unfinished"/>
+        <translation>احفظ ملفات قاعدة البيانات بأمان (قم بتعطيلها إذا كنت تواجه مشكلات مع Dropbox ، وما إلى ذلك)</translation>
     </message>
     <message>
         <source>User Interface</source>
-        <translation type="unfinished"/>
+        <translation>واجهة المستخدم</translation>
     </message>
     <message>
         <source>Toolbar button style:</source>
-        <translation type="unfinished"/>
+        <translation>نمط أزرار شريط الأدوات</translation>
     </message>
     <message>
         <source>Use monospaced font for notes</source>
@@ -440,11 +444,11 @@
     </message>
     <message>
         <source>Require password repeat when it is visible</source>
-        <translation type="unfinished"/>
+        <translation>يلزم تكرار كلمة المرور عندما تكون مرئية</translation>
     </message>
     <message>
         <source>Hide passwords when editing them</source>
-        <translation type="unfinished"/>
+        <translation>إخفاء كلمات المرور عند تعديلها</translation>
     </message>
     <message>
         <source>Use placeholder for empty password fields</source>
@@ -578,7 +582,7 @@
     </message>
     <message>
         <source>Remember</source>
-        <translation type="unfinished"/>
+        <translation>تذكر</translation>
     </message>
     <message>
         <source>Allow access to entries</source>
@@ -586,11 +590,11 @@
     </message>
     <message>
         <source>Allow Selected</source>
-        <translation type="unfinished"/>
+        <translation>السماح بالمُحدد</translation>
     </message>
     <message>
         <source>Deny All</source>
-        <translation type="unfinished"/>
+        <translation>منع الكل</translation>
     </message>
     <message>
         <source>Disable for this site</source>
@@ -885,7 +889,7 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Browser type:</source>
-        <translation type="unfinished"/>
+        <translation>نوع المتصفح:</translation>
     </message>
     <message>
         <source>Toolbar button style</source>
@@ -1106,6 +1110,14 @@ chrome-laptop.</source>
         <source>Column %1</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>أيقونة</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1201,20 +1213,6 @@ Backup database located at %2</source>
         <source>Refresh</source>
         <translation>تحديث</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>تنسيق ملف المفتاح القديم</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>أنت تستخدم تنسيق ملف مفتاح قديم قد يصبح
-غير مُعتمد في المستقبل.
-
-يرجى النظر في إنشاء ملف مفتاح جديد.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>لا تُظهر هذا التحذير مرة أخرى</translation>
@@ -1241,7 +1239,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Enter Password:</source>
-        <translation type="unfinished"/>
+        <translation>أدخل كلمة المرور:</translation>
     </message>
     <message>
         <source>Password field</source>
@@ -1275,14 +1273,6 @@ Please consider generating a new key file.</source>
         <source>TouchID for Quick Unlock</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>مسح</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation type="unfinished"/>
@@ -1313,7 +1303,7 @@ To prevent this error from appearing, you must go to &quot;Database Settings / S
     </message>
     <message>
         <source>?</source>
-        <translation type="unfinished"/>
+        <translation>؟</translation>
     </message>
     <message>
         <source>Cannot use database file as key file</source>
@@ -1348,6 +1338,14 @@ If you do not have a key file, please leave the field empty.</source>
         <source>Select hardware key…</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -1795,7 +1793,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Delete Recycle Bin</source>
-        <translation type="unfinished"/>
+        <translation>حذف سلة المحذوفات</translation>
     </message>
     <message>
         <source>Do you want to delete the current recycle bin and all its contents?
@@ -1835,7 +1833,7 @@ This action is not reversible.</source>
     </message>
     <message>
         <source>Certificates</source>
-        <translation type="unfinished"/>
+        <translation>الشهادات</translation>
     </message>
     <message>
         <source> &gt; </source>
@@ -2270,6 +2268,15 @@ Disable safe saves and try again?</source>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2467,6 +2474,14 @@ Disable safe saves and try again?</source>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2589,6 +2604,10 @@ Disable safe saves and try again?</source>
         <source>Expires:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2725,7 +2744,7 @@ Disable safe saves and try again?</source>
     <name>EditGroupWidgetKeeShare</name>
     <message>
         <source>Type:</source>
-        <translation type="unfinished"/>
+        <translation>النوع:</translation>
     </message>
     <message>
         <source>Path:</source>
@@ -2737,7 +2756,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Inactive</source>
-        <translation type="unfinished"/>
+        <translation>غير فعال</translation>
     </message>
     <message>
         <source>KeeShare unsigned container</source>
@@ -2888,6 +2907,10 @@ Supported extensions are: %1.</source>
         <source>Set default Auto-Type sequence</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3382,11 +3405,6 @@ Are you sure to add this file?</source>
         <source>[PROTECTED]</source>
         <translation>[محمي]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>مُفعل</translation>
@@ -3407,6 +3425,15 @@ Are you sure to add this file?</source>
         <source>Advanced</source>
         <translation>متقدم</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3417,18 +3444,6 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>تخصيص العرض</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>اخفي أسماء المستخدمين</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>اخفي كلمات السر</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>ﻻئم النافذة</translation>
@@ -3461,15 +3476,15 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4287,10 +4302,6 @@ If this reoccurs, then your database file may be corrupt.</source>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>تنسيق ملف المفتاح القديم</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4320,26 +4331,14 @@ Message: %2</source>
         <source>Select a key file</source>
         <translation>حدد ملف المفتاح</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>إستعراض...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation type="unfinished"/>
@@ -4358,10 +4357,23 @@ Are you sure you want to continue with this file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
+        <source>Old key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse…</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -4825,6 +4837,18 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>{PASSWORD}{ENTER}</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>اخفي أسماء المستخدمين</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>اخفي كلمات السر</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5310,7 +5334,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Switch to advanced mode</source>
-        <translation type="unfinished"/>
+        <translation>انتقل الى النمط المتقدم</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -5348,10 +5372,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Hex</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Generated password</source>
         <translation type="unfinished"/>
@@ -5398,7 +5418,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Copy password</source>
-        <translation type="unfinished"/>
+        <translation>انسخ كلمة المرور</translation>
     </message>
     <message>
         <source>lower case</source>
@@ -5444,10 +5464,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>مسح</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation type="unfinished"/>
@@ -5456,6 +5472,10 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Special Characters</source>
         <translation>محارف خاصة</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5694,16 +5714,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Perform advanced analysis on the password.</source>
         <translation>إجراء تحليل متقدم على كلمة المرور.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>تحذير: أنت تستخدم تنسيق ملف مفتاح قديم قد يصبح
-غير مُعتمد في المستقبل.
-
-يرجى النظر في إنشاء ملف مفتاح جديد.</translation>
-    </message>
     <message>
         <source>
 
@@ -6084,16 +6094,12 @@ Available commands:
     </message>
     <message>
         <source>file empty</source>
-        <translation type="unfinished"/>
+        <translation>ملف فارغ</translation>
     </message>
     <message>
         <source>%1: (row, col) %2,%3</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – مستحسن)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6110,7 +6116,7 @@ Available commands:
     <message>
         <source>Invalid Key</source>
         <comment>TOTP</comment>
-        <translation type="unfinished"/>
+        <translation>المفتاح غير صالح</translation>
     </message>
     <message>
         <source>Message encryption failed.</source>
@@ -6184,10 +6190,6 @@ Available commands:
         <source>read password of the database from stdin</source>
         <translation>قراءة كلمة سر قاعدة البيانات من الدخل القياسي &quot;stdin&quot;</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>زر النافذة الأم</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>نسخة أخرى من KeePassXC قيد التشغيل.</translation>
@@ -6618,11 +6620,11 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Name: </source>
-        <translation type="unfinished"/>
+        <translation>الاسم:</translation>
     </message>
     <message>
         <source>Description: </source>
-        <translation type="unfinished"/>
+        <translation>الوصف:</translation>
     </message>
     <message>
         <source>Cipher: </source>
@@ -6673,10 +6675,6 @@ Kernel: %3 %4</source>
         <source>AES (%1 rounds)</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation type="unfinished"/>
@@ -6703,6 +6701,65 @@ Kernel: %3 %4</source>
         <comment>seconds</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>أيقونة</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -6751,7 +6808,7 @@ Kernel: %3 %4</source>
     <message>
         <source>Bad</source>
         <comment>Password quality</comment>
-        <translation type="unfinished"/>
+        <translation>سيئ</translation>
     </message>
     <message>
         <source>Bad — password must be changed</source>
@@ -6773,7 +6830,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Weak — consider changing the password</source>
-        <translation type="unfinished"/>
+        <translation>ضعيف — فكر بتغير كلمة المرور</translation>
     </message>
     <message>
         <source> (Excluded)</source>
@@ -6801,11 +6858,11 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Score</source>
-        <translation type="unfinished"/>
+        <translation>النتيجة</translation>
     </message>
     <message>
         <source>Reason</source>
-        <translation type="unfinished"/>
+        <translation>السبب</translation>
     </message>
     <message>
         <source>Edit Entry...</source>
@@ -7126,10 +7183,6 @@ Kernel: %3 %4</source>
         <source>Search</source>
         <translation>بحث</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>مسح</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>حدد البحث في المجموعة المحددة</translation>
@@ -7409,10 +7462,6 @@ Kernel: %3 %4</source>
         <source>Could not write export container</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7480,10 +7529,6 @@ Kernel: %3 %4</source>
         <source>File does not exist</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_bg.ts

@@ -137,7 +137,11 @@
     </message>
     <message>
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
-        <translation type="unfinished"/>
+        <translation>Трябва да рестартирате приложението, за да настроите нов език. Желаете ли да рестартирате сега?</translation>
+    </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Едноцветен</translation>
     </message>
 </context>
 <context>
@@ -342,15 +346,15 @@
     </message>
     <message>
         <source>Automatically save when locking database</source>
-        <translation type="unfinished"/>
+        <translation>Запази автоматично при заключване на базата данни</translation>
     </message>
     <message>
         <source>Automatically save non-data changes when locking database</source>
-        <translation type="unfinished"/>
+        <translation>При заключване на базата данни, запази автоматично промените, които не засягат данните.</translation>
     </message>
     <message>
         <source>Tray icon type</source>
-        <translation type="unfinished"/>
+        <translation>Тип иконата в системната лента</translation>
     </message>
 </context>
 <context>
@@ -1114,6 +1118,14 @@ chrome-laptop.</translation>
         <source>Column %1</source>
         <translation>Колона %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Икона</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1210,20 +1222,6 @@ Backup database located at %2</source>
         <source>Refresh</source>
         <translation>Обновяване</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Остарял файлов формат на ключа</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Използвате остарял файлов формат на ключа, който може да стане
-неподдържан в бъдеще.
-
-Помислете за генериране на нов файл с ключове.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Не показвай това предупреждение отново</translation>
@@ -1284,14 +1282,6 @@ Please consider generating a new key file.</source>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID за бързо отключване</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Почисти</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Изчистване на файл-ключ</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Грешка при отключване и не е върната парола</translation>
@@ -1362,6 +1352,14 @@ If you do not have a key file, please leave the field empty.</source>
         <source>Select hardware key…</source>
         <translation>Избор на хардуерен ключ...</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Стар файлов формат на ключа</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>Използвате стар ключ файлов формат, който KeePassXC може &lt;br&gt;да спре да поддържва в бъдеще.&lt;br&gt;&lt;br&gt;Моля, създайте нов ключ, като:&lt;br&gt;&lt;strong&gt;База данни / Защита на базата данни / Промяна на ключ.&lt;/strong&gt;&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -1517,7 +1515,7 @@ This is necessary to maintain compatibility with the browser plugin.</source>
     </message>
     <message>
         <source>Refresh database root group ID</source>
-        <translation type="unfinished"/>
+        <translation>Обновяване на IDна главната група на базата данни</translation>
     </message>
     <message>
         <source>Created</source>
@@ -1589,7 +1587,7 @@ Are you sure you want to continue without a password?</source>
     </message>
     <message>
         <source>Key Derivation Function:</source>
-        <translation type="unfinished"/>
+        <translation>Функция за формиране на ключа</translation>
     </message>
     <message>
         <source>Transform rounds:</source>
@@ -2294,6 +2292,16 @@ Disable safe saves and try again?</source>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[ЗАЩИТЕНО] Натиснете &quot;Показане&quot;, за да видите или редактирате</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Невалиден запис</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>Външна операция за обединяване е анулирала този запис.
+За съжаление, всички направени промени са загубени.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2491,6 +2499,14 @@ Disable safe saves and try again?</source>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Използвай този запис само с HTTP Basic Auth</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>Не изпращай тази настройка към браузъра за HTTP Auth прозорци. При активиране, HTTP Auth прозорците няма да покажат този запис за избор.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Не използвай този запис с HTTP Basic Auth</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2613,6 +2629,10 @@ Disable safe saves and try again?</source>
         <source>Expires:</source>
         <translation>Изтича:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Редактиране на запис</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2880,7 +2900,7 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Search toggle for this and sub groups</source>
-        <translation type="unfinished"/>
+        <translation>Превключване на търсенето за тази група и подгрупите ѝ</translation>
     </message>
     <message>
         <source>Default auto-type sequence field</source>
@@ -2914,6 +2934,10 @@ Supported extensions are: %1.</source>
         <source>Set default Auto-Type sequence</source>
         <translation>Задаване на Auto-Type последователност по подразбиране</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Редактиране на група</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -2983,7 +3007,7 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Also apply to child groups</source>
-        <translation type="unfinished"/>
+        <translation>Прилага се и за подгрупи</translation>
     </message>
     <message>
         <source>Also apply to child entries</source>
@@ -3413,11 +3437,6 @@ Are you sure to add this file?</source>
         <source>[PROTECTED]</source>
         <translation>[ЗАЩИТЕНО]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Включено</translation>
@@ -3438,6 +3457,15 @@ Are you sure to add this file?</source>
         <source>Advanced</source>
         <translation>Допълнителни</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Последователност по подразбиране</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3448,18 +3476,6 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Персонализиране на изгледа</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Скриване на потребителските имена</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Скриване на паролите</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Побиране в прозореца</translation>
@@ -3492,15 +3508,15 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>Неуспешно регистриране на услугата DBus на % 1.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n Запис(и) е(са) използван(и) от %1</numerusform><numerusform>%n Запис(а) е(са) използван(и) от %1</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>Неуспешно регистриране на услугата DBus на % 1.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -3725,7 +3741,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Unsupported key derivation function (KDF) or invalid parameters</source>
-        <translation type="unfinished"/>
+        <translation>Неподдържана функция за извличане на ключове (KDF) или невалидни параметри</translation>
     </message>
     <message>
         <source>Legacy header fields found in KDBX4 file.</source>
@@ -4151,11 +4167,11 @@ Line %2, column %3</source>
     </message>
     <message>
         <source>Incorrect group expiry time field size</source>
-        <translation type="unfinished"/>
+        <translation>Неправилен размер на полето за изтичане на времето на група</translation>
     </message>
     <message>
         <source>Incorrect group icon field size</source>
-        <translation type="unfinished"/>
+        <translation>Неправилен размер на поле за икона на група</translation>
     </message>
     <message>
         <source>Incorrect group level field size</source>
@@ -4175,7 +4191,7 @@ Line %2, column %3</source>
     </message>
     <message>
         <source>Invalid entry field size</source>
-        <translation type="unfinished"/>
+        <translation>Невалиден размер на поле за въвеждане</translation>
     </message>
     <message>
         <source>Read entry field data doesn&apos;t match size</source>
@@ -4324,10 +4340,6 @@ If this reoccurs, then your database file may be corrupt.</source>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Можете да добавите ключ-файл, съдържащ случайни байтове за допълнителна сигурност.&lt;/p&gt;&lt;p&gt;Трябва да го пазите в тайна и никога да не го губите или ще бъдете заключени!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Остарял формат на файл-ключа</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4358,26 +4370,14 @@ Message: %2</source>
         <source>Select a key file</source>
         <translation>Избор на файл-ключ</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Избор на файл-ключ</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Избор на файл-ключ</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Преглед...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Генериране на нов файл-ключ</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Забележка: Не използвайте файл, който може да се промени, понеже това ще Ви попречи да отключите вашата база данни!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Невалиден файл-ключ</translation>
@@ -4397,14 +4397,26 @@ Are you sure you want to continue with this file?</source>
 Наистина ли искате да продължите с този файл?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
+        <source>Old key file format</source>
+        <translation>Стар файлов формат на ключа</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>Използвате остарял файлов формат на ключа, който KeePass XC може да спре да поддържа в бъдеще.
 
-Generate a new key file in the database security settings.</source>
-        <translation>Използвате остарял файлов формат на ключа, който може да стане
-неподдържан в бъдеще.
-
-Генериране на нов ключ файл в настройките за сигурност на базата данни.</translation>
+Помислете за генериране на нов ключ файл.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4851,7 +4863,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Perform Auto-Type Sequence</source>
-        <translation type="unfinished"/>
+        <translation>Изпълнение на Auto-Type</translation>
     </message>
     <message>
         <source>{USERNAME}</source>
@@ -4869,6 +4881,18 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>{PASSWORD}{ENTER}</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Винаги отгоре</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Скриване на потребителските имена</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Скриване на паролите</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5393,10 +5417,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Hex</source>
         <translation>Шестнадесетичен</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Изключени знаци: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Генерирана парола</translation>
@@ -5489,16 +5509,16 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Почисти</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Регенериране на паролата (%1)</translation>
     </message>
     <message>
         <source>Special Characters</source>
+        <translation>Специални знаци</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -5739,16 +5759,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Perform advanced analysis on the password.</source>
         <translation>Извършване на разширен анализ на паролата.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>ВНИМАНИЕ: Използвате остарял файлов формат на ключа, който може да стане
-неподдържан в бъдеще.
-
-Помислете за генериране на нов файл с ключове.</translation>
-    </message>
     <message>
         <source>
 
@@ -6106,7 +6116,7 @@ Available commands:
     </message>
     <message>
         <source>Successfully recycled entry %1.</source>
-        <translation type="unfinished"/>
+        <translation>Успешно изтриване на запис%1.</translation>
     </message>
     <message>
         <source>Successfully deleted entry %1.</source>
@@ -6132,10 +6142,6 @@ Available commands:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (ред, колона) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – препоръчително)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6226,10 +6232,6 @@ Available commands:
         <source>read password of the database from stdin</source>
         <translation>прочетете паролата на базата данни от stdin</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Друга инстанция на KeePassXC вече работи.</translation>
@@ -6252,7 +6254,7 @@ Available commands:
     </message>
     <message>
         <source>Deactivate password key for the database.</source>
-        <translation type="unfinished"/>
+        <translation>Деактивиране на парола за базата данни.</translation>
     </message>
     <message>
         <source>Displays debugging information.</source>
@@ -6504,7 +6506,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Successfully recycled group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Успешно изтрита група% 1.</translation>
     </message>
     <message>
         <source>Successfully deleted group %1.</source>
@@ -6608,7 +6610,7 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>time</source>
-        <translation type="unfinished"/>
+        <translation>Време</translation>
     </message>
     <message>
         <source>Set the key file for the database.</source>
@@ -6715,10 +6717,6 @@ Kernel: %3 %4</source>
         <source>AES (%1 rounds)</source>
         <translation>AES (% 1 рунда)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Аргон 2 (%1 рунда, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-битов</translation>
@@ -6745,6 +6743,67 @@ Kernel: %3 %4</source>
         <comment>seconds</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>Използвате остарял файлов формат на ключа, който KeePass XC може да спре да поддържа в бъдеще.
+
+Помислете за генериране на нов ключ файл.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Икона</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Неподдържан тип ключ: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7168,10 +7227,6 @@ Kernel: %3 %4</source>
         <source>Search</source>
         <translation>Търсене</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Почисти</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Ограничаване на търсенето до избрана група</translation>
@@ -7451,10 +7506,6 @@ Kernel: %3 %4</source>
         <source>Could not write export container</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Възникна неочаквана грешка при експортиране</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7522,10 +7573,6 @@ Kernel: %3 %4</source>
         <source>File does not exist</source>
         <translation>Файлът не съществува</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_ca.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -318,7 +322,7 @@
     </message>
     <message>
         <source>Use monospaced font for notes</source>
-        <translation type="unfinished"/>
+        <translation>Usa lletra monoespaiada per a les notes</translation>
     </message>
     <message>
         <source>Tray icon type:</source>
@@ -330,27 +334,27 @@
     </message>
     <message>
         <source>Auto-Type typing delay:</source>
-        <translation type="unfinished"/>
+        <translation>Retard d&apos;escriptura de la compleció automàtica:</translation>
     </message>
     <message>
         <source>Global Auto-Type shortcut:</source>
-        <translation type="unfinished"/>
+        <translation>Drecera global de compleció automàtica:</translation>
     </message>
     <message>
         <source>Auto-Type start delay:</source>
-        <translation type="unfinished"/>
+        <translation>Retard d&apos;inici de la compleció automàtica:</translation>
     </message>
     <message>
         <source>Automatically save when locking database</source>
-        <translation type="unfinished"/>
+        <translation>Desa automàticament en bloquejar la base de dades</translation>
     </message>
     <message>
         <source>Automatically save non-data changes when locking database</source>
-        <translation type="unfinished"/>
+        <translation>Desa automàticament els canvis que no són de dades en bloquejar la base de dades</translation>
     </message>
     <message>
         <source>Tray icon type</source>
-        <translation type="unfinished"/>
+        <translation>Tipus d&apos;icona de la safata</translation>
     </message>
 </context>
 <context>
@@ -439,15 +443,15 @@
     </message>
     <message>
         <source>Require password repeat when it is visible</source>
-        <translation type="unfinished"/>
+        <translation>Demana altre cop la contrasenya quan és visible</translation>
     </message>
     <message>
         <source>Hide passwords when editing them</source>
-        <translation type="unfinished"/>
+        <translation>Oculta les contrasenyes a l&apos;editar-les</translation>
     </message>
     <message>
         <source>Use placeholder for empty password fields</source>
-        <translation type="unfinished"/>
+        <translation>Usa un marcador per als camps de contrasenya buits</translation>
     </message>
 </context>
 <context>
@@ -584,15 +588,15 @@
     </message>
     <message>
         <source>Allow Selected</source>
-        <translation type="unfinished"/>
+        <translation>Permet els seleccionats</translation>
     </message>
     <message>
         <source>Deny All</source>
-        <translation type="unfinished"/>
+        <translation>Denega-ho tot</translation>
     </message>
     <message>
         <source>Disable for this site</source>
-        <translation type="unfinished"/>
+        <translation>Deshabilita per aquest lloc</translation>
     </message>
 </context>
 <context>
@@ -663,7 +667,7 @@ Moved %2 keys to custom data.</source>
     </message>
     <message numerus="yes">
         <source>Successfully moved %n keys to custom data.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Les claus %n s&apos;han desplaçat correctament a dades personalitzades.</numerusform><numerusform>S&apos;han mogut correctament  %n claus a dades personalitzades.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
@@ -763,11 +767,11 @@ chrome-laptop.</source>
     <message>
         <source>Show a notification when credentials are requested</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation type="unfinished"/>
+        <translation>Mostra una notificació quan es sol·licitin les credencials</translation>
     </message>
     <message>
         <source>Request to unlock the database if it is locked</source>
-        <translation type="unfinished"/>
+        <translation>Sol·licita desbloquejar la base de dades si està bloquejada</translation>
     </message>
     <message>
         <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
@@ -1105,6 +1109,14 @@ chrome-laptop.</source>
         <source>Column %1</source>
         <translation>Columna %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icona</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1177,11 +1189,11 @@ Còpia de seguretat de la base de dades situada a %2</translation>
     </message>
     <message>
         <source>Database save is already in progress.</source>
-        <translation type="unfinished"/>
+        <translation>El desat de la base de dades està en curs.</translation>
     </message>
     <message>
         <source>Could not save, database has not been initialized!</source>
-        <translation type="unfinished"/>
+        <translation>No s&apos;ha pogut desar, la base de dades no ha estat inicialitzada!</translation>
     </message>
 </context>
 <context>
@@ -1201,17 +1213,6 @@ Còpia de seguretat de la base de dades situada a %2</translation>
         <source>Refresh</source>
         <translation>Actualitza</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Format de fitxer clau antic</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>No tornis a mostrar aquest avís</translation>
@@ -1272,14 +1273,6 @@ Please consider generating a new key file.</source>
         <source>TouchID for Quick Unlock</source>
         <translation>Usa el TouchID per desbloquejar ràpidament</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Neteja</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>El desbloqueig ha fallat i no s&apos;ha donat cap contrasenya</translation>
@@ -1345,6 +1338,14 @@ If you do not have a key file, please leave the field empty.</source>
         <source>Select hardware key…</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -1392,7 +1393,7 @@ If you do not have a key file, please leave the field empty.</source>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Suprimiu</translation>
+        <translation>Suprimeix</translation>
     </message>
     <message>
         <source>Delete the selected key?</source>
@@ -1714,7 +1715,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Don&apos;t expose this database</source>
-        <translation type="unfinished"/>
+        <translation>No exposis aquesta base de dades</translation>
     </message>
     <message>
         <source>Expose entries under this group:</source>
@@ -1785,11 +1786,11 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Maximum size of history per entry</source>
-        <translation type="unfinished"/>
+        <translation>Maximitzar el tamany de l&apos;històric per entrada</translation>
     </message>
     <message>
         <source>Delete Recycle Bin</source>
-        <translation type="unfinished"/>
+        <translation>Netejar paperera</translation>
     </message>
     <message>
         <source>Do you want to delete the current recycle bin and all its contents?
@@ -2113,7 +2114,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
-        <translation type="unfinished"/>
+        <translation>Esteu segur que voleu moure el grup &quot;%1&quot; a la paperera de reciclatge?</translation>
     </message>
     <message>
         <source>Successfully merged the database files.</source>
@@ -2133,7 +2134,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>This database is opened in read-only mode. Autosave is disabled.</source>
-        <translation type="unfinished"/>
+        <translation>Aquesta base de dades s&apos;ha obert en mode de només lectura. El desat automàtic està deshabilitat.</translation>
     </message>
     <message>
         <source>Save database backup</source>
@@ -2244,7 +2245,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Are you sure you want to remove this URL?</source>
-        <translation type="unfinished"/>
+        <translation>Esteu segur que voleu suprimir aquesta URL?</translation>
     </message>
     <message>
         <source>Reveal</source>
@@ -2252,7 +2253,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Hide</source>
-        <translation type="unfinished"/>
+        <translation>Oculta</translation>
     </message>
     <message>
         <source>Unsaved Changes</source>
@@ -2266,6 +2267,15 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2319,7 +2329,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Remove selected attribute</source>
-        <translation type="unfinished"/>
+        <translation>Suprimeix l&apos;atribut seleccionat</translation>
     </message>
     <message>
         <source>Edit attribute name</source>
@@ -2347,7 +2357,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Exclude from database reports</source>
-        <translation type="unfinished"/>
+        <translation>Exclou dels informes de la base de dades</translation>
     </message>
 </context>
 <context>
@@ -2394,7 +2404,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Remove selected window association</source>
-        <translation type="unfinished"/>
+        <translation>Suprimeix l&apos;associació de finestres seleccionada</translation>
     </message>
     <message>
         <source>You can use an asterisk (*) to match everything</source>
@@ -2414,11 +2424,11 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Inherit default Auto-Type sequence from the group</source>
-        <translation type="unfinished"/>
+        <translation>Hereda la seqüència de compleció automàtica del grup</translation>
     </message>
     <message>
         <source>Use custom Auto-Type sequence:</source>
-        <translation type="unfinished"/>
+        <translation>Usa una seqüència de compleció automàtica personalitzada:</translation>
     </message>
 </context>
 <context>
@@ -2463,6 +2473,14 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2583,6 +2601,10 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Expires:</source>
+        <translation>Caduca:</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -2594,7 +2616,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Remove key from agent after</source>
-        <translation type="unfinished"/>
+        <translation>Suprimeix la clau de l&apos;agent després</translation>
     </message>
     <message>
         <source> seconds</source>
@@ -2663,7 +2685,7 @@ Voleu deshabilitar el desat segur i provar-ho un altre cop?</translation>
     </message>
     <message>
         <source>Remove key from agent after specified seconds</source>
-        <translation type="unfinished"/>
+        <translation>Suprimeix la clau de l&apos;agent després dels segons especificats</translation>
     </message>
     <message>
         <source>Browser for key file</source>
@@ -2858,7 +2880,7 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Expires:</source>
-        <translation type="unfinished"/>
+        <translation>Caduca:</translation>
     </message>
     <message>
         <source>Use default Auto-Type sequence of parent group</source>
@@ -2884,6 +2906,10 @@ Supported extensions are: %1.</source>
         <source>Set default Auto-Type sequence</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -2969,11 +2995,11 @@ Supported extensions are: %1.</source>
     </message>
     <message>
         <source>Use default icon</source>
-        <translation type="unfinished"/>
+        <translation>Usa la icona per defecte</translation>
     </message>
     <message>
         <source>Use custom icon</source>
-        <translation type="unfinished"/>
+        <translation>Usa una icona personalitzada</translation>
     </message>
     <message>
         <source>Apply icon to...</source>
@@ -3049,7 +3075,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Remove selected plugin data</source>
-        <translation type="unfinished"/>
+        <translation>Suprimeix les dades del connector seleccionat</translation>
     </message>
 </context>
 <context>
@@ -3098,7 +3124,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Esteu segur que voleu eliminar %n fitxer(s) adjunt(s)?</numerusform><numerusform>Esteu segur que voleu suprimir %n adjunt(s)?</numerusform></translation>
     </message>
     <message>
         <source>Save attachments</source>
@@ -3152,7 +3178,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Remove selected attachment</source>
-        <translation type="unfinished"/>
+        <translation>Suprimeix el fitxer adjunt seleccionat</translation>
     </message>
     <message>
         <source>Open selected attachment</source>
@@ -3374,11 +3400,6 @@ Are you sure to add this file?</source>
         <source>[PROTECTED]</source>
         <translation>[PROTEGIT]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Habilitat</translation>
@@ -3399,6 +3420,15 @@ Are you sure to add this file?</source>
         <source>Advanced</source>
         <translation>Avançat</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3409,18 +3439,6 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Personalitza la visualització</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Oculta els noms d&apos;usuari</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Oculta les contrasenyes</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Ajusta a la finestra</translation>
@@ -3453,15 +3471,15 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -3630,7 +3648,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Unable to calculate database key</source>
-        <translation type="unfinished"/>
+        <translation>Impossible calcular la clau de base dades</translation>
     </message>
     <message>
         <source>Unable to issue challenge-response: %1</source>
@@ -3645,7 +3663,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Unable to calculate database key</source>
-        <translation type="unfinished"/>
+        <translation>Impossible calcular la clau de base dades</translation>
     </message>
 </context>
 <context>
@@ -4176,7 +4194,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Unable to calculate database key</source>
-        <translation type="unfinished"/>
+        <translation>Impossible calcular la clau de base dades</translation>
     </message>
 </context>
 <context>
@@ -4257,7 +4275,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     <message>
         <source>Remove %1</source>
         <comment>Remove a key component</comment>
-        <translation type="unfinished"/>
+        <translation>Suprimeix %1</translation>
     </message>
     <message>
         <source>%1 set, click to change or remove</source>
@@ -4279,10 +4297,6 @@ If this reoccurs, then your database file may be corrupt.</source>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Podeu afegir un fitxer clau que contingui bytes aleatoris per afegir seguretat.&lt;/p&gt;&lt;p&gt;L&apos;heu de mantenir secret i no perdre&apos;l, sinó us quedareu tancats a fora!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Format de fitxer clau antic</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4312,26 +4326,14 @@ Message: %2</source>
         <source>Select a key file</source>
         <translation>Seleccioneu un fitxer clau</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Selecciona el fitxer clau...</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Navega...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Genera un fitxer clau nou</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Nota: no utilitzeu un fitxer que pugui canviar perquè faria que no poguéssiu desbloquejar la base de dades!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation type="unfinished"/>
@@ -4350,10 +4352,23 @@ Are you sure you want to continue with this file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
+        <source>Old key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse…</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -4588,7 +4603,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>&amp;Check for Updates</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Comprova si hi ha actualitzacions</translation>
     </message>
     <message>
         <source>&amp;Open Database…</source>
@@ -4596,7 +4611,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>&amp;Save Database</source>
-        <translation type="unfinished"/>
+        <translation>De&amp;sa la base de dades</translation>
     </message>
     <message>
         <source>&amp;Close Database</source>
@@ -4608,7 +4623,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>&amp;Merge From Database…</source>
-        <translation type="unfinished"/>
+        <translation>Fusiona des d&apos;una base de dades…</translation>
     </message>
     <message>
         <source>&amp;New Entry…</source>
@@ -4648,11 +4663,11 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Database &amp;Reports...</source>
-        <translation type="unfinished"/>
+        <translation>Informes de la base de dades...</translation>
     </message>
     <message>
         <source>Statistics, health check, etc.</source>
-        <translation type="unfinished"/>
+        <translation>Estadístiques, comprovació de salut, etc.</translation>
     </message>
     <message>
         <source>&amp;Database Settings…</source>
@@ -4664,19 +4679,19 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Move u&amp;p</source>
-        <translation type="unfinished"/>
+        <translation>Mou am&amp;unt</translation>
     </message>
     <message>
         <source>Move entry one step up</source>
-        <translation type="unfinished"/>
+        <translation>Mou l&apos;entrada un graó cap amunt</translation>
     </message>
     <message>
         <source>Move do&amp;wn</source>
-        <translation type="unfinished"/>
+        <translation>Mou avall</translation>
     </message>
     <message>
         <source>Move entry one step down</source>
-        <translation type="unfinished"/>
+        <translation>Baixa l&apos;entrada una posició</translation>
     </message>
     <message>
         <source>Copy &amp;Username</source>
@@ -4756,7 +4771,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Remove key from SSH Agent</source>
-        <translation type="unfinished"/>
+        <translation>Suprimeix la clau de l&apos;agent SSH</translation>
     </message>
     <message>
         <source>Compact Mode</source>
@@ -4780,15 +4795,15 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Show Toolbar</source>
-        <translation type="unfinished"/>
+        <translation>Mostra la barra d&apos;eines</translation>
     </message>
     <message>
         <source>Show Preview Panel</source>
-        <translation type="unfinished"/>
+        <translation>Mostra el plafó de vista prèvia</translation>
     </message>
     <message>
         <source>Don&apos;t show again for this version</source>
-        <translation type="unfinished"/>
+        <translation>No mostrar un altre cop per a aquesta versió</translation>
     </message>
     <message>
         <source>Restart Application?</source>
@@ -4800,7 +4815,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Perform Auto-Type Sequence</source>
-        <translation type="unfinished"/>
+        <translation>Fes un seqüència d&apos;autocompleció</translation>
     </message>
     <message>
         <source>{USERNAME}</source>
@@ -4818,6 +4833,18 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
         <source>{PASSWORD}{ENTER}</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Sempre a la part superior</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Oculta els noms d&apos;usuari</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Oculta les contrasenyes</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -4913,7 +4940,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Removed custom data %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>S&apos; han suprimit les dades personalitzades %1 [%2]</translation>
     </message>
     <message>
         <source>Adding custom data %1 [%2]</source>
@@ -5341,10 +5368,6 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
         <source>Hex</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Generated password</source>
         <translation type="unfinished"/>
@@ -5437,10 +5460,6 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Neteja</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation type="unfinished"/>
@@ -5449,6 +5468,10 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
         <source>Special Characters</source>
         <translation>Caràcters especials</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5506,7 +5529,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Health Check</source>
-        <translation type="unfinished"/>
+        <translation>Comprovació de salut</translation>
     </message>
     <message>
         <source>HIBP</source>
@@ -5525,7 +5548,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
     </message>
     <message>
         <source>Move</source>
-        <translation type="unfinished"/>
+        <translation>Mou</translation>
     </message>
     <message>
         <source>Empty</source>
@@ -5687,13 +5710,6 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
         <source>Perform advanced analysis on the password.</source>
         <translation>Fes una anàlisi avançada de la contrasenya.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>
 
@@ -6044,11 +6060,11 @@ Available commands:
     </message>
     <message>
         <source>Unable to save database to file : %1</source>
-        <translation type="unfinished"/>
+        <translation>No s&apos;ha pogut desar la base de dades al fitxer: %1</translation>
     </message>
     <message>
         <source>Unable to save database to file: %1</source>
-        <translation type="unfinished"/>
+        <translation>No s&apos;ha pogut desar la base de dades al fitxer: %1</translation>
     </message>
     <message>
         <source>Successfully recycled entry %1.</source>
@@ -6078,10 +6094,6 @@ Available commands:
         <source>%1: (row, col) %2,%3</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 - recomanat)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6126,7 +6138,7 @@ Available commands:
     </message>
     <message>
         <source>Failed to save the database: %1.</source>
-        <translation type="unfinished"/>
+        <translation>No s&apos;ha pogut desar la base de dades: %1</translation>
     </message>
     <message>
         <source>Successfully created new database.</source>
@@ -6172,10 +6184,6 @@ Available commands:
         <source>read password of the database from stdin</source>
         <translation>llegiu la contrasenya de la base de dades des de l&apos;entrada estàndard (stdin)</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Ja s&apos;està executant una altra instància de KeePassXC.</translation>
@@ -6418,7 +6426,7 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Path of the entry to move.</source>
-        <translation type="unfinished"/>
+        <translation>Ruta de l&apos;entrada a moure.</translation>
     </message>
     <message>
         <source>Path of the destination group.</source>
@@ -6434,7 +6442,7 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Successfully moved entry %1 to group %2.</source>
-        <translation type="unfinished"/>
+        <translation>S&apos;ha mogut correctament l&apos;entrada %1 al grup %2</translation>
     </message>
     <message>
         <source>Open a database.</source>
@@ -6442,7 +6450,7 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Path of the group to remove.</source>
-        <translation type="unfinished"/>
+        <translation>Ruta del grup a suprimir.</translation>
     </message>
     <message>
         <source>Cannot remove root group from database.</source>
@@ -6661,10 +6669,6 @@ Nucli: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation type="unfinished"/>
@@ -6691,6 +6695,65 @@ Nucli: %3 %4</translation>
         <comment>seconds</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icona</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -6734,7 +6797,7 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Hover over reason to show additional details. Double-click entries to edit.</source>
-        <translation type="unfinished"/>
+        <translation>Poseu-vos damunt del motiu per veure més detalls. Feu doble clic per editar l&apos;entrada.</translation>
     </message>
     <message>
         <source>Bad</source>
@@ -6789,11 +6852,11 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Score</source>
-        <translation type="unfinished"/>
+        <translation>Puntuació</translation>
     </message>
     <message>
         <source>Reason</source>
-        <translation type="unfinished"/>
+        <translation>Motiu</translation>
     </message>
     <message>
         <source>Edit Entry...</source>
@@ -7026,7 +7089,7 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>No agent running, cannot remove identity.</source>
-        <translation type="unfinished"/>
+        <translation>No hi ha cap agent en execució, no es pot suprimir la identitat.</translation>
     </message>
     <message>
         <source>Agent refused this identity. Possible reasons include:</source>
@@ -7114,10 +7177,6 @@ Nucli: %3 %4</translation>
         <source>Search</source>
         <translation>Cerca</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Neteja</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Limitar la cerca al grup seleccionat</translation>
@@ -7360,7 +7419,7 @@ Nucli: %3 %4</translation>
     </message>
     <message>
         <source>Remove selected certificate</source>
-        <translation type="unfinished"/>
+        <translation>Suprimeix el certificat seleccionat</translation>
     </message>
 </context>
 <context>
@@ -7397,10 +7456,6 @@ Nucli: %3 %4</translation>
         <source>Could not write export container</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7468,10 +7523,6 @@ Nucli: %3 %4</translation>
         <source>File does not exist</source>
         <translation>El fitxer no existeix</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_cs.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation>Aby se změna jazyka projevila, je třeba aplikaci restartovat. Chcete to provést nyní?</translation>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Černobílá</translation>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -1114,6 +1118,14 @@ chrome-laptop.</translation>
         <source>Column %1</source>
         <translation>Sloupec %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ikona</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1210,19 +1222,6 @@ Záložní databáze se nachází v %2</translation>
         <source>Refresh</source>
         <translation>Načíst znovu</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Starý formát souboru s klíčem</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Používáte starý formát souboru s klíčem, který v budoucnu nemusí být podporován.
-
-Zvažte vytvoření nového souboru s klíčem.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Toto varování znovu nezobrazovat</translation>
@@ -1283,14 +1282,6 @@ Zvažte vytvoření nového souboru s klíčem.</translation>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID pro rychlé odemknutí</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Vyčistit</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Vyčistit soubor s klíčem</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Odemknutí se nezdařilo a nebylo zadáno žádné heslo</translation>
@@ -1361,6 +1352,14 @@ Pokud nemáte žádný soubor, který by se zaručeně neměnil (a byl tedy vhod
         <source>Select hardware key…</source>
         <translation>Vyberte hardwarový klíč…</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Starý formát souboru s klíčem</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>Používáte starý formát souboru s klíčem, který může KeePassXC &lt;br&gt;přestat v budoucnu podporovat.&lt;br&gt;&lt;br&gt;Zvažte prosím vytvoření nového souboru s klíčem v nabídce &lt;br&gt;&lt;strong&gt;Databáze / Zabezpečení databáze / Změnit soubor s klíčem.&lt;/strong&gt;&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2294,6 +2293,16 @@ Vypnout bezpečné ukládání a zkusit to znovu?</translation>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[CHRÁNĚNO] Pro zobrazení nebo úpravu klikněte na odhalit</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Neplatný údaj</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>Externí operace sloučení tuto položku zneplatnila.
+Všechny provedené změny byly bohužel ztraceny.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2491,6 +2500,14 @@ Vypnout bezpečné ukládání a zkusit to znovu?</translation>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Tuto položku použít pouze ve spojení se základním HTTP ověřováním se</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Tuto položku nepoužívat ve spojení se základním HTTP ověřováním se</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2613,6 +2630,10 @@ Vypnout bezpečné ukládání a zkusit to znovu?</translation>
         <source>Expires:</source>
         <translation>Platnost skončí:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Upravit záznam</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2913,6 +2934,10 @@ Podporovaná rozšíření jsou: %1.</translation>
         <source>Set default Auto-Type sequence</source>
         <translation>Nastavit výchozí pořadí automatického vyplňování</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Upravit skupinu</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3414,11 +3439,6 @@ Opravdu chcete tento soubor přidat?</translation>
         <source>[PROTECTED]</source>
         <translation>[CHRÁNĚNO]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Zapnuto</translation>
@@ -3439,6 +3459,15 @@ Opravdu chcete tento soubor přidat?</translation>
         <source>Advanced</source>
         <translation>Pokročilé</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Výchozí pořadí</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3449,18 +3478,6 @@ Opravdu chcete tento soubor přidat?</translation>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Přizpůsobit pohled</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Skrýt uživatelská jména</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Skrýt hesla</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Přizpůsobit oknu</translation>
@@ -3493,15 +3510,15 @@ Opravdu chcete tento soubor přidat?</translation>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>Nepodařilo se zaregistrovat službu DBus na %1.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n záznam byl použit %1</numerusform><numerusform>%n záznamy byly použity %1</numerusform><numerusform>%n záznamů bylo použito %1</numerusform><numerusform>%n záznamy byly použity %1</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>Nepodařilo se zaregistrovat službu DBus na %1.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4325,10 +4342,6 @@ Pokud se toto opakuje, pak je možné, že je váš soubor s databází poškoze
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Jako další úroveň zabezpečení je možné přidat soubor s klíčem obsahujícím náhodné bajty.&lt;/p&gt;&lt;p&gt;Je třeba ho uchovávat v bezpečí a nikdy ho neztratit, jinak budete uzamčeni!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Starý formát souboru s klíčem</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4359,26 +4372,14 @@ Zpráva: %2</translation>
         <source>Select a key file</source>
         <translation>Vyberte soubor s klíčem</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Výběr souboru s klíčem</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Nalistovat soubor s klíčem</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Procházet…</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Vytvořit nový soubor s klíčem</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Pozn.: Nepoužívejte soubor, který se může změnit, protože by to znemožnilo odemčení databáze!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Neplatný soubor s klíčem</translation>
@@ -4398,13 +4399,24 @@ Are you sure you want to continue with this file?</source>
 Opravdu chcete tento soubor použít?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>Používáte starý formát souboru s klíčem, který v budoucnu nemusí být podporován.
-
-V nastavení zabezpečení databáze vytvořte nový klíč.</translation>
+        <source>Old key file format</source>
+        <translation>Starý formát souboru s klíčem</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>Vybrali jste soubor s klíčem ve starém formátu, který KeePassXC&lt;br&gt;může přestat v budoucnu podporovat.&lt;br&gt;&lt;br&gt;Zvažte prosím místo něj vytvoření nového souboru s klíčem.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4869,6 +4881,18 @@ Očekávejte chyby a drobné problémy, tato verze není určena pro produkční
         <source>{PASSWORD}{ENTER}</source>
         <translation>{HESLO}{ENTER}</translation>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Vždy nahoře</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Skrýt uživatelská jména</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Skrýt hesla</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5393,10 +5417,6 @@ Očekávejte chyby a drobné problémy, tato verze není určena pro produkční
         <source>Hex</source>
         <translation>Hex</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Vynechané znaky: „0“, „1“, „l“, „I“, „O“, „|“, „ . “</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Vytvořené heslo</translation>
@@ -5489,10 +5509,6 @@ Očekávejte chyby a drobné problémy, tato verze není určena pro produkční
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Vyčistit</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Znovu vytvořit heslo (%1)</translation>
@@ -5501,6 +5517,10 @@ Očekávejte chyby a drobné problémy, tato verze není určena pro produkční
         <source>Special Characters</source>
         <translation>Zvláštní znaky</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5739,15 +5759,6 @@ Očekávejte chyby a drobné problémy, tato verze není určena pro produkční
         <source>Perform advanced analysis on the password.</source>
         <translation>Provést pokročilou analýzu hesla.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>VAROVÁNÍ: Používáte starší formát souboru s klíčem, který v budoucnu nemusí být podporován.
-
-Zvažte vytvoření nového souboru s klíčem.</translation>
-    </message>
     <message>
         <source>
 
@@ -6135,10 +6146,6 @@ Příkazy k dispozici:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (řádek, sloupec) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – doporučeno)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6229,10 +6236,6 @@ Příkazy k dispozici:
         <source>read password of the database from stdin</source>
         <translation>načíst heslo k databázi ze standardního vstupu</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Obecný identifikátor (handle) nadřazeného okna</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Již je spuštěná jiná instance KeePassXC.</translation>
@@ -6720,10 +6723,6 @@ Jádro systému: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation>AES (%1 průchodů)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (%1 průchody, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-bit</translation>
@@ -6750,6 +6749,68 @@ Jádro systému: %3 %4</translation>
         <comment>seconds</comment>
         <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>umístění vlastního lokálního souboru s nastaveními</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>VAROVÁNÍ: Používáte starý formát souboru s klíčem, který může KeePassXC
+přestat v budoucnu podporovat.
+
+Zvažte prosím vytvoření nového souboru s klíčem.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 průchody, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 – doporučeno)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ikona</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Nepodporovaná verze souboru s klíčem: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>Kontrolní součet se neshoduje! Soubor s klíčem může být poškozený.</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>Neočekávaná data v souboru s klíčem! Soubor s klíčem může být poškozený.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7173,10 +7234,6 @@ Jádro systému: %3 %4</translation>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Vyčistit</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Omezit hledání na označenou skupinu</translation>
@@ -7456,10 +7513,6 @@ Jádro systému: %3 %4</translation>
         <source>Could not write export container</source>
         <translation>Nedaří se zapsat do exportního kontejneru</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Došlo k neočekávané chybě exportu</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7527,10 +7580,6 @@ Jádro systému: %3 %4</translation>
         <source>File does not exist</source>
         <translation>Soubor neexistuje</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Neznámý typ kontejneru pro sdílení</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_de.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation>Zum Ändern der Sprache müssen Sie die Anwendung neu starten. Möchten Sie jetzt neu starten?</translation>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Monochrom</translation>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -1112,6 +1116,14 @@ Geben Sie der Verbindung einen eindeutigen Namen, z. B. &quot;chrome-laptop&quot
         <source>Column %1</source>
         <translation>Spalte %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Symbol</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1208,19 +1220,6 @@ Sicherungskopie der Datenbank ist in %2</translation>
         <source>Refresh</source>
         <translation>Neu laden</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Veraltetes Schlüsseldatei-Format</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Sie verwenden ein veraltetes Schlüsseldatei-Format, welches in Zukunft möglicherweise nicht mehr unterstützt wird.
-
-Bitte denken Sie darüber nach, eine neue Schlüsseldatei zu erzeugen.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Diese Warnung nicht wieder anzeigen</translation>
@@ -1281,14 +1280,6 @@ Bitte denken Sie darüber nach, eine neue Schlüsseldatei zu erzeugen.</translat
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID für Quick Unlock</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Löschen</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Schlüsseldatei löschen</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Entsperren fehlgeschlagen und kein Passwort angegeben</translation>
@@ -1359,6 +1350,14 @@ Wenn Sie keine Schlüsseldatei haben, lassen Sie das Feld bitte leer.</translati
         <source>Select hardware key…</source>
         <translation>Hardwareschlüssel auswählen…</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Altes Schlüsseldateiformat</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>Sie verwenden ein altes Schlüsseldateiformat, das KeePassXC möglicherweise&lt;br&gt;in Zukunft nicht mehr unterstützen wird.&lt;br&gt;&lt;br&gt;Bitte erwägen Sie, eine neue Schlüsseldatei zu erzeugen, indem Sie zu:&lt;br&gt;&lt;strong&gt;Datenbank / Datenbank-Sicherheit / Schlüsseldatei ändern gehen.&lt;/strong&gt;&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -1997,7 +1996,7 @@ Das ist definitiv ein Programmfehler, bitte benachrichtigen Sie die Entwickler.<
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Möchten Sie wirklich %n Eintrag aus dem Papierkorb löschen?</numerusform><numerusform>Möchten Sie wirklich %n Einträge aus dem Papierkorb löschen?</numerusform></translation>
+        <translation><numerusform>Möchten Sie wirklich %n Eintrag in den Papierkorb verschieben?</numerusform><numerusform>Möchten Sie wirklich %n Einträge in den Papierkorb verschieben?</numerusform></translation>
     </message>
     <message>
         <source>Execute command?</source>
@@ -2293,6 +2292,16 @@ Sicheres Speichern deaktivieren und erneut versuchen?</translation>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[GESCHÜTZT] „Zeigen“ anklicken zum Anzeigen oder Bearbeiten</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Ungültiger Eintrag</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>Ein externer Zusammenführungsvorgang hat diesen Eintrag ungültig gemacht.
+Leider sind alle vorgenommenen Änderungen verloren gegangen.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2490,6 +2499,14 @@ Sicheres Speichern deaktivieren und erneut versuchen?</translation>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Diesen Eintrag nur mit &quot;HTTP Basic Auth&quot; verwenden</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>Diese Einstellung nicht an den Browser für HTTP-Auth-Dialoge senden. Wenn aktiviert, wird dieser Eintrag in HTTP-Auth-Dialogen nicht zur Auswahl angezeigt.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Diesen Eintrag nicht mit HTTP-Basic-Auth verwenden</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2612,6 +2629,10 @@ Sicheres Speichern deaktivieren und erneut versuchen?</translation>
         <source>Expires:</source>
         <translation>Läuft ab:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Eintrag bearbeiten</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2912,6 +2933,10 @@ Unterstützte Erweiterungen sind: %1.</translation>
         <source>Set default Auto-Type sequence</source>
         <translation>Standard-Auto-Type-Sequenz festlegen</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Gruppe bearbeiten</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3411,11 +3436,6 @@ Wollen Sie diese Datei wirklich hinzufügen?</translation>
         <source>[PROTECTED]</source>
         <translation>[GESCHÜTZT]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Aktiviert</translation>
@@ -3436,6 +3456,15 @@ Wollen Sie diese Datei wirklich hinzufügen?</translation>
         <source>Advanced</source>
         <translation>Fortgeschritten</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Standard-Sequenz</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3446,18 +3475,6 @@ Wollen Sie diese Datei wirklich hinzufügen?</translation>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Ansicht anpassen</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Benutzernamen ausblenden</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Passwörter ausblenden</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>An Fenster anpassen</translation>
@@ -3490,15 +3507,15 @@ Wollen Sie diese Datei wirklich hinzufügen?</translation>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>Registrierung des DBus-Service auf %1 fehlgeschlagen.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n Eintrag wurde von %1 verwendet</numerusform><numerusform>%n Einträge wurden von %1 verwendet</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>Registrierung des DBus-Service auf %1 fehlgeschlagen.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4322,10 +4339,6 @@ Falls dies wiederholt passiert, dann könnte Ihre Datenbank beschädigt sein.</t
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Um die Sicherheit zu erhöhen, können Sie eine Schlüsseldatei mit zufälligem Inhalt erzeugen.&lt;/p&gt;&lt;p&gt;Diese Datei muss geheim gehalten werden und darf niemals verloren gehen, ansonsten ist kein Zugriff auf die Datenbank mehr möglich!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Veraltetes Schlüsseldatei-Format</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4356,26 +4369,14 @@ Message: %2</source>
         <source>Select a key file</source>
         <translation>Schlüsseldatei auswählen</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Auswahl der Schlüsseldatei</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Schlüsseldatei auswählen</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Durchsuchen ...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Neue Schlüsseldatei erzeugen</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Hinweis: Benutzen Sie keine Datei, die sich ändern kann, sonst können Sie die Datenbank nicht mehr entsperren!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Ungültige Schlüsseldatei</translation>
@@ -4395,14 +4396,24 @@ Are you sure you want to continue with this file?</source>
 Wollen Sie wirklich mit dieser Datei fortfahren?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>Sie verwenden ein veraltetes Schlüsseldatei-Format,
-welches in Zukunft nicht mehr unterstützt werden könnte.
-
-Erzeugen Sie eine neue Schlüsseldatei in den Datenbank-Sicherheits-Einstellungen.</translation>
+        <source>Old key file format</source>
+        <translation>Altes Schlüsseldateiformat</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>Sie verwenden ein altes Schlüsseldateiformat, das KeePassXC möglicherweise&lt;br&gt;in Zukunft nicht mehr unterstützen wird.&lt;br&gt;&lt;br&gt;Bitte erwägen Sie, eine neue Schlüsseldatei zu erzeugen.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>Erzeugen Sie eine neue Schlüsseldatei oder wählen Sie eine vorhandene aus, um Ihre Datenbank zu schützen.</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>Hinweis: Verwenden Sie NICHT eine Datei, die sich ändern kann, da Sie dann Ihre Datenbank nicht mehr freischalten können.</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Durchsuchen...</translation>
     </message>
 </context>
 <context>
@@ -4867,6 +4878,18 @@ Rechnen Sie mit Fehlern. Diese Version ist nicht für den Produktiveinsatz gedac
         <source>{PASSWORD}{ENTER}</source>
         <translation>{PASSWORT}{ENTER}</translation>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Immer oben</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Benutzernamen ausblenden</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Passwörter ausblenden</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5391,10 +5414,6 @@ Rechnen Sie mit Fehlern. Diese Version ist nicht für den Produktiveinsatz gedac
         <source>Hex</source>
         <translation>Hex</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Ausgeschlossene Zeichen: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Erzeugtes Passwort</translation>
@@ -5487,10 +5506,6 @@ Rechnen Sie mit Fehlern. Diese Version ist nicht für den Produktiveinsatz gedac
         <source>Ctrl+S</source>
         <translation>Strg+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Löschen</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Passwort neu erzeugen (%1)</translation>
@@ -5499,6 +5514,10 @@ Rechnen Sie mit Fehlern. Diese Version ist nicht für den Produktiveinsatz gedac
         <source>Special Characters</source>
         <translation>Sonderzeichen</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation>Ausgeschlossene Zeichen: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5737,15 +5756,6 @@ Rechnen Sie mit Fehlern. Diese Version ist nicht für den Produktiveinsatz gedac
         <source>Perform advanced analysis on the password.</source>
         <translation>Fortgeschrittene Analyse des Passworts ausführen.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>WARNUNG: Sie verwenden ein veraltetes Schlüsseldatei-Format, welches in Zukunft möglicherweise nicht mehr unterstützt wird.
-
-Bitte denken Sie darüber nach, eine neue Schlüsseldatei zu erzeugen.</translation>
-    </message>
     <message>
         <source>
 
@@ -6133,10 +6143,6 @@ Verfügbare Kommandos:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (Zeile, Spalte) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – empfohlen)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6227,10 +6233,6 @@ Verfügbare Kommandos:
         <source>read password of the database from stdin</source>
         <translation>Passwort der Datenbank von stdin lesen</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Eltern-Fenster-Handle</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Eine andere KeePassXC-Instanz läuft bereits.</translation>
@@ -6717,10 +6719,6 @@ Kernel: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation>AES (%1 Runden)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (%1 Runden, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-bit</translation>
@@ -6747,6 +6745,68 @@ Kernel: %3 %4</translation>
         <comment>seconds</comment>
         <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>Pfad zu einer benutzerdefinierten lokalen Konfigurationsdatei</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>WARNUNG: Sie verwenden ein altes Schlüsseldateiformat, das KeePassXC möglicherweise
+in Zukunft nicht mehr unterstützen wird.
+
+Bitte erwägen Sie, eine neue Schlüsseldatei zu erzeugen.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 Runden, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 – empfohlen)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Symbol</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Nicht unterstützte Schlüsseldateiversion: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>Prüfsumme stimmt nicht überein! Die Schlüsseldatei ist möglicherweise beschädigt.</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>Unerwartete Schlüsseldateidaten! Die Schlüsseldatei ist möglicherweise beschädigt.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation><numerusform>Zwischenablage wird in %1 Sekunde(n) gelöscht...</numerusform><numerusform>Zwischenablage wird in %1 Sekunde(n) gelöscht ...</numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>alle offenen Datenbanken sperren</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>Gesperrte Datenbanken.</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>Datenbank kann nicht gesperrt werden.</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7170,10 +7230,6 @@ Kernel: %3 %4</translation>
         <source>Search</source>
         <translation>Suche</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Löschen</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Suche auf ausgewählte Gruppe beschränken</translation>
@@ -7453,10 +7509,6 @@ Kernel: %3 %4</translation>
         <source>Could not write export container</source>
         <translation>Export-Container kann nicht gespeichert werden</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Unerwarteter Fehler beim Export</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7524,10 +7576,6 @@ Kernel: %3 %4</translation>
         <source>File does not exist</source>
         <translation>Datei existiert nicht</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Unbekannter geteilter Containertyp</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_en_US.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation>You must restart the application to set the new language. Would you like to restart now?</translation>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Monochrome</translation>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -1114,6 +1118,14 @@ chrome-laptop.</translation>
         <source>Column %1</source>
         <translation>Column %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icon</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1210,20 +1222,6 @@ Backup database located at %2</translation>
         <source>Refresh</source>
         <translation>Refresh</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Legacy key file format</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Don&apos;t show this warning again</translation>
@@ -1284,14 +1282,6 @@ Please consider generating a new key file.</translation>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID for Quick Unlock</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Clear</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Clear Key File</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Unlock failed and no password given</translation>
@@ -1362,6 +1352,14 @@ If you do not have a key file, please leave the field empty.</translation>
         <source>Select hardware key…</source>
         <translation>Select hardware key…</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Old key file format</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2295,6 +2293,16 @@ Disable safe saves and try again?</translation>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[PROTECTED] Press Reveal to view or edit</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Invalid Entry</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2492,6 +2500,14 @@ Disable safe saves and try again?</translation>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Use this entry only with HTTP Basic Auth</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Do not use this entry with HTTP Basic Auth</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2614,6 +2630,10 @@ Disable safe saves and try again?</translation>
         <source>Expires:</source>
         <translation>Expires:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Edit Entry</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2914,6 +2934,10 @@ Supported extensions are: %1.</translation>
         <source>Set default Auto-Type sequence</source>
         <translation>Set default Auto-Type sequence</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Edit Group</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3413,11 +3437,6 @@ Are you sure to add this file?</translation>
         <source>[PROTECTED]</source>
         <translation>[PROTECTED]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Enabled</translation>
@@ -3438,6 +3457,15 @@ Are you sure to add this file?</translation>
         <source>Advanced</source>
         <translation>Advanced</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Default Sequence</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3448,18 +3476,6 @@ Are you sure to add this file?</translation>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Customize View</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Hide Usernames</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Hide Passwords</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Fit to window</translation>
@@ -3492,15 +3508,15 @@ Are you sure to add this file?</translation>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>Failed to register DBus service at %1.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n Entry was used by %1</numerusform><numerusform>%n Entries were used by %1</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>Failed to register DBus service at %1.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4324,10 +4340,6 @@ If this reoccurs, then your database file may be corrupt.</translation>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out.&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Legacy key file format</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4358,26 +4370,14 @@ Message: %2</translation>
         <source>Select a key file</source>
         <translation>Select a key file</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Key file selection</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Browse for key file</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Browse...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Generate a new key file</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Note: Do not use a file that may change as that will prevent you from unlocking your database!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Invalid Key File</translation>
@@ -4397,14 +4397,24 @@ Are you sure you want to continue with this file?</source>
 Are you sure you want to continue with this file?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>You are using a legacy key file format which may become
-unsupported in the future.
-
-You can generate a new key file in the database security settings.</translation>
+        <source>Old key file format</source>
+        <translation>Old key file format</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>Generate a new key file or choose an existing one to protect your database.</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Browse…</translation>
     </message>
 </context>
 <context>
@@ -4869,6 +4879,18 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>{PASSWORD}{ENTER}</source>
         <translation>{PASSWORD}{ENTER}</translation>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Always on Top</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Hide Usernames</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Hide Passwords</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5393,10 +5415,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Hex</source>
         <translation>Hex</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Generated password</translation>
@@ -5489,10 +5507,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Clear</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Regenerate password (%1)</translation>
@@ -5501,6 +5515,10 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Special Characters</source>
         <translation>Special Characters</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5739,16 +5757,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Perform advanced analysis on the password.</source>
         <translation>Perform advanced analysis on the password.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</translation>
-    </message>
     <message>
         <source>
 
@@ -6136,10 +6144,6 @@ Available commands:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (row, col) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – recommended)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6230,10 +6234,6 @@ Available commands:
         <source>read password of the database from stdin</source>
         <translation>read password of the database from stdin</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Parent window handle</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Another instance of KeePassXC is already running.</translation>
@@ -6720,10 +6720,6 @@ Kernel: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation>AES (%1 rounds)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (%1 rounds, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-bit</translation>
@@ -6750,6 +6746,68 @@ Kernel: %3 %4</translation>
         <comment>seconds</comment>
         <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>path to a custom local config file</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 rounds, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 – recommended)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icon</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Unsupported key file version: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>Checksum mismatch! Key file may be corrupt.</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>Unexpected key file data! Key file may be corrupt.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation><numerusform>Clearing the clipboard in %1 second…</numerusform><numerusform>Clearing the clipboard in %1 seconds…</numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>lock all open databases</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>Databases have been locked.</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>Database failed to lock.</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7173,10 +7231,6 @@ Kernel: %3 %4</translation>
         <source>Search</source>
         <translation>Search</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Clear</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Limit search to selected group</translation>
@@ -7456,10 +7510,6 @@ Kernel: %3 %4</translation>
         <source>Could not write export container</source>
         <translation>Could not write export container</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Unexpected export error occurred</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7477,7 +7527,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Do you want to trust %1 with the fingerprint of %2 from %3?</source>
-        <translation>Do you want to trust %1 with the fingerprint of %2 from %3?</translation>
+        <translation>Do you want to trust %1 with the fingerprint of %2 from %3? {1 ?} {2 ?}</translation>
     </message>
     <message>
         <source>Not this time</source>
@@ -7527,10 +7577,6 @@ Kernel: %3 %4</translation>
         <source>File does not exist</source>
         <translation>File does not exist</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Unknown share container type</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_fi.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation>Ohjelma täytyy käynnistää uudelleen, jotta uusi kieli voidaan ottaa käyttöön. Haluatko käynnistää uudelleen nyt?</translation>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Mustavalkoinen</translation>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -1113,6 +1117,14 @@ chrome-läppäri.</translation>
         <source>Column %1</source>
         <translation>Sarake %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Kuvake</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1209,20 +1221,6 @@ Tietokannan varmuuskopio paikannettu: %2</translation>
         <source>Refresh</source>
         <translation>Päivitä</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Vanha avaintiedostomuoto</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Käytät vanhaa avaintiedostomuotoa joka ei ole
-välttämättä tuettu tulevaisuudessa.
-
-Ole hyvä ja harkitse uuden avaintiedoston luomista.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Älä näytä tätä varoitusta uudelleen</translation>
@@ -1283,14 +1281,6 @@ Ole hyvä ja harkitse uuden avaintiedoston luomista.</translation>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID Pika-Avaukseen</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Tyhjennä</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Tyhjennä Avaintiedosto</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Avaus epäonnistui, eikä salasanaa ole annettu</translation>
@@ -1361,6 +1351,14 @@ Jos sinulla ei ole avaintiedostoa, jätä kenttä tyhjäksi.</translation>
         <source>Select hardware key…</source>
         <translation>Valitse laiteavain...</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Vanha avaintiedostomuoto</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>Käytät vanhaa avaintiedostomuotoa joka ei ole&lt;br&gt;tuettu tulevaisuudessa.&lt;br&gt;&lt;br&gt;Ole hyvä ja harkitse uuden avaintiedoston luomista menemällä:&lt;br&gt;&lt;strong&gt;Tietokanta / Tietokannan turvallisuus / Vaihda avaintiedosto&lt;/strong&gt;&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2293,6 +2291,16 @@ Ota turvallinen tallennus pois käytöstä ja yritä uudelleen?</translation>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[SUOJATTU] Klikkaa Paljasta näyttääksesi tai muokataksesi</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Virheellinen tietue</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>Ulkopuolinen yhdistämisoperaatio on muuttanut tämän tietueen virheelliseksi.
+Valitettavasti kaikki siihen tehdyt muutokset ovat kadonneet.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2490,6 +2498,14 @@ Ota turvallinen tallennus pois käytöstä ja yritä uudelleen?</translation>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Käytä tietuetta vain HTTP Basic -autentikaatioon</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>Älä lähetä tätä tietuetta HTTP-autentikaatiodialogeihin. Jos asetus on päällä, tämä tietue näkyy vain tavallisissa kirjautumiskentissä.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Älä käytä tätä tietuetta HTTP Basic -autentikaatioon</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2612,6 +2628,10 @@ Ota turvallinen tallennus pois käytöstä ja yritä uudelleen?</translation>
         <source>Expires:</source>
         <translation>Vanhentuu:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Muokkaa tietuetta</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2912,6 +2932,10 @@ Tuetut tyypit ovat: %1.</translation>
         <source>Set default Auto-Type sequence</source>
         <translation>Aseta automaattisyötön oletussekvenssi</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Muokkaa ryhmää</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3411,11 +3435,6 @@ Oletko varma, että haluat lisätä tämän tiedoston?</translation>
         <source>[PROTECTED]</source>
         <translation>[SUOJATTU]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Käytössä</translation>
@@ -3436,6 +3455,15 @@ Oletko varma, että haluat lisätä tämän tiedoston?</translation>
         <source>Advanced</source>
         <translation>Lisäasetukset</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Oletussekvenssi</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3446,18 +3474,6 @@ Oletko varma, että haluat lisätä tämän tiedoston?</translation>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Muokkaa näkymää</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Piilota käyttäjänimet</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Piilota salasanat</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Sovita ikkunaan</translation>
@@ -3490,15 +3506,15 @@ Oletko varma, että haluat lisätä tämän tiedoston?</translation>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>DBus-palvelun rekisteröinti epäonnistui %1.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n tietue käytetiin %1</numerusform><numerusform>%n tietuetta käytettiin %1</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>DBus-palvelun rekisteröinti epäonnistui %1.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4322,10 +4338,6 @@ Jos tämä toistuu, tietokantasi voi olla viallinen.</translation>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Lisäturvaksi voit lisätä avaintiedoston, joka sisältää sattumanvaraista dataa.&lt;/p&gt;&lt;p&gt;Tämä tiedosto täytyy pitää salassa eikä sitä saa koskaan hävittää!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Vanha avaintiedostomuoto</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4356,26 +4368,14 @@ Viesti: %2</translation>
         <source>Select a key file</source>
         <translation>Valitse avaintiedosto</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Avaintiedoston valinta</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Selaa avaintiedostoa</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Selaa...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Luo uusi avaintiedosto</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Huom.: Älä käytä tiedostoa jonka sisältö voi muuttua, sillä se voi estää tietokannan avauksen!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Virheellinen avaintiedosto</translation>
@@ -4395,14 +4395,24 @@ Are you sure you want to continue with this file?</source>
 Haluatko jatkaa käyttämällä tätä tiedostoa?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>Käytät vanhaa avaintiedostomuotoa joka ei ole
-välttämättä tuettu tulevaisuudessa.
-
-Ole hyvä ja harkitse uuden avaintiedoston luomista.</translation>
+        <source>Old key file format</source>
+        <translation>Vanha avaintiedostomuoto</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>Käytät vanhaa avaintiedostomuotoa joka ei ole&lt;br&gt;välttämättä tuettu tulevaisuudessa.&lt;br&gt;&lt;br&gt;Ole hyvä ja harkitse uuden avaintiedoston luomista.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>Kuo uusi avaintiedosto, tai avaa jo olemassa oleva suojataksesi tietokantasi.</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>Huom.: Älä käytä tiedostoa jonka sisältö voi muuttua, sillä se voi estää tietokannan avauksen.</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Selaa...</translation>
     </message>
 </context>
 <context>
@@ -4867,6 +4877,18 @@ Bugeja ja ongelmia voi esiintyä. Tämä versio ei ole tarkoitettu päivittäise
         <source>{PASSWORD}{ENTER}</source>
         <translation>{PASSWORD}{ENTER}</translation>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Aina päällimmäisenä</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Piilota käyttäjänimet</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Piilota salasanat</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5391,10 +5413,6 @@ Bugeja ja ongelmia voi esiintyä. Tämä versio ei ole tarkoitettu päivittäise
         <source>Hex</source>
         <translation>Heksa</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Poissuljetut kirjaimet: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Luotu salasana</translation>
@@ -5487,10 +5505,6 @@ Bugeja ja ongelmia voi esiintyä. Tämä versio ei ole tarkoitettu päivittäise
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Tyhjennä</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Luo salasana uudelleen (%1)</translation>
@@ -5499,6 +5513,10 @@ Bugeja ja ongelmia voi esiintyä. Tämä versio ei ole tarkoitettu päivittäise
         <source>Special Characters</source>
         <translation>Erikoismerkit</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation>Suodata pois kirjaimet &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5737,16 +5755,6 @@ Bugeja ja ongelmia voi esiintyä. Tämä versio ei ole tarkoitettu päivittäise
         <source>Perform advanced analysis on the password.</source>
         <translation>Suorita salasanalle edistynyt analyysi.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Käytät vanhaa avaintiedostomuotoa joka ei ole
-välttämättä tuettu tulevaisuudessa.
-
-Ole hyvä ja harkitse uuden avaintiedoston luomista.</translation>
-    </message>
     <message>
         <source>
 
@@ -6134,10 +6142,6 @@ Käytettävissä olevat komennot:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (rivi, sarake) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – suositeltu)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6228,10 +6232,6 @@ Käytettävissä olevat komennot:
         <source>read password of the database from stdin</source>
         <translation>lue tietokannan salasana stdin:istä</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Ylemmän ikkunan kahva</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Toinen KeePassXC-instanssi on jo käynnissä.</translation>
@@ -6718,10 +6718,6 @@ Ydin: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation>AES (%1 kierrosta)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (%1 kierrosta, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-bit</translation>
@@ -6748,6 +6744,68 @@ Ydin: %3 %4</translation>
         <comment>seconds</comment>
         <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>polku mukautettuun asetustiedostoon</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>Käytät vanhaa avaintiedostomuotoa joka ei ole
+välttämättä tuettu tulevaisuudessa.
+
+Ole hyvä ja harkitse uuden avaintiedoston luomista.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 kierrosta, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 - suositeltu)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Kuvake</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Avaintiedosto joka ei ole tuettu, versio: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>Tarkistussumma on virheellinen! Avaintiedosto voi olla korruptoitunut.</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>Odottamatonta avaintiedoston dataa havaittu. Avaintiedosto voi olla korruptoitunut.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation><numerusform>Tyhjennetään leikepöytä %1 sekunnin kuluttua...</numerusform><numerusform>Tyhjennetään leikepöytä %1 sekunnin kuluttua...</numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>lukitse kaikki avoimet tietokannat</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>Lukitut tietokannat.</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>Tietokannan lukitus ei onnistunut.</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7171,10 +7229,6 @@ Ydin: %3 %4</translation>
         <source>Search</source>
         <translation>Etsi</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Tyhjennä</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Rajoita haku valittuun ryhmään</translation>
@@ -7454,10 +7508,6 @@ Ydin: %3 %4</translation>
         <source>Could not write export container</source>
         <translation>Vietyä säiliötä ei voitu kirjoittaa</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Tapahtui odottamaton vientivirhe</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7525,10 +7575,6 @@ Ydin: %3 %4</translation>
         <source>File does not exist</source>
         <translation>Tiedostoa ei ole olemassa</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Tuntematon jaetun säiliön tyyppi</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_hr_HR.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation>Morate ponovo pokrenuti aplikaciju kako biste postavili novi jezik. Želite li ju ponovo pokrenuti sada?</translation>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -1113,6 +1117,14 @@ chrome-laptop.</translation>
         <source>Column %1</source>
         <translation>Stupac %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ikona</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1209,20 +1221,6 @@ Sigurnosna kopija baza podataka nalazi se na %2</translation>
         <source>Refresh</source>
         <translation>Osvježi</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Zastarjeli format datoteke ključa</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Koristite zastarjeli format datoteke ključa koji može postati
-nepodržan u budućnosti.
-
-Razmislite o generiranju nove datoteke ključa.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Nemoj više pokazivati ovo upozorenje.</translation>
@@ -1283,14 +1281,6 @@ Razmislite o generiranju nove datoteke ključa.</translation>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID za Brzo Otključavanje</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Obriši</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Obriši datoteku ključa</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation type="unfinished"/>
@@ -1358,6 +1348,14 @@ Ako nemate datoteku ključa, ostavite polje prazno.</translation>
         <source>Select hardware key…</source>
         <translation>Odaberite hardverski ključ...</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2284,6 +2282,15 @@ Disable safe saves and try again?</source>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[ZAŠTIĆENO] Pritisnite Otkrij za prikaz ili uređivanje</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2481,6 +2488,14 @@ Disable safe saves and try again?</source>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Koristi ovu stavku samo s HTTP Basic Auth</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2603,6 +2618,10 @@ Disable safe saves and try again?</source>
         <source>Expires:</source>
         <translation>Ističe:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2903,6 +2922,10 @@ Podržana proširenja su: %1.</translation>
         <source>Set default Auto-Type sequence</source>
         <translation>Postavi zadani redoslijeda auto-tipkanja</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3392,11 +3415,6 @@ Are you sure to add this file?</source>
         <source>[PROTECTED]</source>
         <translation>[ZAŠTIĆENO]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Omogućeno</translation>
@@ -3417,6 +3435,15 @@ Are you sure to add this file?</source>
         <source>Advanced</source>
         <translation>Napredno</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3427,18 +3454,6 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Sakrij korisnička imena</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Sakrij Lozinke</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation type="unfinished"/>
@@ -3471,15 +3486,15 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4294,10 +4309,6 @@ If this reoccurs, then your database file may be corrupt.</source>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Zastarjeli format datoteke ključa</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4327,26 +4338,14 @@ Message: %2</source>
         <source>Select a key file</source>
         <translation>Odaberite datoteku ključa </translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Odabir datoteke ključa</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Potraži datoteku ključa</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Pretraživanje...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Proizvedi novu datoteku ključa</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation type="unfinished"/>
@@ -4366,14 +4365,24 @@ Are you sure you want to continue with this file?</source>
 Želite li zaista nastaviti s ovom datotekom?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>Koristite zastarjeli format datoteke ključa koji može postati
-nepodržan u budućnosti.
-
-Proizvedite novu datoteku ključa u sigurnosnim postavkama baze podataka.</translation>
+        <source>Old key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4834,6 +4843,18 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>{PASSWORD}{ENTER}</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Sakrij korisnička imena</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Sakrij Lozinke</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5357,10 +5378,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Hex</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Izostavi znakove: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;&quot;.</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Proizvedena lozinka</translation>
@@ -5453,10 +5470,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Obriši</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Ponovo proizvedi lozinku (%1)</translation>
@@ -5465,6 +5478,10 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Special Characters</source>
         <translation>Posebni znakovi</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5703,16 +5720,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Perform advanced analysis on the password.</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>UPOZORENJE: Koristite zastarjeli format datoteke ključa koji može postati
-nepodržan u budućnosti.
-
-Razmislite o generiranju nove datoteke ključa.</translation>
-    </message>
     <message>
         <source>
 
@@ -6099,10 +6106,6 @@ Dostupne naredbe:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (redak, stupac) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – preporučeno)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6193,10 +6196,6 @@ Dostupne naredbe:
         <source>read password of the database from stdin</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation type="unfinished"/>
@@ -6680,10 +6679,6 @@ Kernel: %3 %4</source>
         <source>AES (%1 rounds)</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-bit</translation>
@@ -6710,6 +6705,65 @@ Kernel: %3 %4</source>
         <comment>seconds</comment>
         <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ikona</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7133,10 +7187,6 @@ Kernel: %3 %4</source>
         <source>Search</source>
         <translation>Traži</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Obriši</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation type="unfinished"/>
@@ -7416,10 +7466,6 @@ Kernel: %3 %4</source>
         <source>Could not write export container</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7487,10 +7533,6 @@ Kernel: %3 %4</source>
         <source>File does not exist</source>
         <translation>Datoteka ne postoji</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_hu.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation>Az új nyelv beállításának az érvényre kerüléséhez újra kell indítani az alkalmazást. Legyen azonnal újraindítva?</translation>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Monokróm</translation>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -1114,6 +1118,14 @@ A kapcsolatnak egy olyan egyedi nevet, ill. azonosítót szükség adni, mint am
         <source>Column %1</source>
         <translation>%1. oszlop</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ikon</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1210,19 +1222,6 @@ Az adatbázis biztonsági másolata:  %2</translation>
         <source>Refresh</source>
         <translation>Frissítés</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Örökölt kulcsfájl formátum</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Egy régi, örökölt kulcsfájl formátumot használ, ami a közeljövőben már nem lesz támogatott.
-
-Megfontolandó egy új kulcsfájl készítése.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Ne jelenjen meg többé a figyelmeztetés</translation>
@@ -1283,14 +1282,6 @@ Megfontolandó egy új kulcsfájl készítése.</translation>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID a Quick Unlockhoz</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Törlés</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Kulcsfájl törlése</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Feloldás sikertelen, jelszót nem adott</translation>
@@ -1360,6 +1351,14 @@ If you do not have a key file, please leave the field empty.</source>
         <source>Select hardware key…</source>
         <translation>Hardverkulcs kijelölése…</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Régi kulcsfájl formátum</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>Egy régi kulcsfájl formátumot használ, amit a KeePassXC lehet&lt;br&gt;hogy nem fog támogatni a jövőben.&lt;br&gt;&lt;br&gt;Fontolja meg, hogy új kulcsfájl készít a következő menüben:&lt;br&gt;&lt;strong&gt;Adatbázis / Adatbázis-biztonság / Kulcsfájl módosítása.&lt;/strong&gt;&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2293,6 +2292,16 @@ Letiltható a biztonságos mentés és úgy megkísérelhető a mentés?</transl
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[VÉDETT] A megjelenítés vagy a szerkesztés a „Felfedés” gombbal érhető el</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Érvénytelen bejegyzés</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>Egy külső egyesítési művelet érvénytelenítette ezt a bejegyzést.
+Sajnos az esetleges változások elvesztek.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2490,6 +2499,14 @@ Letiltható a biztonságos mentés és úgy megkísérelhető a mentés?</transl
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Bejegyzés alkalmazása csak HTTP Basic Auth-tal</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>Ne küldje ezt a beállítást a böngésző HTTP Auth párbeszédablakának. Bejelölve a HTTP Auth párbeszédablakokban ez a bejegyzés nem fog kiválaszthatóként feltűnni.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Bejegyzés tiltása HTTP Basic Auth-tal</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2612,6 +2629,10 @@ Letiltható a biztonságos mentés és úgy megkísérelhető a mentés?</transl
         <source>Expires:</source>
         <translation>Lejárat:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Bejegyzés szerkesztése</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2912,6 +2933,10 @@ Támogatott kiterjesztések: %1.</translation>
         <source>Set default Auto-Type sequence</source>
         <translation>Egyéni automatikus beírási sorrend beállítása</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Csoport szerkesztése</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3381,7 +3406,7 @@ Biztosan hozzáadható ez a fájl?</translation>
     </message>
     <message>
         <source>Autotype</source>
-        <translation>Automatikus típus</translation>
+        <translation>Automatikus beírás</translation>
     </message>
     <message>
         <source>Window</source>
@@ -3411,11 +3436,6 @@ Biztosan hozzáadható ez a fájl?</translation>
         <source>[PROTECTED]</source>
         <translation>[VÉDETT]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Engedélyezett</translation>
@@ -3436,6 +3456,15 @@ Biztosan hozzáadható ez a fájl?</translation>
         <source>Advanced</source>
         <translation>Speciális</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Alapértelmezett sorrend</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3446,18 +3475,6 @@ Biztosan hozzáadható ez a fájl?</translation>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Nézet testre szabása</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Felhasználónevek elrejtése</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Jelszavak elrejtése</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Igazítás az ablakhoz</translation>
@@ -3490,15 +3507,15 @@ Biztosan hozzáadható ez a fájl?</translation>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>Nem sikerült regisztrálni a DBus-szolgáltatást: %1.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n bejegyzést használ: %1</numerusform><numerusform>%n bejegyzést használ: %1</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>Nem sikerült regisztrálni a DBus-szolgáltatást: %1.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4322,10 +4339,6 @@ Ha ez újból előfordul, lehet hogy az adatbázisfájl sérült.</translation>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Megadhat egy véletlenszerű bájtokat tartalmazó kulcsot a további biztonság érdekében.&lt;/p&gt;&lt;p&gt;Tartsa titokban, és ne veszítse el, nehogy kizárja magát!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Örökölt kulcsfájl formátum</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4356,26 +4369,14 @@ Message: %2</source>
         <source>Select a key file</source>
         <translation>Kulcsfájl kiválasztása</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Kulcsfájl kijelölése</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Kulcsfájl böngészése</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Tallózás…</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Új kulcsfájl előállítása</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Megjegyzés: Nem szabad olyan fájlt használni, amely megváltozhat, mivel ez megakadályozza az adatbázis feloldását!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Érvénytelen kulcsfájl</translation>
@@ -4395,13 +4396,24 @@ Are you sure you want to continue with this file?</source>
 Valóban folytatható a művelet ezzel a fájllal?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>Egy régi, örökölt kulcsfájl formátumot használ, ami a közeljövőben már nem lesz támogatott.
-
-Állítson elő egy új kulcsfájlt az adatbázis biztonsági beállításaiban.</translation>
+        <source>Old key file format</source>
+        <translation>Régi kulcsfájl formátum</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>Egy régi kulcsfájl formátumot használ, amit a KeePassXC lehet&lt;br&gt;hogy nem fog támogatni a jövőben.&lt;br&gt;&lt;br&gt;Fontolja meg, hogy új kulcsfájlt állítson elő.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>Új kulcsfájl generálása vagy egy meglévő kulcsfájl kijelölése az adatbázis védelméhez.</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>Megjegyzés: NEM szabad olyan fájlt használni, amely megváltozhat, mivel ez megakadályozza az adatbázis feloldását!</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Tallózás…</translation>
     </message>
 </context>
 <context>
@@ -4851,19 +4863,31 @@ Néhány hiba és kisebb nehézségek várhatóak, ezért ez a verzió nem aján
     </message>
     <message>
         <source>{USERNAME}</source>
-        <translation>{FELHASZNÁLÓNÉV}</translation>
+        <translation>{USERNAME}</translation>
     </message>
     <message>
         <source>{USERNAME}{ENTER}</source>
-        <translation>{FELHASZNÁLÓNÉV}{ENTER}</translation>
+        <translation>{USERNAME}{ENTER}</translation>
     </message>
     <message>
         <source>{PASSWORD}</source>
-        <translation>{JELSZÓ}</translation>
+        <translation>{PASSWORD}</translation>
     </message>
     <message>
         <source>{PASSWORD}{ENTER}</source>
-        <translation>{JELSZÓ}{ENTER}</translation>
+        <translation>{PASSWORD}{ENTER}</translation>
+    </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Mindig felül</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Felhasználónevek elrejtése</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Jelszavak elrejtése</translation>
     </message>
 </context>
 <context>
@@ -5389,10 +5413,6 @@ Néhány hiba és kisebb nehézségek várhatóak, ezért ez a verzió nem aján
         <source>Hex</source>
         <translation>Hexadecimális</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Kihagyott karakterek: „0”, „1”, „l”, „I”, „O”, „|”, „﹒”</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Előállított jelszó</translation>
@@ -5485,10 +5505,6 @@ Néhány hiba és kisebb nehézségek várhatóak, ezért ez a verzió nem aján
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Törlés</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Jelszó újraelőállítása (%1)</translation>
@@ -5497,6 +5513,10 @@ Néhány hiba és kisebb nehézségek várhatóak, ezért ez a verzió nem aján
         <source>Special Characters</source>
         <translation>Speciális karakterek</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation>Kihagyott karakterek: „0”, „O”, „1”, „l”, „I”, „|”, „G”, „6”, „B”, „8”, „﹒”</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5735,15 +5755,6 @@ Néhány hiba és kisebb nehézségek várhatóak, ezért ez a verzió nem aján
         <source>Perform advanced analysis on the password.</source>
         <translation>A jelszó speciális elemzése.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>FIGYELEM: Egy régi, örökölt kulcsfájl formátumot használ, ami a közeljövőben már nem lesz támogatott.
-
-Megfontolandó egy új kulcsfájl készítése.</translation>
-    </message>
     <message>
         <source>
 
@@ -6131,10 +6142,6 @@ Elérhető parancsok:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (sor, oszlop) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – ajánlott)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6225,10 +6232,6 @@ Elérhető parancsok:
         <source>read password of the database from stdin</source>
         <translation>adatbázis jelszó beolvasása az stdin-ről</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Szülőablak kezelése</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>A KeePassXC egy másik példánya is fut.</translation>
@@ -6715,10 +6718,6 @@ Kernel: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation>AES (%1 forduló)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (%1 forduló, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-bit</translation>
@@ -6745,6 +6744,68 @@ Kernel: %3 %4</translation>
         <comment>seconds</comment>
         <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>útvonal az egyéni helyi beállítófájlhoz</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>FIGYELEM: Egy régi kulcsfájl formátumot használ, amit a KeePassXC lehet
+hogy nem fog támogatni a jövőben.
+
+Fontolja meg, hogy új kulcsfájlt állítson elő.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 forduló, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 – ajánlott)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ikon</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Nem támogatott kulcsfájlverzió: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>Nem egyezik az ellenőrzőösszeg. A kulcsfájl megsérülhetett.</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>Váratlan kulcsfájladatok. A kulcsfájl megsérülhetett.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation><numerusform>Vágólap törlése %1 másodperc múlva…</numerusform><numerusform>Vágólap törlése %1 másodperc múlva…</numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>Összes nyitott adatbázis zárolása</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>Zárolt adatbázisok.</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>Adatbázis-zárolás sikertelen.</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7168,10 +7229,6 @@ Kernel: %3 %4</translation>
         <source>Search</source>
         <translation>Keresés</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Törlés</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Keresés korlátozása a kijelölt csoportra</translation>
@@ -7451,10 +7508,6 @@ Kernel: %3 %4</translation>
         <source>Could not write export container</source>
         <translation>Az exportálási tároló nem írható</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Váratlan exportálás hiba történt</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7522,10 +7575,6 @@ Kernel: %3 %4</translation>
         <source>File does not exist</source>
         <translation>A fájl nem létezik</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Ismeretlen megosztási tárolótípus</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_it.ts

@@ -101,7 +101,7 @@
     </message>
     <message>
         <source>Text only</source>
-        <translation>Solo icone</translation>
+        <translation>Solo testo</translation>
     </message>
     <message>
         <source>Text beside icon</source>
@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation>È necessario riavviare l&apos;applicazione per impostare la nuova lingua. Vuoi riavviare ora?</translation>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Monocromatico</translation>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -326,7 +330,7 @@
     </message>
     <message>
         <source>Reset settings to default…</source>
-        <translation>Ripristina impostazioni predefinite...</translation>
+        <translation>Ripristina impostazioni predefinite…</translation>
     </message>
     <message>
         <source>Auto-Type typing delay:</source>
@@ -649,7 +653,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Converting attributes to custom data…</source>
-        <translation>Conversione di attributi in dati personalizzati in corso...</translation>
+        <translation>Conversione di attributi in dati personalizzati in corso…</translation>
     </message>
     <message>
         <source>KeePassXC: Converted KeePassHTTP attributes</source>
@@ -1113,6 +1117,14 @@ laptop-chrome</translation>
         <source>Column %1</source>
         <translation>Colonna %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icona</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1209,20 +1221,6 @@ Database di backup che si trova in %2</translation>
         <source>Refresh</source>
         <translation>Aggiorna</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Formato di file chiave legacy</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Per il file della chiave, stai utilizzando un formato obsoleto
-che potrebbe non essere più supportato in futuro.
-
-Considera l&apos;opzione di generarne uno nuovo</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Non mostrare nuovamente questo avviso</translation>
@@ -1283,14 +1281,6 @@ Considera l&apos;opzione di generarne uno nuovo</translation>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID per lo sblocco rapido</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Azzera</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Cancella file di chiave</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Sblocco non riuscito e nessuna password specificata</translation>
@@ -1351,7 +1341,7 @@ Se non possiedi un file chiave, lascia vuoto questo campo.</translation>
     </message>
     <message>
         <source>Detecting hardware keys…</source>
-        <translation>Rilevamento delle chiavi hardware in corso...</translation>
+        <translation>Rilevamento delle chiavi hardware in corso…</translation>
     </message>
     <message>
         <source>No hardware keys detected</source>
@@ -1359,7 +1349,15 @@ Se non possiedi un file chiave, lascia vuoto questo campo.</translation>
     </message>
     <message>
         <source>Select hardware key…</source>
-        <translation>Seleziona chiave hardware...</translation>
+        <translation>Seleziona chiave hardware…</translation>
+    </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Vecchio formato di file chiave</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>Stai utilizzando un vecchio formato di file chiave che KeePassXC può&lt;br&gt;smettere di supportare in futuro.&lt;br&gt;&lt;br&gt;Prendere in considerazione la possibilità di generare un nuovo file di chiave andando a:&lt;br&gt;&lt;strong&gt;Database / Sicurezza database / Cambiare file chiave.&lt;/strong&gt;&lt;br&gt;</translation>
     </message>
 </context>
 <context>
@@ -1470,7 +1468,7 @@ Le autorizzazioni per accedere alle voci verranno revocate.</translation>
     </message>
     <message>
         <source>Removing stored permissions…</source>
-        <translation>Rimozione dei permessi salvati...</translation>
+        <translation>Rimozione dei permessi salvati…</translation>
     </message>
     <message>
         <source>Abort</source>
@@ -2294,6 +2292,16 @@ Disabilitare i salvataggi sicuri e riprovare?</translation>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[PROTETTO] Premere Mostra per visualizzare o modificare</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Voce non valida</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>Questa voce è stata invalidata da un&apos;operazione di unione esterna.
+Purtroppo, le modifiche apportate sono state perse.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2491,6 +2499,14 @@ Disabilitare i salvataggi sicuri e riprovare?</translation>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Utilizza questa voce solo con l&apos;autenticazione HTTP Basic </translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>Non inviare questa impostazione al browser per le finestre di dialogo autenticazione HTTP. Se attivata, le finestre di dialogo autenticazione HTTP non mostreranno questa voce per la selezione.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Non utilizzare questa voce con l&apos;autenticazione di base HTTP</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2613,6 +2629,10 @@ Disabilitare i salvataggi sicuri e riprovare?</translation>
         <source>Expires:</source>
         <translation>Scade:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Modifica voce</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2913,6 +2933,10 @@ Le estensioni supportate sono: %1.</translation>
         <source>Set default Auto-Type sequence</source>
         <translation>Impostare la sequenza predefinita del completamento automatico</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Modifica gruppo</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3412,11 +3436,6 @@ Siete sicuri di voler aggiungere questo file?</translation>
         <source>[PROTECTED]</source>
         <translation>[PROTETTO]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Abilitato</translation>
@@ -3437,6 +3456,15 @@ Siete sicuri di voler aggiungere questo file?</translation>
         <source>Advanced</source>
         <translation>Avanzate</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Sequenza predefinita</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3447,18 +3475,6 @@ Siete sicuri di voler aggiungere questo file?</translation>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Personalizza vista</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Nascondi nome utente</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Nascondi password</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Adatta alla finestra</translation>
@@ -3491,15 +3507,15 @@ Siete sicuri di voler aggiungere questo file?</translation>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>Impossibile registrare il servizio DBus a %1.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n Voce utilizzata da %1</numerusform><numerusform>%n Voci utilizzate da %1</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>Impossibile registrare il servizio DBus a %1.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -3580,7 +3596,7 @@ Siete sicuri di voler aggiungere questo file?</translation>
     <name>IconDownloaderDialog</name>
     <message>
         <source>Download Favicons</source>
-        <translation>Scarica Favicons</translation>
+        <translation>Scarica i Favicon</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -4323,10 +4339,6 @@ Se ciò si ripresenta, il file di database potrebbe essere danneggiato.</transla
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;È possibile aggiungere un file chiave contenente byte casuali per una maggiore sicurezza.&lt;/p&gt;&lt;p&gt;Devi tenerlo segreto e non perderlo mai o sarai bloccato!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Formato di file chiave legacy</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4357,26 +4369,14 @@ Messaggio: %2</translation>
         <source>Select a key file</source>
         <translation>Seleziona un file chiave</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Selezione del file chiave</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Cercare il file chiave</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Sfoglia...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Generare un nuovo file chiave</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Nota: non utilizzare un file che potrebbe cambiare in quanto ciò impedirà di sbloccare il database!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>File chiave non valido</translation>
@@ -4396,14 +4396,24 @@ Are you sure you want to continue with this file?</source>
 Sei sicuro di voler continuare con questo file?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>Si sta utilizzando un formato di file di chiave legacy che può diventare
-non supportato in futuro.
-
-Generare un nuovo file di chiave nelle impostazioni di sicurezza del database.</translation>
+        <source>Old key file format</source>
+        <translation>Vecchio formato di file chiave</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>È stato selezionato un file di chiave in un vecchio formato che KeePassXC&lt;br&gt;potrebbe smettere di supportare in futuro.&lt;br&gt;&lt;br&gt;Prendere in considerazione la possibilità di generare un nuovo file di chiave.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>Genera un nuovo file chiave o scegline uno esistente per proteggere il tuo database.</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>Nota: NON utilizzare un file che potrebbe cambiare in quanto ciò ti impedirà di sbloccare il tuo database.</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Sfoglia…</translation>
     </message>
 </context>
 <context>
@@ -4654,7 +4664,7 @@ Aspettatevi alcuni bug e problemi minori, questa versione non è destinata all&a
     </message>
     <message>
         <source>&amp;New Database…</source>
-        <translation>&amp;Nuovo database</translation>
+        <translation>&amp;Nuovo database…</translation>
     </message>
     <message>
         <source>&amp;Merge From Database…</source>
@@ -4662,39 +4672,39 @@ Aspettatevi alcuni bug e problemi minori, questa versione non è destinata all&a
     </message>
     <message>
         <source>&amp;New Entry…</source>
-        <translation>&amp;Nuova voce</translation>
+        <translation>&amp;Nuova voce…</translation>
     </message>
     <message>
         <source>&amp;Edit Entry…</source>
-        <translation>&amp;Modifica voce</translation>
+        <translation>&amp;Modifica voce…</translation>
     </message>
     <message>
         <source>&amp;Delete Entry…</source>
-        <translation>&amp;Elimina voce</translation>
+        <translation>&amp;Elimina voce…</translation>
     </message>
     <message>
         <source>&amp;New Group…</source>
-        <translation>&amp;Nuovo gruppo</translation>
+        <translation>&amp;Nuovo gruppo…</translation>
     </message>
     <message>
         <source>&amp;Edit Group…</source>
-        <translation>&amp;Modifica gruppo</translation>
+        <translation>&amp;Modifica gruppo…</translation>
     </message>
     <message>
         <source>&amp;Delete Group…</source>
-        <translation>&amp;Elimina gruppo</translation>
+        <translation>&amp;Elimina gruppo…</translation>
     </message>
     <message>
         <source>Download All &amp;Favicons…</source>
-        <translation>Scarica tutte le &amp;Favicons</translation>
+        <translation>Scarica tutte le &amp;Favicon…</translation>
     </message>
     <message>
         <source>Sa&amp;ve Database As…</source>
-        <translation>Sal&amp;va database come</translation>
+        <translation>Sal&amp;va database come…</translation>
     </message>
     <message>
         <source>Database &amp;Security…</source>
-        <translation>Database &amp;Sicurezza...</translation>
+        <translation>Database &amp;Sicurezza…</translation>
     </message>
     <message>
         <source>Database &amp;Reports...</source>
@@ -4706,11 +4716,11 @@ Aspettatevi alcuni bug e problemi minori, questa versione non è destinata all&a
     </message>
     <message>
         <source>&amp;Database Settings…</source>
-        <translation>Impostazioni &amp;database</translation>
+        <translation>Impostazioni &amp;database…</translation>
     </message>
     <message>
         <source>&amp;Clone Entry…</source>
-        <translation>&amp;Clona voce</translation>
+        <translation>&amp;Clona voce…</translation>
     </message>
     <message>
         <source>Move u&amp;p</source>
@@ -4746,23 +4756,23 @@ Aspettatevi alcuni bug e problemi minori, questa versione non è destinata all&a
     </message>
     <message>
         <source>&amp;CSV File…</source>
-        <translation>&amp;File CSV...</translation>
+        <translation>&amp;File CSV…</translation>
     </message>
     <message>
         <source>&amp;HTML File…</source>
-        <translation>File &amp;HTML...</translation>
+        <translation>File &amp;HTML…</translation>
     </message>
     <message>
         <source>KeePass 1 Database…</source>
-        <translation>Database KeePass 1</translation>
+        <translation>Database KeePass 1…</translation>
     </message>
     <message>
         <source>1Password Vault…</source>
-        <translation>1Password Vault</translation>
+        <translation>1Password Vault…</translation>
     </message>
     <message>
         <source>CSV File…</source>
-        <translation>File CSV</translation>
+        <translation>File CSV…</translation>
     </message>
     <message>
         <source>Show TOTP</source>
@@ -4774,7 +4784,7 @@ Aspettatevi alcuni bug e problemi minori, questa versione non è destinata all&a
     </message>
     <message>
         <source>Set up TOTP…</source>
-        <translation>Configura TOTP...</translation>
+        <translation>Configura TOTP…</translation>
     </message>
     <message>
         <source>Report a &amp;Bug</source>
@@ -4798,7 +4808,7 @@ Aspettatevi alcuni bug e problemi minori, questa versione non è destinata all&a
     </message>
     <message>
         <source>Save Database Backup...</source>
-        <translation>Salva il backup del database </translation>
+        <translation>Salva il backup del database...</translation>
     </message>
     <message>
         <source>Add key to SSH Agent</source>
@@ -4868,6 +4878,18 @@ Aspettatevi alcuni bug e problemi minori, questa versione non è destinata all&a
         <source>{PASSWORD}{ENTER}</source>
         <translation>{PASSWORD}{ENTER}</translation>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Sempre sopra</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Nascondi nome utente</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Nascondi password</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5392,10 +5414,6 @@ Aspettatevi alcuni bug e problemi minori, questa versione non è destinata all&a
         <source>Hex</source>
         <translation>Hex</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Escludere i caratteri: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Password generata</translation>
@@ -5488,10 +5506,6 @@ Aspettatevi alcuni bug e problemi minori, questa versione non è destinata all&a
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Azzera</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Rigenera password (%1)</translation>
@@ -5500,6 +5514,10 @@ Aspettatevi alcuni bug e problemi minori, questa versione non è destinata all&a
         <source>Special Characters</source>
         <translation>Caratteri speciali</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation>Caratteri esclusi: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5738,16 +5756,6 @@ Aspettatevi alcuni bug e problemi minori, questa versione non è destinata all&a
         <source>Perform advanced analysis on the password.</source>
         <translation>Esegui un&apos;analisi avanzata sulla password.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>ATTENZIONE: state utilizzando un formato di file della chiave obsoleto che potrebbe diventare
-non supportato in futuro.
-
-Per favore valutate la possibilita&apos; di generare un nuovo file della chiave</translation>
-    </message>
     <message>
         <source>
 
@@ -6135,10 +6143,6 @@ Comandi disponibili:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (riga, col) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – raccomandato)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6229,10 +6233,6 @@ Comandi disponibili:
         <source>read password of the database from stdin</source>
         <translation>leggi la password del database da stdin</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Riferimento alla finestra padre</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>È già in esecuzione un&apos;altra istanza di KeePassXC.</translation>
@@ -6695,7 +6695,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Please touch the button on your YubiKey to continue…</source>
-        <translation>Premere il pulsante della YubiKey per continuare</translation>
+        <translation>Premere il pulsante della YubiKey per continuare…</translation>
     </message>
     <message>
         <source>Do you want to create a database with an empty password? [y/N]: </source>
@@ -6719,10 +6719,6 @@ Kernel: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation>AES (%1 turni)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (%1 iterazioni, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-bit</translation>
@@ -6749,6 +6745,68 @@ Kernel: %3 %4</translation>
         <comment>seconds</comment>
         <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>Percorso di un file di configurazione locale personalizzato</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>ATTENZIONE: stai utilizzando un vecchio formato di file chiave che KeePassXC potrebbe
+smettere di supportare in futuro.
+
+Prendere in considerazione la possibilità di generare un nuovo file di chiave.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 passaggi, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 – consigliato)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icona</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Versione del file chiave non supportata: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>Checksum non corrispondente! Il file chiave potrebbe essere danneggiato.</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>Dati di file chiave imprevisti! Il file chiave potrebbe essere danneggiato.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation><numerusform>Cancellazione degli appunti in %1 secondo…</numerusform><numerusform>Cancellazione degli appunti in %1 secondi…</numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>blocca tutti i database aperti</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>Database bloccati.</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>Impossibile bloccare il database.</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -6855,7 +6913,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Edit Entry...</source>
-        <translation>Modifica voce</translation>
+        <translation>Modifica voce…</translation>
     </message>
     <message>
         <source>Exclude from reports</source>
@@ -6894,7 +6952,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Password exposed…</source>
-        <translation>Password esposta </translation>
+        <translation>Password esposta…</translation>
     </message>
     <message>
         <source> (Excluded)</source>
@@ -6938,7 +6996,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Edit Entry...</source>
-        <translation>Modifica voce</translation>
+        <translation>Modifica voce…</translation>
     </message>
     <message>
         <source>Exclude from reports</source>
@@ -7172,10 +7230,6 @@ Kernel: %3 %4</translation>
         <source>Search</source>
         <translation>Cerca</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Azzera</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Limita la ricerca al gruppo selezionato</translation>
@@ -7455,10 +7509,6 @@ Kernel: %3 %4</translation>
         <source>Could not write export container</source>
         <translation>Impossibile scrivere il contenitore di esportazione</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Si è verificato un errore di esportazione imprevisto</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7526,10 +7576,6 @@ Kernel: %3 %4</translation>
         <source>File does not exist</source>
         <translation>Il file non esiste</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Tipo di contenitore di condivisione sconosciuto</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>
@@ -7859,7 +7905,7 @@ Esempio: JBSWY3DPEHPK3PXP</translation>
     </message>
     <message>
         <source>Detecting hardware keys…</source>
-        <translation>Rilevamento delle chiavi hardware in corso...</translation>
+        <translation>Rilevamento delle chiavi hardware in corso…</translation>
     </message>
     <message>
         <source>No hardware keys detected</source>

share/translations/keepassxc_ja.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation>新しい言語を設定するには、このアプリケーションを再起動する必要があります。今すぐ再起動しますか？</translation>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>モノクロ</translation>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -936,7 +940,7 @@ chrome-laptop.</translation>
     </message>
     <message>
         <source>&lt;b&gt;Error:&lt;/b&gt; The custom proxy location cannot be found!&lt;br/&gt;Browser integration WILL NOT WORK without the proxy application.</source>
-        <translation>&lt;b&gt;エラー:&lt;/b&gt; カスタムプロキシの場所が見つかりませんでした。&lt;br/&gt;ブラウザー統合はプロキシアプリケーション無しでは動作しません。</translation>
+        <translation>&lt;b&gt;エラー:&lt;/b&gt; カスタムプロキシの場所が見つかりませんでした。&lt;br/&gt;ブラウザー統合はプロキシアプリケーションなしでは動作しません。</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
@@ -1114,6 +1118,14 @@ chrome-laptop.</translation>
         <source>Column %1</source>
         <translation>列 %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>アイコン</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1210,20 +1222,6 @@ Backup database located at %2</source>
         <source>Refresh</source>
         <translation>再読み込み</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>レガシーなキーファイル形式</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>レガシーなキーファイル形式は将来的に、
-サポートしなくなる可能性があります。
-
-新しいキーファイルの生成を検討してください。</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>今後この警告を表示しない</translation>
@@ -1284,14 +1282,6 @@ Please consider generating a new key file.</source>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID で素早くロックを解除する</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>消去</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>キーファイルを消去</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>パスワードが未指定なためロックの解除に失敗しました</translation>
@@ -1335,7 +1325,7 @@ To prevent this error from appearing, you must go to &quot;Database Settings / S
         <source>You cannot use your database file as a key file.
 If you do not have a key file, please leave the field empty.</source>
         <translation>データベースファイルをキーファイルとして使用することはできません。
-キーファイルが無い場合は、フィールドを空のままにしてください。</translation>
+キーファイルがない場合は、フィールドを空のままにしてください。</translation>
     </message>
     <message>
         <source>&lt;p&gt;In addition to a password, you can use a secret file to enhance the security of your database. This file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave this field empty.&lt;/p&gt;&lt;p&gt;Click for more information...&lt;/p&gt;</source>
@@ -1361,6 +1351,14 @@ If you do not have a key file, please leave the field empty.</source>
         <source>Select hardware key…</source>
         <translation>ハードウェアキーを選択…</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>古いキーファイル形式</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>KeePassXC は将来的に、現在使用中の古いキーファイル形式を&lt;br&gt;サポートしなくなる可能性があります。&lt;br&gt;&lt;br&gt;&lt;strong&gt;データベース -&gt; データベースのセキュリティ&lt;/strong&gt;メニューから&lt;br&gt;新しいキーファイルを生成することを検討してください。&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -1547,13 +1545,13 @@ This is only necessary if your database is a copy of another and the browser ext
         <source>WARNING! You have not set a password. Using a database without a password is strongly discouraged!
 
 Are you sure you want to continue without a password?</source>
-        <translation>[警告] パスワードを設定していません。パスワード無しでのデータベースの使用は極力避けるべきです。
+        <translation>[警告] パスワードを設定していません。パスワードなしでのデータベースの使用は極力避けるべきです。
 
-パスワード無しで続行してもよろしいですか？</translation>
+パスワードなしで続行してもよろしいですか？</translation>
     </message>
     <message>
         <source>Continue without password</source>
-        <translation>パスワード無しで続行</translation>
+        <translation>パスワードなしで続行</translation>
     </message>
     <message>
         <source>No encryption key added</source>
@@ -1928,7 +1926,7 @@ This action is not reversible.</source>
     <message>
         <source>The created database has no key or KDF, refusing to save it.
 This is definitely a bug, please report it to the developers.</source>
-        <translation>作成したデータベースはキーや KDF が無いため保存しません。
+        <translation>作成したデータベースはキーや KDF がないため保存しません。
 これは確実にバグなので、開発者への報告をお願いします。</translation>
     </message>
     <message>
@@ -2294,6 +2292,16 @@ Disable safe saves and try again?</source>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[保護] 表示または編集する場合は開示をクリックしてください</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>不正なエントリー</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>外部でのマージ処理によって、このエントリーは無効化されました。
+申し訳ありませんが、行った変更は全て失われました。</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2371,7 +2379,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked, the entry will not appear in reports like Health Check and HIBP even if it doesn&apos;t match the quality requirements (e. g. password entropy or re-use). You can set the check mark if the password is beyond your control (e. g. if it needs to be a four-digit PIN) to prevent it from cluttering the reports.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;チェックを入れると、エントリーが品質要件を満たさなかった (例えばパスワードのエントロピーが低かったり何度も使い回されていた) としても、安全性の確認や HIBP のレポートにエントリーを表示しません。パスワードの決定権が自身に無い (例えば必要なパスワードが四桁の PIN である) 場合などに、レポートのノイズになるのを防ぐことができます。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;チェックを入れると、エントリーが品質要件を満たさなかった (例えばパスワードのエントロピーが低かったり何度も使い回されていた) としても、安全性の確認や HIBP のレポートにエントリーを表示しません。パスワードの決定権が自身にない (例えば必要なパスワードが四桁の PIN である) 場合などに、レポートのノイズになるのを防ぐことができます。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Exclude from database reports</source>
@@ -2491,6 +2499,14 @@ Disable safe saves and try again?</source>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>このエントリーは HTTP ベーシック認証でのみ使用する</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>この設定をブラウザーの HTTP 認証ダイアログに送信しません。有効になっている場合、このエントリーは HTTP 認証ダイアログには表示されません。</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>このエントリーは HTTP ベーシック認証で使用しない</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2613,6 +2629,10 @@ Disable safe saves and try again?</source>
         <source>Expires:</source>
         <translation>期限:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>エントリーを編集</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2913,6 +2933,10 @@ Supported extensions are: %1.</source>
         <source>Set default Auto-Type sequence</source>
         <translation>既定の自動入力シーケンスを設定する</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>グループを編集</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3411,11 +3435,6 @@ Are you sure to add this file?</source>
         <source>[PROTECTED]</source>
         <translation>[保護]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>有効</translation>
@@ -3436,6 +3455,15 @@ Are you sure to add this file?</source>
         <source>Advanced</source>
         <translation>詳細設定</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>既定のシーケンス</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3446,18 +3474,6 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>表示のカスタマイズ</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>ユーザー名を隠す</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>パスワードを隠す</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>ウィンドウに合わせる</translation>
@@ -3490,15 +3506,15 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>%1 で DBus サービスの登録に失敗しました。&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n 個のエントリーが %1 に使用されました</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>%1 で DBus サービスの登録に失敗しました。&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4320,11 +4336,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
-        <translation>&lt;p&gt;セキュリティ対策でランダムバイトを含むキーファイルを追加できます。&lt;/p&gt;&lt;p&gt;キーファイルは誰にも知られず、絶対に無くさないよう注意してください。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>レガシーなキーファイル形式</translation>
+        <translation>&lt;p&gt;セキュリティ対策でランダムバイトを含むキーファイルを追加できます。&lt;/p&gt;&lt;p&gt;キーファイルは誰にも知られず、絶対になくさないよう注意してください。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Error loading the key file '%1'
@@ -4356,26 +4368,14 @@ Message: %2</source>
         <source>Select a key file</source>
         <translation>キーファイルを選択</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>キーファイルの選択</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>キーファイルを探す</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>参照...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>新しいキーファイルを生成</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>備考: 内容が変更される可能性があるファイルを使用すると、データベースのロックを解除できなくなる恐れがあります。</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>不正なキーファイルです</translation>
@@ -4391,18 +4391,28 @@ Message: %2</source>
     <message>
         <source>The chosen key file looks like a password database file. A key file must be a static file that never changes or you will lose access to your database forever.
 Are you sure you want to continue with this file?</source>
-        <translation>選択したキーファイルはパスワードデータベースファイルだと思われます。キーファイルは絶対に変更されることが無い、静的なファイルである必要があります。変更される可能性があるファイルでは、データベースに永久にアクセスできなくなる恐れがあります。
+        <translation>選択したキーファイルはパスワードデータベースファイルだと思われます。キーファイルは絶対に変更されることがない、静的なファイルである必要があります。変更される可能性があるファイルでは、データベースに永久にアクセスできなくなる恐れがあります。
 このファイルで続行してもよろしいですか？</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>レガシーなキーファイル形式は将来的に、
-サポートされなくなる可能性があります。
-
-データベースのセキュリティ設定で新しいキーファイルを生成してください。</translation>
+        <source>Old key file format</source>
+        <translation>古いキーファイル形式</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>KeePassXC は将来的に、選択した古い形式のキーファイルを&lt;br&gt;サポートしなくなる可能性があります。&lt;br&gt;&lt;br&gt;代わりに新しいキーファイルを生成することを検討してください。</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>データベースを保護するための新しいキーファイルを生成するか、既存のキーファイルを選択してください。</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>備考: 内容が変更される可能性があるファイルを使用すると、データベースのロックを解除できなくなる恐れがあります。</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>参照…</translation>
     </message>
 </context>
 <context>
@@ -4867,6 +4877,18 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>{PASSWORD}{ENTER}</source>
         <translation>{PASSWORD}{ENTER}</translation>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>常に最前面に表示</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>ユーザー名を隠す</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>パスワードを隠す</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -4950,7 +4972,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Deleting orphan %1 [%2]</source>
-        <translation>親要素が無い %1 [%2] を削除</translation>
+        <translation>親要素がない %1 [%2] を削除</translation>
     </message>
     <message>
         <source>Changed deleted objects</source>
@@ -5048,7 +5070,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     <name>OpData01</name>
     <message>
         <source>Invalid OpData01, does not contain header</source>
-        <translation>ヘッダーが無い不正な OpData01 です</translation>
+        <translation>ヘッダーがない不正な OpData01 です</translation>
     </message>
     <message>
         <source>Unable to read all IV bytes, wanted 16 but got %1</source>
@@ -5391,10 +5413,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Hex</source>
         <translation>16進数</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>除外される文字: &quot;0&quot;、&quot;1&quot;、&quot;l&quot;、&quot;I&quot;、&quot;O&quot;、&quot;|&quot;、&quot;﹒&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>生成されたパスワード</translation>
@@ -5487,10 +5505,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>消去</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>パスワードを再生成 (%1)</translation>
@@ -5499,6 +5513,10 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Special Characters</source>
         <translation>特殊文字</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation>除外される文字: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5737,16 +5755,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Perform advanced analysis on the password.</source>
         <translation>パスワードの詳細な分析を実行する。</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>警告: レガシーなキーファイル形式は将来的に、
-サポートしなくなる可能性があります。
-
-新しいキーファイルの生成を検討してください。</translation>
-    </message>
     <message>
         <source>
 
@@ -5799,7 +5807,7 @@ Available commands:
     </message>
     <message>
         <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
-        <translation>表示する属性の名前。このオプションはいくつでも指定することができ、各属性は指定した順に一行に一つずつ表示されます。属性の指定が無い場合は既定の属性の概要が表示されます。</translation>
+        <translation>表示する属性の名前。このオプションはいくつでも指定することができ、各属性は指定した順に一行に一つずつ表示されます。属性の指定がない場合は既定の属性の概要が表示されます。</translation>
     </message>
     <message>
         <source>attribute</source>
@@ -6134,10 +6142,6 @@ Available commands:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (行, 列) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – 推奨)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6228,10 +6232,6 @@ Available commands:
         <source>read password of the database from stdin</source>
         <translation>標準入力からデータベースのパスワードを読み込む</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>親ウィンドウの制御</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>KeePassXC の別インスタンスが既に起動しています。</translation>
@@ -6718,10 +6718,6 @@ CPU アーキテクチャー: %2
         <source>AES (%1 rounds)</source>
         <translation>AES (%1 回)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (%1 回, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256 ビット</translation>
@@ -6748,6 +6744,68 @@ CPU アーキテクチャー: %2
         <comment>seconds</comment>
         <translation><numerusform>%1 秒</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>カスタムローカル設定ファイルへのパス</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>警告: KeePassXC は将来的に、古いキーファイル
+形式をサポートしなくなる可能性があります。
+
+新しいキーファイルの生成を検討してください。</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 回, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 – 推奨)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>アイコン</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>サポートしていないバージョンのキーファイルです: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>チェックサムが一致しません！キーファイルが破損している可能性があります。</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>予期しないキーファイルデータです！キーファイルが破損している可能性があります。</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation><numerusform>%1 秒後にクリップボードを消去します…</numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>開いている全データベースをロックする</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>データベースをロックしました。</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>データベースのロックに失敗しました。</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7171,10 +7229,6 @@ CPU アーキテクチャー: %2
         <source>Search</source>
         <translation>検索</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>消去</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>選択したグループに検索対象を制限</translation>
@@ -7213,7 +7267,7 @@ CPU アーキテクチャー: %2
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If recycle bin is enabled for the database, entries will be moved to recycle bin directly. Otherwise, they will be deleted without confirmation.&lt;/p&gt;&lt;p&gt;You will still be prompted if any entries are referenced by others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;データベースのゴミ箱が有効になっている場合は、エントリーをゴミ箱に直接移動し、そうでない場合は確認無しで削除します。&lt;/p&gt;&lt;p&gt;エントリーが他から参照されている場合はプロンプトを表示します。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;データベースのゴミ箱が有効になっている場合は、エントリーをゴミ箱に直接移動し、そうでない場合は確認なしで削除します。&lt;/p&gt;&lt;p&gt;エントリーが他から参照されている場合はプロンプトを表示します。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Exposed database groups:</source>
@@ -7454,10 +7508,6 @@ CPU アーキテクチャー: %2
         <source>Could not write export container</source>
         <translation>コンテナを書き込めませんでした</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>予期しないエクスポートエラーが発生しました</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7525,10 +7575,6 @@ CPU アーキテクチャー: %2
         <source>File does not exist</source>
         <translation>ファイルが存在しません</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>不明な共有コンテナ形式です</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_ko.ts

@@ -137,7 +137,11 @@
     </message>
     <message>
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
-        <translation type="unfinished"/>
+        <translation>새 언어를 적용하려면 프로그램을 다시 시작해야 합니다. 지금 다시 시작하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>흑백</translation>
     </message>
 </context>
 <context>
@@ -342,15 +346,15 @@
     </message>
     <message>
         <source>Automatically save when locking database</source>
-        <translation type="unfinished"/>
+        <translation>데이터베이스를 잠글 때 자동으로 저장</translation>
     </message>
     <message>
         <source>Automatically save non-data changes when locking database</source>
-        <translation type="unfinished"/>
+        <translation>데이터베이스를 잠글 때 데이터 이외의 변경 사항 자동 저장</translation>
     </message>
     <message>
         <source>Tray icon type</source>
-        <translation type="unfinished"/>
+        <translation>트레이 아이콘 종류</translation>
     </message>
 </context>
 <context>
@@ -1114,6 +1118,14 @@ chrome-laptop.</translation>
         <source>Column %1</source>
         <translation>열 %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>아이콘</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1210,20 +1222,6 @@ Backup database located at %2</source>
         <source>Refresh</source>
         <translation>새로 고침</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>레거시 키 파일 형식</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>차후 버전에서 지원이 중단될 예정인 레거시 키 파일
-형식을 사용하고 있습니다.
-
-새 키 파일을 생성하는 것을 추천합니다.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>더 이상 이 경고 표시하지 않기</translation>
@@ -1284,14 +1282,6 @@ Please consider generating a new key file.</source>
         <source>TouchID for Quick Unlock</source>
         <translation>빠른 잠금 해제용 Touch ID</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>비우기</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>키 파일 비우기</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>잠금 해제 실패, 지정한 암호 없음</translation>
@@ -1362,6 +1352,14 @@ If you do not have a key file, please leave the field empty.</source>
         <source>Select hardware key…</source>
         <translation>하드웨어 키 선택...</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>이전 키 파일 형식</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>KeePassXC에서 차후에 지원을 중단할 수도 있는&lt;br&gt;이전 키 파일 형식을 사용하고 있습니다.&lt;br&gt;&lt;br&gt;다음 메뉴 항목을 사용하여 새 키 파일을 생성하기를 추천합니다:&lt;br&gt;&lt;strong&gt;데이터베이스 / 데이터베이스 보안 / 키 파일 변경&lt;/strong&gt;&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2294,6 +2292,16 @@ Disable safe saves and try again?</source>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[보호됨] 보거나 편집하려면 &quot;보이기&quot;를 누르십시오</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>잘못된 항목</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>외부 합치기 작업으로 인해서 이 항목은 더 이상 유효하지 않습니다.
+모든 변경 사항은 손실되었습니다.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2491,6 +2499,14 @@ Disable safe saves and try again?</source>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>HTTP Basic 인증에만 이 항목 사용</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>이 설정을 브라우저의 HTTP 인증 대화 상자로 보내지 않습니다. 이 옵션을 사용하면 HTTP 인증 대화 상자에서 이 항목을 숨깁니다.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>HTTP Basic 인증에 이 항목 사용하지 않기</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2613,6 +2629,10 @@ Disable safe saves and try again?</source>
         <source>Expires:</source>
         <translation>만료:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>항목 편집</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2913,6 +2933,10 @@ Supported extensions are: %1.</source>
         <source>Set default Auto-Type sequence</source>
         <translation>기본 자동 입력 순서 설정</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>그룹 편집</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3411,11 +3435,6 @@ Are you sure to add this file?</source>
         <source>[PROTECTED]</source>
         <translation>[보호됨]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>사용함</translation>
@@ -3436,6 +3455,15 @@ Are you sure to add this file?</source>
         <source>Advanced</source>
         <translation>고급</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>기본 시퀀스</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3446,18 +3474,6 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>보기 사용자 정의</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>사용자 이름 숨기기</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>암호 숨기기</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>창에 맞춤</translation>
@@ -3490,15 +3506,15 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>%1에 DBus 서비스를 등록할 수 없습니다.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%1에서 항목 %n개 사용함</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>%1에 DBus 서비스를 등록할 수 없습니다.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4322,10 +4338,6 @@ If this reoccurs, then your database file may be corrupt.</source>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;무작위 바이트가 들어 있는 키 파일을 추가하여 보안을 향상시킬 수 있습니다.&lt;/p&gt;&lt;p&gt;키 파일을 안전한 곳에 보관해야 하며 키 파일을 잃어버리면 데이터베이스에 접근할 수 없습니다!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>레거시 키 파일 형식</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4356,26 +4368,14 @@ Message: %2</source>
         <source>Select a key file</source>
         <translation>키 파일 선택</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>키 파일 선택</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>키 파일 찾아보기</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>찾아보기...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>새 키 파일 생성</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>메모: 변경될 수 있는 파일을 사용하면 나중에 데이터베이스의 잠금을 해제하지 못할 수도 있습니다!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>잘못된 키 파일</translation>
@@ -4395,14 +4395,24 @@ Are you sure you want to continue with this file?</source>
 이 파일을 그래도 사용하시겠습니까?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>차후 버전에서 지원이 중단될 예정인 레거시 키 파일
-형식을 사용하고 있습니다.
-
-데이터베이스 보안 설정에서 새 키 파일을 생성하는 것을 추천합니다.</translation>
+        <source>Old key file format</source>
+        <translation>이전 키 파일 형식</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>KeePassXC에서 차후에 지원을 중단할 수도 있는&lt;br&gt;이전 키 파일 형식을 사용하고 있습니다.&lt;br&gt;&lt;br&gt;새 키 파일을 생성하기를 추천합니다:</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>데이터베이스를 안전하게 보호할 수 있는 새 키 파일을 생성하거나 기존 파일을 선택할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>메모: 변경될 수 있는 파일을 사용하면 나중에 데이터베이스의 잠금을 해제하지 못할 수도 있습니다.</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>찾아보기...</translation>
     </message>
 </context>
 <context>
@@ -4849,23 +4859,35 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Perform Auto-Type Sequence</source>
-        <translation type="unfinished"/>
+        <translation>자동 입력 시퀀스 실행</translation>
     </message>
     <message>
         <source>{USERNAME}</source>
-        <translation type="unfinished"/>
+        <translation>{USERNAME}</translation>
     </message>
     <message>
         <source>{USERNAME}{ENTER}</source>
-        <translation type="unfinished"/>
+        <translation>{USERNAME}{ENTER}</translation>
     </message>
     <message>
         <source>{PASSWORD}</source>
-        <translation type="unfinished"/>
+        <translation>{PASSWORD}</translation>
     </message>
     <message>
         <source>{PASSWORD}{ENTER}</source>
-        <translation type="unfinished"/>
+        <translation>{PASSWORD}{ENTER}</translation>
+    </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>항상 위</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>사용자 이름 숨기기</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>암호 숨기기</translation>
     </message>
 </context>
 <context>
@@ -5391,10 +5413,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Hex</source>
         <translation>16진</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>제외할 글자: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>생성된 암호</translation>
@@ -5487,10 +5505,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>비우기</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>암호 다시 생성(%1)</translation>
@@ -5499,6 +5513,10 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Special Characters</source>
         <translation>특수 문자</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation>제외할 글자: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5737,16 +5755,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Perform advanced analysis on the password.</source>
         <translation>암호에 고급 분석을 시행합니다.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>경고: 차후 버전에서 지원이 중단될 예정인 레거시 키 파일
-형식을 사용하고 있습니다.
-
-새 키 파일을 생성하는 것을 추천합니다.</translation>
-    </message>
     <message>
         <source>
 
@@ -6134,10 +6142,6 @@ Available commands:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (줄, 칸) %2, %3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2(KDBX 4 – 추천)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF(KDBX 4)</translation>
@@ -6228,10 +6232,6 @@ Available commands:
         <source>read password of the database from stdin</source>
         <translation>표준 입력에서 데이터베이스 암호 읽기</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>부모 창 핸들</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>다른 KeePassXC 인스턴스가 이미 실행 중입니다.</translation>
@@ -6718,10 +6718,6 @@ CPU 아키텍처: %2
         <source>AES (%1 rounds)</source>
         <translation>AES(%1라운드)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2(%1라운드, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256비트</translation>
@@ -6748,6 +6744,68 @@ CPU 아키텍처: %2
         <comment>seconds</comment>
         <translation><numerusform>%1초</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>사용자 정의 로컬 설정 파일 경로</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>경고: KeePassXC에서 차후에 지원을 중단할 수도 있는
+이전 키 파일 형식을 사용하고 있습니다.
+
+새 키 파일을 생성하기를 추천합니다.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1(%2회, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d(KDBX 4 – 추천)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id(KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>아이콘</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>지원하지 않는 키 파일 버전: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>체크섬이 일치하지 않습니다! 키 파일이 손상되었을 수도 있습니다.</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>예상하지 못한 키 파일 데이터입니다! 키 파일이 손상되었을 수도 있습니다.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation><numerusform>%1초 후 클립보드를 지웁니다...</numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>모든 열린 데이터베이스 잠금</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>데이터베이스를 잠갔습니다.</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>데이터베이스를 잠글 수 없습니다.</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7171,10 +7229,6 @@ CPU 아키텍처: %2
         <source>Search</source>
         <translation>찾기</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>비우기</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>지정한 그룹에서만 찾기</translation>
@@ -7454,10 +7508,6 @@ CPU 아키텍처: %2
         <source>Could not write export container</source>
         <translation>내보내기 컨테이너에 기록할 수 없음</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>예상하지 못한 내보내기 오류</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7525,10 +7575,6 @@ CPU 아키텍처: %2
         <source>File does not exist</source>
         <translation>파일이 존재하지 않음</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>알 수 없는 공유 컨테이너 형식</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_lt.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -1105,6 +1109,14 @@ chrome-laptop.</source>
         <source>Column %1</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Piktograma</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1200,17 +1212,6 @@ Backup database located at %2</source>
         <source>Refresh</source>
         <translation>Įkelti iš naujo</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Daugiau neberodyti šio įspėjimo</translation>
@@ -1271,14 +1272,6 @@ Please consider generating a new key file.</source>
         <source>TouchID for Quick Unlock</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Išvalyti</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation type="unfinished"/>
@@ -1344,6 +1337,14 @@ If you do not have a key file, please leave the field empty.</source>
         <source>Select hardware key…</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2261,6 +2262,15 @@ Disable safe saves and try again?</source>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2458,6 +2468,14 @@ Disable safe saves and try again?</source>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2580,6 +2598,10 @@ Disable safe saves and try again?</source>
         <source>Expires:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2879,6 +2901,10 @@ Supported extensions are: %1.</source>
         <source>Set default Auto-Type sequence</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3372,11 +3398,6 @@ Are you sure to add this file?</source>
         <source>[PROTECTED]</source>
         <translation>[APSAUGOTA]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Įjungta</translation>
@@ -3397,6 +3418,15 @@ Are you sure to add this file?</source>
         <source>Advanced</source>
         <translation>Išplėstiniai</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3407,18 +3437,6 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Slėpti naudotojo vardus</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Slėpti slaptažodžius</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Priderinti prie lango</translation>
@@ -3451,15 +3469,15 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4279,10 +4297,6 @@ If this reoccurs, then your database file may be corrupt.</source>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4312,26 +4326,14 @@ Message: %2</source>
         <source>Select a key file</source>
         <translation>Pasirinkite rakto failą</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Naršyti...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation type="unfinished"/>
@@ -4350,10 +4352,23 @@ Are you sure you want to continue with this file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
+        <source>Old key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse…</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -4815,6 +4830,18 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>{PASSWORD}{ENTER}</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Slėpti naudotojo vardus</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Slėpti slaptažodžius</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5338,10 +5365,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Hex</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Generated password</source>
         <translation type="unfinished"/>
@@ -5434,10 +5457,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Išvalyti</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation type="unfinished"/>
@@ -5446,6 +5465,10 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Special Characters</source>
         <translation>Specialūs simboliai</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5684,13 +5707,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Perform advanced analysis on the password.</source>
         <translation>Atlikti išplėstinę slaptažodžio analizę</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>
 
@@ -6076,10 +6092,6 @@ Prieinamos komandos:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (eil., stulp.) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – rekomenduojama)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6170,10 +6182,6 @@ Prieinamos komandos:
         <source>read password of the database from stdin</source>
         <translation>nuskaityti duomenų bazės slaptažodį iš stdin</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Jau yra paleistas kitas KeePassXC egzempliorius.</translation>
@@ -6659,10 +6667,6 @@ Branduolys: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation type="unfinished"/>
@@ -6689,6 +6693,65 @@ Branduolys: %3 %4</translation>
         <comment>seconds</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Piktograma</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7112,10 +7175,6 @@ Branduolys: %3 %4</translation>
         <source>Search</source>
         <translation>Paieška</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Išvalyti</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Riboti paiešką iki pasirinktos grupės</translation>
@@ -7395,10 +7454,6 @@ Branduolys: %3 %4</translation>
         <source>Could not write export container</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Įvyko netikėta eksportavimo klaida</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7466,10 +7521,6 @@ Branduolys: %3 %4</translation>
         <source>File does not exist</source>
         <translation>Failo nėra</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_nl_NL.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation>Je moet de toepassing opnieuw starten om de nieuwe taal in te stellen. Wil je dat nu doen?</translation>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Monochroom</translation>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -928,7 +932,7 @@ chrome-laptop</translation>
     </message>
     <message>
         <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2 and %3. %4</source>
-        <translation>KeePassXC-Browser is nodig om de integratie met de browser te laten werken.  &lt;br /&gt; Download het voor %1 en %2 en %3. %4.</translation>
+        <translation>KeePassXC-Browser is nodig om de integratie met de browser te laten werken.  &lt;br /&gt; Download het voor %1 en %2 en %3. %4</translation>
     </message>
     <message>
         <source>Please see special instructions for browser extension use below</source>
@@ -1114,6 +1118,14 @@ chrome-laptop</translation>
         <source>Column %1</source>
         <translation>Kolom %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Pictogram</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1210,19 +1222,6 @@ Back-up databestand op %2</translation>
         <source>Refresh</source>
         <translation>Vernieuwen</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Verouderd sleutelbestandsformaat</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Je gebruikt een verouderd sleutelbestandsformaat dat in de toekomst niet ondersteund zal worden.
-
-Het is raadzaam om een nieuw sleutelbestand te genereren.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Deze waarschuwing niet meer geven</translation>
@@ -1283,14 +1282,6 @@ Het is raadzaam om een nieuw sleutelbestand te genereren.</translation>
         <source>TouchID for Quick Unlock</source>
         <translation>Touch ID voor snelle ontgrendeling</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Wissen</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Wis sleutelbestand</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Ontgrendeling mislukt en geen wachtwoord ingevoerd</translation>
@@ -1361,6 +1352,14 @@ Als je geen sleutelbestand hebt laat je het veld leeg.</translation>
         <source>Select hardware key…</source>
         <translation>Selecteer hardwaresleutel...</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Oud sleutelbestandsformaat</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>Je gebruikt een oude sleutelbestandsindeling die KeePassXC&lt;br&gt;in de toekomst mogelijk niet meer ondersteunt.&lt;br&gt;&lt;br&gt;Overweeg om een nieuw sleutelbestand te genereren bij:&lt;br&gt;&lt;strong&gt;Database / Databasebeveiliging / Sleutelbestand wijzigen.&lt;/strong&gt;&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2293,6 +2292,16 @@ Veilig opslaan uitschakelen en opnieuw proberen?</translation>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[BESCHERMD] Druk op Onthullen om te bekijken of te bewerken</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Ongeldige invoer</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>Een externe samenvoegbewerking heeft dit item ongeldig gemaakt.
+Helaas zijn alle aangebrachte wijzigingen verloren gegaan.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2490,6 +2499,14 @@ Veilig opslaan uitschakelen en opnieuw proberen?</translation>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Gebruik dit item alleen met HTTP Basic Auth</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>Stuur deze instelling niet naar de browser voor HTTP Auth-dialoogvensters. Indien ingeschakeld, zullen HTTP-authenticatiedialogen dit item niet tonen voor selectie.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Gebruik dit item niet met HTTP Basic Auth</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2612,6 +2629,10 @@ Veilig opslaan uitschakelen en opnieuw proberen?</translation>
         <source>Expires:</source>
         <translation>Verloopt:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Invoer bewerken</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2912,6 +2933,10 @@ Ondersteund zijn: %1.</translation>
         <source>Set default Auto-Type sequence</source>
         <translation>Standaard Auto-type tekenreeks instellen</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Groep bewerken</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3409,11 +3434,6 @@ Weet je zeker dat je dit bestand wilt toevoegen?</translation>
         <source>[PROTECTED]</source>
         <translation>[BEVEILIGD]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Geactiveerd</translation>
@@ -3434,6 +3454,15 @@ Weet je zeker dat je dit bestand wilt toevoegen?</translation>
         <source>Advanced</source>
         <translation>Geavanceerd</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Standaardreeks</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3444,18 +3473,6 @@ Weet je zeker dat je dit bestand wilt toevoegen?</translation>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Weergave aanpassen</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Gebruikersnamen verbergen</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Wachtwoorden verbergen</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Aanpassen aan venstergrootte</translation>
@@ -3488,15 +3505,15 @@ Weet je zeker dat je dit bestand wilt toevoegen?</translation>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>Kan DBus-service niet registreren op %1.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n Item is gebruikt door %1</numerusform><numerusform>%n Items zijn gebruikt door %1</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>Kan DBus-service niet registreren op %1.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4320,10 +4337,6 @@ Als dit vaker gebeurt, is het databasebestand mogelijk beschadigd.</translation>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Je kunt een sleutelbestand met willekeurige bytes toevoegen voor extra veiligheid.&lt;/p&gt; &lt;p&gt;Je moet het sleutelbestand geheim houden en nooit verliezen anders wordt je buitengesloten!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Verouderd sleutelbestandsformaat</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4354,26 +4367,14 @@ Bericht: %2</translation>
         <source>Select a key file</source>
         <translation>Kies een sleutelbestand</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Sleutelbestand</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Blader naar sleutelbestand</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Bladeren…</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Een nieuw sleutelbestand genereren</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Merk op: gebruik geen bestand dat kan veranderen; elke verandering maakt het ontgrendelen van je database onmogelijk!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Ongeldig sleutelbestand</translation>
@@ -4393,14 +4394,24 @@ Are you sure you want to continue with this file?</source>
 Weet je zeker dat je wilt doorgaan met dit bestand?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>Je gebruikt een verouderde sleutelbestandsindeling die in de toekomst
-mogelijk niet wordt ondersteund.
-
-Genereer een nieuw sleutelbestand in de beveiligingsinstellingen van de database.</translation>
+        <source>Old key file format</source>
+        <translation>Oud sleutelbestandsformaat</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>Je hebt een sleutelbestand in een oud formaat geselecteerd dat KeePassXC in de toekomst mogelijk niet meer ondersteunt.&lt;br&gt;&lt;br&gt;Overweeg in plaats daarvan een nieuw sleutelbestand te genereren.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>Genereer een nieuw sleutelbestand of kies een bestaand bestand om de database te beschermen.</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>Opmerking: gebruik GEEN bestand dat kan veranderen, omdat ertoe kan leiden dat de database niet ontgrendeld kan worden.</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Bladeren…</translation>
     </message>
 </context>
 <context>
@@ -4866,6 +4877,18 @@ Wil je KeePassXC nu opnieuw opstarten?</translation>
         <source>{PASSWORD}{ENTER}</source>
         <translation>{WACHTWOORD}{ENTER}</translation>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Altijd bovenop</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Gebruikersnamen verbergen</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Wachtwoorden verbergen</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5390,10 +5413,6 @@ Wil je KeePassXC nu opnieuw opstarten?</translation>
         <source>Hex</source>
         <translation>Hex</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Niet te gebruiken karakters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Gegenereerd wachtwoord</translation>
@@ -5486,10 +5505,6 @@ Wil je KeePassXC nu opnieuw opstarten?</translation>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Wissen</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Òpnieuw genereren (%1)</translation>
@@ -5498,6 +5513,10 @@ Wil je KeePassXC nu opnieuw opstarten?</translation>
         <source>Special Characters</source>
         <translation>Speciale tekens</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation>Uitgesloten tekens: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5736,15 +5755,6 @@ Wil je KeePassXC nu opnieuw opstarten?</translation>
         <source>Perform advanced analysis on the password.</source>
         <translation>Geavanceerde analyse op het wachtwoord uitvoeren.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>WAARSCHUWING: Je gebruikt een verouderd sleutelbestandsformaat dat in de toekomst mogelijk niet ondersteund zal worden.
-
-Het is raadzaam om een nieuw sleutelbestand te genereren.</translation>
-    </message>
     <message>
         <source>
 
@@ -6132,10 +6142,6 @@ Beschikbare opdrachten:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (rij, col) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – aanbevolen)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6226,10 +6232,6 @@ Beschikbare opdrachten:
         <source>read password of the database from stdin</source>
         <translation>lees wachtwoord van de database uit stdin</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Parent window handle</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Een andere instantie van KeePassXC is reeds actief.</translation>
@@ -6716,10 +6718,6 @@ Kernelversie: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation>AES (%1 iteraties)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (%1 iteraties, %2 kB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-bit</translation>
@@ -6746,6 +6744,68 @@ Kernelversie: %3 %4</translation>
         <comment>seconds</comment>
         <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>pad naar een aangepast lokaal configuratiebestand</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>WAARSCHUWING: Je gebruikt een oud sleutelbestandsformaat dat KeePassXC
+in de toekomst mogelijk niet meer kan ondersteunen.
+
+Overweeg om een nieuw sleutelbestand te genereren.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 cycli, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 – aanbevolen)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Pictogram</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Niet-ondersteunde sleutelbestandversie: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>Checksum komt niet overeen! Sleutelbestand is mogelijk beschadigd.</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>Onverwachte sleutelbestandgegevens! Sleutelbestand is mogelijk beschadigd.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation><numerusform>Het klembord wissen in %1 seconde(n)…</numerusform><numerusform>Het klembord wissen in %1 seconde(n)…</numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>alle databases vergrendelen</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>Vergrendelde databases.</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>Database kan niet worden vergrendeld.</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7169,10 +7229,6 @@ Kernelversie: %3 %4</translation>
         <source>Search</source>
         <translation>Zoeken</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Wissen</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Beperk het zoeken tot de geselecteerde groep</translation>
@@ -7452,10 +7508,6 @@ Kernelversie: %3 %4</translation>
         <source>Could not write export container</source>
         <translation>Kan niet schrijven naar export-container</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Onverwachte fout bij het exporteren</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7523,10 +7575,6 @@ Kernelversie: %3 %4</translation>
         <source>File does not exist</source>
         <translation>Bestand bestaat niet</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Type van deel-container is onbekend</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_pl.ts

@@ -137,7 +137,11 @@
     </message>
     <message>
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
-        <translation>Musisz zrestartować aplikację, aby ustawić nowy język. Czy chcesz teraz zrestartować?</translation>
+        <translation>Musisz uruchomić ponownie aplikację, aby ustawić nowy język. Czy chcesz teraz to zrobić?</translation>
+    </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Monochromatyczny</translation>
     </message>
 </context>
 <context>
@@ -486,7 +490,7 @@
     </message>
     <message>
         <source>KeePassXC requires the Accessibility permission in order to perform entry level Auto-Type. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation>KeePassXC wymaga uprawnienia Dostępności w celu wykonania autowpisywania na poziomie podstawowym. Jeśli już udzieliłeś uprawnienia, być może będziesz musiał zrestartować KeePassXC.</translation>
+        <translation>KeePassXC wymaga uprawnienia dostępności w celu wykonania podstawowego autowpisywania. Jeśli już udzielono uprawnienia, być może będzie wymagane ponowne uruchomienie KeePassXC.</translation>
     </message>
 </context>
 <context>
@@ -542,7 +546,7 @@
     </message>
     <message>
         <source>KeePassXC requires the Accessibility and Screen Recorder permission in order to perform global Auto-Type. Screen Recording is necessary to use the window title to find entries. If you already granted permission, you may have to restart KeePassXC.</source>
-        <translation>KeePassXC wymaga uprawnień Dostępności i Rejestratora ekranu w celu wykonania globalnego autowpisywania. Nagrywanie ekranu jest konieczne, aby użyć tytułu okna do odnajdywania wpisów. Jeśli już udzieliłeś uprawnień, być może będziesz musiał zrestartować KeePassXC.</translation>
+        <translation>KeePassXC wymaga uprawnień dostępności i rejestratora ekranu w celu wykonania globalnego autowpisywania. Nagrywanie ekranu jest konieczne, aby użyć tytułu okna do odnajdywania wpisów. Jeśli już udzielono uprawnień, być może będzie wymagane ponowne uruchomienie KeePassXC.</translation>
     </message>
 </context>
 <context>
@@ -1114,6 +1118,14 @@ chrome-laptop.</translation>
         <source>Column %1</source>
         <translation>Kolumna %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ikona</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1210,20 +1222,6 @@ Zapasowa baza danych znajduje się w %2</translation>
         <source>Refresh</source>
         <translation>Odśwież</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Przestarzały format pliku klucza</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Używasz przestarzałego formatu pliku klucza, który może nie być
-obsługiwany w przyszłości.
-
-Proszę rozważyć wygenerowanie nowego pliku klucza.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Nie wyświetlaj ponownie tego ostrzeżenia</translation>
@@ -1284,14 +1282,6 @@ Proszę rozważyć wygenerowanie nowego pliku klucza.</translation>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID do szybkiego odblokowania</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Wyczyść</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Wyczyść plik klucza</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Odblokowanie nie powiodło się i nie podano hasła</translation>
@@ -1362,6 +1352,14 @@ Jeśli nie masz pliku klucza, pozostaw puste pole.</translation>
         <source>Select hardware key…</source>
         <translation>Wybierz klucz sprzętowy…</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Stary format pliku klucza</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>Używasz starego formatu pliku klucza, który KeePassXC może&lt;br&gt;przestać obsługiwać w przyszłości.&lt;br&gt;&lt;br&gt;Rozważ wygenerowanie nowego pliku klucza, przechodząc do:&lt;br&gt;&lt;strong&gt;Baza danych / Bezpieczeństwo bazy danych / Zmień plik klucza.&lt;/strong&gt;&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2295,6 +2293,16 @@ Wyłączyć bezpieczne zapisywanie i spróbować ponownie?</translation>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[CHRONIONE] Wciśnij Odsłoń, aby zobaczyć albo edytować</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Nieprawidłowy wpis</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>Zewnętrzna operacja scalania unieważniła ten wpis.
+Niestety, wszelkie wprowadzone zmiany zostały utracone.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2492,6 +2500,14 @@ Wyłączyć bezpieczne zapisywanie i spróbować ponownie?</translation>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Użyj tego wpisu tylko w przypadku podstawowego uwierzytelniania HTTP</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>Nie wysyłaj tego ustawienia do przeglądarki w przypadku okien dialogowych uwierzytelniania HTTP. Jeśli jest włączone, okna dialogowe uwierzytelniania HTTP nie będą pokazywać tego wpisu do wyboru.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Nie używaj tego wpisu z podstawowym uwierzytelnianiem HTTP</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2614,6 +2630,10 @@ Wyłączyć bezpieczne zapisywanie i spróbować ponownie?</translation>
         <source>Expires:</source>
         <translation>Wygasa:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Edytuj wpis</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2914,6 +2934,10 @@ Obsługiwane rozszerzenia to: %1.</translation>
         <source>Set default Auto-Type sequence</source>
         <translation>Ustaw domyślną sekwencję autowpisywania</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Edytuj grupę</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3415,11 +3439,6 @@ Czy na pewno chcesz dodać ten plik?</translation>
         <source>[PROTECTED]</source>
         <translation>[CHRONIONE]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Włączone</translation>
@@ -3440,6 +3459,15 @@ Czy na pewno chcesz dodać ten plik?</translation>
         <source>Advanced</source>
         <translation>Zaawansowane</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Sekwencja domyślna</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3450,18 +3478,6 @@ Czy na pewno chcesz dodać ten plik?</translation>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Dostosuj widok</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Ukryj użytkowników</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Ukryj hasła</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Dopasuj do okna</translation>
@@ -3494,15 +3510,15 @@ Czy na pewno chcesz dodać ten plik?</translation>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>Rejestracja usługi DBus w %1 nie powiodła się.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n wpis był używany przez %1</numerusform><numerusform>%n wpisy były używane przez %1</numerusform><numerusform>%n wpisów było używanych przez %1</numerusform><numerusform>%n wpisów było używanych przez %1</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>Rejestracja usługi DBus w %1 nie powiodła się.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4326,10 +4342,6 @@ Jeśli wystąpi to ponownie, plik bazy danych może być uszkodzony.</translatio
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Możesz dodać plik klucza zawierający losowe bajty do zwiększenia bezpieczeństwa.&lt;/p&gt;&lt;p&gt;Musisz trzymać go w tajemnicy i nigdy go nie stracić, bo zostaniesz zablokowany!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Przestarzały format pliku klucza</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4360,26 +4372,14 @@ Komunikat: %2</translation>
         <source>Select a key file</source>
         <translation>Wybierz plik klucza</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Wybór pliku klucza</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Przeglądaj plik klucza</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Przeglądaj...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Generuj nowy plik klucza</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Uwaga: nie należy używać pliku, który może ulec zmianie, ponieważ uniemożliwi to odblokowanie bazy danych!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Nieprawidłowy plik klucza</translation>
@@ -4399,14 +4399,24 @@ Are you sure you want to continue with this file?</source>
 Czy na pewno chcesz kontynuować z tym plikiem?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>Używasz przestarzałego formatu pliku klucza, który może nie być
-obsługiwany w przyszłości.
-
-Wygeneruj nowy plik klucza w ustawieniach bezpieczeństwa bazy danych.</translation>
+        <source>Old key file format</source>
+        <translation>Stary format pliku klucza</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>Wybrano plik klucza w starym formacie, który KeePassXC&lt;br&gt;może przestać obsługiwać w przyszłości.&lt;br&gt;&lt;br&gt;Zamiast tego warto rozważyć wygenerowanie nowego pliku klucza.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>Wygeneruj nowy plik klucza lub wybierz istniejący, aby chronić bazę danych.</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>Uwaga: NIE używaj pliku, który może się zmienić, ponieważ uniemożliwi to odblokowanie bazy danych.</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Przeglądaj…</translation>
     </message>
 </context>
 <context>
@@ -4844,11 +4854,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Restart Application?</source>
-        <translation>Zrestartować aplikację?</translation>
+        <translation>Uruchomić ponownie aplikację?</translation>
     </message>
     <message>
         <source>You must restart the application to apply this setting. Would you like to restart now?</source>
-        <translation>Musisz zrestartować aplikację, aby zastosować to ustawienie. Czy chcesz teraz zrestartować?</translation>
+        <translation>Musisz uruchomić ponownie aplikację, aby zastosować to ustawienie. Czy chcesz teraz to zrobić?</translation>
     </message>
     <message>
         <source>Perform Auto-Type Sequence</source>
@@ -4870,6 +4880,18 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>{PASSWORD}{ENTER}</source>
         <translation>{HASŁO}{ENTER}</translation>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Zawsze na wierzchu</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Ukryj użytkowników</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Ukryj hasła</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5394,10 +5416,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Hex</source>
         <translation>Heksadecymalne</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Wykluczone znaki: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Wygenerowane hasło</translation>
@@ -5490,10 +5508,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Wyczyść</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Wygeneruj ponownie hasło (%1)</translation>
@@ -5502,6 +5516,10 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Special Characters</source>
         <translation>Znaki specjalne</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation>Wykluczone znaki: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5740,16 +5758,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Perform advanced analysis on the password.</source>
         <translation>Wykonaj zaawansowaną analizę hasła.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>OSTRZEŻENIE: Używasz przestarzałego formatu pliku klucza, który może być
-nieobsługiwany w przyszłości.
-
-Proszę rozważyć wygenerowanie nowego pliku klucza.</translation>
-    </message>
     <message>
         <source>
 
@@ -6137,10 +6145,6 @@ Dostępne polecenia:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (rząd, kolumna) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – zalecany)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6231,10 +6235,6 @@ Dostępne polecenia:
         <source>read password of the database from stdin</source>
         <translation>odczytaj hasło bazy danych z stdin</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Uchwyt okna nadrzędnego</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Inna instancja KeePassXC jest już uruchomiona.</translation>
@@ -6721,10 +6721,6 @@ Jądro: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation>AES (rundy: %1)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (rundy: %1, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-bitowy</translation>
@@ -6751,6 +6747,68 @@ Jądro: %3 %4</translation>
         <comment>seconds</comment>
         <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>ścieżka do lokalnego pliku z ustawieniami</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>OSTRZEŻENIE: Używasz starego formatu pliku klucza, który może nie być
+obsługiwany przez KeePassXC w przyszłości.
+
+Rozważ wygenerowanie nowego pliku klucza.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 rundy, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 – zalecany)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ikona</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Nieobsługiwana wersja pliku klucza: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>Niezgodność sumy kontrolnej! Plik klucza może być uszkodzony.</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>Nieoczekiwane dane pliku klucza! Plik klucza może być uszkodzony.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation><numerusform>Czyszczenie schowka za %1 sekundę…</numerusform><numerusform>Czyszczenie schowka za %1 sekundy…</numerusform><numerusform>Czyszczenie schowka za %1 sekund…</numerusform><numerusform>Czyszczenie schowka za %1 sekund…</numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>zablokuj wszystkie otwarte bazy danych</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>Zablokowane bazy danych.</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>Nie udało się zablokować bazy danych.</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7174,10 +7232,6 @@ Jądro: %3 %4</translation>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Wyczyść</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Ogranicz wyszukiwanie do wybranych grup</translation>
@@ -7457,10 +7511,6 @@ Jądro: %3 %4</translation>
         <source>Could not write export container</source>
         <translation>Nie można zapisać kontenera eksportu</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Wystąpił nieoczekiwany błąd eksportu</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7528,10 +7578,6 @@ Jądro: %3 %4</translation>
         <source>File does not exist</source>
         <translation>Plik nie istnieje</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Nieznany typ kontenera udostępniania</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_pt_BR.ts

@@ -137,7 +137,11 @@
     </message>
     <message>
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
-        <translation type="unfinished"/>
+        <translation>Você precisa reiniciar o aplicativo para aplicar o novo idioma. Você gostaria de reiniciar agora?</translation>
+    </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Monocromático</translation>
     </message>
 </context>
 <context>
@@ -342,15 +346,15 @@
     </message>
     <message>
         <source>Automatically save when locking database</source>
-        <translation type="unfinished"/>
+        <translation>Salvar automaticamente ao bloquear banco de dados</translation>
     </message>
     <message>
         <source>Automatically save non-data changes when locking database</source>
-        <translation type="unfinished"/>
+        <translation>Salvar automaticamente alterações que não são de dados ao bloquear banco de dados</translation>
     </message>
     <message>
         <source>Tray icon type</source>
-        <translation type="unfinished"/>
+        <translation>Tipo de ícone da área de notificação</translation>
     </message>
 </context>
 <context>
@@ -1114,6 +1118,14 @@ chrome-laptop</translation>
         <source>Column %1</source>
         <translation>Coluna %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ícone</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1210,19 +1222,6 @@ Backup do banco de dados alocado em %2</translation>
         <source>Refresh</source>
         <translation>Atualizar</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Formato de chave antigo</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Você está usando um formato de arquivo de chave legado que pode tornar-se sem suporte no futuro.
-
-Por favor, considere-se gerar um novo arquivo de chave.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Não mostrar este alerta novamente</translation>
@@ -1283,14 +1282,6 @@ Por favor, considere-se gerar um novo arquivo de chave.</translation>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID para destrancar rapidamente</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Limpar</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Limpar arquivo-chave</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Destrancar falhou e nenhuma senha foi digitada</translation>
@@ -1361,6 +1352,14 @@ Se você não tem um arquivo-chave, por favor deixe o campo vazio.</translation>
         <source>Select hardware key…</source>
         <translation>Selecionar chave física...</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Formato antigo de arquivo de chave</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>Você está usando um formato de arquivo-chave antigo, que o KeePassXC pode &lt;br&gt;parar de suportar no futuro.&lt;br&gt;&lt;br&gt;Por favor, considere gerar um novo arquivo-chave acessando:&lt;br&gt;&lt;strong&gt;Banco de Dados / Segurança do Banco de Dados / Alterar Arquivo-Chave.&lt;/strong&gt;&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2294,6 +2293,16 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[PROTEGIDO] Pressione Revelar para visualizar ou editar</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Entrada Inválida</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>Uma operação de mesclagem externa invalidou esta entrada.
+Infelizmente, todas as alterações feitas foram perdidas.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2491,6 +2500,14 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Usar esta entrada somente com Autenticação HTTP Básica</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>Não envia esta configuração para o navegador para caixas de diálogo de Autenticação HTTP. Se ativado, as caixas de diálogo de Autenticação HTTP não mostrarão esta entrada para seleção.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Não usar esta entrada com Autenticação HTTP Básica</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2613,6 +2630,10 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
         <source>Expires:</source>
         <translation>Expira em:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Editar Entrada</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2913,6 +2934,10 @@ Extensões suportadas são: %1</translation>
         <source>Set default Auto-Type sequence</source>
         <translation>Configurar sequência padrão de Auto-Digitar</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Editar Grupo</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3412,11 +3437,6 @@ Você deseja realmente adicionar este arquivo?</translation>
         <source>[PROTECTED]</source>
         <translation>[PROTEGIDO]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Habilitado</translation>
@@ -3437,6 +3457,15 @@ Você deseja realmente adicionar este arquivo?</translation>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Sequência Padrão</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3447,18 +3476,6 @@ Você deseja realmente adicionar este arquivo?</translation>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Visualização Personalizada</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Ocultar nome de usuários</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Ocultar senhas</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Ajustar à janela</translation>
@@ -3491,15 +3508,15 @@ Você deseja realmente adicionar este arquivo?</translation>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>Falha ao registrar serviço DBus em %1.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n entrada foi usada por %1</numerusform><numerusform>%n entradas foram usadas por %1</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>Falha ao registrar serviço DBus em %1.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4323,10 +4340,6 @@ Se este erro ocorrer novamente, seu banco de dados pode estar corrompido.</trans
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Você pode adicionar um arquivo de chave contendo bytes aleatórios para segurança adicional.&lt;/p&gt;&lt;p&gt;Você deve mantê-lo em segredo e nunca perdê-lo ou você será bloqueado!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Formato de chave antigo</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4357,26 +4370,14 @@ Mensagem: %2</translation>
         <source>Select a key file</source>
         <translation>Escolha um arquivo-chave</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Seleção do arquivo-chave</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Procurar por arquivo-chave</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Procurar...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Gerar um novo arquivo-chave</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Nota: Não use um arquivo que possa ser modificado, pois isso irá impedir que você destranque seu banco de dados!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Arquivo-chave inválido</translation>
@@ -4396,15 +4397,24 @@ Are you sure you want to continue with this file?</source>
 Tem certeza que deseja continuar com este arquivo?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>Você está usando um formato de arquivo de chave legado
-que pode perder o suporte no futuro.
-
-Por favor, considere gerar um novo arquivo de chave nas
-configurações de segurança do banco de dados.</translation>
+        <source>Old key file format</source>
+        <translation>Formato antigo de arquivo de chave</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>Você selecionou um arquivo-chave em um formato antigo que o KeePassXC&lt;br&gt;pode parar de suportar no futuro.&lt;br&gt;&lt;br&gt;Por favor, considere-se gerar um novo arquivo-chave.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>Gere um novo arquivo-chave ou escolha um existente para proteger o seu banco de dados.</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>Nota: Não use um arquivo que possa ser modificado, pois isso irá impedir que você desbloqueie seu banco de dados.</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Navegar...</translation>
     </message>
 </context>
 <context>
@@ -4851,23 +4861,35 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
     </message>
     <message>
         <source>Perform Auto-Type Sequence</source>
-        <translation type="unfinished"/>
+        <translation>Realizar Sequência de Auto-Digitação</translation>
     </message>
     <message>
         <source>{USERNAME}</source>
-        <translation type="unfinished"/>
+        <translation>{USERNAME}</translation>
     </message>
     <message>
         <source>{USERNAME}{ENTER}</source>
-        <translation type="unfinished"/>
+        <translation>{USERNAME}{ENTER}</translation>
     </message>
     <message>
         <source>{PASSWORD}</source>
-        <translation type="unfinished"/>
+        <translation>{PASSWORD}</translation>
     </message>
     <message>
         <source>{PASSWORD}{ENTER}</source>
-        <translation type="unfinished"/>
+        <translation>{PASSWORD}{ENTER}</translation>
+    </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Sempre no Topo</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Ocultar nome de usuários</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Ocultar senhas</translation>
     </message>
 </context>
 <context>
@@ -5393,10 +5415,6 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
         <source>Hex</source>
         <translation>Hex</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Caracteres excluídos: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Senha geradas</translation>
@@ -5489,10 +5507,6 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Limpar</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Regenerar senha (%1)</translation>
@@ -5501,6 +5515,10 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
         <source>Special Characters</source>
         <translation>Caracteres Especiais</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5739,15 +5757,6 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
         <source>Perform advanced analysis on the password.</source>
         <translation>Execute análise avançada sobre a senha.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Aviso: Você está usando um formato de arquivo de chave legado que pode tornar-se sem suporte no futuro.
-
-Por favor, considere gerar um novo arquivo de chave.</translation>
-    </message>
     <message>
         <source>
 
@@ -6135,10 +6144,6 @@ Comandos disponíveis:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (linha, coluna) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – recomendado)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6229,10 +6234,6 @@ Comandos disponíveis:
         <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>Parent window handle</source>
-        <translation>Identificador de janela pai</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Outra instância do KeePassXC já está rodando.</translation>
@@ -6718,10 +6719,6 @@ Kernel: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation>AES (%1 rodadas)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (%1 rodadas, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-bit</translation>
@@ -6748,6 +6745,68 @@ Kernel: %3 %4</translation>
         <comment>seconds</comment>
         <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>caminho para um arquivo de configuração local personalizado</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>AVISO: Você está usando um formato de arquivo-chave antigo que o KeePassXC pode.
+parar de suportar no futuro
+
+Por favor, considere gerar um novo arquivo-chave.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 rodadas, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 – recomendado)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ícone</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Versão de arquivo-chave não suportada: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>Erro de checksum! O arquivo-chave pode estar corrompido.</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>Dados inesperados do arquivo-chave! Ele pode estar corrompido.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>bloquear todas os bancos de dados abertas</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>Bancos de dados bloqueados.</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>Falha ao bloquear banco de dados.</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7171,10 +7230,6 @@ Kernel: %3 %4</translation>
         <source>Search</source>
         <translation>Pesquisar</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Limpar</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Limitar busca ao grupo selecionado</translation>
@@ -7454,10 +7509,6 @@ Kernel: %3 %4</translation>
         <source>Could not write export container</source>
         <translation>Não foi possível escrever o recipiente de exportação</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Ocorreu um erro de exportação inesperado</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7525,10 +7576,6 @@ Kernel: %3 %4</translation>
         <source>File does not exist</source>
         <translation>Arquivo não existe</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Tipo de compartilhamento de recipiente desconhecido</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_pt_PT.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation>Tem que reiniciar a aplicação para aplicar o novo idioma. Reiniciar agora?</translation>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Monocromático</translation>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -854,7 +858,7 @@ chrome-laptop</translation>
     </message>
     <message>
         <source>Do not prompt for KeePassHTTP settings migration.</source>
-        <translation>Não perguntar para migrar as definições KeePassHTTP</translation>
+        <translation>Não perguntar para migrar as definições KeePassHTTP.</translation>
     </message>
     <message>
         <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
@@ -924,7 +928,7 @@ chrome-laptop</translation>
     </message>
     <message>
         <source>Due to Snap sandboxing, you must run a script to enable browser integration.&lt;br /&gt;You can obtain this script from %1</source>
-        <translation>Devido a &apos;Snap sandboxing&apos;, tem que executar um script para ativar a integração com o navegador.&lt;br /&gt;Pode obter o script em %1.</translation>
+        <translation>Devido a &apos;Snap sandboxing&apos;, tem que executar um script para ativar a integração com o navegador.&lt;br /&gt;Pode obter o script em %1</translation>
     </message>
     <message>
         <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2 and %3. %4</source>
@@ -1114,6 +1118,14 @@ chrome-laptop</translation>
         <source>Column %1</source>
         <translation>Coluna %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ícone</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1210,20 +1222,6 @@ Backup localizado em %2</translation>
         <source>Refresh</source>
         <translation>Recarregar</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Ficheiro-chave no formato legado</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Está a utilizar um formato legado que pode, no futuro, deixar
-de ser suportado.
-
-Deve considerar a geração de um novo ficheiro-chave.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Não mostrar novamente</translation>
@@ -1284,14 +1282,6 @@ Deve considerar a geração de um novo ficheiro-chave.</translation>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID para desbloqueio rápido</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Limpar</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Limpar ficheiro-chave</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Não foi possível desbloquear - palavra-passe não introduzida</translation>
@@ -1362,6 +1352,14 @@ Se não quiser utilizar um ficheiro-chave, deixe este campo em branco.</translat
         <source>Select hardware key…</source>
         <translation>Selecione a chave de hardware...</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Formato de ficheiro-chave antigo</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>Está a utilizar um formato de ficheiro-chave antigo que KeePassXC pode&lt;br&gt;deixar de ter suporte no futuro.&lt;br&gt;&lt;br&gt;Por favor considere a geração de um novo ficheiro-chave em:&lt;br&gt;&lt;strong&gt;Base de dados -&gt; Segurança da base de dados -&gt; Alterar ficheiro-chave.&lt;/strong&gt;&lt;br&gt;</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2295,6 +2293,16 @@ Desativar salvaguardas e tentar novamente?</translation>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[PROTEGIDA] Por favor revele para ver ou editar</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Entrada inválida</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>Uma operação externa de combinação invalidou esta entrada.
+Infelizmente, quaisquer alterações efetuadas foram perdidas.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2492,6 +2500,14 @@ Desativar salvaguardas e tentar novamente?</translation>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Apenas utilizar esta entrada com HTTP Basic Auth</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>Não enviar esta definição para o navegador em diálogos de HTTP Auth. Se ativa, as caixas de diálogo HTTP Auth não mostrarão esta entrada.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Não utilizar esta entrada com HTTP Basic Auth</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2614,6 +2630,10 @@ Desativar salvaguardas e tentar novamente?</translation>
         <source>Expires:</source>
         <translation>Caduca:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Editar entrada</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2914,6 +2934,10 @@ As extensões suportadas são: %1.</translation>
         <source>Set default Auto-Type sequence</source>
         <translation>Definir sequência padrão para escrita automática</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Editar grupo</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3413,11 +3437,6 @@ Tem a certeza de que deseja adicionar este ficheiro?</translation>
         <source>[PROTECTED]</source>
         <translation>[PROTEGIDA]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Ativada</translation>
@@ -3438,6 +3457,15 @@ Tem a certeza de que deseja adicionar este ficheiro?</translation>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Sequência padrão</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3448,18 +3476,6 @@ Tem a certeza de que deseja adicionar este ficheiro?</translation>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Personalizar vista</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Ocultar nome de utilizador</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Ocultar palavras-passe</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Ajustar à janela</translation>
@@ -3492,15 +3508,15 @@ Tem a certeza de que deseja adicionar este ficheiro?</translation>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>Não foi possível registar o serviços DBus em %1.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n entrada foi utilizada por %1</numerusform><numerusform>%n entradas foram utilizadas por %1</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>Não foi possível registar o serviços DBus em %1.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4324,10 +4340,6 @@ Caso isto volte a acontecer, pode ser que a base de dados esteja danificada.</tr
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Para mais segurança, pode adicionar um ficheiro-chave que contenha dados aleatórios.&lt;/p&gt;&lt;p&gt;Tem de o manter secreto e não o pode perder pois se tal acontecer, nunca mais conseguirá abrir a base de dados.&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Ficheiro-chave no formato legado</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4358,26 +4370,14 @@ Mensagem: %2</translation>
         <source>Select a key file</source>
         <translation>Selecione o ficheiro-chave</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Seleção do ficheiro-chave</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Procurar ficheiro-chave</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Explorar...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Gerar um novo ficheiro-chave</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>AVISO: Não utilize um ficheiro que possa ser alterado pois deixará de conseguir desbloquear a sua base de dados!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Ficheiro-chave inválido</translation>
@@ -4397,14 +4397,24 @@ Are you sure you want to continue with this file?</source>
 Tem a certeza de que deseja utilizar este ficheiro?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>Está a utilizar um formato legado que pode, no futuro, deixar
-de ser suportado.
-
-Deve gerar um novo ficheiro-chave nas definições da base de dados.</translation>
+        <source>Old key file format</source>
+        <translation>Formato de ficheiro-chave antigo</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>Está a utilizar um formato de ficheiro-chave antigo que KeePassXC pode &lt;br&gt;deixar de ter suporte no futuro.&lt;br&gt;&lt;br&gt;Deve considerar a geração de um novo ficheiro-chave.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>Gere um novo ficheiro-chave ou escolha um existente para proteger a sua base de dados.</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>Atenção: não utilize um ficheiro que pode ser alterado porque, se o fizer, deixará de ter acesso à base de dados.</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Procurar...</translation>
     </message>
 </context>
 <context>
@@ -4647,11 +4657,11 @@ Pode encontrar erros graves e esta versão não deve ser utilizada em ambientes
     </message>
     <message>
         <source>&amp;Save Database</source>
-        <translation>Guardar base de dado&amp;s...</translation>
+        <translation>Guardar base de dado&amp;s</translation>
     </message>
     <message>
         <source>&amp;Close Database</source>
-        <translation>Fe&amp;char base de dados...</translation>
+        <translation>Fe&amp;char base de dados</translation>
     </message>
     <message>
         <source>&amp;New Database…</source>
@@ -4687,7 +4697,7 @@ Pode encontrar erros graves e esta versão não deve ser utilizada em ambientes
     </message>
     <message>
         <source>Download All &amp;Favicons…</source>
-        <translation>Descarregar todos os &apos;favicons&apos;...</translation>
+        <translation>Descarregar todos os &apos;&amp;favicons&apos;...</translation>
     </message>
     <message>
         <source>Sa&amp;ve Database As…</source>
@@ -4703,7 +4713,7 @@ Pode encontrar erros graves e esta versão não deve ser utilizada em ambientes
     </message>
     <message>
         <source>Statistics, health check, etc.</source>
-        <translation>Estatísticas, verificações...</translation>
+        <translation>Estatísticas, verificações, etc.</translation>
     </message>
     <message>
         <source>&amp;Database Settings…</source>
@@ -4869,6 +4879,18 @@ Pode encontrar erros graves e esta versão não deve ser utilizada em ambientes
         <source>{PASSWORD}{ENTER}</source>
         <translation>{Palavra-passe}{ENTER}</translation>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Sempre na frente</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Ocultar nome de utilizador</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Ocultar palavras-passe</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5232,7 +5254,7 @@ Pode encontrar erros graves e esta versão não deve ser utilizada em ambientes
     </message>
     <message>
         <source>Warning: Caps Lock enabled!</source>
-        <translation>Aviso: Caps Lock ativado</translation>
+        <translation>Aviso: Caps Lock ativado!</translation>
     </message>
 </context>
 <context>
@@ -5393,10 +5415,6 @@ Pode encontrar erros graves e esta versão não deve ser utilizada em ambientes
         <source>Hex</source>
         <translation>Hex</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Caracteres excluídos: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Palavra-passe gerada</translation>
@@ -5489,10 +5507,6 @@ Pode encontrar erros graves e esta versão não deve ser utilizada em ambientes
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Limpar</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Recriar palavra-passe (%1)</translation>
@@ -5501,6 +5515,10 @@ Pode encontrar erros graves e esta versão não deve ser utilizada em ambientes
         <source>Special Characters</source>
         <translation>Caracteres especiais</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation>Caracteres excluídos: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5739,16 +5757,6 @@ Pode encontrar erros graves e esta versão não deve ser utilizada em ambientes
         <source>Perform advanced analysis on the password.</source>
         <translation>Executar análise avançada da palavra-passe.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>AVISO: está a utilizar um formato legado que pode, no futuro, deixar
-de ser suportado.
-
-Deve considerar a geração de uma novo ficheiro-chave.</translation>
-    </message>
     <message>
         <source>
 
@@ -6136,10 +6144,6 @@ Comandos disponíveis:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (linha, coluna) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – recomendado)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6230,10 +6234,6 @@ Comandos disponíveis:
         <source>read password of the database from stdin</source>
         <translation>ler palavra-passe da base de dados a partir de stdin</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Gestão da janela parental</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Já está em execução uma instância do KeePassXC.</translation>
@@ -6360,7 +6360,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Check if any passwords have been publicly leaked. FILENAME must be the path of a file listing SHA-1 hashes of leaked passwords in HIBP format, as available from https://haveibeenpwned.com/Passwords.</source>
-        <translation>Verifique se as suas palavras-passe foram reveladas publicamente. FILENAME tem que ser o caminho de um ficheiro que liste as &apos;hashes&apos; SHA-1 das palavras-passe reveladas (no formato HIBP), tal como definido em https://haveibeenpwned.com/Passwords.</translation>
+        <translation>Verifique se as suas palavras-passe foram expostas publicamente. FILENAME tem que ser o caminho de um ficheiro que liste as &apos;hashes&apos; SHA-1 das palavras-passe expostas (no formato HIBP), tal como definido em https://haveibeenpwned.com/Passwords.</translation>
     </message>
     <message>
         <source>FILENAME</source>
@@ -6552,7 +6552,7 @@ Kernel: %3 %4</translation>
     </message>
     <message numerus="yes">
         <source>Password for &apos;%1&apos; has been leaked %2 time(s)!</source>
-        <translation><numerusform>A palavra-passe para &apos;%1&apos; foi revelada %2 vez!</numerusform><numerusform>A palavra-passe para &apos;%1&apos; foi revelada %2 vezes!</numerusform></translation>
+        <translation><numerusform>A palavra-passe para &apos;%1&apos; foi exposta %2 vez!</numerusform><numerusform>A palavra-passe para &apos;%1&apos; foi exposta %2 vezes!</numerusform></translation>
     </message>
     <message>
         <source>Invalid password generator after applying all options</source>
@@ -6704,7 +6704,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Repeat password: </source>
-        <translation>Repetição de palavra-passe:</translation>
+        <translation>Repetição de palavra-passe: </translation>
     </message>
     <message>
         <source>Error: Passwords do not match.</source>
@@ -6720,10 +6720,6 @@ Kernel: %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation>AES (%1 ciclos)</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (%1 ciclos, %2 KB)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-bit</translation>
@@ -6750,6 +6746,68 @@ Kernel: %3 %4</translation>
         <comment>seconds</comment>
         <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>caminho para um ficheiro de configuração local</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>AVISO: está a utilizar um formato de ficheiro-chave antigo que KeePassXC
+pode deixar de ter suporte no futuro.
+
+Deve considerar a geração de um novo ficheiro-chave.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 ciclos, %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 – recomendado)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ícone</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Versão de ficheiro-chave não suportada: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>Disparidade &apos;checksum&apos;! O ficheiro-chave pode estar danificado.</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>Dados inesperados! O ficheiro-chave pode estar danificado.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation><numerusform>A área de transferência será limpa dentro de %1 segundo...</numerusform><numerusform>A área de transferência será limpa dentro de %1 segundos...</numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>bloquear todas as bases de dados abertas</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>Bases de dados bloqueadas.</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>Não foi possível desbloquear a base de dados.</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -6824,7 +6882,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source> (Excluded)</source>
-        <translation>(Excluída)</translation>
+        <translation> (Excluída)</translation>
     </message>
     <message>
         <source>This entry is being excluded from reports</source>
@@ -6836,7 +6894,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Congratulations, everything is healthy!</source>
-        <translation>Parabéns, tudo parece estar bem.</translation>
+        <translation>Parabéns, tudo parece estar bem!</translation>
     </message>
     <message>
         <source>Title</source>
@@ -6883,7 +6941,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Congratulations, no exposed passwords!</source>
-        <translation>Parabéns, não possui palavras-passe expostas.</translation>
+        <translation>Parabéns, não possui palavras-passe expostas!</translation>
     </message>
     <message>
         <source>Title</source>
@@ -6899,7 +6957,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source> (Excluded)</source>
-        <translation>(Excluída)</translation>
+        <translation> (Excluída)</translation>
     </message>
     <message>
         <source>This entry is being excluded from reports</source>
@@ -6962,7 +7020,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Please wait, database statistics are being calculated...</source>
-        <translation>Por favor aguarde. As estatísticas da base de dados estão a ser calculadas.</translation>
+        <translation>Por favor aguarde. As estatísticas da base de dados estão a ser calculadas...</translation>
     </message>
     <message>
         <source>Database name</source>
@@ -7173,10 +7231,6 @@ Kernel: %3 %4</translation>
         <source>Search</source>
         <translation>Pesquisa</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Limpar</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Limitar pesquisa ao grupo selecionado</translation>
@@ -7231,7 +7285,7 @@ Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Don&apos;t confirm when entries are deleted by clients</source>
-        <translation>Não confirmar se as entradas forem apagadas pelos clientes.</translation>
+        <translation>Não confirmar se as entradas forem apagadas pelos clientes</translation>
     </message>
     <message>
         <source>&lt;b&gt;Error:&lt;/b&gt; Failed to connect to DBus. Please check your DBus setup.</source>
@@ -7456,10 +7510,6 @@ Kernel: %3 %4</translation>
         <source>Could not write export container</source>
         <translation>Não foi possível escrever o contentor de exportação</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Ocorreu um erro inesperado ao exportar</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7527,10 +7577,6 @@ Kernel: %3 %4</translation>
         <source>File does not exist</source>
         <translation>O ficheiro não existe</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Tipo de contentor de partilha desconhecido</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>
@@ -7738,7 +7784,7 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>KeePassXC %1 is currently the newest version available</source>
-        <translation>Atualmente, KeePassXC %1 é a versão mais recente.</translation>
+        <translation>Atualmente, KeePassXC %1 é a versão mais recente</translation>
     </message>
 </context>
 <context>
@@ -7820,11 +7866,11 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>A USB error ocurred when accessing the hardware key: %1</source>
-        <translation>Ocorreu um erro USB ao tentar aceder à chave de hardware: %1.</translation>
+        <translation>Ocorreu um erro USB ao tentar aceder à chave de hardware: %1</translation>
     </message>
     <message>
         <source>Failed to complete a challenge-response, the specific error was: %1</source>
-        <translation>Erro ao tentar concluir a pergunta de segurança. O erro foi: %1.</translation>
+        <translation>Erro ao tentar concluir a pergunta de segurança. O erro foi: %1</translation>
     </message>
 </context>
 <context>
@@ -7851,7 +7897,7 @@ Example: JBSWY3DPEHPK3PXP</source>
     </message>
     <message>
         <source>Could not find any hardware keys!</source>
-        <translation>Não foram encontradas chaves de hardware.</translation>
+        <translation>Não foram encontradas chaves de hardware!</translation>
     </message>
     <message>
         <source>Selected hardware key slot does not support challenge-response!</source>

share/translations/keepassxc_ro.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -1113,6 +1117,14 @@ chrome-laptop.</translation>
         <source>Column %1</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icon</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1209,20 +1221,6 @@ Baza de date de rezervă localizată la %2</translation>
         <source>Refresh</source>
         <translation>Actualizează</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Format moștenit de fișier cheie </translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Utilizați un format moștenit de fișier cheie  care poate deveni
-neacceptat în viitor.
-
-Vă rugăm să luați în considerare generarea unui nou fișier cheie.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Nu mai afișa acest avertisment</translation>
@@ -1283,14 +1281,6 @@ Vă rugăm să luați în considerare generarea unui nou fișier cheie.</transla
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID pentru deblocare rapidă</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Golește</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Ștergeți fișierul cheie</translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Deblocarea a eșuat și nu a fost dată nicio parolă</translation>
@@ -1361,6 +1351,14 @@ Dacă nu aveți un fișier cheie, lăsați câmpul gol.</translation>
         <source>Select hardware key…</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2293,6 +2291,15 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2490,6 +2497,14 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2612,6 +2627,10 @@ Dezactivați salvarea sigură și încercați din nou?</translation>
         <source>Expires:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2912,6 +2931,10 @@ Extensiile acceptate sunt: %1.</translation>
         <source>Set default Auto-Type sequence</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3409,11 +3432,6 @@ Are you sure to add this file?</source>
         <source>[PROTECTED]</source>
         <translation>[PROTEJAT]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;:%2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Activat</translation>
@@ -3434,6 +3452,15 @@ Are you sure to add this file?</source>
         <source>Advanced</source>
         <translation>Avansat</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3444,18 +3471,6 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Particularizare vizualizare</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Ascundere nume de utilizator</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Ascundere parole</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>Potrivire la fereastră</translation>
@@ -3488,15 +3503,15 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -4320,10 +4335,6 @@ Dacă reîncepe, atunci fișierul dvs. de bază de date poate fi corupt.</transl
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Aveți posibilitatea să adăugați un fișier cheie care conține octeți aleatoare pentru securitate suplimentară.&lt;/p&gt;&lt;p&gt;Trebuie să-l păstrați secret și niciodată nu-l pierde sau vei fi blocat!&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Format moștenit de fișier cheie </translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4354,26 +4365,14 @@ Mesaj: %2</translation>
         <source>Select a key file</source>
         <translation>Selectați un fișier cheie</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Selectarea fișierelor cheie</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Căutați fișierul cheie</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Răsfoiește...</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Generați un nou fișier cheie</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Notă: Nu folosiți un fișier care s-ar putea schimba, deoarece acest lucru vă va împiedica să deblocați baza de date!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Fișier cheie nevalid</translation>
@@ -4393,10 +4392,23 @@ Are you sure you want to continue with this file?</source>
 Sigur doriți să continuați cu acest fișier?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
+        <source>Old key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse…</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -4862,6 +4874,18 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
         <source>{PASSWORD}{ENTER}</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Ascundere nume de utilizator</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Ascundere parole</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5386,10 +5410,6 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
         <source>Hex</source>
         <translation>Hex</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Caractere excluse: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;.&quot;</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Parol generat</translation>
@@ -5482,10 +5502,6 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Golește</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation type="unfinished"/>
@@ -5494,6 +5510,10 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
         <source>Special Characters</source>
         <translation>Caractere speciale</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5732,16 +5752,6 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
         <source>Perform advanced analysis on the password.</source>
         <translation>Efectuați o analiză avansată a parolei.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Avertisment: utilizați un format de fișier cheie moștenit care poate deveni
-neacceptat în viitor.
-
-Vă rugăm să luați în considerare generarea unui nou fișier cheie.</translation>
-    </message>
     <message>
         <source>
 
@@ -6129,10 +6139,6 @@ Comenzi disponibile:
         <source>%1: (row, col) %2,%3</source>
         <translation>% 1: (rând, col) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – recomandat)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6223,10 +6229,6 @@ Comenzi disponibile:
         <source>read password of the database from stdin</source>
         <translation>citi parola bazei de date de la stdin</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Handle fereastră părinte</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>O altă instanță a KeePassXC este deja în execuție.</translation>
@@ -6712,10 +6714,6 @@ Nucleu (Kernel): %3 %4</translation>
         <source>AES (%1 rounds)</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256-biți</translation>
@@ -6742,6 +6740,65 @@ Nucleu (Kernel): %3 %4</translation>
         <comment>seconds</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icon</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7165,10 +7222,6 @@ Nucleu (Kernel): %3 %4</translation>
         <source>Search</source>
         <translation>Caută</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Golește</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Limitați căutarea la grupul selectat</translation>
@@ -7448,10 +7501,6 @@ Nucleu (Kernel): %3 %4</translation>
         <source>Could not write export container</source>
         <translation>Imposibil de scris container de export</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Eroare de export neașteptată</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7519,10 +7568,6 @@ Nucleu (Kernel): %3 %4</translation>
         <source>File does not exist</source>
         <translation>Fișierul nu există</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Tip de container de partajare necunoscut</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>

share/translations/keepassxc_ru.ts

@@ -139,6 +139,10 @@
         <source>You must restart the application to set the new language. Would you like to restart now?</source>
         <translation>Вы должны перезапустить приложение, чтобы установить новый язык. Хотите перезапустить сейчас?</translation>
     </message>
+    <message>
+        <source>Monochrome</source>
+        <translation>Монохромный</translation>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -1106,12 +1110,20 @@ chrome-laptop.</source>
     </message>
     <message>
         <source>Not Present</source>
-        <translation>Отусуствует</translation>
+        <translation>Отсутствует</translation>
     </message>
     <message>
         <source>Column %1</source>
         <translation>Столбец %1</translation>
     </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Значок</translation>
+    </message>
 </context>
 <context>
     <name>CsvParserModel</name>
@@ -1208,19 +1220,6 @@ Backup database located at %2</source>
         <source>Refresh</source>
         <translation>Обновить</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Устаревший формат файла-ключа</translation>
-    </message>
-    <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>Вы используете файл-ключ устаревшего формата, поддержка которого может быть прекращена в будущем.
-
-По возможности создайте новый файл-ключ.</translation>
-    </message>
     <message>
         <source>Don&apos;t show this warning again</source>
         <translation>Не показывать это предупреждение</translation>
@@ -1281,14 +1280,6 @@ Please consider generating a new key file.</source>
         <source>TouchID for Quick Unlock</source>
         <translation>TouchID для Быстрой Разблокировки</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Очистить</translation>
-    </message>
-    <message>
-        <source>Clear Key File</source>
-        <translation>Очистить строку выбора файла-ключа </translation>
-    </message>
     <message>
         <source>Unlock failed and no password given</source>
         <translation>Неудачное разблокирование, пароль не указан</translation>
@@ -1358,6 +1349,14 @@ If you do not have a key file, please leave the field empty.</source>
         <source>Select hardware key…</source>
         <translation>Выберите аппаратный ключ...</translation>
     </message>
+    <message>
+        <source>Old key file format</source>
+        <translation>Старый формат файла-ключа</translation>
+    </message>
+    <message>
+        <source>You are using an old key file format which KeePassXC may&lt;br&gt;stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file by going to:&lt;br&gt;&lt;strong&gt;Database / Database Security / Change Key File.&lt;/strong&gt;&lt;br&gt;</source>
+        <translation>Вы используете старый формат файла-ключа, который KeePassXC может прекратить поддерживать в будущем. Пожалуйста, сгенерируете новый файл-ключ, перейдя в раздел параметров безопасности базы данных.</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -2291,6 +2290,15 @@ Disable safe saves and try again?</source>
         <source>[PROTECTED] Press Reveal to view or edit</source>
         <translation>[ЗАЩИЩЕНО] Нажмите для восстановления или изменения</translation>
     </message>
+    <message>
+        <source>Invalid Entry</source>
+        <translation>Недопустимая запись</translation>
+    </message>
+    <message>
+        <source>An external merge operation has invalidated this entry.
+Unfortunately, any changes made have been lost.</source>
+        <translation>Операция по слиянию сделала эту запись недействительной. К сожалению, любые изменения были потеряны.</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -2488,6 +2496,14 @@ Disable safe saves and try again?</source>
         <source>Use this entry only with HTTP Basic Auth</source>
         <translation>Использовать эту запись только при обычной проверке подлинности HTTP</translation>
     </message>
+    <message>
+        <source>Do not send this setting to the browser for HTTP Auth dialogs. If enabled, HTTP Auth dialogs will not show this entry for selection.</source>
+        <translation>Не отправлять эту настройку в браузер для HTTP Auth диалогов. Если включено, данные диалоги не покажутся для этой записи для выбора.</translation>
+    </message>
+    <message>
+        <source>Do not use this entry with HTTP Basic Auth</source>
+        <translation>Не использовать эту запись для базовой HTTP авторизации</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -2610,6 +2626,10 @@ Disable safe saves and try again?</source>
         <source>Expires:</source>
         <translation>Истекает:</translation>
     </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation>Редактировать запись</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
@@ -2909,6 +2929,10 @@ Supported extensions are: %1.</source>
         <source>Set default Auto-Type sequence</source>
         <translation>Задать последовательность автоввода по умолчанию</translation>
     </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Редактировать группу</translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
@@ -3410,11 +3434,6 @@ Are you sure to add this file?</source>
         <source>[PROTECTED]</source>
         <translation>[ЗАЩИЩЕНО]</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
-        <comment>attributes line</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
-    </message>
     <message>
         <source>Enabled</source>
         <translation>Включено</translation>
@@ -3435,6 +3454,15 @@ Are you sure to add this file?</source>
         <source>Advanced</source>
         <translation>Расширенный режим</translation>
     </message>
+    <message>
+        <source>Default Sequence</source>
+        <translation>Последовательность по умолчанию</translation>
+    </message>
+    <message>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</source>
+        <comment>attributes line</comment>
+        <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;%1&lt;/b&gt;:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EntryURLModel</name>
@@ -3445,18 +3473,6 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>EntryView</name>
-    <message>
-        <source>Customize View</source>
-        <translation>Настройка вида</translation>
-    </message>
-    <message>
-        <source>Hide Usernames</source>
-        <translation>Скрыть логины</translation>
-    </message>
-    <message>
-        <source>Hide Passwords</source>
-        <translation>Скрыть пароли</translation>
-    </message>
     <message>
         <source>Fit to window</source>
         <translation>По размеру окна</translation>
@@ -3489,15 +3505,15 @@ Are you sure to add this file?</source>
 </context>
 <context>
     <name>FdoSecrets::Service</name>
+    <message>
+        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
+        <translation>Не удалось зарегистрировать службу DBus на %1.&lt;br/&gt;</translation>
+    </message>
     <message numerus="yes">
         <source>%n Entry(s) was used by %1</source>
         <comment>%1 is the name of an application</comment>
         <translation><numerusform>%n запись использована %1</numerusform><numerusform>%n записи использованы %1</numerusform><numerusform>%n записей использованы %1</numerusform><numerusform>%n записи использованы %1</numerusform></translation>
     </message>
-    <message>
-        <source>Failed to register DBus service at %1.&lt;br/&gt;</source>
-        <translation>Не удалось зарегистрировать службу DBus на %1.&lt;br/&gt;</translation>
-    </message>
 </context>
 <context>
     <name>FdoSecrets::SettingsDatabaseModel</name>
@@ -3664,7 +3680,7 @@ You can enable the DuckDuckGo website icon service in the security section of th
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
         <translation>Вероятно, для входа были указанные неверные данные.
-Попробуйте ввести данные ещё раз, если ошибка повториться, возможно, файл базы данных повреждён.</translation>
+Попробуйте ввести данные ещё раз, если ошибка повторится, возможно, файл базы данных повреждён.</translation>
     </message>
     <message>
         <source>Unable to calculate database key</source>
@@ -3804,7 +3820,7 @@ If this reoccurs, then your database file may be corrupt.</source>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
         <translation>Вероятно, для входа были указанные неверные данные.
-Попробуйте ввести данные ещё раз, если ошибка повториться, возможно, файл базы данных повреждён.</translation>
+Попробуйте ввести данные ещё раз, если ошибка повторится, возможно, файл базы данных повреждён.</translation>
     </message>
     <message>
         <source>(HMAC mismatch)</source>
@@ -3868,7 +3884,7 @@ If this reoccurs, then your database file may be corrupt.</source>
     </message>
     <message>
         <source>Invalid random stream id size</source>
-        <translation>Недопустимый размер индентификатора случайного потока</translation>
+        <translation>Недопустимый размер идентификатора случайного потока</translation>
     </message>
     <message>
         <source>Invalid inner random stream cipher</source>
@@ -4192,7 +4208,7 @@ Line %2, column %3</source>
     </message>
     <message>
         <source>Invalid entry creation time field size</source>
-        <translation>Недопустимный размер поля времени создания записи</translation>
+        <translation>Недопустимый размер поля времени создания записи</translation>
     </message>
     <message>
         <source>Invalid entry modification time field size</source>
@@ -4214,7 +4230,7 @@ Line %2, column %3</source>
         <source>Invalid credentials were provided, please try again.
 If this reoccurs, then your database file may be corrupt.</source>
         <translation>Вероятно, для входа были указанные неверные данные.
-Попробуйте ввести данные ещё раз, если ошибка повториться, возможно, файл базы данных повреждён.</translation>
+Попробуйте ввести данные ещё раз, если ошибка повторится, возможно, файл базы данных повреждён.</translation>
     </message>
     <message>
         <source>Unable to calculate database key</source>
@@ -4321,10 +4337,6 @@ If this reoccurs, then your database file may be corrupt.</source>
         <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Для большей безопасности вы можете добавить файл-ключ со случайным содержимым.&lt;/p&gt;&lt;p&gt;Храните его в надёжном месте и не теряйте, иначе доступ к базе будет заблокирован.&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation>Устаревший формат ключевого файла</translation>
-    </message>
     <message>
         <source>Error loading the key file '%1'
 Message: %2</source>
@@ -4355,26 +4367,14 @@ Message: %2</source>
         <source>Select a key file</source>
         <translation>Выберите файл-ключ</translation>
     </message>
-    <message>
-        <source>Key file selection</source>
-        <translation>Выбор файла-ключа</translation>
-    </message>
     <message>
         <source>Browse for key file</source>
         <translation>Открыть диалога выбора файла-ключа</translation>
     </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Обзор…</translation>
-    </message>
     <message>
         <source>Generate a new key file</source>
         <translation>Создать новый файл-ключ</translation>
     </message>
-    <message>
-        <source>Note: Do not use a file that may change as that will prevent you from unlocking your database!</source>
-        <translation>Внимание: изменение файла приведёт к невозможности разблокировать базу данных!</translation>
-    </message>
     <message>
         <source>Invalid Key File</source>
         <translation>Неверный файл-ключ</translation>
@@ -4394,13 +4394,25 @@ Are you sure you want to continue with this file?</source>
 Продолжить использовать выбранный файл?</translation>
     </message>
     <message>
-        <source>You are using a legacy key file format which may become
-unsupported in the future.
-
-Generate a new key file in the database security settings.</source>
-        <translation>Вы используете файл-ключ устаревшего формата, поддержка которого может быть прекращена в будущем.
-
-По возможности создайте новый файл-ключ используя раздел параметров безопасности базы данных.</translation>
+        <source>Old key file format</source>
+        <translation>Устаревший формат файла-ключа</translation>
+    </message>
+    <message>
+        <source>You selected a key file in an old format which KeePassXC&lt;br&gt;may stop supporting in the future.&lt;br&gt;&lt;br&gt;Please consider generating a new key file instead.</source>
+        <translation>ВНИМАНИЕ: Вы используете файл-ключ устаревшего формата, поддержка которого может быть прекращена в будущем.
+По возможности создайте новый ключевой файл.</translation>
+    </message>
+    <message>
+        <source>Generate a new key file or choose an existing one to protect your database.</source>
+        <translation>Создать новый файл ключа или выбрать существующий, чтобы защитить базу данных.</translation>
+    </message>
+    <message>
+        <source>Note: Do NOT use a file that may change as that will prevent you from unlocking your database.</source>
+        <translation>Внимание: изменение файла приведёт к невозможности разблокировать базу данных!</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Обзор...</translation>
     </message>
 </context>
 <context>
@@ -4691,7 +4703,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Database &amp;Security…</source>
-        <translation>&amp;Безопаснось базы данных…</translation>
+        <translation>&amp;Безопасность базы данных…</translation>
     </message>
     <message>
         <source>Database &amp;Reports...</source>
@@ -4819,7 +4831,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
     </message>
     <message>
         <source>Dark</source>
-        <translation>Темная</translation>
+        <translation>Тёмная</translation>
     </message>
     <message>
         <source>Classic (Platform-native)</source>
@@ -4865,6 +4877,18 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>{PASSWORD}{ENTER}</source>
         <translation>{PASSWORD}{ENTER}</translation>
     </message>
+    <message>
+        <source>Always on Top</source>
+        <translation>Всегда поверх других окон</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Скрыть логины</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Скрыть пароли</translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5389,10 +5413,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Hex</source>
         <translation>Hex</translation>
     </message>
-    <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation>Исключить символы: «0», «1», «l», «I», «O», «|», «﹒»</translation>
-    </message>
     <message>
         <source>Generated password</source>
         <translation>Сгенерированный пароль</translation>
@@ -5485,10 +5505,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Очистить</translation>
-    </message>
     <message>
         <source>Regenerate password (%1)</source>
         <translation>Создать заново (%1)</translation>
@@ -5497,6 +5513,10 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Special Characters</source>
         <translation>Специальные символы</translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</source>
+        <translation>Исключить символы: &quot;0&quot;, &quot;O&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;|&quot;, &quot;G&quot;, &quot;6&quot;, &quot;B&quot;, &quot;8&quot;, &quot;﹒&quot;</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -5735,16 +5755,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Perform advanced analysis on the password.</source>
         <translation>Выполнить расширенный анализ пароля.</translation>
     </message>
-    <message>
-        <source>WARNING: You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</source>
-        <translation>ВНИМАНИЕ: Вы используете файл-ключ устаревшего формата, поддержка которого 
-может быть прекращена в будущем.
-
-По возможности создайте новый ключевой файл.</translation>
-    </message>
     <message>
         <source>
 
@@ -6132,10 +6142,6 @@ Available commands:
         <source>%1: (row, col) %2,%3</source>
         <translation>%1: (строка, столбец) %2,%3</translation>
     </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – рекомендуется)</translation>
-    </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
         <translation>AES-KDF (KDBX 4)</translation>
@@ -6226,10 +6232,6 @@ Available commands:
         <source>read password of the database from stdin</source>
         <translation>читать пароли базы данных с stdin</translation>
     </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Дескриптор родительского окна</translation>
-    </message>
     <message>
         <source>Another instance of KeePassXC is already running.</source>
         <translation>Другой экземпляр KeePassXC уже запущен.</translation>
@@ -6715,10 +6717,6 @@ Kernel: %3 %4</source>
         <source>AES (%1 rounds)</source>
         <translation>AES (%1 раунд(а))</translation>
     </message>
-    <message>
-        <source>Argon2 (%1 rounds, %2 KB)</source>
-        <translation>Argon2 (%1 раунда(а), %2 КБ)</translation>
-    </message>
     <message>
         <source>AES 256-bit</source>
         <translation>AES 256 бит</translation>
@@ -6745,6 +6743,68 @@ Kernel: %3 %4</source>
         <comment>seconds</comment>
         <translation><numerusform>%1 с</numerusform><numerusform>%1 с</numerusform><numerusform>%1 с</numerusform><numerusform>%1 с</numerusform></translation>
     </message>
+    <message>
+        <source>path to a custom local config file</source>
+        <translation>Путь к пользовательскому файлу настроек</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an old key file format which KeePassXC may
+stop supporting in the future.
+
+Please consider generating a new key file.</source>
+        <translation>ВНИМАНИЕ: Вы используете файл-ключ устаревшего формата, поддержка которого 
+может быть прекращена в будущем.
+
+По возможности создайте новый ключевой файл.</translation>
+    </message>
+    <message>
+        <source>Argon2%1 (%2 rounds, %3 KB)</source>
+        <translation>Argon2%1 (%2 раунда(-ов), %3 KB)</translation>
+    </message>
+    <message>
+        <source>Argon2d (KDBX 4 – recommended)</source>
+        <translation>Argon2d (KDBX 4 – рекомендуемок)</translation>
+    </message>
+    <message>
+        <source>Argon2id (KDBX 4)</source>
+        <translation>Argon2id (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Значок</translation>
+    </message>
+    <message>
+        <source>Unsupported key file version: %1</source>
+        <translation>Неподдерживаемый тип файла-ключа: %1</translation>
+    </message>
+    <message>
+        <source>Checksum mismatch! Key file may be corrupt.</source>
+        <translation>Несоответствие хэша! Возможно, ключ-файл повреждён</translation>
+    </message>
+    <message>
+        <source>Unexpected key file data! Key file may be corrupt.</source>
+        <translation>Неожиданные данные в файле-ключе! Вероятно, он повреждён</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)…</source>
+        <translation><numerusform>Буфер обмена будет очищен через %1 с</numerusform><numerusform>Буфер обмена будет очищен через %1 с</numerusform><numerusform>Буфер обмена будет очищен через %1 с</numerusform><numerusform>Буфер обмена будет очищен через %1 с</numerusform></translation>
+    </message>
+    <message>
+        <source>lock all open databases</source>
+        <translation>заблокировать все открытые базы данных</translation>
+    </message>
+    <message>
+        <source>Locked databases.</source>
+        <translation>Базы данных заблокированы.</translation>
+    </message>
+    <message>
+        <source>Database failed to lock.</source>
+        <translation>Не удалось заблокировать базы данных.</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -7168,10 +7228,6 @@ Kernel: %3 %4</source>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Очистить</translation>
-    </message>
     <message>
         <source>Limit search to selected group</source>
         <translation>Поиск только в выбранной группе</translation>
@@ -7451,10 +7507,6 @@ Kernel: %3 %4</source>
         <source>Could not write export container</source>
         <translation>Не удалось записать экспортируемый контейнер</translation>
     </message>
-    <message>
-        <source>Unexpected export error occurred</source>
-        <translation>Неизвестная ошибка экспорта</translation>
-    </message>
 </context>
 <context>
     <name>ShareImport</name>
@@ -7522,10 +7574,6 @@ Kernel: %3 %4</source>
         <source>File does not exist</source>
         <translation>Файл не существует</translation>
     </message>
-    <message>
-        <source>Unknown share container type</source>
-        <translation>Неизвестный тип совместного контейнера</translation>
-    </message>
 </context>
 <context>
     <name>ShareObserver</name>